making class definitions PHP7 compatible

fiammybe · fiammybe · commit 66ef9956c4a2 · 2020-06-26T00:54:33.000+02:00
diff --git a/class/art/object.persistable.php b/class/art/object.persistable.php
@@ -22,7 +22,7 @@ class _XoopsPersistableObject extends icms_core_Object
      */
     var $table;
     
-    function _XoopsPersistableObject($table = null) {
+    function __construct($table = null) {
 	    if (!empty($table)) {
 	    	$this->table = $GLOBALS["xoopsDB"]->prefix($table);
     	}
@@ -251,7 +251,7 @@ class _XoopsPersistableObjectHandler extends icms_core_ObjectHandler {
     *
     * @return void
     */
-    function _XoopsPersistableObjectHandler(&$db, $table = "", $className = "", $keyName = "", $identifierName = false) {
+    function __construct(&$db, $table = "", $className = "", $keyName = "", $identifierName = false) {
         parent::__construct($db);
         $this->table = $table;
         $this->keyName = $keyName;
@@ -372,11 +372,14 @@ function &getAll($criteria = null, $tags = null, $asObject = true)
      */
     function mysql_server_version($conn = null)
     {
+	    /*
 	    if (!is_null($conn)) {
 		    return mysql_get_server_info($conn);
 	    } else {
 		    return mysql_get_server_info();
 	    }
+	    */
+	    return "6.0.0";
     }
     
     /**
diff --git a/class/art/object.php b/class/art/object.php
@@ -38,7 +38,7 @@ class ArtObject extends _XoopsPersistableObject
     
     function __construct($table = "")
     {
-	    $this->_XoopsPersistableObject($table);
+	    parent::__construct($table);
     }
 
     /**
@@ -69,7 +69,7 @@ function _loadFilters()
 	    if (!isset($loaded)) return;
 	    $loaded = 1;
 	    
-	    $path = empty($this->plugin_path) ? dirname(__FILE__).'/filters' : $this->plugin_path;
+	    $path = empty($this->plugin_path) ? __DIR__ .'/filters' : $this->plugin_path;
         @include_once $path.'/filter.php';
         foreach ($this->_filters as $f) {
             @include_once $path.'/'.strtolower($f).'php';
@@ -135,7 +135,7 @@ class ArtObjectHandler extends _XoopsPersistableObjectHandler
 	 **/
     function __construct(&$db, $table = "", $className = "", $keyName = "", $identifierName = false) {
 	    $table = $db->prefix($table);
-        $this->_XoopsPersistableObjectHandler( $db, $table, $className, $keyName, $identifierName );
+        parent::__construct( $db, $table, $className, $keyName, $identifierName );
     }
     
     function _loadHandler($name, $params = array()) {
diff --git a/class/category.php b/class/category.php
@@ -35,7 +35,7 @@ class Category extends ArtObject {
 	 
 	function __construct()
 	{
-		$this->ArtObject("bb_categories");
+		parent::__construct("bb_categories");
 		$this->initVar('cat_id', XOBJ_DTYPE_INT);
 		$this->initVar('pid', XOBJ_DTYPE_INT, 0);
 		$this->initVar('cat_title', XOBJ_DTYPE_TXTBOX);
@@ -51,7 +51,7 @@ function __construct()
 class IforumCategoryHandler extends ArtObjectHandler {
 	function __construct(&$db)
 	{
-		$this->ArtObjectHandler($db, 'bb_categories', 'Category', 'cat_id', 'cat_title');
+        parent::__construct($db, 'bb_categories', 'Category', 'cat_id', 'cat_title');
 	}
 	 
 	function &getAllCats($permission = false, $idAsKey = true, $tags = null)
@@ -77,7 +77,7 @@ function &getAllCats($permission = false, $idAsKey = true, $tags = null)
 		return $_cachedCats[$perm_string];
 	}
 	 
-	function insert(&$category)
+	function insert(&$category,$force=true)
 	{
 		parent::insert($category, true);
 		if ($category->isNew())
@@ -88,7 +88,7 @@ function insert(&$category)
 		return $category->getVar('cat_id');
 	}
 	 
-	function delete(&$category)
+	function delete(&$category,$force=true)
 	{
 		global $icmsModule;
 		$forum_handler =icms_getmodulehandler('forum', basename(dirname(dirname(__FILE__ ) ) ), 'iforum' );
diff --git a/class/forum.php b/class/forum.php
@@ -35,7 +35,7 @@ class Forum extends ArtObject {
 	 
 	function __construct()
 	{
-		$this->ArtObject("bb_forums");
+		parent::__construct("bb_forums");
 		$this->initVar('forum_id', XOBJ_DTYPE_INT);
 		$this->initVar('forum_name', XOBJ_DTYPE_TXTBOX);
 		$this->initVar('forum_desc', XOBJ_DTYPE_TXTAREA);
@@ -124,10 +124,10 @@ function disp_forumModerators($valid_moderators = 0)
 class IforumForumHandler extends ArtObjectHandler {
 	function __construct(&$db)
 	{
-		$this->ArtObjectHandler($db, 'bb_forums', 'Forum', 'forum_id', 'forum_name');
+		parent::__construct($db, 'bb_forums', 'Forum', 'forum_id', 'forum_name');
 	}
 	 
-	function insert(&$forum)
+	function insert(&$forum,$force=true)
 	{
 		if (!parent::insert($forum, true))
 		{
@@ -143,7 +143,7 @@ function insert(&$forum)
 		return $forum->getVar('forum_id');
 	}
 	 
-	function delete(&$forum)
+	function delete(&$forum,$force=true)
 	{
 		global $icmsModule;
 		// RMV-NOTIFY
@@ -706,7 +706,7 @@ function applyPermissionTemplate(&$forum)
 	*
 	* @return  bool true on success
 	*/
-	function cleanOrphan()
+	function cleanOrphan($table_link='', $field_link='', $field_object='')
 	{
 		parent::cleanOrphan($this->db->prefix("bb_categories"), "cat_id");
 		 
diff --git a/class/moderate.php b/class/moderate.php
@@ -44,7 +44,7 @@ class Moderate extends ArtObject {
 	 
 	function __construct()
 	{
-		$this->ArtObject("bb_moderates");
+		parent::__construct("bb_moderates");
 		$this->initVar('mod_id', XOBJ_DTYPE_INT);
 		$this->initVar('mod_start', XOBJ_DTYPE_INT);
 		$this->initVar('mod_end', XOBJ_DTYPE_INT);
@@ -58,7 +58,7 @@ function __construct()
 class IforumModerateHandler extends ArtObjectHandler {
 	function __construct(&$db)
 	{
-		$this->ArtObjectHandler($db, 'bb_moderates', 'Moderate', 'mod_id', 'uid');
+        parent::__construct($db, 'bb_moderates', 'Moderate', 'mod_id', 'uid');
 	}
 	 
 	/**
diff --git a/class/post.php b/class/post.php
@@ -519,7 +519,7 @@ function showPost($isadmin)
 class IforumPostHandler extends ArtObjectHandler {
 	function __construct(&$db)
 	{
-		$this->ArtObjectHandler($db, 'bb_posts', 'Post', 'post_id', 'subject');
+		parent::__construct($db, 'bb_posts', 'Post', 'post_id', 'subject');
 	}
 	 
 	function &get($id)
diff --git a/class/rate.php b/class/rate.php
@@ -34,7 +34,7 @@
 class Nrate extends ArtObject {
 	function __construct()
 	{
-		$this->ArtObject("bb_votedata");
+		parent::__construct("bb_votedata");
 		$this->initVar('ratingid', XOBJ_DTYPE_INT);
 		$this->initVar('topic_id', XOBJ_DTYPE_INT);
 		$this->initVar('ratinguser', XOBJ_DTYPE_INT);
@@ -47,7 +47,7 @@ function __construct()
 class IforumRateHandler extends ArtObjectHandler {
 	function __construct(&$db)
 	{
-		$this->ArtObjectHandler($db, 'bb_votedata', 'Nrate', 'ratingid');
+        parent::__construct($db, 'bb_votedata', 'Nrate', 'ratingid');
 	}
 	 
 	/**
diff --git a/class/read.php b/class/read.php
@@ -43,7 +43,7 @@
 class Read extends ArtObject {
 	function __construct($type)
 	{
-		$this->ArtObject("bb_reads_".$type);
+		parent::__construct("bb_reads_".$type);
 		$this->initVar('read_id', XOBJ_DTYPE_INT);
 		$this->initVar('uid', XOBJ_DTYPE_INT);
 		$this->initVar('read_item', XOBJ_DTYPE_INT);
@@ -93,7 +93,7 @@ function __construct(&$db, $type)
 	{
 		$type = ("forum" == $type) ? "forum" :
 		 "topic";
-		$this->ArtObjectHandler($db, 'bb_reads_'.$type, 'Read'.$type, 'read_id', 'post_id');
+        parent::__construct($db, 'bb_reads_'.$type, 'Read'.$type, 'read_id', 'post_id');
 		$this->type = $type;
 		$iforumConfig = iforum_load_config();
 		$this->lifetime = !empty($iforumConfig["read_expire"]) ? $iforumConfig["read_expire"] * 24 * 3600 :
diff --git a/class/readforum.php b/class/readforum.php
@@ -37,14 +37,14 @@
 class Readforum extends Read {
 	function __construct()
 	{
-		$this->Read("forum");
+        parent::__construct("forum");
 	}
 }
  
 class IforumReadforumHandler extends IforumReadHandler {
 	function __construct(&$db)
 	{
-		$this->IforumReadHandler($db, "forum");
+        parent::__construct($db, "forum");
 	}
 	 
 	/**
diff --git a/class/readtopic.php b/class/readtopic.php
@@ -37,7 +37,7 @@
 class Readtopic extends Read {
 	function __construct()
 	{
-		$this->Read("topic");
+        parent::__construct("topic");
 		//$this->initVar('forum_id', XOBJ_DTYPE_INT);
 	}
 }
@@ -53,7 +53,7 @@ class IforumReadtopicHandler extends IforumReadHandler {
 	 
 	function __construct(&$db)
 	{
-		$this->IforumReadHandler($db, "topic");
+        parent::__construct($db, "topic");
 		$iforumConfig = iforum_load_config();
 		$this->items_per_forum = isset($iforumConfig["read_items"])?intval($iforumConfig["read_items"]):
 		100;
diff --git a/class/report.php b/class/report.php
@@ -34,7 +34,7 @@
 class Report extends ArtObject {
 	function __construct()
 	{
-		$this->ArtObject("bb_report");
+		parent::__construct("bb_report");
 		$this->initVar('report_id', XOBJ_DTYPE_INT);
 		$this->initVar('post_id', XOBJ_DTYPE_INT);
 		$this->initVar('reporter_uid', XOBJ_DTYPE_INT);
@@ -49,7 +49,7 @@ function __construct()
 class IforumReportHandler extends ArtObjectHandler {
 	function __construct(&$db)
 	{
-		$this->ArtObjectHandler($db, 'bb_report', 'Report', 'report_id');
+        parent::__construct($db, 'bb_report', 'Report', 'report_id');
 	}
 	function &getByPost($posts)
 	{
diff --git a/class/text.php b/class/text.php
@@ -34,7 +34,7 @@
 class Ntext extends ArtObject {
 	function __construct()
 	{
-		$this->ArtObject("bb_posts_text");
+		parent::__construct("bb_posts_text");
 		$this->initVar('post_id', XOBJ_DTYPE_INT);
 		$this->initVar('post_text', XOBJ_DTYPE_TXTAREA);
 		$this->initVar('post_edit', XOBJ_DTYPE_TXTAREA);
@@ -44,7 +44,7 @@ function __construct()
 class IforumTextHandler extends ArtObjectHandler {
 	function __construct(&$db)
 	{
-		$this->ArtObjectHandler($db, 'bb_posts_text', 'Ntext', 'post_id');
+		parent::__construct($db, 'bb_posts_text', 'Ntext', 'post_id');
 	}
 	 
 	/**
diff --git a/class/topic.php b/class/topic.php
@@ -28,13 +28,13 @@
 	exit();
 }
  
-defined("IFORUM_FUNCTIONS_INI") || include ICMS_ROOT_PATH.'/modules/'.basename(dirname(dirname(__FILE__ ) ) ).'/include/functions.ini.php';
+defined("IFORUM_FUNCTIONS_INI") || include ICMS_ROOT_PATH.'/modules/'.basename(dirname(__DIR__) ).'/include/functions.ini.php';
 iforum_load_object();
  
 class Topic extends ArtObject {
 	function __construct()
 	{
-		$this->ArtObject("bb_topics");
+		parent::__construct("bb_topics");
 		$this->initVar('topic_id', XOBJ_DTYPE_INT);
 		$this->initVar('topic_title', XOBJ_DTYPE_TXTBOX);
 		$this->initVar('topic_poster', XOBJ_DTYPE_INT);
@@ -67,7 +67,7 @@ function incrementCounter()
 class IforumTopicHandler extends ArtObjectHandler {
 	function __construct(&$db)
 	{
-		$this->ArtObjectHandler($db, 'bb_topics', 'Topic', 'topic_id', 'topic_title');
+		parent::__construct($db, 'bb_topics', 'Topic', 'topic_id', 'topic_title');
 	}
 	 
 	function &get($id, $var = null)

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ class _XoopsPersistableObject extends icms_core_Object`
`22`	`22`	`*/`
`23`	`23`	`var $table;`
`24`	`24`
`25`		`- function _XoopsPersistableObject($table = null) {`
	`25`	`+ function __construct($table = null) {`
`26`	`26`	`if (!empty($table)) {`
`27`	`27`	`$this->table = $GLOBALS["xoopsDB"]->prefix($table);`
`28`	`28`	`}`
`@@ -251,7 +251,7 @@ class _XoopsPersistableObjectHandler extends icms_core_ObjectHandler {`
`251`	`251`	`*`
`252`	`252`	`* @return void`
`253`	`253`	`*/`
`254`		`- function _XoopsPersistableObjectHandler(&$db, $table = "", $className = "", $keyName = "", $identifierName = false) {`
	`254`	`+ function __construct(&$db, $table = "", $className = "", $keyName = "", $identifierName = false) {`
`255`	`255`	`parent::__construct($db);`
`256`	`256`	`$this->table = $table;`
`257`	`257`	`$this->keyName = $keyName;`
`@@ -372,11 +372,14 @@ function &getAll($criteria = null, $tags = null, $asObject = true)`
`372`	`372`	`*/`
`373`	`373`	`function mysql_server_version($conn = null)`
`374`	`374`	`{`
	`375`	`+ /*`
`375`	`376`	`if (!is_null($conn)) {`
`376`	`377`	`return mysql_get_server_info($conn);`
`377`	`378`	`} else {`
`378`	`379`	`return mysql_get_server_info();`
`379`	`380`	`}`
	`381`	`+ */`
	`382`	`+ return "6.0.0";`
`380`	`383`	`}`
`381`	`384`
`382`	`385`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class Category extends ArtObject {`
`35`	`35`
`36`	`36`	`function __construct()`
`37`	`37`	`{`
`38`		`- $this->ArtObject("bb_categories");`
	`38`	`+ parent::__construct("bb_categories");`
`39`	`39`	`$this->initVar('cat_id', XOBJ_DTYPE_INT);`
`40`	`40`	`$this->initVar('pid', XOBJ_DTYPE_INT, 0);`
`41`	`41`	`$this->initVar('cat_title', XOBJ_DTYPE_TXTBOX);`
`@@ -51,7 +51,7 @@ function __construct()`
`51`	`51`	`class IforumCategoryHandler extends ArtObjectHandler {`
`52`	`52`	`function __construct(&$db)`
`53`	`53`	`{`
`54`		`- $this->ArtObjectHandler($db, 'bb_categories', 'Category', 'cat_id', 'cat_title');`
	`54`	`+ parent::__construct($db, 'bb_categories', 'Category', 'cat_id', 'cat_title');`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`function &getAllCats($permission = false, $idAsKey = true, $tags = null)`
`@@ -77,7 +77,7 @@ function &getAllCats($permission = false, $idAsKey = true, $tags = null)`
`77`	`77`	`return $_cachedCats[$perm_string];`
`78`	`78`	`}`
`79`	`79`
`80`		`- function insert(&$category)`
	`80`	`+ function insert(&$category,$force=true)`
`81`	`81`	`{`
`82`	`82`	`parent::insert($category, true);`
`83`	`83`	`if ($category->isNew())`
`@@ -88,7 +88,7 @@ function insert(&$category)`
`88`	`88`	`return $category->getVar('cat_id');`
`89`	`89`	`}`
`90`	`90`
`91`		`- function delete(&$category)`
	`91`	`+ function delete(&$category,$force=true)`
`92`	`92`	`{`
`93`	`93`	`global $icmsModule;`
`94`	`94`	`$forum_handler =icms_getmodulehandler('forum', basename(dirname(dirname(__FILE__ ) ) ), 'iforum' );`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ class Forum extends ArtObject {`
`35`	`35`
`36`	`36`	`function __construct()`
`37`	`37`	`{`
`38`		`- $this->ArtObject("bb_forums");`
	`38`	`+ parent::__construct("bb_forums");`
`39`	`39`	`$this->initVar('forum_id', XOBJ_DTYPE_INT);`
`40`	`40`	`$this->initVar('forum_name', XOBJ_DTYPE_TXTBOX);`
`41`	`41`	`$this->initVar('forum_desc', XOBJ_DTYPE_TXTAREA);`
`@@ -124,10 +124,10 @@ function disp_forumModerators($valid_moderators = 0)`
`124`	`124`	`class IforumForumHandler extends ArtObjectHandler {`
`125`	`125`	`function __construct(&$db)`
`126`	`126`	`{`
`127`		`- $this->ArtObjectHandler($db, 'bb_forums', 'Forum', 'forum_id', 'forum_name');`
	`127`	`+ parent::__construct($db, 'bb_forums', 'Forum', 'forum_id', 'forum_name');`
`128`	`128`	`}`
`129`	`129`
`130`		`- function insert(&$forum)`
	`130`	`+ function insert(&$forum,$force=true)`
`131`	`131`	`{`
`132`	`132`	`if (!parent::insert($forum, true))`
`133`	`133`	`{`
`@@ -143,7 +143,7 @@ function insert(&$forum)`
`143`	`143`	`return $forum->getVar('forum_id');`
`144`	`144`	`}`
`145`	`145`
`146`		`- function delete(&$forum)`
	`146`	`+ function delete(&$forum,$force=true)`
`147`	`147`	`{`
`148`	`148`	`global $icmsModule;`
`149`	`149`	`// RMV-NOTIFY`
`@@ -706,7 +706,7 @@ function applyPermissionTemplate(&$forum)`
`706`	`706`	`*`
`707`	`707`	`* @return bool true on success`
`708`	`708`	`*/`
`709`		`- function cleanOrphan()`
	`709`	`+ function cleanOrphan($table_link='', $field_link='', $field_object='')`
`710`	`710`	`{`
`711`	`711`	`parent::cleanOrphan($this->db->prefix("bb_categories"), "cat_id");`
`712`	`712`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ class Moderate extends ArtObject {`
`44`	`44`
`45`	`45`	`function __construct()`
`46`	`46`	`{`
`47`		`- $this->ArtObject("bb_moderates");`
	`47`	`+ parent::__construct("bb_moderates");`
`48`	`48`	`$this->initVar('mod_id', XOBJ_DTYPE_INT);`
`49`	`49`	`$this->initVar('mod_start', XOBJ_DTYPE_INT);`
`50`	`50`	`$this->initVar('mod_end', XOBJ_DTYPE_INT);`
`@@ -58,7 +58,7 @@ function __construct()`
`58`	`58`	`class IforumModerateHandler extends ArtObjectHandler {`
`59`	`59`	`function __construct(&$db)`
`60`	`60`	`{`
`61`		`- $this->ArtObjectHandler($db, 'bb_moderates', 'Moderate', 'mod_id', 'uid');`
	`61`	`+ parent::__construct($db, 'bb_moderates', 'Moderate', 'mod_id', 'uid');`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,7 @@ function showPost($isadmin)`
`519`	`519`	`class IforumPostHandler extends ArtObjectHandler {`
`520`	`520`	`function __construct(&$db)`
`521`	`521`	`{`
`522`		`- $this->ArtObjectHandler($db, 'bb_posts', 'Post', 'post_id', 'subject');`
	`522`	`+ parent::__construct($db, 'bb_posts', 'Post', 'post_id', 'subject');`
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`function &get($id)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@`
`34`	`34`	`class Nrate extends ArtObject {`
`35`	`35`	`function __construct()`
`36`	`36`	`{`
`37`		`- $this->ArtObject("bb_votedata");`
	`37`	`+ parent::__construct("bb_votedata");`
`38`	`38`	`$this->initVar('ratingid', XOBJ_DTYPE_INT);`
`39`	`39`	`$this->initVar('topic_id', XOBJ_DTYPE_INT);`
`40`	`40`	`$this->initVar('ratinguser', XOBJ_DTYPE_INT);`
`@@ -47,7 +47,7 @@ function __construct()`
`47`	`47`	`class IforumRateHandler extends ArtObjectHandler {`
`48`	`48`	`function __construct(&$db)`
`49`	`49`	`{`
`50`		`- $this->ArtObjectHandler($db, 'bb_votedata', 'Nrate', 'ratingid');`
	`50`	`+ parent::__construct($db, 'bb_votedata', 'Nrate', 'ratingid');`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -37,14 +37,14 @@`
`37`	`37`	`class Readforum extends Read {`
`38`	`38`	`function __construct()`
`39`	`39`	`{`
`40`		`- $this->Read("forum");`
	`40`	`+ parent::__construct("forum");`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`class IforumReadforumHandler extends IforumReadHandler {`
`45`	`45`	`function __construct(&$db)`
`46`	`46`	`{`
`47`		`- $this->IforumReadHandler($db, "forum");`
	`47`	`+ parent::__construct($db, "forum");`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@`
`37`	`37`	`class Readtopic extends Read {`
`38`	`38`	`function __construct()`
`39`	`39`	`{`
`40`		`- $this->Read("topic");`
	`40`	`+ parent::__construct("topic");`
`41`	`41`	`//$this->initVar('forum_id', XOBJ_DTYPE_INT);`
`42`	`42`	`}`
`43`	`43`	`}`
`@@ -53,7 +53,7 @@ class IforumReadtopicHandler extends IforumReadHandler {`
`53`	`53`
`54`	`54`	`function __construct(&$db)`
`55`	`55`	`{`
`56`		`- $this->IforumReadHandler($db, "topic");`
	`56`	`+ parent::__construct($db, "topic");`
`57`	`57`	`$iforumConfig = iforum_load_config();`
`58`	`58`	`$this->items_per_forum = isset($iforumConfig["read_items"])?intval($iforumConfig["read_items"]):`
`59`	`59`	`100;`