Merge pull request #67 from ucfopen/issue/git-dependencies-after-move

updates composer references to git repositories after move

composer.json

@@ -8,26 +8,26 @@
         },
         {
             "type": "git",
-            "url": "git@github.com:ucfcdl/Obojobo-Wordpress-Stats-Plugin.git"
+            "url": "https://github.com/ucfopen/Obojobo-Wordpress-Stats-Plugin.git"
         },
         {
             "type": "git",
-            "url": "git@github.com:ucfcdl/Obojobo-Wordpress-RocketD-Plugin.git"
+            "url": "https://github.com/ucfopen/Obojobo-Wordpress-Stats-Plugin.git"
         },
         {
             "type": "git",
-            "url": "git@github.com:ucfcdl/Obojobo-Wordpress-Theme.git"
+            "url": "https://github.com/ucfopen/Obojobo-Wordpress-Theme.git"
         },
         {
             "type": "git",
-            "url": "https://github.com/ucfcdl/php-saml.git"
+            "url": "https://github.com/ucfopen/Obojobo-Wordpress-RocketD-Plugin.git"
         }
     ],
     "require": {
-        "php": ">=5.4",
+        "php": ">=7.2",
         "onelogin/php-saml": "2.10.2",
         "monolog/monolog": "1.18.2",
-        "johnpbloch/wordpress": ">=5.1.1",
+        "johnpbloch/wordpress": ">=5.3.0",
         "obojobo/obo-stats": "0.0.3",
         "obojobo/rocketD": "0.0.3",
         "obojobo-themes/obojobo": "0.0.3",

internal/app.php

@@ -74,3 +74,22 @@ function classAutoLoader($className)
 	}
 	@include($file);
 }
+
+// Fix a bug with php7.1 + and php72-pecl-memcache which breaks the session handling w/ memcache
+class PeclMemcacheBugFixForSessionsHandler extends SessionHandler
+{
+	public function read($id)
+	{
+		$data = parent::read($id);
+		 // the bug is a result of pecl-memcache not returning an empty string
+		 // and that being incompatable with php 7.1's session handler
+		return empty($data) ? '' : $data;
+	}
+}
+
+if(\AppCfg::CACHE_MEMCACHE === true)
+{
+	$sessionHandler = new PeclMemcacheBugFixForSessionsHandler();
+	session_set_save_handler($sessionHandler);
+}
+// END php72-pecl-memcache bug fix

internal/classes/obo/log/LogManager.class.php

@@ -256,7 +256,7 @@ protected function getInteractionLogs($query, $totalsOnly=false)
 						{
 							$toSection = (int) ($r->{\cfg_obo_Track::IN} == 0 ? 1 : $r->{\cfg_obo_Track::IN});
 							$pageIndex = '?';
-							if(isset($lo->pages) && count($lo->pages > 0))
+							if(isset($lo->pages) && count($lo->pages) > 0)
 							{
 								switch($toSection)
 								{

internal/classes/obo/util/Cache.class.php

@@ -130,7 +130,7 @@ public function clearLock($loid)
 	{
 		if($this->memEnabled)
 		{
-			$this->delete($this->ns.'\obo\Lock:'.$lock->lockID);
+			$this->delete($this->ns.'\obo\Lock:'.$loid);
 		}
 	}
 

internal/classes/rocketD/auth/AuthManager.class.php

@@ -435,7 +435,7 @@ public function authenticate($requestVars, $authID=0 )
 		$authModList = $this->getAllAuthModules();
 
 		// loop through authmods
-		if(count($authModList > 0))
+		if(count($authModList) > 0)
 		{
 			foreach($authModList AS $authMod)
 			{