PHP 7.3 compat, bug fixes

querwurzelt · querwurzelt · commit f87c477cf1cb · 2019-01-21T22:13:45.000+01:00
diff --git a/README.md b/README.md
@@ -0,0 +1,16 @@
+# SemanticScuttle
+
+SemanticScuttle is a social bookmarking tool experimenting with new features like structured tags and collaborative descriptions of tags. Originally a fork of Scuttle, it has overtaken its ancestor in stability, features and usability.
+
+## Features
+  * LDAP/Active Directory authentication
+  * RSS feed support: global feed, user feeds, per-tag feeds, private feeds
+  * Public and private bookmarks
+  * Delicious and Browser bookmark import
+  * Theming support
+  * Firefox plugin
+
+## Origin
+
+  * https://sourceforge.net/projects/semanticscuttle/
+  * https://github.com/cweiske/SemanticScuttle
diff --git a/cache/.gitignore b/cache/.gitignore
@@ -0,0 +1 @@
+*.cache
diff --git a/cache/.htaccess b/cache/.htaccess
@@ -1,2 +1 @@
-order allow,deny
-deny from all
+Require all denied
diff --git a/data/config.default.php b/data/config.default.php
@@ -115,7 +115,7 @@
  *
  * @var string
  */
-$dir_cache = dirname(__FILE__) . '/cache/';
+$dir_cache = dirname(__DIR__, 1) . '/cache';
 
 /**
  * Use clean urls without .php filenames.
@@ -149,14 +149,14 @@
  *
  * @var string
  */
-$dbtype = 'mysql4';
+$dbtype = 'mysqli';
 
 /**
  * Database hostname/IP
  *
  * @var string
  */
-$dbhost = '127.0.0.1';
+$dbhost = 'localhost';
 
 /**
  * Database port.
diff --git 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/2.sql b/data/schema/2.sql
@@ -1,4 +1,4 @@
-ALTER TABLE `sc_bookmarks` CHANGE `bDescription` `bDescription` VARCHAR( 1500 )
+ALTER TABLE `sc_bookmarks` CHANGE `bDescription` `bDescription` VARCHAR( 1500 );
 CREATE TABLE `sc_tagscache` (
    `tcId` int(11) NOT NULL auto_increment,
    `tag1` varchar(100) NOT NULL default '',
diff --git a/data/tables.sql b/data/tables.sql
@@ -5,6 +5,8 @@
 -- Table structure for table `sc_bookmarks`
 -- 
 
+SET sql_mode = '';
+
 CREATE TABLE `sc_bookmarks` (
   `bId` int(11) NOT NULL auto_increment,
   `uId` int(11) NOT NULL default '0',
@@ -17,8 +19,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`),
diff --git a/data/templates/default/dynamictags.inc.php b/data/templates/default/dynamictags.inc.php
@@ -53,7 +53,7 @@ function writeTagsProposition($tagsCloud, $title)
 	$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
@@ -31,7 +31,7 @@
     }
 
     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
@@ -26,7 +26,7 @@
     }
 
     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
@@ -16,7 +16,7 @@
 <?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/res/docs/header.tpl.html b/res/docs/header.tpl.html
diff --git a/res/docs/style.css b/res/docs/style.css
diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php
@@ -734,7 +734,7 @@ public function getBookmarks(
             $tags = explode('+', trim($tags));
         }
 
-        $tagcount = count($tags);
+        $tagcount = empty($tags) ? 0 : count($tags);
         for ($i = 0; $i < $tagcount; $i ++) {
             $tags[$i] = trim($tags[$i]);
         }
@@ -853,7 +853,7 @@ public function getBookmarks(
             $aTerms = array_map('trim', $aTerms);
 
             // Search terms in tags as well when none given
-            if (!count($tags)) {
+            if (!empty($tags)) {
                 $query_2 .= ' LEFT JOIN '. $b2tservice->getTableName() .' AS T'
                     . ' ON B.bId = T.bId';
                 $dotags = true;
@@ -1136,7 +1136,7 @@ public function normalize($address)
 
         // Delete final /
         if (substr($address, -1) == '/') {
-            $address = substr($address, 0, count($address)-2);
+            $address = substr($address, 0, strlen($address)-2);
         }
 
         return $address;
diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php
@@ -691,14 +691,12 @@ function &tagCloud($tags = NULL, $steps = 5, $sizemin = 90, $sizemax = 225, $sor
         }
 
         if ($sortOrder == 'alphabet_asc') {
-            usort($output, create_function('$a,$b','return strcasecmp(utf8_deaccent($a["tag"]), utf8_deaccent($b["tag"]));'));
+            usort($output, "cmp");
         }
 
         return $output;
     }
 
-
-
     /**
      * Deletes all tags in bookmarks2tags
      *
@@ -711,4 +709,10 @@ public function deleteAll()
     }
 
 }
+
+function cmp($a,$b)
+{
+    return strcasecmp(utf8_deaccent($a["tag"]), utf8_deaccent($b["tag"]));
+}
+
 ?>
diff --git a/www/.htaccess b/www/.htaccess
@@ -6,7 +6,7 @@
 
 # Rewrite clean URLs onto real files
 <IfModule mod_rewrite.c>
-Options +FollowSymlinks
+Options -MultiViews +FollowSymlinks
 RewriteEngine On
 RewriteCond %{REQUEST_FILENAME}.php -f
 RewriteRule ^([^/.]+)/?(.*)$ /$1.php/$2 [QSA,L]

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1 @@`
`1`		`-order allow,deny`
`2`		`-deny from all`
	`1`	`+Require all denied`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ $cleanurls = false;`
`46`	`46`	`*`
`47`	`47`	`* @var boolean`
`48`	`48`	`*/`
`49`		`-$debugMode = true;`
	`49`	`+$debugMode = false;`
`50`	`50`
`51`	`51`
`52`	`52`	`/***************************************************`
`@@ -62,7 +62,7 @@ $debugMode = true;`
`62`	`62`	`*`
`63`	`63`	`* @var string`
`64`	`64`	`*/`
`65`		`-$dbtype = 'mysql4';`
	`65`	`+$dbtype = 'mysqli';`
`66`	`66`	`/**`
`67`	`67`	`* Database username`
`68`	`68`	`*`
`@@ -89,7 +89,7 @@ $dbname = 'scuttle';`
`89`	`89`	`*`
`90`	`90`	`* @var string`
`91`	`91`	`*/`
`92`		`-$dbhost = '127.0.0.1';`
	`92`	`+$dbhost = 'localhost';`
`93`	`93`
`94`	`94`
`95`	`95`	`/***************************************************`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		-ALTER TABLE `sc_bookmarks` CHANGE `bDescription` `bDescription` VARCHAR( 1500 )
	`1`	+ALTER TABLE `sc_bookmarks` CHANGE `bDescription` `bDescription` VARCHAR( 1500 );
`2`	`2`	CREATE TABLE `sc_tagscache` (
`3`	`3`	`tcId` int(11) NOT NULL auto_increment,
`4`	`4`	`tag1` varchar(100) NOT NULL default '',
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`foreach ($popularTags as $row) {`
`34`		`- $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']);`
	`34`	`+ $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']);`
`35`	`35`	`$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> ';`
`36`	`36`	`}`
`37`	`37`	`echo $contents ."\n";`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`foreach ($recentTags as $row) {`
`29`		`- $entries = T_ngettext('bookmark', 'bookmarks', $row['bCount']);`
	`29`	`+ $entries = T_ngettext('bookmark', 'bookmarks', (int)$row['bCount']);`
`30`	`30`	`$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> ';`
`31`	`31`	`}`
`32`	`32`	`echo $contents ."</p>\n";`