fixes PHP 7.3; setup updates for PHP >= 7,0

conlite/classes/class.version.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Project: 
  * Contenido Content Management System
@@ -27,7 +28,6 @@
  * }}
  * 
  */
- 
 if (!defined('CON_FRAMEWORK')) {
     die('Illegal call');
 }
@@ -153,10 +153,8 @@ class Version {
      * 
      */
     public static $iDisplayNotification;
-    
     protected $_bPathError = false;
 
-
     /**
      * The Version object constructor, initializes class variables
      * 
@@ -198,7 +196,6 @@ class Version {
                     $oNotification = new Contenido_Notification();
                     $sNotification = i18n('Alternative path %s does not exist. Version was saved in frondendpath.');
                     $oNotification->displayNotification("warning", sprintf($sNotification, $this->sAlternativePath));
-    				
                 }
 
                 $this->sAlternativePath = "";
@@ -268,7 +265,6 @@ class Version {
      */
     public function setData($sKey, $sValue) {
         $this->aBodyData[$sKey] = $sValue;
-
     }
 
     /**
@@ -277,7 +273,7 @@ class Version {
      * @return string returns content of xml file
      */
     public function createNewXml() {
-		$oXW = new xmlWriter();
+        $oXW = new cXmlWriter();
         $oXW->openMemory();
         $oXW->setIndent(true);
         $oXW->startDocument('1.0', 'UTF-8');
@@ -314,7 +310,8 @@ class Version {
      * @return void
      */
     public function createNewVersion() {
-     if($this->_bPathError) return false;
+        if ($this->_bPathError)
+            return false;
         $bCreate = false;
         if ($this->bVersionCreatActive == "true") {
             try { // Get version Name
@@ -336,7 +333,6 @@ class Version {
                 if ($bCreate == false) {
                     throw new Exception('Couldnt Create New Version');
                 }
-				
             } catch (Exception $e) {
                 $bCreate = false;
                 echo '<br>Some error occured: ' . $e->getMessage() . ': ' . $e->getFile() . ' at line ' . $e->getLine() . ' (' . $e->getTraceAsString() . ')';
@@ -558,7 +554,6 @@ class Version {
                 $aMessage["alt"] = i18n("Clear history");
                 $aMessage["popup"] = i18n("Do you really want to clear history?") . "<br><br>" . i18n("Note: This only affects the current history.");
                 break;
-      		
         }
         return $aMessage;
     }
@@ -604,7 +599,6 @@ class Version {
         $oHTMLTextarea->updateAttributes(array("wrap" => "off"));
 
         return $oHTMLTextarea->render();
-		
     }
 
     /**
@@ -650,6 +644,7 @@ class Version {
         }
     }
 
-} // end of class
+}
 
+// end of class
 ?>

conlite/classes/class.versionImport.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Project: 
  * Contenido Content Management System
@@ -25,7 +26,6 @@
  * }}
  * 
  */
- 
 if (!defined('CON_FRAMEWORK')) {
     die('Illegal call');
 }
@@ -151,8 +151,9 @@ if(!defined('CON_FRAMEWORK')) {
 
 //		Init class members with table con_history
         $this->getModuleHistoryTable();
+    }
 
- 	} // end of constructor
+// end of constructor
 
     /**
      * Creats xml files from table mod_history if exists any rows. After create a version it will be delete the current row. 
@@ -208,7 +209,6 @@ if(!defined('CON_FRAMEWORK')) {
         }
     }
 
- 	 	
     /**
      * Function reads rows variables from table con_mod and init with the class members.
      * 
@@ -222,15 +222,16 @@ if(!defined('CON_FRAMEWORK')) {
 
 //		save mod_history in three dimension array 
         while ($this->oDB->next_record()) {
-         	$this->aCreateVersion[$this->oDB->f("idclient")][$this->oDB->f("idmod")][$this->oDB->f("idmodhistory")] = 
+            $this->aCreateVersion[$this->oDB->f("idclient")][$this->oDB->f("idmod")][$this->oDB->f("idmodhistory")] = array("idmodhistory" => $this->oDB->f("idmodhistory"), "idmod" => $this->oDB->f("idmod"),
-         	array("idmodhistory"=>$this->oDB->f("idmodhistory"), "idmod"=>$this->oDB->f("idmod"),
                         "idclient" => $this->oDB->f("idclient"), "name" => $this->oDB->f("name"),
                         "type" => $this->oDB->f("type"), "description" => $this->oDB->f("description"),
                         "input" => $this->oDB->f("input"), "output" => $this->oDB->f("output"),
                         "template" => $this->oDB->f("template"), "changedby" => $this->oDB->f("changedby"),
                         "changed" => $this->oDB->f("changed"));
         }
-    } // end of function
+    }
+
+// end of function
 
     /**
      * Set with the body nodes of xml file
@@ -250,7 +251,6 @@ if(!defined('CON_FRAMEWORK')) {
         $this->setData("Static", $this->sStatic);
         $this->setData("PackageGuid", $this->sPackageGuid);
         $this->setData("PackageData", $this->sPackageData);
- 		
     }
 
     /**
@@ -291,6 +291,6 @@ if(!defined('CON_FRAMEWORK')) {
         $this->oDB->query($sSql2);
     }
 
-
 }
+
 ?>