Merge pull request #101 from jsperhac/php7-xdmod

Modify xdmod source for php7 compatibility. Schema version changes requested by @jtpalmer are included.
ubccr · Apr 20, 2017 · 678b7c7 · 678b7c7
2 parents eed4e57 + 53e923d
commit 678b7c7
Show file tree

Hide file tree

Showing 14 changed files with 9 additions and 305 deletions.
diff --git a/classes/Glossary.php b/classes/Glossary.php
diff --git a/classes/OpenXdmod/DataWarehouseInitializer.php b/classes/OpenXdmod/DataWarehouseInitializer.php
@@ -53,7 +53,7 @@ class DataWarehouseInitializer
      * @var array
      */
     protected $shreddedJobIngestors = array(
-        'Resource',
+        'Resources',
         'PI',
         'PIResource',
         'UserPIResource',

diff --git a/.../OpenXdmod/Ingestor/Shredded/Resource.php → ...OpenXdmod/Ingestor/Shredded/Resources.php b/.../OpenXdmod/Ingestor/Shredded/Resource.php → ...OpenXdmod/Ingestor/Shredded/Resources.php
@@ -4,7 +4,7 @@
 
 use PDODBSynchronizingIngestor;
 
-class Resource extends PDODBSynchronizingIngestor
+class Resources extends PDODBSynchronizingIngestor
 {
     public function __construct($dest_db, $src_db)
     {
@@ -20,4 +20,3 @@ public function __construct($dest_db, $src_db)
         );
     }
 }
-
diff --git a/db/data/moddb.sql b/db/data/moddb.sql
@@ -37,4 +37,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
-INSERT INTO `schema_version_history` VALUES ('moddb', '6.6.0', NOW(), 'created', 'N/A');
+INSERT INTO `schema_version_history` VALUES ('moddb', '6.7.0', NOW(), 'created', 'N/A');
diff --git a/db/migrations/6.6.0-6.7.0/moddb.sql b/db/migrations/6.6.0-6.7.0/moddb.sql
@@ -0,0 +1,5 @@
+DROP TABLE IF EXISTS `Glossary`;
+
+DROP TABLE IF EXISTS `GlossaryAliases`;
+
+INSERT INTO `schema_version_history` VALUES ('moddb', '6.7.0', NOW(), 'upgraded', 'N/A');
diff --git a/db/schema/moddb.sql b/db/schema/moddb.sql
@@ -73,22 +73,6 @@ CREATE TABLE `ExceptionEmailAddresses` (
   `email_address` varchar(200) DEFAULT NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
 /*!40101 SET character_set_client = @saved_cs_client */;
-DROP TABLE IF EXISTS `Glossary`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `Glossary` (
-  `term` text,
-  `definition` text
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-DROP TABLE IF EXISTS `GlossaryAliases`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `GlossaryAliases` (
-  `term` text,
-  `alias` text
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
 DROP TABLE IF EXISTS `RESTx509`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;

diff --git a/html/controllers/ui_data/repogen_sites.php b/html/controllers/ui_data/repogen_sites.php
diff --git a/html/controllers/user_profile.php b/html/controllers/user_profile.php
diff --git a/html/controllers/user_profile/fetch_profile.php b/html/controllers/user_profile/fetch_profile.php
diff --git a/html/controllers/user_profile/list_fields_of_science.php b/html/controllers/user_profile/list_fields_of_science.php
diff --git a/html/controllers/user_profile/update_profile.php b/html/controllers/user_profile/update_profile.php
diff --git a/libraries/network.php b/libraries/network.php
diff --git a/libraries/utilities.php b/libraries/utilities.php
@@ -184,28 +184,6 @@ function quote($entity)
     return "'$entity'";
 }
 
-/**
- * Resolve a token?
- */
-function tokenResolver($input)
-{
-    $user = \xd_security\getLoggedInUser();
-
-    $mappings = array(
-        "username" => $user->getUsername()
-    );
-
-    $output = $input;
-
-    foreach ($mappings as $find => $replace) {
-        $output = str_replace("<$find>", $replace, $output);
-    }
-
-    $output = mysql_escape_string($output);
-
-    return $output;
-}
-
 /**
  * Remove an element from an array.
  */

diff --git a/open_xdmod/modules/xdmod/integration_tests/lib/TestHarness/XdmodTestHelper.php b/open_xdmod/modules/xdmod/integration_tests/lib/TestHarness/XdmodTestHelper.php
@@ -47,7 +47,7 @@ public function __construct($config = array())
 
     private function processResponseHeader($curl, $headerline)
     {
-        $tokens = split(':', $headerline);
+        $tokens = explode(':', $headerline);
         if (count($tokens) == 2) {
             $this->responseHeaders[$tokens[0]] = $tokens[1];
         }