Dev Removed 5.4 dependent functionality.

LimeSurvey · Jan 13, 2015 · c13ab2a · c13ab2a
1 parent c07ce02
commit c13ab2a
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 28 deletions.
diff --git a/application/controllers/RegisterController.php b/application/controllers/RegisterController.php
@@ -303,9 +303,9 @@ public function getTokenId($iSurveyId)
 
         $aFieldValue=$this->getFieldValue($iSurveyId);
         // Now construct the text returned
-        $oToken=Token::model($iSurveyId)->findByAttributes([
+        $oToken=Token::model($iSurveyId)->findByAttributes(array(
             'email' => $aFieldValue['sEmail']
-        ]);
+        ));
         if ($oToken)
          {
             if($oToken->usesleft<1 && $aSurveyInfo['alloweditaftercompletion']!='Y')

diff --git a/application/controllers/admin/assessments.php b/application/controllers/admin/assessments.php
@@ -125,7 +125,7 @@ private function _collectGroupData($iSurveyID)
     private function _collectEditData(array $aData)
     {
         $assessments = Assessment::model()->findAllByAttributes(array(
-            'id' => sanitize_int($_POST['id'])
+            'id' => sanitize_int($_POST['id']),
             'language' => App()->language
         ));
 

diff --git a/application/core/db/DbConnection.php b/application/core/db/DbConnection.php
@@ -4,13 +4,13 @@ class DbConnection extends \CDbConnection
 {
     public function __construct($dsn = '', $username = '', $password = '') {
         parent::__construct($dsn, $username, $password);
-        $this->driverMap = array_merge($this->driverMap, [
+        $this->driverMap = array_merge($this->driverMap, array(
             'mysql' => 'MysqlSchema',
             'mysqli' => 'MysqlSchema',
             'mssql' => 'MssqlSchema',
             'dblib' => 'MssqlSchema',
             'sqlsrv' => 'MssqlSchema',
-        ]);
+        ));
     }
 }
 ?>
diff --git a/application/core/db/MssqlSchema.php b/application/core/db/MssqlSchema.php
@@ -30,7 +30,14 @@ public function getColumnType($type)
          * Not confirmed.
          * If resulting type doesn't contain NULL then add it.
          */
-        $result = parent::getColumnType($type);
+        if (preg_match('/([[:alpha:]]+)\s*(\(.+?\)).*/', $type, $matches)) {
+            $baseType = parent::getColumnType($type);
+            $param = $matches[2];
+            $result = preg_replace('/\(.+?\)/', $param, $baseType, 1);
+        } else {
+            $result = parent::getColumnType($type);
+        }
+
         if (stripos($result, 'NULL') === false) {
             $result .= ' NULL';
         }

diff --git a/application/core/db/MysqlSchema.php b/application/core/db/MysqlSchema.php
@@ -2,8 +2,6 @@
 
 class MysqlSchema extends CMysqlSchema
 {
-    use SmartColumnTypeTrait;
-
     public function __construct($conn) {
         parent::__construct($conn);
         /**
@@ -18,4 +16,16 @@ public function createTable($table, $columns, $options = null) {
         return $result;
     }
 
+    public function getColumnType($type)
+	{
+        if (preg_match('/([[:alpha:]]+)\s*(\(.+?\)).*/', $type, $matches)) {
+            $baseType = parent::getColumnType($type);
+            $param = $matches[2];
+            $result = preg_replace('/\(.+?\)/', $param, $baseType, 1);
+        } else {
+            $result = parent::getColumnType($type);
+        }
+        return $result;		
+	}
+
 }
diff --git a/application/core/db/PgsqlSchema.php b/application/core/db/PgsqlSchema.php
@@ -2,12 +2,23 @@
 
 class PgsqlSchema extends CPgsqlSchema
 {
-    use SmartColumnTypeTrait;
     public function __construct($conn) {
         parent::__construct($conn);
         /**
          * Auto increment.
          */
         $this->columnTypes['autoincrement'] = 'serial';
     }
+
+    public function getColumnType($type)
+	{
+        if (preg_match('/([[:alpha:]]+)\s*(\(.+?\)).*/', $type, $matches)) {
+            $baseType = parent::getColumnType($type);
+            $param = $matches[2];
+            $result = preg_replace('/\(.+?\)/', $param, $baseType, 1);
+        } else {
+            $result = parent::getColumnType($type);
+        }
+        return $result;		
+	}
 }
diff --git a/application/core/db/SmartColumnTypeTrait.php b/application/core/db/SmartColumnTypeTrait.php