update art for PHP7 : no more end php tag, and constructor functions renamed

fiammybe · fiammybe · commit 70d34775bd06 · 2020-06-25T13:13:58.000+02:00
diff --git a/class/art/functions.admin.php b/class/art/functions.admin.php
@@ -14,6 +14,4 @@
 function loadModuleAdminMenu ($currentoption = 0, $breadcrumb = '')  {
 	global $icmsModule;
 	$icmsModule -> displayAdminMenu( $currentoption, $icmsModule -> getVar('name') . ' | ' . $breadcrumb );
-}
-
-?>
+}
diff --git a/class/art/functions.cache.php b/class/art/functions.cache.php
@@ -132,5 +132,4 @@ function mod_clearSmartyCache($pattern = "")
 	return true;
 }
 
-endif;
-?>
+endif;
diff --git a/class/art/functions.config.php b/class/art/functions.config.php
@@ -104,5 +104,4 @@ function mod_clearConfg($dirname = "")
 	return mod_clearConfig($dirname);
 }
 
-endif;
-?>
+endif;
diff --git a/class/art/functions.filter.php b/class/art/functions.filter.php
@@ -46,6 +46,4 @@ function mod_loadFilters(&$object, $method)
     }
 }
     
-endif;
-    
-?>
+endif;
diff --git a/class/art/functions.ini.php b/class/art/functions.ini.php
@@ -161,5 +161,4 @@ function mod_getDirname($current_path= null)
 	return $url_arr[2];
 }
 
-endif;
-?>
+endif;
diff --git a/class/art/functions.locale.php b/class/art/functions.locale.php
@@ -55,5 +55,4 @@ function xoops_local($func)
 	}
 }
 
-endif;
-?>
+endif;
diff --git a/class/art/functions.php b/class/art/functions.php
@@ -28,15 +28,15 @@
  */
 function mod_getMysqlVersion($conn = null)
 {
-    static $mysql_version;
+/*    static $mysql_version;
     if (isset($mysql_version)) return $mysql_version;
     if (!is_null($conn)) {
 	    $version = mysql_get_server_info($conn);
     } else {
 	    $version = mysql_get_server_info();
     }
-    return $mysql_version;
+    return $mysql_version;*/
+return 11;
 }
 
-endif;
-?>
+endif;
diff --git a/class/art/functions.sanitizer.php b/class/art/functions.sanitizer.php
@@ -64,5 +64,4 @@ function text_filter(&$text, $force = false)
 	return $text;
 }
 
-endif;
-?>
+endif;
diff --git a/class/art/functions.user.php b/class/art/functions.user.php
@@ -112,5 +112,4 @@ function mod_getUnameFromId( $userid, $usereal = 0, $linked = false)
     return $username;
 }
 
-endif;
-?>
+endif;
diff --git a/class/art/object.joint.php b/class/art/object.joint.php
@@ -32,7 +32,7 @@ class ArtObjectJointHandler
      */
     var $_handler;
     
-    function ArtObjectJointHandler(&$handler) {
+    function __construct(&$handler) {
 	    $this->_handler =& $handler; 
     }
 	
@@ -158,5 +158,4 @@ function deleteByLink($criteria = null)
         }
         return icms::$xoopsDB->query($sql);
     }
-}
-?>
+}
diff --git a/class/art/object.persistable.php b/class/art/object.persistable.php
@@ -395,5 +395,4 @@ function mysql_major_version()
 	
 	function insert(&$object) {}
 	function delete(&$object) {}
-}
-?>
+}
diff --git a/class/art/object.php b/class/art/object.php
@@ -36,7 +36,7 @@ class ArtObject extends _XoopsPersistableObject
      */
     var $plugin_path;
     
-    function ArtObject($table = "")
+    function __construct($table = "")
     {
 	    $this->_XoopsPersistableObject($table);
     }
@@ -133,7 +133,7 @@ class ArtObjectHandler extends _XoopsPersistableObjectHandler
 	 *
 	 * @param object $db reference to the {@link XoopsDatabase} object	 
 	 **/
-    function ArtObjectHandler(&$db, $table = "", $className = "", $keyName = "", $identifierName = false) {
+    function __construct(&$db, $table = "", $className = "", $keyName = "", $identifierName = false) {
 	    $table = $db->prefix($table);
         $this->_XoopsPersistableObjectHandler( $db, $table, $className, $keyName, $identifierName );
     }
@@ -364,5 +364,4 @@ function synchronization()
         return true;
     }
 }
-endif;
-?>
+endif;
diff --git a/class/art/object.recon.php b/class/art/object.recon.php
@@ -33,7 +33,7 @@ class ArtObjectReconHandler
      */
     var $_handler;
     
-    function ArtObjectReconHandler(&$handler) {
+    function __construct(&$handler) {
 	    $this->_handler =& $handler; 
     }
     
@@ -90,5 +90,4 @@ function synchronization()
 	    $this->cleanOrphan();
         return true;
     }
-}
-?>
+}
diff --git a/class/art/object.render.php b/class/art/object.render.php
@@ -32,7 +32,7 @@ class ArtObjectRenderHandler
      */
     var $_handler;
     
-    function ArtObjectRenderHandler(&$handler) {
+    function __construct(&$handler) {
 	    $this->_handler =& $handler; 
     }
 
@@ -208,5 +208,4 @@ function &getByLimit($limit=0, $start = 0, $criteria = null, $tags = null, $asOb
         $ret = $this->_handler->getAll($criteria, $tags, $asObject);
         return $ret;
    	}	
-}
-?>
+}
diff --git a/class/art/object.stats.php b/class/art/object.stats.php
@@ -32,7 +32,7 @@ class ArtObjectStatsHandler
      */
     var $_handler;
     
-    function ArtObjectStatsHandler(&$handler) {
+    function __construct(&$handler) {
 	    $this->_handler =& $handler; 
     }
     
@@ -114,5 +114,4 @@ function getCounts($criteria = null)
         }
         return $ret;
     }
-}
-?>
+}
diff --git a/class/art/object.write.php b/class/art/object.write.php
@@ -32,7 +32,7 @@ class ArtObjectWriteHandler
      */
     var $_handler;
     
-    function ArtObjectWriteHandler(&$handler) {
+    function __construct(&$handler) {
 	    $this->_handler =& $handler; 
     }
 
@@ -224,5 +224,4 @@ function updateAll($fieldname, $fieldvalue, $criteria = null, $force = false)
         }
         return true;
     }
-}
-?>
+}

Original file line number	Diff line number	Diff line change
`@@ -132,5 +132,4 @@ function mod_clearSmartyCache($pattern = "")`
`132`	`132`	`return true;`
`133`	`133`	`}`
`134`	`134`
`135`		`-endif;`
`136`		`-?>`
	`135`	`+endif;`
Original file line number	Diff line number	Diff line change
`@@ -104,5 +104,4 @@ function mod_clearConfg($dirname = "")`
`104`	`104`	`return mod_clearConfig($dirname);`
`105`	`105`	`}`
`106`	`106`
`107`		`-endif;`
`108`		`-?>`
	`107`	`+endif;`
Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,4 @@ function mod_loadFilters(&$object, $method)`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`
`49`		`-endif;`
`50`		`-`
`51`		`-?>`
	`49`	`+endif;`
Original file line number	Diff line number	Diff line change
`@@ -161,5 +161,4 @@ function mod_getDirname($current_path= null)`
`161`	`161`	`return $url_arr[2];`
`162`	`162`	`}`
`163`	`163`
`164`		`-endif;`
`165`		`-?>`
	`164`	`+endif;`
Original file line number	Diff line number	Diff line change
`@@ -55,5 +55,4 @@ function xoops_local($func)`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`-endif;`
`59`		`-?>`
	`58`	`+endif;`
Original file line number	Diff line number	Diff line change
`@@ -28,15 +28,15 @@`
`28`	`28`	`*/`
`29`	`29`	`function mod_getMysqlVersion($conn = null)`
`30`	`30`	`{`
`31`		`- static $mysql_version;`
	`31`	`+/* static $mysql_version;`
`32`	`32`	`if (isset($mysql_version)) return $mysql_version;`
`33`	`33`	`if (!is_null($conn)) {`
`34`	`34`	`$version = mysql_get_server_info($conn);`
`35`	`35`	`} else {`
`36`	`36`	`$version = mysql_get_server_info();`
`37`	`37`	`}`
`38`		`- return $mysql_version;`
	`38`	`+ return $mysql_version;*/`
	`39`	`+return 11;`
`39`	`40`	`}`
`40`	`41`
`41`		`-endif;`
`42`		`-?>`
	`42`	`+endif;`
Original file line number	Diff line number	Diff line change
`@@ -64,5 +64,4 @@ function text_filter(&$text, $force = false)`
`64`	`64`	`return $text;`
`65`	`65`	`}`
`66`	`66`
`67`		`-endif;`
`68`		`-?>`
	`67`	`+endif;`
Original file line number	Diff line number	Diff line change
`@@ -112,5 +112,4 @@ function mod_getUnameFromId( $userid, $usereal = 0, $linked = false)`
`112`	`112`	`return $username;`
`113`	`113`	`}`
`114`	`114`
`115`		`-endif;`
`116`		`-?>`
	`115`	`+endif;`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ class ArtObjectJointHandler`
`32`	`32`	`*/`
`33`	`33`	`var $_handler;`
`34`	`34`
`35`		`- function ArtObjectJointHandler(&$handler) {`
	`35`	`+ function __construct(&$handler) {`
`36`	`36`	`$this->_handler =& $handler;`
`37`	`37`	`}`
`38`	`38`
`@@ -158,5 +158,4 @@ function deleteByLink($criteria = null)`
`158`	`158`	`}`
`159`	`159`	`return icms::$xoopsDB->query($sql);`
`160`	`160`	`}`
`161`		`-}`
`162`		`-?>`
	`161`	`+}`