aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/config.default.php12
-rw-r--r--data/config.php.dist6
-rw-r--r--data/schema/7.sql1
-rw-r--r--data/tables.sql9
-rw-r--r--data/templates/default/bookmarks.tpl.php18
-rw-r--r--data/templates/default/dynamictags.inc.php2
-rw-r--r--data/templates/default/sidebar.block.popular.php2
-rw-r--r--data/templates/default/sidebar.block.recent.php2
-rw-r--r--data/templates/default/tags.tpl.php2
-rw-r--r--data/templates/default/top.inc.php1
10 files changed, 40 insertions, 15 deletions
diff --git a/data/config.default.php b/data/config.default.php
index 95df176..73b098b 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -115,7 +115,7 @@ $usecache = false;
*
* @var string
*/
-$dir_cache = dirname(__FILE__) . '/cache/';
+$dir_cache = dirname(__DIR__, 1) . '/cache';
/**
* Use clean urls without .php filenames.
@@ -149,14 +149,14 @@ $debugMode = false;
*
* @var string
*/
-$dbtype = 'mysql4';
+$dbtype = 'mysqli';
/**
* Database hostname/IP
*
* @var string
*/
-$dbhost = '127.0.0.1';
+$dbhost = 'localhost';
/**
* Database port.
@@ -796,4 +796,10 @@ $allowUnittestMode = false;
*/
$cacheUrl = null;
+/**
+ * bookmark-bot email address mapping
+ * Input address as key, user email as target
+ */
+$botMailMap = array();
+
?>
diff --git a/data/config.php.dist b/data/config.php.dist
index 5f49857..61eb7af 100644
--- a/data/config.php.dist
+++ b/data/config.php.dist
@@ -46,7 +46,7 @@ $cleanurls = false;
*
* @var boolean
*/
-$debugMode = true;
+$debugMode = false;
/***************************************************
@@ -62,7 +62,7 @@ $debugMode = true;
*
* @var string
*/
-$dbtype = 'mysql4';
+$dbtype = 'mysqli';
/**
* Database username
*
@@ -89,7 +89,7 @@ $dbname = 'scuttle';
*
* @var string
*/
-$dbhost = '127.0.0.1';
+$dbhost = 'localhost';
/***************************************************
diff --git a/data/schema/7.sql b/data/schema/7.sql
new file mode 100644
index 0000000..28694fa
--- /dev/null
+++ b/data/schema/7.sql
@@ -0,0 +1 @@
+CREATE INDEX sc_bookmarks2tags_index ON sc_bookmarks2tags(tag);
diff --git a/data/tables.sql b/data/tables.sql
index 68d5ba9..86779c2 100644
--- a/data/tables.sql
+++ b/data/tables.sql
@@ -5,6 +5,9 @@
-- Table structure for table `sc_bookmarks`
--
+# to avoid STRICT_TRANS_TABLES mode
+SET sql_mode = '';
+
CREATE TABLE `sc_bookmarks` (
`bId` int(11) NOT NULL auto_increment,
`uId` int(11) NOT NULL default '0',
@@ -17,8 +20,8 @@ CREATE TABLE `sc_bookmarks` (
`bDescription` text default NULL,
`bPrivateNote` text default NULL,
`bHash` varchar(32) NOT NULL default '',
- `bVotes` int(11) NOT NULL,
- `bVoting` int(11) NOT NULL,
+ `bVotes` int(11) NOT NULL default '0',
+ `bVoting` int(11) NOT NULL default '0',
`bShort` varchar(16) default NULL,
PRIMARY KEY (`bId`),
KEY `sc_bookmarks_usd` (`uId`,`bStatus`,`bDatetime`),
@@ -56,6 +59,8 @@ CREATE TABLE `sc_bookmarks2tags` (
KEY `sc_bookmarks2tags_bId` (`bId`)
) CHARACTER SET utf8 COLLATE utf8_general_ci ;
+CREATE INDEX sc_bookmarks2tags_index ON sc_bookmarks2tags(tag);
+
-- --------------------------------------------------------
--
diff --git a/data/templates/default/bookmarks.tpl.php b/data/templates/default/bookmarks.tpl.php
index 818eea0..20b5336 100644
--- a/data/templates/default/bookmarks.tpl.php
+++ b/data/templates/default/bookmarks.tpl.php
@@ -112,6 +112,7 @@ if($userservice->isLoggedOn()) {
window.onload = playerLoad;
</script>
+<?php if (count($bookmarks) > 1) { ?>
<p id="sort"><?php echo $total.' '.T_("bookmark(s)"); ?> - <?php echo T_("Sort by:"); ?>
<?php
$titleArrow = '';
@@ -162,6 +163,7 @@ default:
<a href="?sort=<?php echo $votingSort ?>"><?php echo T_("Voting").$votingArrow; ?></a>
<span>/</span>
<?php } ?>
+<?php } ?>
<?php
if ($currenttag!= '') {
@@ -275,6 +277,12 @@ if ($currenttag!= '') {
break;
}
+ // Add username in case bookmark was loaded using getBookmark()
+ if (!isset($row['username']) && isset($row['uId'])) {
+ $userinfo = $userservice->getObjectUser($row['uId']);
+ $row['username'] = $userinfo->username;
+ }
+
$cats = '';
$tagsForCopy = '';
$tags = $row['tags'];
@@ -310,12 +318,13 @@ if ($currenttag!= '') {
$update = ' <small title="'. T_('Last update') .'">('. date($GLOBALS['shortdate'], strtotime($row['bModified'])). ') </small>';
// User attribution
- $copy = ' ' . T_('by') . ' ';
if ($userservice->isLoggedOn()
&& $currentUser->getUsername() == $row['username']
) {
+ $copy = ' ' . T_('by') . ' ';
$copy .= T_('you');
- } else {
+ } else if (isset($row['username'])) {
+ $copy = ' ' . T_('by') . ' ';
$copy .= '<a href="' . createURL('bookmarks', $row['username']) . '">'
. SemanticScuttle_Model_UserArray::getName($row)
. '</a>';
@@ -506,6 +515,7 @@ if ($currenttag!= '') {
. $edit . "\n"
. $update . "\n"
. $cacheLink ."\n"
+ . ' | <a href="/permalink/'. $row['bId'] . '">Permalink</a>' ."\n"
. " </div>\n";
echo $privateNoteField != ''
? ' <div class="privateNote" title="'. T_('Private Note on this bookmark') .'">'.$privateNoteField."</div>\n"
@@ -524,8 +534,10 @@ if ($currenttag!= '') {
if(getPerPageCount($currentUser)>7) {
echo '<p class="backToTop"><a href="#header" title="'.T_('Come back to the top of this page.').'">'.T_('Top of the page').'</a></p>';
}
- echo $pagesBanner; // display previous and next links pages + RSS link
+ if (isset($bookmarks) && count($bookmarks) > 1) {
+ echo $pagesBanner; // display previous and next links pages + RSS link
+ }
} else {
echo '<p class="error">'.T_('No bookmarks available').'</p>';
diff --git a/data/templates/default/dynamictags.inc.php b/data/templates/default/dynamictags.inc.php
index c2ab6d4..f731048 100644
--- a/data/templates/default/dynamictags.inc.php
+++ b/data/templates/default/dynamictags.inc.php
@@ -53,7 +53,7 @@ JS;
$taglist = '';
foreach (array_keys($tagsCloud) as $key) {
$row = $tagsCloud[$key];
- $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']);
+ $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']);
$taglist .= '<span'
. ' title="'. $row['bCount'] . ' ' . $entries . '"'
. ' style="font-size:' . $row['size'] . '"'
diff --git a/data/templates/default/sidebar.block.popular.php b/data/templates/default/sidebar.block.popular.php
index 842aa60..83ad2fb 100644
--- a/data/templates/default/sidebar.block.popular.php
+++ b/data/templates/default/sidebar.block.popular.php
@@ -31,7 +31,7 @@ if ($popularTags && count($popularTags) > 0) {
}
foreach ($popularTags as $row) {
- $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']);
+ $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']);
$contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> ';
}
echo $contents ."\n";
diff --git a/data/templates/default/sidebar.block.recent.php b/data/templates/default/sidebar.block.recent.php
index 80ae71c..1deae27 100644
--- a/data/templates/default/sidebar.block.recent.php
+++ b/data/templates/default/sidebar.block.recent.php
@@ -26,7 +26,7 @@ if ($recentTags && count($recentTags) > 0) {
}
foreach ($recentTags as $row) {
- $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']);
+ $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']);
$contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> ';
}
echo $contents ."</p>\n";
diff --git a/data/templates/default/tags.tpl.php b/data/templates/default/tags.tpl.php
index d6259cc..dce5e1c 100644
--- a/data/templates/default/tags.tpl.php
+++ b/data/templates/default/tags.tpl.php
@@ -16,7 +16,7 @@ if ($tags && count($tags) > 0) {
<?php
$contents = '';
foreach ($tags as $row) {
- $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']);
+ $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']);
$contents .= '<a href="'. sprintf($cat_url, $user, filter($row['tag'], 'url')) .'" title="'. $row['bCount'] .' '. $entries .'" rel="tag" style="font-size:'. $row['size'] .'">'. filter($row['tag']) .'</a> ';
}
echo $contents ."\n";
diff --git a/data/templates/default/top.inc.php b/data/templates/default/top.inc.php
index 55be4a7..79cc2e2 100644
--- a/data/templates/default/top.inc.php
+++ b/data/templates/default/top.inc.php
@@ -3,6 +3,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
<head>
<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />
+ <meta name="viewport" content="width=device-width,initial-scale=1">
<title><?php echo filter($GLOBALS['sitename'] .(isset($pagetitle) ? ' ยป ' . $pagetitle : '')); ?></title>
<link rel="icon" type="image/png" href="<?php echo $theme->resource('icon.png');?>" />
<link rel="stylesheet" type="text/css" href="<?php echo $theme->resource('scuttle.css');?>" />
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-09 16:14:10 +0000