mambax7 / smartobject

admin/update.php

Unused Use Statements -1 removed lines

@@ -8,7 +8,6 @@
  */
 
 use XoopsModules\Wfdownloads;
-use XoopsModules\Smartobject;
 
 require_once __DIR__ . '/admin_header.php';
 require_once SMARTCONTENT_ROOT_PATH . 'class/dbupdater.php';

Indentation +298 added lines, -298 removed lines

@@ -21,188 +21,188 @@ 
 // =========================================================================================
 function update_tables_to_300()
 {
-    $dbupdater = new Wfdownloads\Dbupdater();
+	$dbupdater = new Wfdownloads\Dbupdater();
 
-    if (!wfdownloads_TableExists('wfdownloads_meta')) {
-        // Create table wfdownloads_meta
-        $table = new Wfdownloads\DbupdaterTable('wfdownloads_meta');
-        $table->setStructure("CREATE TABLE `%s` (
+	if (!wfdownloads_TableExists('wfdownloads_meta')) {
+		// Create table wfdownloads_meta
+		$table = new Wfdownloads\DbupdaterTable('wfdownloads_meta');
+		$table->setStructure("CREATE TABLE `%s` (
                                 metakey varchar(50) NOT NULL default '',
                                 metavalue varchar(255) NOT NULL default '',
                                 PRIMARY KEY (metakey))
                                 ENGINE=MyISAM;");
 
-        $table->setData(sprintf("'version', %s", round($GLOBALS['xoopsModule']->getVar('version') / 100, 2)));
-        if ($dbupdater->updateTable($table)) {
-            echo 'wfdownloads_meta table created<br>';
-        }
-    }
-
-    $download_fields = [
-        'lid'           => ['Type' => 'int(11) unsigned NOT NULL auto_increment', 'Default' => false],
-        'cid'           => ['Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true],
-        'title'         => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
-        'url'           => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'filename'      => ['Type' => "varchar(150) NOT NULL default ''", 'Default' => true],
-        'filetype'      => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
-        'homepage'      => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
-        'version'       => ['Type' => "varchar(20) NOT NULL default ''", 'Default' => true],
-        'size'          => ['Type' => "int(8) NOT NULL default '0'", 'Default' => true],
-        'platform'      => ['Type' => "varchar(50) NOT NULL default ''", 'Default' => true],
-        'screenshot'    => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'submitter'     => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'publisher'     => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'status'        => ['Type' => "tinyint(2) NOT NULL default '0'", 'Default' => true],
-        'date'          => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
-        'hits'          => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
-        'rating'        => ['Type' => "double(6,4) NOT NULL default '0.0000'", 'Default' => true],
-        'votes'         => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
-        'comments'      => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
-        'license'       => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'mirror'        => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'price'         => ['Type' => "varchar(10) NOT NULL default 'Free'", 'Default' => true],
-        'paypalemail'   => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'features'      => ['Type' => 'text NOT NULL', 'Default' => false],
-        'requirements'  => ['Type' => 'text NOT NULL', 'Default' => false],
-        'homepagetitle' => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'forumid'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'limitations'   => ['Type' => "varchar(255) NOT NULL default '30 day trial'", 'Default' => true],
-        'dhistory'      => ['Type' => 'text NOT NULL', 'Default' => false],
-        'published'     => ['Type' => "int(11) NOT NULL default '1089662528'", 'Default' => true],
-        'expired'       => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
-        'updated'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'offline'       => ['Type' => "tinyint(1) NOT NULL default '0'", 'Default' => true],
-        'description'   => ['Type' => 'text NOT NULL', 'Default' => false],
-        'ipaddress'     => ['Type' => "varchar(120) NOT NULL default '0'", 'Default' => true],
-        'notifypub'     => ['Type' => "int(1) NOT NULL default '0'", 'Default' => true],
-        'summary'       => ['Type' => 'text NOT NULL', 'Default' => false]
-    ];
-
-    $renamed_fields = [
-        'logourl' => 'screenshot'
-    ];
-
-    echo '<br><b>Checking Download table</b><br>';
-    $helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
-    $downloadHandler = $helperWfdownloads->getHandler('Download');
-    $download_table  = new Wfdownloads\DbupdaterTable('wfdownloads_downloads');
-    $fields          = get_table_info($downloadHandler->table, $download_fields);
-    // Check for renamed fields
-    rename_fields($download_table, $renamed_fields, $fields, $download_fields);
-    update_table($download_fields, $fields, $download_table);
-    if ($dbupdater->updateTable($download_table)) {
-        echo 'Downloads table updated<br>';
-    }
-    unset($fields);
-
-    $mod_fields = [
-        'requestid'       => ['Type' => 'int(11) NOT NULL auto_increment', 'Default' => false],
-        'lid'             => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
-        'cid'             => ['Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true],
-        'title'           => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'url'             => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'filename'        => ['Type' => "varchar(150) NOT NULL default ''", 'Default' => true],
-        'filetype'        => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
-        'homepage'        => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'version'         => ['Type' => "varchar(20) NOT NULL default ''", 'Default' => true],
-        'size'            => ['Type' => "int(8) NOT NULL default '0'", 'Default' => true],
-        'platform'        => ['Type' => "varchar(50) NOT NULL default ''", 'Default' => true],
-        'screenshot'      => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'submitter'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'publisher'       => ['Type' => 'text NOT NULL', 'Default' => false],
-        'status'          => ['Type' => "tinyint(2) NOT NULL default '0'", 'Default' => true],
-        'date'            => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
-        'hits'            => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
-        'rating'          => ['Type' => "double(6,4) NOT NULL default '0.0000'", 'Default' => true],
-        'votes'           => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
-        'comments'        => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
-        'license'         => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'mirror'          => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'price'           => ['Type' => "varchar(10) NOT NULL default 'Free'", 'Default' => true],
-        'paypalemail'     => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'features'        => ['Type' => 'text NOT NULL', 'Default' => false],
-        'requirements'    => ['Type' => 'text NOT NULL', 'Default' => false],
-        'homepagetitle'   => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'forumid'         => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'limitations'     => ['Type' => "varchar(255) NOT NULL default '30 day trial'", 'Default' => true],
-        'dhistory'        => ['Type' => 'text NOT NULL', 'Default' => false],
-        'published'       => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
-        'expired'         => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
-        'updated'         => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'offline'         => ['Type' => "tinyint(1) NOT NULL default '0'", 'Default' => true],
-        'summary'         => ['Type' => 'text NOT NULL', 'Default' => false],
-        'description'     => ['Type' => 'text NOT NULL', 'Default' => false],
-        'modifysubmitter' => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'requestdate'     => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true]
-    ];
-
-    $renamed_fields = [
-        'logourl' => 'screenshot'
-    ];
-
-    echo '<br><b>Checking Modified Downloads table</b><br>';
+		$table->setData(sprintf("'version', %s", round($GLOBALS['xoopsModule']->getVar('version') / 100, 2)));
+		if ($dbupdater->updateTable($table)) {
+			echo 'wfdownloads_meta table created<br>';
+		}
+	}
+
+	$download_fields = [
+		'lid'           => ['Type' => 'int(11) unsigned NOT NULL auto_increment', 'Default' => false],
+		'cid'           => ['Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true],
+		'title'         => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
+		'url'           => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'filename'      => ['Type' => "varchar(150) NOT NULL default ''", 'Default' => true],
+		'filetype'      => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
+		'homepage'      => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
+		'version'       => ['Type' => "varchar(20) NOT NULL default ''", 'Default' => true],
+		'size'          => ['Type' => "int(8) NOT NULL default '0'", 'Default' => true],
+		'platform'      => ['Type' => "varchar(50) NOT NULL default ''", 'Default' => true],
+		'screenshot'    => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'submitter'     => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'publisher'     => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'status'        => ['Type' => "tinyint(2) NOT NULL default '0'", 'Default' => true],
+		'date'          => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
+		'hits'          => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
+		'rating'        => ['Type' => "double(6,4) NOT NULL default '0.0000'", 'Default' => true],
+		'votes'         => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
+		'comments'      => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
+		'license'       => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'mirror'        => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'price'         => ['Type' => "varchar(10) NOT NULL default 'Free'", 'Default' => true],
+		'paypalemail'   => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'features'      => ['Type' => 'text NOT NULL', 'Default' => false],
+		'requirements'  => ['Type' => 'text NOT NULL', 'Default' => false],
+		'homepagetitle' => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'forumid'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'limitations'   => ['Type' => "varchar(255) NOT NULL default '30 day trial'", 'Default' => true],
+		'dhistory'      => ['Type' => 'text NOT NULL', 'Default' => false],
+		'published'     => ['Type' => "int(11) NOT NULL default '1089662528'", 'Default' => true],
+		'expired'       => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
+		'updated'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'offline'       => ['Type' => "tinyint(1) NOT NULL default '0'", 'Default' => true],
+		'description'   => ['Type' => 'text NOT NULL', 'Default' => false],
+		'ipaddress'     => ['Type' => "varchar(120) NOT NULL default '0'", 'Default' => true],
+		'notifypub'     => ['Type' => "int(1) NOT NULL default '0'", 'Default' => true],
+		'summary'       => ['Type' => 'text NOT NULL', 'Default' => false]
+	];
+
+	$renamed_fields = [
+		'logourl' => 'screenshot'
+	];
+
+	echo '<br><b>Checking Download table</b><br>';
+	$helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
+	$downloadHandler = $helperWfdownloads->getHandler('Download');
+	$download_table  = new Wfdownloads\DbupdaterTable('wfdownloads_downloads');
+	$fields          = get_table_info($downloadHandler->table, $download_fields);
+	// Check for renamed fields
+	rename_fields($download_table, $renamed_fields, $fields, $download_fields);
+	update_table($download_fields, $fields, $download_table);
+	if ($dbupdater->updateTable($download_table)) {
+		echo 'Downloads table updated<br>';
+	}
+	unset($fields);
+
+	$mod_fields = [
+		'requestid'       => ['Type' => 'int(11) NOT NULL auto_increment', 'Default' => false],
+		'lid'             => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
+		'cid'             => ['Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true],
+		'title'           => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'url'             => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'filename'        => ['Type' => "varchar(150) NOT NULL default ''", 'Default' => true],
+		'filetype'        => ['Type' => "varchar(100) NOT NULL default ''", 'Default' => true],
+		'homepage'        => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'version'         => ['Type' => "varchar(20) NOT NULL default ''", 'Default' => true],
+		'size'            => ['Type' => "int(8) NOT NULL default '0'", 'Default' => true],
+		'platform'        => ['Type' => "varchar(50) NOT NULL default ''", 'Default' => true],
+		'screenshot'      => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'submitter'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'publisher'       => ['Type' => 'text NOT NULL', 'Default' => false],
+		'status'          => ['Type' => "tinyint(2) NOT NULL default '0'", 'Default' => true],
+		'date'            => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
+		'hits'            => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
+		'rating'          => ['Type' => "double(6,4) NOT NULL default '0.0000'", 'Default' => true],
+		'votes'           => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
+		'comments'        => ['Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true],
+		'license'         => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'mirror'          => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'price'           => ['Type' => "varchar(10) NOT NULL default 'Free'", 'Default' => true],
+		'paypalemail'     => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'features'        => ['Type' => 'text NOT NULL', 'Default' => false],
+		'requirements'    => ['Type' => 'text NOT NULL', 'Default' => false],
+		'homepagetitle'   => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'forumid'         => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'limitations'     => ['Type' => "varchar(255) NOT NULL default '30 day trial'", 'Default' => true],
+		'dhistory'        => ['Type' => 'text NOT NULL', 'Default' => false],
+		'published'       => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
+		'expired'         => ['Type' => "int(10) NOT NULL default '0'", 'Default' => true],
+		'updated'         => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'offline'         => ['Type' => "tinyint(1) NOT NULL default '0'", 'Default' => true],
+		'summary'         => ['Type' => 'text NOT NULL', 'Default' => false],
+		'description'     => ['Type' => 'text NOT NULL', 'Default' => false],
+		'modifysubmitter' => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'requestdate'     => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true]
+	];
+
+	$renamed_fields = [
+		'logourl' => 'screenshot'
+	];
+
+	echo '<br><b>Checking Modified Downloads table</b><br>';
 //    $moduleHandler = xoops_getModuleHandler('modification', 'wfdownloads');
-    $helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
-    $moduleHandler = $helperWfdownloads->getHandler('Modification');
-    $mod_table     = new Wfdownloads\DbupdaterTable('wfdownloads_mod');
-    $fields        = get_table_info($moduleHandler->table, $mod_fields);
-    rename_fields($mod_table, $renamed_fields, $fields, $mod_fields);
-    update_table($mod_fields, $fields, $mod_table);
-    if ($dbupdater->updateTable($mod_table)) {
-        echo 'Modified Downloads table updated <br>';
-    }
-    unset($fields);
-
-    $cat_fields = [
-        'cid'          => ['Type' => 'int(5) unsigned NOT NULL auto_increment', 'Default' => false],
-        'pid'          => ['Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true],
-        'title'        => ['Type' => "varchar(50) NOT NULL default ''", 'Default' => true],
-        'imgurl'       => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
-        'description'  => ['Type' => 'text NULL', 'Default' => true],
-        'total'        => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'summary'      => ['Type' => 'text NOT NULL', 'Default' => false],
-        'spotlighttop' => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'spotlighthis' => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'dohtml'       => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
-        'dosmiley'     => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
-        'doxcode'      => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
-        'doimage'      => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
-        'dobr'         => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
-        'weight'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true]
-    ];
-    echo '<br><b>Checking Category table</b><br>';
+	$helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
+	$moduleHandler = $helperWfdownloads->getHandler('Modification');
+	$mod_table     = new Wfdownloads\DbupdaterTable('wfdownloads_mod');
+	$fields        = get_table_info($moduleHandler->table, $mod_fields);
+	rename_fields($mod_table, $renamed_fields, $fields, $mod_fields);
+	update_table($mod_fields, $fields, $mod_table);
+	if ($dbupdater->updateTable($mod_table)) {
+		echo 'Modified Downloads table updated <br>';
+	}
+	unset($fields);
+
+	$cat_fields = [
+		'cid'          => ['Type' => 'int(5) unsigned NOT NULL auto_increment', 'Default' => false],
+		'pid'          => ['Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true],
+		'title'        => ['Type' => "varchar(50) NOT NULL default ''", 'Default' => true],
+		'imgurl'       => ['Type' => "varchar(255) NOT NULL default ''", 'Default' => true],
+		'description'  => ['Type' => 'text NULL', 'Default' => true],
+		'total'        => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'summary'      => ['Type' => 'text NOT NULL', 'Default' => false],
+		'spotlighttop' => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'spotlighthis' => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'dohtml'       => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
+		'dosmiley'     => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
+		'doxcode'      => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
+		'doimage'      => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
+		'dobr'         => ['Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true],
+		'weight'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true]
+	];
+	echo '<br><b>Checking Category table</b><br>';
 //    $catHandler = xoops_getModuleHandler('category', 'wfdownloads');
-    $helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
-    $catHandler = $helperWfdownloads->getHandler('Report');
-
-    $cat_table  = new Wfdownloads\DbupdaterTable('wfdownloads_cat');
-    $fields     = get_table_info($catHandler->table, $cat_fields);
-    update_table($cat_fields, $fields, $cat_table);
-    if ($dbupdater->updateTable($cat_table)) {
-        echo 'Category table updated<br>';
-    }
-    unset($fields);
-
-    $broken_fields = [
-        'reportid'     => ['Type' => 'int(5) NOT NULL auto_increment', 'Default' => false],
-        'lid'          => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'sender'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
-        'ip'           => ['Type' => "varchar(20) NOT NULL default ''", 'Default' => true],
-        'date'         => ['Type' => "varchar(11) NOT NULL default '0'", 'Default' => true],
-        'confirmed'    => ['Type' => "enum('0','1') NOT NULL default '0'", 'Default' => true],
-        'acknowledged' => ['Type' => "enum('0','1') NOT NULL default '0'", 'Default' => true]
-    ];
-    echo '<br><b>Checking Broken Report table</b><br>';
-    $helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
-    $brokenHandler = $helperWfdownloads->getHandler('Report');
+	$helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
+	$catHandler = $helperWfdownloads->getHandler('Report');
+
+	$cat_table  = new Wfdownloads\DbupdaterTable('wfdownloads_cat');
+	$fields     = get_table_info($catHandler->table, $cat_fields);
+	update_table($cat_fields, $fields, $cat_table);
+	if ($dbupdater->updateTable($cat_table)) {
+		echo 'Category table updated<br>';
+	}
+	unset($fields);
+
+	$broken_fields = [
+		'reportid'     => ['Type' => 'int(5) NOT NULL auto_increment', 'Default' => false],
+		'lid'          => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'sender'       => ['Type' => "int(11) NOT NULL default '0'", 'Default' => true],
+		'ip'           => ['Type' => "varchar(20) NOT NULL default ''", 'Default' => true],
+		'date'         => ['Type' => "varchar(11) NOT NULL default '0'", 'Default' => true],
+		'confirmed'    => ['Type' => "enum('0','1') NOT NULL default '0'", 'Default' => true],
+		'acknowledged' => ['Type' => "enum('0','1') NOT NULL default '0'", 'Default' => true]
+	];
+	echo '<br><b>Checking Broken Report table</b><br>';
+	$helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
+	$brokenHandler = $helperWfdownloads->getHandler('Report');
 //    $brokenHandler = xoops_getModuleHandler('report', 'wfdownloads');
-    $broken_table  = new Wfdownloads\DbupdaterTable('wfdownloads_broken');
-    $fields        = get_table_info($brokenHandler->table, $broken_fields);
-    update_table($broken_fields, $fields, $broken_table);
-    if ($dbupdater->updateTable($broken_table)) {
-        echo 'Broken Reports table updated<br>';
-    }
-    unset($fields);
+	$broken_table  = new Wfdownloads\DbupdaterTable('wfdownloads_broken');
+	$fields        = get_table_info($brokenHandler->table, $broken_fields);
+	update_table($broken_fields, $fields, $broken_table);
+	if ($dbupdater->updateTable($broken_table)) {
+		echo 'Broken Reports table updated<br>';
+	}
+	unset($fields);
 }
 
 // =========================================================================================
@@ -215,49 +215,49 @@ 
  */
 function invert_nohtm_dohtml_values()
 {
-    $ret = [];
-    global $xoopsDB;
-    $helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
-    $catHandler = $helperWfdownloads->getHandler('Category');
-    $result     = $xoopsDB->query('SHOW COLUMNS FROM ' . $catHandler->table);
-    while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
-        $fields[$existing_field['field']] = $existing_field['type'];
-    }
-    if (in_array('nohtml', array_keys($fields))) {
-        $dbupdater = new Wfdownloads\Dbupdater();
-        //Invert column values
-        // alter options in wfdownloads_cat
-        $table = new Wfdownloads\DbupdaterTable('wfdownloads_cat');
-        $table->addAlteredField('nohtml', "dohtml tinyint(1) NOT NULL DEFAULT '1'");
-        $table->addAlteredField('nosmiley', "dosmiley tinyint(1) NOT NULL DEFAULT '1'");
-        $table->addAlteredField('noxcodes', "doxcode tinyint(1) NOT NULL DEFAULT '1'");
-        $table->addAlteredField('noimages', "doimage tinyint(1) NOT NULL DEFAULT '1'");
-        $table->addAlteredField('nobreak', "dobr tinyint(1) NOT NULL DEFAULT '1'");
-
-        //inverting values no=1 <=> do=0
-        // have to store teporarly as value = 2 to
-        // avoid putting everithing to same value
-        // if you change 1 to 0, then 0 to one,
-        // every value will be 1, follow me?
-        $table->addUpdatedWhere('dohtml', 2, '=1');
-        $table->addUpdatedWhere('dohtml', 1, '=0');
-        $table->addUpdatedWhere('dohtml', 0, '=2');
-
-        $table->addUpdatedWhere('dosmiley', 2, '=1');
-        $table->addUpdatedWhere('dosmiley', 1, '=0');
-        $table->addUpdatedWhere('dosmiley', 0, '=2');
-
-        $table->addUpdatedWhere('doxcode', 2, '=1');
-        $table->addUpdatedWhere('doxcode', 1, '=0');
-        $table->addUpdatedWhere('doxcode', 0, '=2');
-
-        $table->addUpdatedWhere('doimage', 2, '=1');
-        $table->addUpdatedWhere('doimage', 1, '=0');
-        $table->addUpdatedWhere('doimage', 0, '=2');
-        $ret = $dbupdater->updateTable($table);
-    }
-
-    return $ret;
+	$ret = [];
+	global $xoopsDB;
+	$helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
+	$catHandler = $helperWfdownloads->getHandler('Category');
+	$result     = $xoopsDB->query('SHOW COLUMNS FROM ' . $catHandler->table);
+	while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
+		$fields[$existing_field['field']] = $existing_field['type'];
+	}
+	if (in_array('nohtml', array_keys($fields))) {
+		$dbupdater = new Wfdownloads\Dbupdater();
+		//Invert column values
+		// alter options in wfdownloads_cat
+		$table = new Wfdownloads\DbupdaterTable('wfdownloads_cat');
+		$table->addAlteredField('nohtml', "dohtml tinyint(1) NOT NULL DEFAULT '1'");
+		$table->addAlteredField('nosmiley', "dosmiley tinyint(1) NOT NULL DEFAULT '1'");
+		$table->addAlteredField('noxcodes', "doxcode tinyint(1) NOT NULL DEFAULT '1'");
+		$table->addAlteredField('noimages', "doimage tinyint(1) NOT NULL DEFAULT '1'");
+		$table->addAlteredField('nobreak', "dobr tinyint(1) NOT NULL DEFAULT '1'");
+
+		//inverting values no=1 <=> do=0
+		// have to store teporarly as value = 2 to
+		// avoid putting everithing to same value
+		// if you change 1 to 0, then 0 to one,
+		// every value will be 1, follow me?
+		$table->addUpdatedWhere('dohtml', 2, '=1');
+		$table->addUpdatedWhere('dohtml', 1, '=0');
+		$table->addUpdatedWhere('dohtml', 0, '=2');
+
+		$table->addUpdatedWhere('dosmiley', 2, '=1');
+		$table->addUpdatedWhere('dosmiley', 1, '=0');
+		$table->addUpdatedWhere('dosmiley', 0, '=2');
+
+		$table->addUpdatedWhere('doxcode', 2, '=1');
+		$table->addUpdatedWhere('doxcode', 1, '=0');
+		$table->addUpdatedWhere('doxcode', 0, '=2');
+
+		$table->addUpdatedWhere('doimage', 2, '=1');
+		$table->addUpdatedWhere('doimage', 1, '=0');
+		$table->addUpdatedWhere('doimage', 0, '=2');
+		$ret = $dbupdater->updateTable($table);
+	}
+
+	return $ret;
 }
 
 /**
@@ -270,22 +270,22 @@ 
  */
 function update_table($new_fields, $existing_fields, &$table)
 {
-    foreach ($new_fields as $field => $fieldinfo) {
-        $type = $fieldinfo['Type'];
-        if (!in_array($field, array_keys($existing_fields))) {
-            //Add field as it is missing
-            $table->addNewField($field, $type);
-        //$xoopsDB->query("ALTER TABLE ".$table." ADD ".$field." ".$type);
-            //echo $field."(".$type.") <FONT COLOR='##22DD51'>Added</FONT><br>";
-        } elseif ($existing_fields[$field] != $type) {
-            $table->addAlteredField($field, $field . ' ' . $type);
-        // check $fields[$field]['type'] for things like "int(10) unsigned"
-            //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$field." ".$type);
-            //echo $field." <FONT COLOR='#FF6600'>Changed to</FONT> ".$type."<br>";
-        } else {
-            //echo $field." <FONT COLOR='#0033FF'>Uptodate</FONT><br>";
-        }
-    }
+	foreach ($new_fields as $field => $fieldinfo) {
+		$type = $fieldinfo['Type'];
+		if (!in_array($field, array_keys($existing_fields))) {
+			//Add field as it is missing
+			$table->addNewField($field, $type);
+		//$xoopsDB->query("ALTER TABLE ".$table." ADD ".$field." ".$type);
+			//echo $field."(".$type.") <FONT COLOR='##22DD51'>Added</FONT><br>";
+		} elseif ($existing_fields[$field] != $type) {
+			$table->addAlteredField($field, $field . ' ' . $type);
+		// check $fields[$field]['type'] for things like "int(10) unsigned"
+			//$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$field." ".$type);
+			//echo $field." <FONT COLOR='#FF6600'>Changed to</FONT> ".$type."<br>";
+		} else {
+			//echo $field." <FONT COLOR='#0033FF'>Uptodate</FONT><br>";
+		}
+	}
 }
 
 /**
@@ -298,22 +298,22 @@ 
  */
 function get_table_info($table, $default_fields)
 {
-    global $xoopsDB;
-    $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $table);
-    while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
-        $fields[$existing_field['Field']] = $existing_field['Type'];
-        if ('YES' !== $existing_field['Null']) {
-            $fields[$existing_field['Field']] .= ' NOT NULL';
-        }
-        if ($existing_field['Extra']) {
-            $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
-        }
-        if ($default_fields[$existing_field['Field']]['Default']) {
-            $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
-        }
-    }
-
-    return $fields;
+	global $xoopsDB;
+	$result = $xoopsDB->query('SHOW COLUMNS FROM ' . $table);
+	while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
+		$fields[$existing_field['Field']] = $existing_field['Type'];
+		if ('YES' !== $existing_field['Null']) {
+			$fields[$existing_field['Field']] .= ' NOT NULL';
+		}
+		if ($existing_field['Extra']) {
+			$fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+		}
+		if ($default_fields[$existing_field['Field']]['Default']) {
+			$fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
+		}
+	}
+
+	return $fields;
 }
 
 /**
@@ -327,60 +327,60 @@ 
  */
 function rename_fields(&$table, $renamed_fields, &$fields, $new_fields)
 {
-    foreach (array_keys($fields) as $field) {
-        if (in_array($field, array_keys($renamed_fields))) {
-            $new_field_name = $renamed_fields[$field];
-            $new_field_type = $new_fields[$new_field_name]['Type'];
-            $table->addAltered($field, $new_field_name . ' ' . $new_field_type);
-            //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$new_field_name." ".$new_field_type);
-            //echo $field." Renamed to ".$new_field_name."<br>";
-            $fields[$new_field_name] = $new_field_type;
-        }
-    }
-    //return $fields;
+	foreach (array_keys($fields) as $field) {
+		if (in_array($field, array_keys($renamed_fields))) {
+			$new_field_name = $renamed_fields[$field];
+			$new_field_type = $new_fields[$new_field_name]['Type'];
+			$table->addAltered($field, $new_field_name . ' ' . $new_field_type);
+			//$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$new_field_name." ".$new_field_type);
+			//echo $field." Renamed to ".$new_field_name."<br>";
+			$fields[$new_field_name] = $new_field_type;
+		}
+	}
+	//return $fields;
 }
 
 $op = isset($_REQUEST['op']) ? (int)$_REQUEST['op'] : 0;
 switch ($op) {
-    case 1:
-        // Make sure that nohtml is properly changed to dohtml
-        invert_nohtm_dohtml_values();
-        // Ensure that the proper tables are present
-        update_tables_to_300();
-        // Import data from MyDownloads
-        import_mydownloads_to_wfdownloads();
-        break;
-
-    case 2:
-        // Update WF-Downloads
-        $log = invert_nohtm_dohtml_values();
-        update_tables_to_300();
-        break;
-
-    default:
-        //ask what to do
-        include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-        $form = new \XoopsThemeForm('Upgrade WF-Downloads', 'form', $_SERVER['REQUEST_URI']);
-
-        //Is MyDownloads installed?
-        /** @var XoopsModuleHandler $moduleHandler */
-        $moduleHandler     = xoops_getHandler('module');
-        $mydownloadsModule = $moduleHandler->getByDirname('mydownloads');
-        if (is_object($mydownloadsModule)) {
-            $mydownloadsButton = new \XoopsFormButton('Import data from MyDownloads', 'myd_button', 'Import', 'submit');
-            $mydownloadsButton->setExtra("onclick='document.forms.form.op.value=\"1\"'");
-            $form->addElement($mydownloadsButton);
-        }
-
-        if (!wfdownloads_TableExists('wfdownloads_meta')) {
-            $updateButton = new \XoopsFormButton('Update WF-Downloads', 'upd_button', 'Update', 'submit');
-            $updateButton->setExtra("onclick='document.forms.form.op.value=\"2\"'");
-            $form->addElement($updateButton);
-        }
-
-        $form->addElement(new \XoopsFormHidden('op', 0));
-        $form->display();
-        break;
+	case 1:
+		// Make sure that nohtml is properly changed to dohtml
+		invert_nohtm_dohtml_values();
+		// Ensure that the proper tables are present
+		update_tables_to_300();
+		// Import data from MyDownloads
+		import_mydownloads_to_wfdownloads();
+		break;
+
+	case 2:
+		// Update WF-Downloads
+		$log = invert_nohtm_dohtml_values();
+		update_tables_to_300();
+		break;
+
+	default:
+		//ask what to do
+		include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+		$form = new \XoopsThemeForm('Upgrade WF-Downloads', 'form', $_SERVER['REQUEST_URI']);
+
+		//Is MyDownloads installed?
+		/** @var XoopsModuleHandler $moduleHandler */
+		$moduleHandler     = xoops_getHandler('module');
+		$mydownloadsModule = $moduleHandler->getByDirname('mydownloads');
+		if (is_object($mydownloadsModule)) {
+			$mydownloadsButton = new \XoopsFormButton('Import data from MyDownloads', 'myd_button', 'Import', 'submit');
+			$mydownloadsButton->setExtra("onclick='document.forms.form.op.value=\"1\"'");
+			$form->addElement($mydownloadsButton);
+		}
+
+		if (!wfdownloads_TableExists('wfdownloads_meta')) {
+			$updateButton = new \XoopsFormButton('Update WF-Downloads', 'upd_button', 'Update', 'submit');
+			$updateButton->setExtra("onclick='document.forms.form.op.value=\"2\"'");
+			$form->addElement($updateButton);
+		}
+
+		$form->addElement(new \XoopsFormHidden('op', 0));
+		$form->display();
+		break;
 }
 //wfdownloads_modFooter();
 //xoops_cp_footer();

Spacing +11 added lines, -11 removed lines

@@ -10,8 +10,8 @@ 
 use XoopsModules\Wfdownloads;
 use XoopsModules\Smartobject;
 
-require_once __DIR__ . '/admin_header.php';
-require_once SMARTCONTENT_ROOT_PATH . 'class/dbupdater.php';
+require_once __DIR__.'/admin_header.php';
+require_once SMARTCONTENT_ROOT_PATH.'class/dbupdater.php';
 
 smartcontent_xoops_cp_header();
 
@@ -219,7 +219,7 @@ 
     global $xoopsDB;
     $helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
     $catHandler = $helperWfdownloads->getHandler('Category');
-    $result     = $xoopsDB->query('SHOW COLUMNS FROM ' . $catHandler->table);
+    $result     = $xoopsDB->query('SHOW COLUMNS FROM '.$catHandler->table);
     while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
         $fields[$existing_field['field']] = $existing_field['type'];
     }
@@ -278,7 +278,7 @@ 
         //$xoopsDB->query("ALTER TABLE ".$table." ADD ".$field." ".$type);
             //echo $field."(".$type.") <FONT COLOR='##22DD51'>Added</FONT><br>";
         } elseif ($existing_fields[$field] != $type) {
-            $table->addAlteredField($field, $field . ' ' . $type);
+            $table->addAlteredField($field, $field.' '.$type);
         // check $fields[$field]['type'] for things like "int(10) unsigned"
             //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$field." ".$type);
             //echo $field." <FONT COLOR='#FF6600'>Changed to</FONT> ".$type."<br>";
@@ -299,17 +299,17 @@ 
 function get_table_info($table, $default_fields)
 {
     global $xoopsDB;
-    $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $table);
+    $result = $xoopsDB->query('SHOW COLUMNS FROM '.$table);
     while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
         $fields[$existing_field['Field']] = $existing_field['Type'];
         if ('YES' !== $existing_field['Null']) {
             $fields[$existing_field['Field']] .= ' NOT NULL';
         }
         if ($existing_field['Extra']) {
-            $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+            $fields[$existing_field['Field']] .= ' '.$existing_field['Extra'];
         }
         if ($default_fields[$existing_field['Field']]['Default']) {
-            $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
+            $fields[$existing_field['Field']] .= " default '".$existing_field['Default']."'";
         }
     }
 
@@ -331,7 +331,7 @@ 
         if (in_array($field, array_keys($renamed_fields))) {
             $new_field_name = $renamed_fields[$field];
             $new_field_type = $new_fields[$new_field_name]['Type'];
-            $table->addAltered($field, $new_field_name . ' ' . $new_field_type);
+            $table->addAltered($field, $new_field_name.' '.$new_field_type);
             //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$new_field_name." ".$new_field_type);
             //echo $field." Renamed to ".$new_field_name."<br>";
             $fields[$new_field_name] = $new_field_type;
@@ -340,7 +340,7 @@ 
     //return $fields;
 }
 
-$op = isset($_REQUEST['op']) ? (int)$_REQUEST['op'] : 0;
+$op = isset($_REQUEST['op']) ? (int) $_REQUEST['op'] : 0;
 switch ($op) {
     case 1:
         // Make sure that nohtml is properly changed to dohtml
@@ -359,7 +359,7 @@ 
 
     default:
         //ask what to do
-        include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         $form = new \XoopsThemeForm('Upgrade WF-Downloads', 'form', $_SERVER['REQUEST_URI']);
 
         //Is MyDownloads installed?
@@ -384,4 +384,4 @@ 
 }
 //wfdownloads_modFooter();
 //xoops_cp_footer();
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

class/Dbupdater.php

Doc Comments +2 added lines, -2 removed lines

@@ -143,7 +143,7 @@ 
     /**
      * Use to update a table
      *
-     * @param object $table {@link SmartDbTable} that will be updated
+     * @param DbTable $table {@link SmartDbTable} that will be updated
      *
      * @see DbTable
      *
@@ -245,7 +245,7 @@ 
     /**
      * @param $module
      * @param $item
-     * @return bool
+     * @return false|null
      */
     public function upgradeObjectItem($module, $item)
     {

Indentation +320 added lines, -321 removed lines

@@ -25,7 +25,6 @@ 
  * Contains the classes for updating database tables
  *
  * @license GNU
-
  */
 /**
  * SmartDbTable class
@@ -38,7 +37,7 @@ 
  */
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 if (!defined('SMARTOBJECT_ROOT_PATH')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+	require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
 }
 /**
  * Include the language constants for the SmartObjectDBUpdater
@@ -46,7 +45,7 @@ 
 global $xoopsConfig;
 $common_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/smartdbupdater.php';
 if (!file_exists($common_file)) {
-    $common_file = SMARTOBJECT_ROOT_PATH . 'language/english/smartdbupdater.php';
+	$common_file = SMARTOBJECT_ROOT_PATH . 'language/english/smartdbupdater.php';
 }
 include $common_file;
 
@@ -62,328 +61,328 @@ 
  */
 class Dbupdater
 {
-    public $_dbTypesArray;
-
-    /**
-     * SmartobjectDbupdater constructor.
-     */
-    public function __construct()
-    {
-        $this->_dbTypesArray[XOBJ_DTYPE_TXTBOX]       = 'varchar(255)';
-        $this->_dbTypesArray[XOBJ_DTYPE_TXTAREA]      = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_INT]          = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_URL]          = 'varchar(255)';
-        $this->_dbTypesArray[XOBJ_DTYPE_EMAIL]        = 'varchar(255)';
-        $this->_dbTypesArray[XOBJ_DTYPE_ARRAY]        = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_OTHER]        = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_SOURCE]       = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_STIME]        = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_MTIME]        = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_LTIME]        = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_SIMPLE_ARRAY] = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_CURRENCY]     = 'text';
-        $this->_dbTypesArray[XOBJ_DTYPE_FLOAT]        = 'float';
-        $this->_dbTypesArray[XOBJ_DTYPE_TIME_ONLY]    = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_URLLINK]      = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_FILE]         = 'int(11)';
-        $this->_dbTypesArray[XOBJ_DTYPE_IMAGE]        = 'varchar(255)';
-    }
-
-    /**
-     * Use to execute a general query
-     *
-     * @param string $query   query that will be executed
-     * @param string $goodmsg message displayed on success
-     * @param string $badmsg  message displayed on error
-     *
-     * @return bool true if success, false if an error occured
-     *
-     */
-    public function runQuery($query, $goodmsg, $badmsg)
-    {
-        global $xoopsDB;
-        $ret = $xoopsDB->query($query);
-        if (!$ret) {
-            echo "&nbsp;&nbsp;$badmsg<br>";
-
-            return false;
-        } else {
-            echo "&nbsp;&nbsp;$goodmsg<br>";
-
-            return true;
-        }
-    }
-
-    /**
-     * Use to rename a table
-     *
-     * @param string $from name of the table to rename
-     * @param string $to   new name of the renamed table
-     *
-     * @return bool true if success, false if an error occured
-     */
-    public function renameTable($from, $to)
-    {
-        global $xoopsDB;
-        $from  = $xoopsDB->prefix($from);
-        $to    = $xoopsDB->prefix($to);
-        $query = sprintf('ALTER TABLE %s RENAME %s', $from, $to);
-        $ret   = $xoopsDB->query($query);
-        if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . '<br>';
-
-            return false;
-        } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . '<br>';
-
-            return true;
-        }
-    }
-
-    /**
-     * Use to update a table
-     *
-     * @param object $table {@link SmartDbTable} that will be updated
-     *
-     * @see DbTable
-     *
-     * @return bool true if success, false if an error occured
-     */
-    public function updateTable($table)
-    {
-        global $xoopsDB;
-        $ret = true;
-        // If table has a structure, create the table
-        if ($table->getStructure()) {
-            $ret = $table->createTable() && $ret;
-        }
-        // If table is flag for drop, drop it
-        if ($table->_flagForDrop) {
-            $ret = $table->dropTable() && $ret;
-        }
-        // If table has data, insert it
-        if ($table->getData()) {
-            $ret = $table->addData() && $ret;
-        }
-        // If table has new fields to be added, add them
-        if ($table->getNewFields()) {
-            $ret = $table->addNewFields() && $ret;
-        }
-        // If table has altered field, alter the table
-        if ($table->getAlteredFields()) {
-            $ret = $table->alterTable() && $ret;
-        }
-        // If table has updated field values, update the table
-        if ($table->getUpdatedFields()) {
-            $ret = $table->updateFieldsValues($table) && $ret;
-        }
-        // If table has dropped field, alter the table
-        if ($table->getDroppedFields()) {
-            $ret = $table->dropFields($table) && $ret;
-        }
-        //felix
-        // If table has updated field values, update the table
-        if ($table->getUpdatedWhere()) {
-            $ret = $table->UpdateWhereValues($table) && $ret;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param $module
-     * @param $item
-     */
-    public function automaticUpgrade($module, $item)
-    {
-        if (is_array($item)) {
-            foreach ($item as $v) {
-                $this->upgradeObjectItem($module, $v);
-            }
-        } else {
-            $this->upgradeObjectItem($module, $item);
-        }
-    }
-
-    /**
-     * @param $var
-     * @return string
-     */
-    public function getFieldTypeFromVar($var)
-    {
-        $ret = isset($this->_dbTypesArray[$var['data_type']]) ? $this->_dbTypesArray[$var['data_type']] : 'text';
-
-        return $ret;
-    }
-
-    /**
-     * @param         $var
-     * @param  bool   $key
-     * @return string
-     */
-    public function getFieldDefaultFromVar($var, $key = false)
-    {
-        if ($var['value']) {
-            return $var['value'];
-        } else {
-            if (in_array($var['data_type'], [
-                XOBJ_DTYPE_INT,
-                XOBJ_DTYPE_STIME,
-                XOBJ_DTYPE_MTIME,
-                XOBJ_DTYPE_LTIME,
-                XOBJ_DTYPE_TIME_ONLY,
-                XOBJ_DTYPE_URLLINK,
-                XOBJ_DTYPE_FILE
-            ])) {
-                return '0';
-            } else {
-                return '';
-            }
-        }
-    }
-
-    /**
-     * @param $module
-     * @param $item
-     * @return bool
-     */
-    public function upgradeObjectItem($module, $item)
-    {
-        $moduleHandler = xoops_getModuleHandler($item, $module);
-        if (!$moduleHandler) {
-            return false;
-        }
-
-        $table      = new DbTable($module . '_' . $item);
-        $object     = $moduleHandler->create();
-        $objectVars = $object->getVars();
-
-        if (!$table->exists()) {
-            // table was never created, let's do it
-            $structure = '';
-            foreach ($objectVars as $key => $var) {
-                if ($var['persistent']) {
-                    $type = $this->getFieldTypeFromVar($var);
-                    if ($key == $moduleHandler->keyName) {
-                        $extra = 'auto_increment';
-                    } else {
-                        $default = $this->getFieldDefaultFromVar($var);
-                        $extra   = "default '$default'
+	public $_dbTypesArray;
+
+	/**
+	 * SmartobjectDbupdater constructor.
+	 */
+	public function __construct()
+	{
+		$this->_dbTypesArray[XOBJ_DTYPE_TXTBOX]       = 'varchar(255)';
+		$this->_dbTypesArray[XOBJ_DTYPE_TXTAREA]      = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_INT]          = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_URL]          = 'varchar(255)';
+		$this->_dbTypesArray[XOBJ_DTYPE_EMAIL]        = 'varchar(255)';
+		$this->_dbTypesArray[XOBJ_DTYPE_ARRAY]        = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_OTHER]        = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_SOURCE]       = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_STIME]        = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_MTIME]        = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_LTIME]        = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_SIMPLE_ARRAY] = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_CURRENCY]     = 'text';
+		$this->_dbTypesArray[XOBJ_DTYPE_FLOAT]        = 'float';
+		$this->_dbTypesArray[XOBJ_DTYPE_TIME_ONLY]    = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_URLLINK]      = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_FILE]         = 'int(11)';
+		$this->_dbTypesArray[XOBJ_DTYPE_IMAGE]        = 'varchar(255)';
+	}
+
+	/**
+	 * Use to execute a general query
+	 *
+	 * @param string $query   query that will be executed
+	 * @param string $goodmsg message displayed on success
+	 * @param string $badmsg  message displayed on error
+	 *
+	 * @return bool true if success, false if an error occured
+	 *
+	 */
+	public function runQuery($query, $goodmsg, $badmsg)
+	{
+		global $xoopsDB;
+		$ret = $xoopsDB->query($query);
+		if (!$ret) {
+			echo "&nbsp;&nbsp;$badmsg<br>";
+
+			return false;
+		} else {
+			echo "&nbsp;&nbsp;$goodmsg<br>";
+
+			return true;
+		}
+	}
+
+	/**
+	 * Use to rename a table
+	 *
+	 * @param string $from name of the table to rename
+	 * @param string $to   new name of the renamed table
+	 *
+	 * @return bool true if success, false if an error occured
+	 */
+	public function renameTable($from, $to)
+	{
+		global $xoopsDB;
+		$from  = $xoopsDB->prefix($from);
+		$to    = $xoopsDB->prefix($to);
+		$query = sprintf('ALTER TABLE %s RENAME %s', $from, $to);
+		$ret   = $xoopsDB->query($query);
+		if (!$ret) {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . '<br>';
+
+			return false;
+		} else {
+			echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . '<br>';
+
+			return true;
+		}
+	}
+
+	/**
+	 * Use to update a table
+	 *
+	 * @param object $table {@link SmartDbTable} that will be updated
+	 *
+	 * @see DbTable
+	 *
+	 * @return bool true if success, false if an error occured
+	 */
+	public function updateTable($table)
+	{
+		global $xoopsDB;
+		$ret = true;
+		// If table has a structure, create the table
+		if ($table->getStructure()) {
+			$ret = $table->createTable() && $ret;
+		}
+		// If table is flag for drop, drop it
+		if ($table->_flagForDrop) {
+			$ret = $table->dropTable() && $ret;
+		}
+		// If table has data, insert it
+		if ($table->getData()) {
+			$ret = $table->addData() && $ret;
+		}
+		// If table has new fields to be added, add them
+		if ($table->getNewFields()) {
+			$ret = $table->addNewFields() && $ret;
+		}
+		// If table has altered field, alter the table
+		if ($table->getAlteredFields()) {
+			$ret = $table->alterTable() && $ret;
+		}
+		// If table has updated field values, update the table
+		if ($table->getUpdatedFields()) {
+			$ret = $table->updateFieldsValues($table) && $ret;
+		}
+		// If table has dropped field, alter the table
+		if ($table->getDroppedFields()) {
+			$ret = $table->dropFields($table) && $ret;
+		}
+		//felix
+		// If table has updated field values, update the table
+		if ($table->getUpdatedWhere()) {
+			$ret = $table->UpdateWhereValues($table) && $ret;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param $module
+	 * @param $item
+	 */
+	public function automaticUpgrade($module, $item)
+	{
+		if (is_array($item)) {
+			foreach ($item as $v) {
+				$this->upgradeObjectItem($module, $v);
+			}
+		} else {
+			$this->upgradeObjectItem($module, $item);
+		}
+	}
+
+	/**
+	 * @param $var
+	 * @return string
+	 */
+	public function getFieldTypeFromVar($var)
+	{
+		$ret = isset($this->_dbTypesArray[$var['data_type']]) ? $this->_dbTypesArray[$var['data_type']] : 'text';
+
+		return $ret;
+	}
+
+	/**
+	 * @param         $var
+	 * @param  bool   $key
+	 * @return string
+	 */
+	public function getFieldDefaultFromVar($var, $key = false)
+	{
+		if ($var['value']) {
+			return $var['value'];
+		} else {
+			if (in_array($var['data_type'], [
+				XOBJ_DTYPE_INT,
+				XOBJ_DTYPE_STIME,
+				XOBJ_DTYPE_MTIME,
+				XOBJ_DTYPE_LTIME,
+				XOBJ_DTYPE_TIME_ONLY,
+				XOBJ_DTYPE_URLLINK,
+				XOBJ_DTYPE_FILE
+			])) {
+				return '0';
+			} else {
+				return '';
+			}
+		}
+	}
+
+	/**
+	 * @param $module
+	 * @param $item
+	 * @return bool
+	 */
+	public function upgradeObjectItem($module, $item)
+	{
+		$moduleHandler = xoops_getModuleHandler($item, $module);
+		if (!$moduleHandler) {
+			return false;
+		}
+
+		$table      = new DbTable($module . '_' . $item);
+		$object     = $moduleHandler->create();
+		$objectVars = $object->getVars();
+
+		if (!$table->exists()) {
+			// table was never created, let's do it
+			$structure = '';
+			foreach ($objectVars as $key => $var) {
+				if ($var['persistent']) {
+					$type = $this->getFieldTypeFromVar($var);
+					if ($key == $moduleHandler->keyName) {
+						$extra = 'auto_increment';
+					} else {
+						$default = $this->getFieldDefaultFromVar($var);
+						$extra   = "default '$default'
 ";
-                    }
-                    $structure .= "`$key` $type not null $extra,
+					}
+					$structure .= "`$key` $type not null $extra,
 ";
-                }
-            }
-            $structure .= 'PRIMARY KEY  (`' . $moduleHandler->keyName . '`)
+				}
+			}
+			$structure .= 'PRIMARY KEY  (`' . $moduleHandler->keyName . '`)
 ';
-            $table->setStructure($structure);
-            if (!$this->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        } else {
-            $existingFieldsArray = $table->getExistingFieldsArray();
-            foreach ($objectVars as $key => $var) {
-                if ($var['persistent']) {
-                    if (!isset($existingFieldsArray[$key])) {
-                        // the fiels does not exist, let's create it
-                        $type    = $this->getFieldTypeFromVar($var);
-                        $default = $this->getFieldDefaultFromVar($var);
-                        $table->addNewField($key, "$type not null default '$default'");
-                    } else {
-                        // if field already exists, let's check if the definition is correct
-                        $definition = strtolower($existingFieldsArray[$key]);
-                        $type       = $this->getFieldTypeFromVar($var);
-                        if ($key == $moduleHandler->keyName) {
-                            $extra = 'auto_increment';
-                        } else {
-                            $default = $this->getFieldDefaultFromVar($var, $key);
-                            $extra   = "default '$default'";
-                        }
-                        $actual_definition = "$type not null $extra";
-                        if ($definition != $actual_definition) {
-                            $table->addAlteredField($key, $actual_definition);
-                        }
-                    }
-                }
-            }
-
-            // check to see if there are some unused fields left in the table
-            foreach ($existingFieldsArray as $key => $v) {
-                if (!isset($objectVars[$key]) || !$objectVars[$key]['persistent']) {
-                    $table->addDroppedField($key);
-                }
-            }
-
-            if (!$this->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-    }
-
-    /**
-     * @param $module
-     * @return bool
-     */
-    public function moduleUpgrade(\XoopsModule $module)
-    {
-        $dirname = $module->getVar('dirname');
-
-        ob_start();
-
-        $table = new DbTable($dirname . '_meta');
-        if (!$table->exists()) {
-            $table->setStructure("
+			$table->setStructure($structure);
+			if (!$this->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		} else {
+			$existingFieldsArray = $table->getExistingFieldsArray();
+			foreach ($objectVars as $key => $var) {
+				if ($var['persistent']) {
+					if (!isset($existingFieldsArray[$key])) {
+						// the fiels does not exist, let's create it
+						$type    = $this->getFieldTypeFromVar($var);
+						$default = $this->getFieldDefaultFromVar($var);
+						$table->addNewField($key, "$type not null default '$default'");
+					} else {
+						// if field already exists, let's check if the definition is correct
+						$definition = strtolower($existingFieldsArray[$key]);
+						$type       = $this->getFieldTypeFromVar($var);
+						if ($key == $moduleHandler->keyName) {
+							$extra = 'auto_increment';
+						} else {
+							$default = $this->getFieldDefaultFromVar($var, $key);
+							$extra   = "default '$default'";
+						}
+						$actual_definition = "$type not null $extra";
+						if ($definition != $actual_definition) {
+							$table->addAlteredField($key, $actual_definition);
+						}
+					}
+				}
+			}
+
+			// check to see if there are some unused fields left in the table
+			foreach ($existingFieldsArray as $key => $v) {
+				if (!isset($objectVars[$key]) || !$objectVars[$key]['persistent']) {
+					$table->addDroppedField($key);
+				}
+			}
+
+			if (!$this->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+	}
+
+	/**
+	 * @param $module
+	 * @return bool
+	 */
+	public function moduleUpgrade(\XoopsModule $module)
+	{
+		$dirname = $module->getVar('dirname');
+
+		ob_start();
+
+		$table = new DbTable($dirname . '_meta');
+		if (!$table->exists()) {
+			$table->setStructure("
               `metakey` varchar(50) NOT NULL default '',
               `metavalue` varchar(255) NOT NULL default '',
               PRIMARY KEY (`metakey`)");
-            $table->setData("'version',0");
-            if (!$this->updateTable($table)) {
-                /**
-                 * @todo trap the errors
-                 */
-            }
-        }
-
-        $dbVersion = Smartobject\Utility::getMeta('version', $dirname);
-        if (!$dbVersion) {
-            $dbVersion = 0;
-        }
-        $newDbVersion = constant(strtoupper($dirname . '_db_version')) ?: 0;
-        echo 'Database version: ' . $dbVersion . '<br>';
-        echo 'New database version: ' . $newDbVersion . '<br>';
-
-        if ($newDbVersion > $dbVersion) {
-            for ($i = $dbVersion + 1; $i <= $newDbVersion; ++$i) {
-                $upgrade_function = $dirname . '_db_upgrade_' . $i;
-                if (function_exists($upgrade_function)) {
-                    $upgrade_function();
-                }
-            }
-        }
-
-        echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
-
-        // if there is a function to execute for this DB version, let's do it
-        //$function_
-
-        $module_info = Smartobject\Utility::getModuleInfo($dirname);
-        $this->automaticUpgrade($dirname, $module_info->modinfo['object_items']);
-
-        echo '</code>';
-
-        $feedback = ob_get_clean();
-        if (method_exists($module, 'setMessage')) {
-            $module->setMessage($feedback);
-        } else {
-            echo $feedback;
-        }
-        Smartobject\Utility::setMeta('version', $newDbVersion, $dirname); //Set meta version to current
-
-        return true;
-    }
+			$table->setData("'version',0");
+			if (!$this->updateTable($table)) {
+				/**
+				 * @todo trap the errors
+				 */
+			}
+		}
+
+		$dbVersion = Smartobject\Utility::getMeta('version', $dirname);
+		if (!$dbVersion) {
+			$dbVersion = 0;
+		}
+		$newDbVersion = constant(strtoupper($dirname . '_db_version')) ?: 0;
+		echo 'Database version: ' . $dbVersion . '<br>';
+		echo 'New database version: ' . $newDbVersion . '<br>';
+
+		if ($newDbVersion > $dbVersion) {
+			for ($i = $dbVersion + 1; $i <= $newDbVersion; ++$i) {
+				$upgrade_function = $dirname . '_db_upgrade_' . $i;
+				if (function_exists($upgrade_function)) {
+					$upgrade_function();
+				}
+			}
+		}
+
+		echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
+
+		// if there is a function to execute for this DB version, let's do it
+		//$function_
+
+		$module_info = Smartobject\Utility::getModuleInfo($dirname);
+		$this->automaticUpgrade($dirname, $module_info->modinfo['object_items']);
+
+		echo '</code>';
+
+		$feedback = ob_get_clean();
+		if (method_exists($module, 'setMessage')) {
+			$module->setMessage($feedback);
+		} else {
+			echo $feedback;
+		}
+		Smartobject\Utility::setMeta('version', $newDbVersion, $dirname); //Set meta version to current
+
+		return true;
+	}
 }

Spacing +13 added lines, -13 removed lines

@@ -38,15 +38,15 @@ 
  */
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 if (!defined('SMARTOBJECT_ROOT_PATH')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 }
 /**
  * Include the language constants for the SmartObjectDBUpdater
  */
 global $xoopsConfig;
-$common_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/smartdbupdater.php';
+$common_file = SMARTOBJECT_ROOT_PATH.'language/'.$xoopsConfig['language'].'/smartdbupdater.php';
 if (!file_exists($common_file)) {
-    $common_file = SMARTOBJECT_ROOT_PATH . 'language/english/smartdbupdater.php';
+    $common_file = SMARTOBJECT_ROOT_PATH.'language/english/smartdbupdater.php';
 }
 include $common_file;
 
@@ -130,11 +130,11 @@ 
         $query = sprintf('ALTER TABLE %s RENAME %s', $from, $to);
         $ret   = $xoopsDB->query($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from).'<br>';
 
             return false;
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE, $from, $to).'<br>';
 
             return true;
         }
@@ -254,7 +254,7 @@ 
             return false;
         }
 
-        $table      = new DbTable($module . '_' . $item);
+        $table      = new DbTable($module.'_'.$item);
         $object     = $moduleHandler->create();
         $objectVars = $object->getVars();
 
@@ -275,7 +275,7 @@ 
 ";
                 }
             }
-            $structure .= 'PRIMARY KEY  (`' . $moduleHandler->keyName . '`)
+            $structure .= 'PRIMARY KEY  (`'.$moduleHandler->keyName.'`)
 ';
             $table->setStructure($structure);
             if (!$this->updateTable($table)) {
@@ -335,7 +335,7 @@ 
 
         ob_start();
 
-        $table = new DbTable($dirname . '_meta');
+        $table = new DbTable($dirname.'_meta');
         if (!$table->exists()) {
             $table->setStructure("
               `metakey` varchar(50) NOT NULL default '',
@@ -353,20 +353,20 @@ 
         if (!$dbVersion) {
             $dbVersion = 0;
         }
-        $newDbVersion = constant(strtoupper($dirname . '_db_version')) ?: 0;
-        echo 'Database version: ' . $dbVersion . '<br>';
-        echo 'New database version: ' . $newDbVersion . '<br>';
+        $newDbVersion = constant(strtoupper($dirname.'_db_version')) ?: 0;
+        echo 'Database version: '.$dbVersion.'<br>';
+        echo 'New database version: '.$newDbVersion.'<br>';
 
         if ($newDbVersion > $dbVersion) {
             for ($i = $dbVersion + 1; $i <= $newDbVersion; ++$i) {
-                $upgrade_function = $dirname . '_db_upgrade_' . $i;
+                $upgrade_function = $dirname.'_db_upgrade_'.$i;
                 if (function_exists($upgrade_function)) {
                     $upgrade_function();
                 }
             }
         }
 
-        echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
+        echo '<code>'._SDU_UPDATE_UPDATING_DATABASE.'<br>';
 
         // if there is a function to execute for this DB version, let's do it
         //$function_

class/ObjectController.php

Doc Comments +5 added lines, -5 removed lines

@@ -126,9 +126,9 @@ 
 
     /**
      * @param        $smartObj
-     * @param        $objectid
-     * @param        $created_success_msg
-     * @param        $modified_success_msg
+     * @param        integer $objectid
+     * @param        string $created_success_msg
+     * @param        string $modified_success_msg
      * @param  bool  $redirect_page
      * @param  bool  $debug
      * @return mixed
@@ -440,7 +440,7 @@ 
     }
 
     /**
-     * @param         $smartObj
+     * @param         MlObject $smartObj
      * @param  bool   $onlyUrl
      * @param  bool   $withimage
      * @return string
@@ -498,7 +498,7 @@ 
     }
 
     /**
-     * @param $smartObj
+     * @param BaseSmartObject $smartObj
      * @return string
      */
     public function getPrintAndMailLink($smartObj)

Indentation +506 added lines, -506 removed lines

@@ -33,511 +33,511 @@
  */
 class ObjectController
 {
-    public $handler;
-
-    /**
-     * SmartObjectController constructor.
-     * @param $handler
-     */
-    public function __construct($handler)
-    {
-        $this->handler = $handler;
-    }
-
-    /**
-     * @param $smartObj
-     */
-    public function postDataToObject(&$smartObj)
-    {
-        foreach (array_keys($smartObj->vars) as $key) {
-            switch ($smartObj->vars[$key]['data_type']) {
-                case XOBJ_DTYPE_IMAGE:
-                    if (isset($_POST['url_' . $key]) && '' !== $_POST['url_' . $key]) {
-                        $oldFile = $smartObj->getUploadDir(true) . $smartObj->getVar($key, 'e');
-                        $smartObj->setVar($key, $_POST['url_' . $key]);
-                        if (file_exists($oldFile)) {
-                            unlink($oldFile);
-                        }
-                    }
-                    if (isset($_POST['delete_' . $key]) && '1' == $_POST['delete_' . $key]) {
-                        $oldFile = $smartObj->getUploadDir(true) . $smartObj->getVar($key, 'e');
-                        $smartObj->setVar($key, '');
-                        if (file_exists($oldFile)) {
-                            unlink($oldFile);
-                        }
-                    }
-                    break;
-
-                case XOBJ_DTYPE_URLLINK:
-                    $linkObj = $smartObj->getUrlLinkObj($key);
-                    $linkObj->setVar('caption', $_POST['caption_' . $key]);
-                    $linkObj->setVar('description', $_POST['desc_' . $key]);
-                    $linkObj->setVar('target', $_POST['target_' . $key]);
-                    $linkObj->setVar('url', $_POST['url_' . $key]);
-                    if ('' !== $linkObj->getVar('url')) {
-                        $smartObj->storeUrlLinkObj($linkObj);
-                    }
-                    //todo: catch errors
-                    $smartObj->setVar($key, $linkObj->getVar('urllinkid'));
-                    break;
-
-                case XOBJ_DTYPE_FILE:
-                    if (!isset($_FILES['upload_' . $key]['name']) || '' === $_FILES['upload_' . $key]['name']) {
-                        $fileObj = $smartObj->getFileObj($key);
-                        $fileObj->setVar('caption', $_POST['caption_' . $key]);
-                        $fileObj->setVar('description', $_POST['desc_' . $key]);
-                        $fileObj->setVar('url', $_POST['url_' . $key]);
-                        if (!('' === $fileObj->getVar('url') && '' === $fileObj->getVar('url')
-                              && '' === $fileObj->getVar('url'))) {
-                            $res = $smartObj->storeFileObj($fileObj);
-                            if ($res) {
-                                $smartObj->setVar($key, $fileObj->getVar('fileid'));
-                            } else {
-                                //error setted, but no error message (to be improved)
-                                $smartObj->setErrors($fileObj->getErrors());
-                            }
-                        }
-                    }
-                    break;
-
-                case XOBJ_DTYPE_STIME:
-                case XOBJ_DTYPE_MTIME:
-                case XOBJ_DTYPE_LTIME:
-                    // check if this field's value is available in the POST array
-                    if (is_array($_POST[$key]) && isset($_POST[$key]['date'])) {
-                        $value = strtotime($_POST[$key]['date']) + $_POST[$key]['time'];
-                    } else {
-                        $value = strtotime($_POST[$key]);
-                        //if strtotime returns false, the value is already a time stamp
-                        if (!$value) {
-                            $value = (int)$_POST[$key];
-                        }
-                    }
-                    $smartObj->setVar($key, $value);
-
-                    break;
-
-                default:
-                    $smartObj->setVar($key, $_POST[$key]);
-                    break;
-            }
-        }
-    }
-
-    /**
-     * @param        $smartObj
-     * @param        $objectid
-     * @param        $created_success_msg
-     * @param        $modified_success_msg
-     * @param  bool  $redirect_page
-     * @param  bool  $debug
-     * @return mixed
-     */
-    public function doStoreFromDefaultForm(
-        &$smartObj,
-        $objectid,
-        $created_success_msg,
-        $modified_success_msg,
-        $redirect_page = false,
-        $debug = false
-    ) {
-        global $smart_previous_page;
-
-        $this->postDataToObject($smartObj);
-
-        if ($smartObj->isNew()) {
-            $redirect_msg = $created_success_msg;
-        } else {
-            $redirect_msg = $modified_success_msg;
-        }
-
-        // Check if there were uploaded files
-        if (isset($_POST['smart_upload_image']) || isset($_POST['smart_upload_file'])) {
+	public $handler;
+
+	/**
+	 * SmartObjectController constructor.
+	 * @param $handler
+	 */
+	public function __construct($handler)
+	{
+		$this->handler = $handler;
+	}
+
+	/**
+	 * @param $smartObj
+	 */
+	public function postDataToObject(&$smartObj)
+	{
+		foreach (array_keys($smartObj->vars) as $key) {
+			switch ($smartObj->vars[$key]['data_type']) {
+				case XOBJ_DTYPE_IMAGE:
+					if (isset($_POST['url_' . $key]) && '' !== $_POST['url_' . $key]) {
+						$oldFile = $smartObj->getUploadDir(true) . $smartObj->getVar($key, 'e');
+						$smartObj->setVar($key, $_POST['url_' . $key]);
+						if (file_exists($oldFile)) {
+							unlink($oldFile);
+						}
+					}
+					if (isset($_POST['delete_' . $key]) && '1' == $_POST['delete_' . $key]) {
+						$oldFile = $smartObj->getUploadDir(true) . $smartObj->getVar($key, 'e');
+						$smartObj->setVar($key, '');
+						if (file_exists($oldFile)) {
+							unlink($oldFile);
+						}
+					}
+					break;
+
+				case XOBJ_DTYPE_URLLINK:
+					$linkObj = $smartObj->getUrlLinkObj($key);
+					$linkObj->setVar('caption', $_POST['caption_' . $key]);
+					$linkObj->setVar('description', $_POST['desc_' . $key]);
+					$linkObj->setVar('target', $_POST['target_' . $key]);
+					$linkObj->setVar('url', $_POST['url_' . $key]);
+					if ('' !== $linkObj->getVar('url')) {
+						$smartObj->storeUrlLinkObj($linkObj);
+					}
+					//todo: catch errors
+					$smartObj->setVar($key, $linkObj->getVar('urllinkid'));
+					break;
+
+				case XOBJ_DTYPE_FILE:
+					if (!isset($_FILES['upload_' . $key]['name']) || '' === $_FILES['upload_' . $key]['name']) {
+						$fileObj = $smartObj->getFileObj($key);
+						$fileObj->setVar('caption', $_POST['caption_' . $key]);
+						$fileObj->setVar('description', $_POST['desc_' . $key]);
+						$fileObj->setVar('url', $_POST['url_' . $key]);
+						if (!('' === $fileObj->getVar('url') && '' === $fileObj->getVar('url')
+							  && '' === $fileObj->getVar('url'))) {
+							$res = $smartObj->storeFileObj($fileObj);
+							if ($res) {
+								$smartObj->setVar($key, $fileObj->getVar('fileid'));
+							} else {
+								//error setted, but no error message (to be improved)
+								$smartObj->setErrors($fileObj->getErrors());
+							}
+						}
+					}
+					break;
+
+				case XOBJ_DTYPE_STIME:
+				case XOBJ_DTYPE_MTIME:
+				case XOBJ_DTYPE_LTIME:
+					// check if this field's value is available in the POST array
+					if (is_array($_POST[$key]) && isset($_POST[$key]['date'])) {
+						$value = strtotime($_POST[$key]['date']) + $_POST[$key]['time'];
+					} else {
+						$value = strtotime($_POST[$key]);
+						//if strtotime returns false, the value is already a time stamp
+						if (!$value) {
+							$value = (int)$_POST[$key];
+						}
+					}
+					$smartObj->setVar($key, $value);
+
+					break;
+
+				default:
+					$smartObj->setVar($key, $_POST[$key]);
+					break;
+			}
+		}
+	}
+
+	/**
+	 * @param        $smartObj
+	 * @param        $objectid
+	 * @param        $created_success_msg
+	 * @param        $modified_success_msg
+	 * @param  bool  $redirect_page
+	 * @param  bool  $debug
+	 * @return mixed
+	 */
+	public function doStoreFromDefaultForm(
+		&$smartObj,
+		$objectid,
+		$created_success_msg,
+		$modified_success_msg,
+		$redirect_page = false,
+		$debug = false
+	) {
+		global $smart_previous_page;
+
+		$this->postDataToObject($smartObj);
+
+		if ($smartObj->isNew()) {
+			$redirect_msg = $created_success_msg;
+		} else {
+			$redirect_msg = $modified_success_msg;
+		}
+
+		// Check if there were uploaded files
+		if (isset($_POST['smart_upload_image']) || isset($_POST['smart_upload_file'])) {
 //            require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartuploader.php';
-            $uploaderObj = new Uploader($smartObj->getImageDir(true), $this->handler->_allowedMimeTypes, $this->handler->_maxFileSize, $this->handler->_maxWidth, $this->handler->_maxHeight);
-            foreach ($_FILES as $name => $file_array) {
-                if (isset($file_array['name']) && '' !== $file_array['name']
-                    && in_array(str_replace('upload_', '', $name), array_keys($smartObj->vars))) {
-                    if ($uploaderObj->fetchMedia($name)) {
-                        $uploaderObj->setTargetFileName(time() . '_' . $uploaderObj->getMediaName());
-                        if ($uploaderObj->upload()) {
-                            // Find the related field in the SmartObject
-                            $related_field   = str_replace('upload_', '', $name);
-                            $uploadedArray[] = $related_field;
-                            //si c'est un fichier Rich
-                            if (XOBJ_DTYPE_FILE === $smartObj->vars[$related_field]['data_type']) {
-                                $object_fileurl = $smartObj->getUploadDir();
-                                $fileObj        = $smartObj->getFileObj($related_field);
-                                $fileObj->setVar('url', $object_fileurl . $uploaderObj->getSavedFileName());
-                                $fileObj->setVar('caption', $_POST['caption_' . $related_field]);
-                                $fileObj->setVar('description', $_POST['desc_' . $related_field]);
-                                $smartObj->storeFileObj($fileObj);
-                                //todo: catch errors
-                                $smartObj->setVar($related_field, $fileObj->getVar('fileid'));
-                            } else {
-                                $old_file = $smartObj->getUploadDir(true) . $smartObj->getVar($related_field);
-                                unlink($old_file);
-                                $smartObj->setVar($related_field, $uploaderObj->getSavedFileName());
-                            }
-                        } else {
-                            $smartObj->setErrors($uploaderObj->getErrors(false));
-                        }
-                    } else {
-                        $smartObj->setErrors($uploaderObj->getErrors(false));
-                    }
-                }
-            }
-        }
-
-        if ($debug) {
-            $storeResult = $this->handler->insertD($smartObj);
-        } else {
-            $storeResult = $this->handler->insert($smartObj);
-        }
-
-        if ($storeResult) {
-            if ($this->handler->getPermissions()) {
-                $smartPermissionsHandler = new PermissionHandler($this->handler);
-                $smartPermissionsHandler->storeAllPermissionsForId($smartObj->id());
-            }
-        }
-
-        if (null === $redirect_page) {
-            return $smartObj;
-        } else {
-            if (!$storeResult) {
-                redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $smartObj->getHtmlErrors());
-            }
-
-            $redirect_page = $redirect_page ?: Smartobject\Utility::getPageBeforeForm();
-
-            redirect_header($redirect_page, 2, $redirect_msg);
-        }
-    }
-
-    /**
-     * Store the object in the database autmatically from a form sending POST data
-     *
-     * @param  string      $created_success_msg  message to display if new object was created
-     * @param  string      $modified_success_msg message to display if object was successfully edited
-     * @param  bool|string $redirect_page        redirect page, if not set, then we backup once
-     * @param  bool        $debug
-     * @param  bool        $x_param
-     * @return bool
-     * @internal param string $created_redir_page redirect page after creating the object
-     * @internal param string $modified_redir_page redirect page after editing the object
-     * @internal param bool $exit if set to TRUE then the script ends
-     */
-    public function storeFromDefaultForm(
-        $created_success_msg,
-        $modified_success_msg,
-        $redirect_page = false,
-        $debug = false,
-        $x_param = false
-    ) {
-        $objectid = isset($_POST[$this->handler->keyName]) ? (int)$_POST[$this->handler->keyName] : 0;
-        if ($debug) {
-            if ($x_param) {
-                $smartObj = $this->handler->getD($objectid, true, $x_param);
-            } else {
-                $smartObj = $this->handler->getD($objectid);
-            }
-        } else {
-            if ($x_param) {
-                $smartObj = $this->handler->get($objectid, true, false, false, $x_param);
-            } else {
-                $smartObj = $this->handler->get($objectid);
-            }
-        }
-
-        // if handler is the Multilanguage handler, we will need to treat this for multilanguage
-        if (is_subclass_of($this->handler, 'smartpersistablemlobjecthandler')) {
-            if ($smartObj->isNew()) {
-                // This is a new object. We need to store the meta data and then the language data
-                // First, we will get rid of the multilanguage data to only store the meta data
-                $smartObj->stripMultilanguageFields();
-                $newObject = $this->doStoreFromDefaultForm($smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page, $debug);
-                /**
-                 * @todo we need to trap potential errors here
-                 */
-
-                // ok, the meta daa is stored. Let's recreate the object and then
-                // get rid of anything not multilanguage
-                unset($smartObj);
-                $smartObj = $this->handler->get($objectid);
-                $smartObj->stripNonMultilanguageFields();
-
-                $smartObj->setVar($this->handler->keyName, $newObject->getVar($this->handler->keyName));
-                $this->handler->changeTableNameForML();
-                $ret = $this->doStoreFromDefaultForm($smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page, $debug);
-
-                return $ret;
-            }
-        } else {
-            return $this->doStoreFromDefaultForm($smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page, $debug);
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    public function storeSmartObjectD()
-    {
-        return $this->storeSmartObject(true);
-    }
-
-    /**
-     * @param  bool $debug
-     * @param  bool $xparam
-     * @return bool
-     */
-    public function storeSmartObject($debug = false, $xparam = false)
-    {
-        $ret = $this->storeFromDefaultForm('', '', null, $debug, $xparam);
-
-        return $ret;
-    }
-
-    /**
-     * Handles deletion of an object which keyid is passed as a GET param
-     *
-     * @param  bool   $confirm_msg
-     * @param  string $op
-     * @param  bool   $userSide
-     * @return void
-     * @internal param string $redir_page redirect page after deleting the object
-     */
-    public function handleObjectDeletion($confirm_msg = false, $op = 'del', $userSide = false)
-    {
-        global $smart_previous_page;
-
-        $objectid = isset($_REQUEST[$this->handler->keyName]) ? (int)$_REQUEST[$this->handler->keyName] : 0;
-        $smartObj = $this->handler->get($objectid);
-
-        if ($smartObj->isNew()) {
-            redirect_header('javascript:history.go(-1)', 3, _CO_SOBJECT_NOT_SELECTED);
-        }
-
-        $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
-        if ($confirm) {
-            if (!$this->handler->delete($smartObj)) {
-                redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_ERROR . $smartObj->getHtmlErrors());
-            }
-
-            redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_SUCCESS);
-        } else {
-            // no confirm: show deletion condition
-
-            xoops_cp_header();
-
-            if (!$confirm_msg) {
-                $confirm_msg = _CO_SOBJECT_DELETE_CONFIRM;
-            }
-
-            xoops_confirm([
-                              'op'                    => $op,
-                              $this->handler->keyName => $smartObj->getVar($this->handler->keyName),
-                              'confirm'               => 1,
-                              'redirect_page'         => $smart_previous_page
-                          ], xoops_getenv('PHP_SELF'), sprintf($confirm_msg, $smartObj->getVar($this->handler->identifierName)), _CO_SOBJECT_DELETE);
-
-            xoops_cp_footer();
-        }
-        exit();
-    }
-
-    /**
-     * @param bool   $confirm_msg
-     * @param string $op
-     */
-    public function handleObjectDeletionFromUserSide($confirm_msg = false, $op = 'del')
-    {
-        global $smart_previous_page, $xoopsTpl;
-
-        $objectid = isset($_REQUEST[$this->handler->keyName]) ? (int)$_REQUEST[$this->handler->keyName] : 0;
-        $smartObj = $this->handler->get($objectid);
-
-        if ($smartObj->isNew()) {
-            redirect_header('javascript:history.go(-1)', 3, _CO_SOBJECT_NOT_SELECTED);
-        }
-
-        $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
-        if ($confirm) {
-            if (!$this->handler->delete($smartObj)) {
-                redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_ERROR . $smartObj->getHtmlErrors());
-            }
-
-            redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_SUCCESS);
-        } else {
-            // no confirm: show deletion condition
-            if (!$confirm_msg) {
-                $confirm_msg = _CO_SOBJECT_DELETE_CONFIRM;
-            }
-
-            ob_start();
-            xoops_confirm([
-                              'op'                    => $op,
-                              $this->handler->keyName => $smartObj->getVar($this->handler->keyName),
-                              'confirm'               => 1,
-                              'redirect_page'         => $smart_previous_page
-                          ], xoops_getenv('PHP_SELF'), sprintf($confirm_msg, $smartObj->getVar($this->handler->identifierName)), _CO_SOBJECT_DELETE);
-            $smartobjectDeleteConfirm = ob_get_clean();
-            $xoopsTpl->assign('smartobject_delete_confirm', $smartobjectDeleteConfirm);
-        }
-    }
-
-    /**
-     * Retreive the object admin side link for a {@link SmartObjectSingleView} page
-     *
-     * @param  SmartObject $smartObj reference to the object from which we want the user side link
-     * @param  bool        $onlyUrl  wether or not to return a simple URL or a full <a> link
-     * @param  bool        $withimage
-     * @return string      admin side link to the object
-     */
-    public function getAdminViewItemLink(SmartObject $smartObj, $onlyUrl = false, $withimage = false)
-    {
-        $ret = $this->handler->_moduleUrl . 'admin/' . $this->handler->_page . '?op=view&' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
-        if ($onlyUrl) {
-            return $ret;
-        } elseif ($withimage) {
-            return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "viewmag.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_ADMIN_VIEW . "'  title='" . _CO_SOBJECT_ADMIN_VIEW . "'></a>";
-        }
-
-        return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
-    }
-
-    /**
-     * Retreive the object user side link
-     *
-     * @param  SmartObject $smartObj reference to the object from which we want the user side link
-     * @param  bool        $onlyUrl  wether or not to return a simple URL or a full <a> link
-     * @return string      user side link to the object
-     */
-    public function getItemLink(SmartObject $smartObj, $onlyUrl = false)
-    {
-        $seoMode       = Smartobject\Utility::getModuleModeSEO($this->handler->_moduleName);
-        $seoModuleName = Smartobject\Utility::getModuleNameForSEO($this->handler->_moduleName);
-
-        /**
-         * $seoIncludeId feature is not finished yet, so let's put it always to true
-         */
-        //$seoIncludeId = Smartobject\Utility::getModuleIncludeIdSEO($this->handler->_moduleName);
-        $seoIncludeId = true;
-
-        if ('rewrite' === $seoMode) {
-            $ret = XOOPS_URL . '/' . $seoModuleName . '.' . $this->handler->_itemname . ($seoIncludeId ? '.' . $smartObj->getVar($this->handler->keyName) : '') . '/' . $smartObj->getVar('short_url') . '.html';
-        } elseif ('pathinfo' === $seoMode) {
-            $ret = SMARTOBJECT_URL . 'seo.php/' . $seoModuleName . '.' . $this->handler->_itemname . ($seoIncludeId ? '.' . $smartObj->getVar($this->handler->keyName) : '') . '/' . $smartObj->getVar('short_url') . '.html';
-        } else {
-            $ret = $this->handler->_moduleUrl . $this->handler->_page . '?' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
-        }
-
-        if (!$onlyUrl) {
-            $ret = "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param         $smartObj
-     * @param  bool   $onlyUrl
-     * @param  bool   $withimage
-     * @return string
-     */
-    public function getEditLanguageLink($smartObj, $onlyUrl = false, $withimage = true)
-    {
-        $ret = $this->handler->_moduleUrl . 'admin/' . $this->handler->_page . '?op=mod&' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName) . '&language=' . $smartObj->getVar('language');
-        if ($onlyUrl) {
-            return $ret;
-        } elseif ($withimage) {
-            return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "wizard.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_LANGUAGE_MODIFY . "'  title='" . _CO_SOBJECT_LANGUAGE_MODIFY . "'></a>";
-        }
-
-        return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
-    }
-
-    /**
-     * @param         $smartObj
-     * @param  bool   $onlyUrl
-     * @param  bool   $withimage
-     * @param  bool   $userSide
-     * @return string
-     */
-    public function getEditItemLink($smartObj, $onlyUrl = false, $withimage = true, $userSide = false)
-    {
-        $admin_side = $userSide ? '' : 'admin/';
-        $ret        = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . '?op=mod&' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
-        if ($onlyUrl) {
-            return $ret;
-        } elseif ($withimage) {
-            return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "edit.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_MODIFY . "'  title='" . _CO_SOBJECT_MODIFY . "'></a>";
-        }
-
-        return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
-    }
-
-    /**
-     * @param         $smartObj
-     * @param  bool   $onlyUrl
-     * @param  bool   $withimage
-     * @param  bool   $userSide
-     * @return string
-     */
-    public function getDeleteItemLink($smartObj, $onlyUrl = false, $withimage = true, $userSide = false)
-    {
-        $admin_side = $userSide ? '' : 'admin/';
-        $ret        = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . '?op=del&' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
-        if ($onlyUrl) {
-            return $ret;
-        } elseif ($withimage) {
-            return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "editdelete.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_DELETE . "'  title='" . _CO_SOBJECT_DELETE . "'></a>";
-        }
-
-        return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
-    }
-
-    /**
-     * @param $smartObj
-     * @return string
-     */
-    public function getPrintAndMailLink($smartObj)
-    {
-        global $xoopsConfig;
-
-        $printlink = $this->handler->_moduleUrl . 'print.php?' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
-        $js        = "javascript:openWithSelfMain('" . $printlink . "', 'smartpopup', 700, 519);";
-        $printlink = '<a href="' . $js . '"><img  src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'fileprint.png" alt="" style="vertical-align: middle;"></a>';
-
-        $smartModule = Smartobject\Utility::getModuleInfo($smartObj->handler->_moduleName);
-        $link        = Smartobject\Utility::getCurrentPage();
-        $mid         = $smartModule->getVar('mid');
-        $friendlink  = "<a href=\"javascript:openWithSelfMain('"
-                       . SMARTOBJECT_URL
-                       . 'sendlink.php?link='
-                       . $link
-                       . '&amp;mid='
-                       . $mid
-                       . "', ',',',',',','sendmessage', 674, 500);\"><img src=\""
-                       . SMARTOBJECT_IMAGES_ACTIONS_URL
-                       . 'mail_send.png"  alt="'
-                       . _CO_SOBJECT_EMAIL
-                       . '" title="'
-                       . _CO_SOBJECT_EMAIL
-                       . '" style="vertical-align: middle;"></a>';
-
-        $ret = '<span id="smartobject_print_button">' . $printlink . '&nbsp;</span>' . '<span id="smartobject_mail_button">' . $friendlink . '</span>';
-
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public function getModuleItemString()
-    {
-        $ret = $this->handler->_moduleName . '_' . $this->handler->_itemname;
-
-        return $ret;
-    }
+			$uploaderObj = new Uploader($smartObj->getImageDir(true), $this->handler->_allowedMimeTypes, $this->handler->_maxFileSize, $this->handler->_maxWidth, $this->handler->_maxHeight);
+			foreach ($_FILES as $name => $file_array) {
+				if (isset($file_array['name']) && '' !== $file_array['name']
+					&& in_array(str_replace('upload_', '', $name), array_keys($smartObj->vars))) {
+					if ($uploaderObj->fetchMedia($name)) {
+						$uploaderObj->setTargetFileName(time() . '_' . $uploaderObj->getMediaName());
+						if ($uploaderObj->upload()) {
+							// Find the related field in the SmartObject
+							$related_field   = str_replace('upload_', '', $name);
+							$uploadedArray[] = $related_field;
+							//si c'est un fichier Rich
+							if (XOBJ_DTYPE_FILE === $smartObj->vars[$related_field]['data_type']) {
+								$object_fileurl = $smartObj->getUploadDir();
+								$fileObj        = $smartObj->getFileObj($related_field);
+								$fileObj->setVar('url', $object_fileurl . $uploaderObj->getSavedFileName());
+								$fileObj->setVar('caption', $_POST['caption_' . $related_field]);
+								$fileObj->setVar('description', $_POST['desc_' . $related_field]);
+								$smartObj->storeFileObj($fileObj);
+								//todo: catch errors
+								$smartObj->setVar($related_field, $fileObj->getVar('fileid'));
+							} else {
+								$old_file = $smartObj->getUploadDir(true) . $smartObj->getVar($related_field);
+								unlink($old_file);
+								$smartObj->setVar($related_field, $uploaderObj->getSavedFileName());
+							}
+						} else {
+							$smartObj->setErrors($uploaderObj->getErrors(false));
+						}
+					} else {
+						$smartObj->setErrors($uploaderObj->getErrors(false));
+					}
+				}
+			}
+		}
+
+		if ($debug) {
+			$storeResult = $this->handler->insertD($smartObj);
+		} else {
+			$storeResult = $this->handler->insert($smartObj);
+		}
+
+		if ($storeResult) {
+			if ($this->handler->getPermissions()) {
+				$smartPermissionsHandler = new PermissionHandler($this->handler);
+				$smartPermissionsHandler->storeAllPermissionsForId($smartObj->id());
+			}
+		}
+
+		if (null === $redirect_page) {
+			return $smartObj;
+		} else {
+			if (!$storeResult) {
+				redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $smartObj->getHtmlErrors());
+			}
+
+			$redirect_page = $redirect_page ?: Smartobject\Utility::getPageBeforeForm();
+
+			redirect_header($redirect_page, 2, $redirect_msg);
+		}
+	}
+
+	/**
+	 * Store the object in the database autmatically from a form sending POST data
+	 *
+	 * @param  string      $created_success_msg  message to display if new object was created
+	 * @param  string      $modified_success_msg message to display if object was successfully edited
+	 * @param  bool|string $redirect_page        redirect page, if not set, then we backup once
+	 * @param  bool        $debug
+	 * @param  bool        $x_param
+	 * @return bool
+	 * @internal param string $created_redir_page redirect page after creating the object
+	 * @internal param string $modified_redir_page redirect page after editing the object
+	 * @internal param bool $exit if set to TRUE then the script ends
+	 */
+	public function storeFromDefaultForm(
+		$created_success_msg,
+		$modified_success_msg,
+		$redirect_page = false,
+		$debug = false,
+		$x_param = false
+	) {
+		$objectid = isset($_POST[$this->handler->keyName]) ? (int)$_POST[$this->handler->keyName] : 0;
+		if ($debug) {
+			if ($x_param) {
+				$smartObj = $this->handler->getD($objectid, true, $x_param);
+			} else {
+				$smartObj = $this->handler->getD($objectid);
+			}
+		} else {
+			if ($x_param) {
+				$smartObj = $this->handler->get($objectid, true, false, false, $x_param);
+			} else {
+				$smartObj = $this->handler->get($objectid);
+			}
+		}
+
+		// if handler is the Multilanguage handler, we will need to treat this for multilanguage
+		if (is_subclass_of($this->handler, 'smartpersistablemlobjecthandler')) {
+			if ($smartObj->isNew()) {
+				// This is a new object. We need to store the meta data and then the language data
+				// First, we will get rid of the multilanguage data to only store the meta data
+				$smartObj->stripMultilanguageFields();
+				$newObject = $this->doStoreFromDefaultForm($smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page, $debug);
+				/**
+				 * @todo we need to trap potential errors here
+				 */
+
+				// ok, the meta daa is stored. Let's recreate the object and then
+				// get rid of anything not multilanguage
+				unset($smartObj);
+				$smartObj = $this->handler->get($objectid);
+				$smartObj->stripNonMultilanguageFields();
+
+				$smartObj->setVar($this->handler->keyName, $newObject->getVar($this->handler->keyName));
+				$this->handler->changeTableNameForML();
+				$ret = $this->doStoreFromDefaultForm($smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page, $debug);
+
+				return $ret;
+			}
+		} else {
+			return $this->doStoreFromDefaultForm($smartObj, $objectid, $created_success_msg, $modified_success_msg, $redirect_page, $debug);
+		}
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function storeSmartObjectD()
+	{
+		return $this->storeSmartObject(true);
+	}
+
+	/**
+	 * @param  bool $debug
+	 * @param  bool $xparam
+	 * @return bool
+	 */
+	public function storeSmartObject($debug = false, $xparam = false)
+	{
+		$ret = $this->storeFromDefaultForm('', '', null, $debug, $xparam);
+
+		return $ret;
+	}
+
+	/**
+	 * Handles deletion of an object which keyid is passed as a GET param
+	 *
+	 * @param  bool   $confirm_msg
+	 * @param  string $op
+	 * @param  bool   $userSide
+	 * @return void
+	 * @internal param string $redir_page redirect page after deleting the object
+	 */
+	public function handleObjectDeletion($confirm_msg = false, $op = 'del', $userSide = false)
+	{
+		global $smart_previous_page;
+
+		$objectid = isset($_REQUEST[$this->handler->keyName]) ? (int)$_REQUEST[$this->handler->keyName] : 0;
+		$smartObj = $this->handler->get($objectid);
+
+		if ($smartObj->isNew()) {
+			redirect_header('javascript:history.go(-1)', 3, _CO_SOBJECT_NOT_SELECTED);
+		}
+
+		$confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
+		if ($confirm) {
+			if (!$this->handler->delete($smartObj)) {
+				redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_ERROR . $smartObj->getHtmlErrors());
+			}
+
+			redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_SUCCESS);
+		} else {
+			// no confirm: show deletion condition
+
+			xoops_cp_header();
+
+			if (!$confirm_msg) {
+				$confirm_msg = _CO_SOBJECT_DELETE_CONFIRM;
+			}
+
+			xoops_confirm([
+							  'op'                    => $op,
+							  $this->handler->keyName => $smartObj->getVar($this->handler->keyName),
+							  'confirm'               => 1,
+							  'redirect_page'         => $smart_previous_page
+						  ], xoops_getenv('PHP_SELF'), sprintf($confirm_msg, $smartObj->getVar($this->handler->identifierName)), _CO_SOBJECT_DELETE);
+
+			xoops_cp_footer();
+		}
+		exit();
+	}
+
+	/**
+	 * @param bool   $confirm_msg
+	 * @param string $op
+	 */
+	public function handleObjectDeletionFromUserSide($confirm_msg = false, $op = 'del')
+	{
+		global $smart_previous_page, $xoopsTpl;
+
+		$objectid = isset($_REQUEST[$this->handler->keyName]) ? (int)$_REQUEST[$this->handler->keyName] : 0;
+		$smartObj = $this->handler->get($objectid);
+
+		if ($smartObj->isNew()) {
+			redirect_header('javascript:history.go(-1)', 3, _CO_SOBJECT_NOT_SELECTED);
+		}
+
+		$confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
+		if ($confirm) {
+			if (!$this->handler->delete($smartObj)) {
+				redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_ERROR . $smartObj->getHtmlErrors());
+			}
+
+			redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_SUCCESS);
+		} else {
+			// no confirm: show deletion condition
+			if (!$confirm_msg) {
+				$confirm_msg = _CO_SOBJECT_DELETE_CONFIRM;
+			}
+
+			ob_start();
+			xoops_confirm([
+							  'op'                    => $op,
+							  $this->handler->keyName => $smartObj->getVar($this->handler->keyName),
+							  'confirm'               => 1,
+							  'redirect_page'         => $smart_previous_page
+						  ], xoops_getenv('PHP_SELF'), sprintf($confirm_msg, $smartObj->getVar($this->handler->identifierName)), _CO_SOBJECT_DELETE);
+			$smartobjectDeleteConfirm = ob_get_clean();
+			$xoopsTpl->assign('smartobject_delete_confirm', $smartobjectDeleteConfirm);
+		}
+	}
+
+	/**
+	 * Retreive the object admin side link for a {@link SmartObjectSingleView} page
+	 *
+	 * @param  SmartObject $smartObj reference to the object from which we want the user side link
+	 * @param  bool        $onlyUrl  wether or not to return a simple URL or a full <a> link
+	 * @param  bool        $withimage
+	 * @return string      admin side link to the object
+	 */
+	public function getAdminViewItemLink(SmartObject $smartObj, $onlyUrl = false, $withimage = false)
+	{
+		$ret = $this->handler->_moduleUrl . 'admin/' . $this->handler->_page . '?op=view&' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
+		if ($onlyUrl) {
+			return $ret;
+		} elseif ($withimage) {
+			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "viewmag.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_ADMIN_VIEW . "'  title='" . _CO_SOBJECT_ADMIN_VIEW . "'></a>";
+		}
+
+		return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
+	}
+
+	/**
+	 * Retreive the object user side link
+	 *
+	 * @param  SmartObject $smartObj reference to the object from which we want the user side link
+	 * @param  bool        $onlyUrl  wether or not to return a simple URL or a full <a> link
+	 * @return string      user side link to the object
+	 */
+	public function getItemLink(SmartObject $smartObj, $onlyUrl = false)
+	{
+		$seoMode       = Smartobject\Utility::getModuleModeSEO($this->handler->_moduleName);
+		$seoModuleName = Smartobject\Utility::getModuleNameForSEO($this->handler->_moduleName);
+
+		/**
+		 * $seoIncludeId feature is not finished yet, so let's put it always to true
+		 */
+		//$seoIncludeId = Smartobject\Utility::getModuleIncludeIdSEO($this->handler->_moduleName);
+		$seoIncludeId = true;
+
+		if ('rewrite' === $seoMode) {
+			$ret = XOOPS_URL . '/' . $seoModuleName . '.' . $this->handler->_itemname . ($seoIncludeId ? '.' . $smartObj->getVar($this->handler->keyName) : '') . '/' . $smartObj->getVar('short_url') . '.html';
+		} elseif ('pathinfo' === $seoMode) {
+			$ret = SMARTOBJECT_URL . 'seo.php/' . $seoModuleName . '.' . $this->handler->_itemname . ($seoIncludeId ? '.' . $smartObj->getVar($this->handler->keyName) : '') . '/' . $smartObj->getVar('short_url') . '.html';
+		} else {
+			$ret = $this->handler->_moduleUrl . $this->handler->_page . '?' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
+		}
+
+		if (!$onlyUrl) {
+			$ret = "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param         $smartObj
+	 * @param  bool   $onlyUrl
+	 * @param  bool   $withimage
+	 * @return string
+	 */
+	public function getEditLanguageLink($smartObj, $onlyUrl = false, $withimage = true)
+	{
+		$ret = $this->handler->_moduleUrl . 'admin/' . $this->handler->_page . '?op=mod&' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName) . '&language=' . $smartObj->getVar('language');
+		if ($onlyUrl) {
+			return $ret;
+		} elseif ($withimage) {
+			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "wizard.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_LANGUAGE_MODIFY . "'  title='" . _CO_SOBJECT_LANGUAGE_MODIFY . "'></a>";
+		}
+
+		return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
+	}
+
+	/**
+	 * @param         $smartObj
+	 * @param  bool   $onlyUrl
+	 * @param  bool   $withimage
+	 * @param  bool   $userSide
+	 * @return string
+	 */
+	public function getEditItemLink($smartObj, $onlyUrl = false, $withimage = true, $userSide = false)
+	{
+		$admin_side = $userSide ? '' : 'admin/';
+		$ret        = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . '?op=mod&' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
+		if ($onlyUrl) {
+			return $ret;
+		} elseif ($withimage) {
+			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "edit.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_MODIFY . "'  title='" . _CO_SOBJECT_MODIFY . "'></a>";
+		}
+
+		return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
+	}
+
+	/**
+	 * @param         $smartObj
+	 * @param  bool   $onlyUrl
+	 * @param  bool   $withimage
+	 * @param  bool   $userSide
+	 * @return string
+	 */
+	public function getDeleteItemLink($smartObj, $onlyUrl = false, $withimage = true, $userSide = false)
+	{
+		$admin_side = $userSide ? '' : 'admin/';
+		$ret        = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . '?op=del&' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
+		if ($onlyUrl) {
+			return $ret;
+		} elseif ($withimage) {
+			return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "editdelete.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_DELETE . "'  title='" . _CO_SOBJECT_DELETE . "'></a>";
+		}
+
+		return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
+	}
+
+	/**
+	 * @param $smartObj
+	 * @return string
+	 */
+	public function getPrintAndMailLink($smartObj)
+	{
+		global $xoopsConfig;
+
+		$printlink = $this->handler->_moduleUrl . 'print.php?' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
+		$js        = "javascript:openWithSelfMain('" . $printlink . "', 'smartpopup', 700, 519);";
+		$printlink = '<a href="' . $js . '"><img  src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'fileprint.png" alt="" style="vertical-align: middle;"></a>';
+
+		$smartModule = Smartobject\Utility::getModuleInfo($smartObj->handler->_moduleName);
+		$link        = Smartobject\Utility::getCurrentPage();
+		$mid         = $smartModule->getVar('mid');
+		$friendlink  = "<a href=\"javascript:openWithSelfMain('"
+					   . SMARTOBJECT_URL
+					   . 'sendlink.php?link='
+					   . $link
+					   . '&amp;mid='
+					   . $mid
+					   . "', ',',',',',','sendmessage', 674, 500);\"><img src=\""
+					   . SMARTOBJECT_IMAGES_ACTIONS_URL
+					   . 'mail_send.png"  alt="'
+					   . _CO_SOBJECT_EMAIL
+					   . '" title="'
+					   . _CO_SOBJECT_EMAIL
+					   . '" style="vertical-align: middle;"></a>';
+
+		$ret = '<span id="smartobject_print_button">' . $printlink . '&nbsp;</span>' . '<span id="smartobject_mail_button">' . $friendlink . '</span>';
+
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getModuleItemString()
+	{
+		$ret = $this->handler->_moduleName . '_' . $this->handler->_itemname;
+
+		return $ret;
+	}
 }

Spacing +46 added lines, -46 removed lines

@@ -52,15 +52,15 @@ 
         foreach (array_keys($smartObj->vars) as $key) {
             switch ($smartObj->vars[$key]['data_type']) {
                 case XOBJ_DTYPE_IMAGE:
-                    if (isset($_POST['url_' . $key]) && '' !== $_POST['url_' . $key]) {
-                        $oldFile = $smartObj->getUploadDir(true) . $smartObj->getVar($key, 'e');
-                        $smartObj->setVar($key, $_POST['url_' . $key]);
+                    if (isset($_POST['url_'.$key]) && '' !== $_POST['url_'.$key]) {
+                        $oldFile = $smartObj->getUploadDir(true).$smartObj->getVar($key, 'e');
+                        $smartObj->setVar($key, $_POST['url_'.$key]);
                         if (file_exists($oldFile)) {
                             unlink($oldFile);
                         }
                     }
-                    if (isset($_POST['delete_' . $key]) && '1' == $_POST['delete_' . $key]) {
-                        $oldFile = $smartObj->getUploadDir(true) . $smartObj->getVar($key, 'e');
+                    if (isset($_POST['delete_'.$key]) && '1' == $_POST['delete_'.$key]) {
+                        $oldFile = $smartObj->getUploadDir(true).$smartObj->getVar($key, 'e');
                         $smartObj->setVar($key, '');
                         if (file_exists($oldFile)) {
                             unlink($oldFile);
@@ -70,10 +70,10 @@ 
 
                 case XOBJ_DTYPE_URLLINK:
                     $linkObj = $smartObj->getUrlLinkObj($key);
-                    $linkObj->setVar('caption', $_POST['caption_' . $key]);
-                    $linkObj->setVar('description', $_POST['desc_' . $key]);
-                    $linkObj->setVar('target', $_POST['target_' . $key]);
-                    $linkObj->setVar('url', $_POST['url_' . $key]);
+                    $linkObj->setVar('caption', $_POST['caption_'.$key]);
+                    $linkObj->setVar('description', $_POST['desc_'.$key]);
+                    $linkObj->setVar('target', $_POST['target_'.$key]);
+                    $linkObj->setVar('url', $_POST['url_'.$key]);
                     if ('' !== $linkObj->getVar('url')) {
                         $smartObj->storeUrlLinkObj($linkObj);
                     }
@@ -82,11 +82,11 @@ 
                     break;
 
                 case XOBJ_DTYPE_FILE:
-                    if (!isset($_FILES['upload_' . $key]['name']) || '' === $_FILES['upload_' . $key]['name']) {
+                    if (!isset($_FILES['upload_'.$key]['name']) || '' === $_FILES['upload_'.$key]['name']) {
                         $fileObj = $smartObj->getFileObj($key);
-                        $fileObj->setVar('caption', $_POST['caption_' . $key]);
-                        $fileObj->setVar('description', $_POST['desc_' . $key]);
-                        $fileObj->setVar('url', $_POST['url_' . $key]);
+                        $fileObj->setVar('caption', $_POST['caption_'.$key]);
+                        $fileObj->setVar('description', $_POST['desc_'.$key]);
+                        $fileObj->setVar('url', $_POST['url_'.$key]);
                         if (!('' === $fileObj->getVar('url') && '' === $fileObj->getVar('url')
                               && '' === $fileObj->getVar('url'))) {
                             $res = $smartObj->storeFileObj($fileObj);
@@ -110,7 +110,7 @@ 
                         $value = strtotime($_POST[$key]);
                         //if strtotime returns false, the value is already a time stamp
                         if (!$value) {
-                            $value = (int)$_POST[$key];
+                            $value = (int) $_POST[$key];
                         }
                     }
                     $smartObj->setVar($key, $value);
@@ -159,7 +159,7 @@ 
                 if (isset($file_array['name']) && '' !== $file_array['name']
                     && in_array(str_replace('upload_', '', $name), array_keys($smartObj->vars))) {
                     if ($uploaderObj->fetchMedia($name)) {
-                        $uploaderObj->setTargetFileName(time() . '_' . $uploaderObj->getMediaName());
+                        $uploaderObj->setTargetFileName(time().'_'.$uploaderObj->getMediaName());
                         if ($uploaderObj->upload()) {
                             // Find the related field in the SmartObject
                             $related_field   = str_replace('upload_', '', $name);
@@ -168,14 +168,14 @@ 
                             if (XOBJ_DTYPE_FILE === $smartObj->vars[$related_field]['data_type']) {
                                 $object_fileurl = $smartObj->getUploadDir();
                                 $fileObj        = $smartObj->getFileObj($related_field);
-                                $fileObj->setVar('url', $object_fileurl . $uploaderObj->getSavedFileName());
-                                $fileObj->setVar('caption', $_POST['caption_' . $related_field]);
-                                $fileObj->setVar('description', $_POST['desc_' . $related_field]);
+                                $fileObj->setVar('url', $object_fileurl.$uploaderObj->getSavedFileName());
+                                $fileObj->setVar('caption', $_POST['caption_'.$related_field]);
+                                $fileObj->setVar('description', $_POST['desc_'.$related_field]);
                                 $smartObj->storeFileObj($fileObj);
                                 //todo: catch errors
                                 $smartObj->setVar($related_field, $fileObj->getVar('fileid'));
                             } else {
-                                $old_file = $smartObj->getUploadDir(true) . $smartObj->getVar($related_field);
+                                $old_file = $smartObj->getUploadDir(true).$smartObj->getVar($related_field);
                                 unlink($old_file);
                                 $smartObj->setVar($related_field, $uploaderObj->getSavedFileName());
                             }
@@ -206,7 +206,7 @@ 
             return $smartObj;
         } else {
             if (!$storeResult) {
-                redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $smartObj->getHtmlErrors());
+                redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR.$smartObj->getHtmlErrors());
             }
 
             $redirect_page = $redirect_page ?: Smartobject\Utility::getPageBeforeForm();
@@ -235,7 +235,7 @@ 
         $debug = false,
         $x_param = false
     ) {
-        $objectid = isset($_POST[$this->handler->keyName]) ? (int)$_POST[$this->handler->keyName] : 0;
+        $objectid = isset($_POST[$this->handler->keyName]) ? (int) $_POST[$this->handler->keyName] : 0;
         if ($debug) {
             if ($x_param) {
                 $smartObj = $this->handler->getD($objectid, true, $x_param);
@@ -311,7 +311,7 @@ 
     {
         global $smart_previous_page;
 
-        $objectid = isset($_REQUEST[$this->handler->keyName]) ? (int)$_REQUEST[$this->handler->keyName] : 0;
+        $objectid = isset($_REQUEST[$this->handler->keyName]) ? (int) $_REQUEST[$this->handler->keyName] : 0;
         $smartObj = $this->handler->get($objectid);
 
         if ($smartObj->isNew()) {
@@ -321,7 +321,7 @@ 
         $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
         if ($confirm) {
             if (!$this->handler->delete($smartObj)) {
-                redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_ERROR . $smartObj->getHtmlErrors());
+                redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_ERROR.$smartObj->getHtmlErrors());
             }
 
             redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_SUCCESS);
@@ -354,7 +354,7 @@ 
     {
         global $smart_previous_page, $xoopsTpl;
 
-        $objectid = isset($_REQUEST[$this->handler->keyName]) ? (int)$_REQUEST[$this->handler->keyName] : 0;
+        $objectid = isset($_REQUEST[$this->handler->keyName]) ? (int) $_REQUEST[$this->handler->keyName] : 0;
         $smartObj = $this->handler->get($objectid);
 
         if ($smartObj->isNew()) {
@@ -364,7 +364,7 @@ 
         $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
         if ($confirm) {
             if (!$this->handler->delete($smartObj)) {
-                redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_ERROR . $smartObj->getHtmlErrors());
+                redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_ERROR.$smartObj->getHtmlErrors());
             }
 
             redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_SUCCESS);
@@ -396,14 +396,14 @@ 
      */
     public function getAdminViewItemLink(SmartObject $smartObj, $onlyUrl = false, $withimage = false)
     {
-        $ret = $this->handler->_moduleUrl . 'admin/' . $this->handler->_page . '?op=view&' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
+        $ret = $this->handler->_moduleUrl.'admin/'.$this->handler->_page.'?op=view&'.$this->handler->keyName.'='.$smartObj->getVar($this->handler->keyName);
         if ($onlyUrl) {
             return $ret;
         } elseif ($withimage) {
-            return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "viewmag.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_ADMIN_VIEW . "'  title='" . _CO_SOBJECT_ADMIN_VIEW . "'></a>";
+            return "<a href='".$ret."'><img src='".SMARTOBJECT_IMAGES_ACTIONS_URL."viewmag.png' style='vertical-align: middle;' alt='"._CO_SOBJECT_ADMIN_VIEW."'  title='"._CO_SOBJECT_ADMIN_VIEW."'></a>";
         }
 
-        return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
+        return "<a href='".$ret."'>".$smartObj->getVar($this->handler->identifierName).'</a>';
     }
 
     /**
@@ -425,15 +425,15 @@ 
         $seoIncludeId = true;
 
         if ('rewrite' === $seoMode) {
-            $ret = XOOPS_URL . '/' . $seoModuleName . '.' . $this->handler->_itemname . ($seoIncludeId ? '.' . $smartObj->getVar($this->handler->keyName) : '') . '/' . $smartObj->getVar('short_url') . '.html';
+            $ret = XOOPS_URL.'/'.$seoModuleName.'.'.$this->handler->_itemname.($seoIncludeId ? '.'.$smartObj->getVar($this->handler->keyName) : '').'/'.$smartObj->getVar('short_url').'.html';
         } elseif ('pathinfo' === $seoMode) {
-            $ret = SMARTOBJECT_URL . 'seo.php/' . $seoModuleName . '.' . $this->handler->_itemname . ($seoIncludeId ? '.' . $smartObj->getVar($this->handler->keyName) : '') . '/' . $smartObj->getVar('short_url') . '.html';
+            $ret = SMARTOBJECT_URL.'seo.php/'.$seoModuleName.'.'.$this->handler->_itemname.($seoIncludeId ? '.'.$smartObj->getVar($this->handler->keyName) : '').'/'.$smartObj->getVar('short_url').'.html';
         } else {
-            $ret = $this->handler->_moduleUrl . $this->handler->_page . '?' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
+            $ret = $this->handler->_moduleUrl.$this->handler->_page.'?'.$this->handler->keyName.'='.$smartObj->getVar($this->handler->keyName);
         }
 
         if (!$onlyUrl) {
-            $ret = "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
+            $ret = "<a href='".$ret."'>".$smartObj->getVar($this->handler->identifierName).'</a>';
         }
 
         return $ret;
@@ -447,14 +447,14 @@ 
      */
     public function getEditLanguageLink($smartObj, $onlyUrl = false, $withimage = true)
     {
-        $ret = $this->handler->_moduleUrl . 'admin/' . $this->handler->_page . '?op=mod&' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName) . '&language=' . $smartObj->getVar('language');
+        $ret = $this->handler->_moduleUrl.'admin/'.$this->handler->_page.'?op=mod&'.$this->handler->keyName.'='.$smartObj->getVar($this->handler->keyName).'&language='.$smartObj->getVar('language');
         if ($onlyUrl) {
             return $ret;
         } elseif ($withimage) {
-            return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "wizard.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_LANGUAGE_MODIFY . "'  title='" . _CO_SOBJECT_LANGUAGE_MODIFY . "'></a>";
+            return "<a href='".$ret."'><img src='".SMARTOBJECT_IMAGES_ACTIONS_URL."wizard.png' style='vertical-align: middle;' alt='"._CO_SOBJECT_LANGUAGE_MODIFY."'  title='"._CO_SOBJECT_LANGUAGE_MODIFY."'></a>";
         }
 
-        return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
+        return "<a href='".$ret."'>".$smartObj->getVar($this->handler->identifierName).'</a>';
     }
 
     /**
@@ -467,14 +467,14 @@ 
     public function getEditItemLink($smartObj, $onlyUrl = false, $withimage = true, $userSide = false)
     {
         $admin_side = $userSide ? '' : 'admin/';
-        $ret        = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . '?op=mod&' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
+        $ret        = $this->handler->_moduleUrl.$admin_side.$this->handler->_page.'?op=mod&'.$this->handler->keyName.'='.$smartObj->getVar($this->handler->keyName);
         if ($onlyUrl) {
             return $ret;
         } elseif ($withimage) {
-            return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "edit.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_MODIFY . "'  title='" . _CO_SOBJECT_MODIFY . "'></a>";
+            return "<a href='".$ret."'><img src='".SMARTOBJECT_IMAGES_ACTIONS_URL."edit.png' style='vertical-align: middle;' alt='"._CO_SOBJECT_MODIFY."'  title='"._CO_SOBJECT_MODIFY."'></a>";
         }
 
-        return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
+        return "<a href='".$ret."'>".$smartObj->getVar($this->handler->identifierName).'</a>';
     }
 
     /**
@@ -487,14 +487,14 @@ 
     public function getDeleteItemLink($smartObj, $onlyUrl = false, $withimage = true, $userSide = false)
     {
         $admin_side = $userSide ? '' : 'admin/';
-        $ret        = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . '?op=del&' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
+        $ret        = $this->handler->_moduleUrl.$admin_side.$this->handler->_page.'?op=del&'.$this->handler->keyName.'='.$smartObj->getVar($this->handler->keyName);
         if ($onlyUrl) {
             return $ret;
         } elseif ($withimage) {
-            return "<a href='" . $ret . "'><img src='" . SMARTOBJECT_IMAGES_ACTIONS_URL . "editdelete.png' style='vertical-align: middle;' alt='" . _CO_SOBJECT_DELETE . "'  title='" . _CO_SOBJECT_DELETE . "'></a>";
+            return "<a href='".$ret."'><img src='".SMARTOBJECT_IMAGES_ACTIONS_URL."editdelete.png' style='vertical-align: middle;' alt='"._CO_SOBJECT_DELETE."'  title='"._CO_SOBJECT_DELETE."'></a>";
         }
 
-        return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
+        return "<a href='".$ret."'>".$smartObj->getVar($this->handler->identifierName).'</a>';
     }
 
     /**
@@ -505,9 +505,9 @@ 
     {
         global $xoopsConfig;
 
-        $printlink = $this->handler->_moduleUrl . 'print.php?' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
-        $js        = "javascript:openWithSelfMain('" . $printlink . "', 'smartpopup', 700, 519);";
-        $printlink = '<a href="' . $js . '"><img  src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'fileprint.png" alt="" style="vertical-align: middle;"></a>';
+        $printlink = $this->handler->_moduleUrl.'print.php?'.$this->handler->keyName.'='.$smartObj->getVar($this->handler->keyName);
+        $js        = "javascript:openWithSelfMain('".$printlink."', 'smartpopup', 700, 519);";
+        $printlink = '<a href="'.$js.'"><img  src="'.SMARTOBJECT_IMAGES_ACTIONS_URL.'fileprint.png" alt="" style="vertical-align: middle;"></a>';
 
         $smartModule = Smartobject\Utility::getModuleInfo($smartObj->handler->_moduleName);
         $link        = Smartobject\Utility::getCurrentPage();
@@ -526,7 +526,7 @@ 
                        . _CO_SOBJECT_EMAIL
                        . '" style="vertical-align: middle;"></a>';
 
-        $ret = '<span id="smartobject_print_button">' . $printlink . '&nbsp;</span>' . '<span id="smartobject_mail_button">' . $friendlink . '</span>';
+        $ret = '<span id="smartobject_print_button">'.$printlink.'&nbsp;</span>'.'<span id="smartobject_mail_button">'.$friendlink.'</span>';
 
         return $ret;
     }
@@ -536,7 +536,7 @@ 
      */
     public function getModuleItemString()
     {
-        $ret = $this->handler->_moduleName . '_' . $this->handler->_itemname;
+        $ret = $this->handler->_moduleName.'_'.$this->handler->_itemname;
 
         return $ret;
     }

class/SingleView.php

Doc Comments +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 
     /**
      * Constructor
-     * @param       $object
+     * @param       BaseSmartObject $object
      * @param bool  $userSide
      * @param array $actions
      * @param bool  $headerAsRow
@@ -46,7 +46,7 @@ 
     }
 
     /**
-     * @param $rowObj
+     * @param ObjectRow $rowObj
      */
     public function addRow($rowObj)
     {

Indentation +82 added lines, -82 removed lines

@@ -23,94 +23,94 @@
  */
 class SingleView
 {
-    public $_object;
-    public $_userSide;
-    public $_tpl;
-    public $_rows;
-    public $_actions;
-    public $_headerAsRow = true;
+	public $_object;
+	public $_userSide;
+	public $_tpl;
+	public $_rows;
+	public $_actions;
+	public $_headerAsRow = true;
 
-    /**
-     * Constructor
-     * @param       $object
-     * @param bool  $userSide
-     * @param array $actions
-     * @param bool  $headerAsRow
-     */
-    public function __construct($object, $userSide = false, $actions = [], $headerAsRow = true)
-    {
-        $this->_object      = $object;
-        $this->_userSide    = $userSide;
-        $this->_actions     = $actions;
-        $this->_headerAsRow = $headerAsRow;
-    }
+	/**
+	 * Constructor
+	 * @param       $object
+	 * @param bool  $userSide
+	 * @param array $actions
+	 * @param bool  $headerAsRow
+	 */
+	public function __construct($object, $userSide = false, $actions = [], $headerAsRow = true)
+	{
+		$this->_object      = $object;
+		$this->_userSide    = $userSide;
+		$this->_actions     = $actions;
+		$this->_headerAsRow = $headerAsRow;
+	}
 
-    /**
-     * @param $rowObj
-     */
-    public function addRow($rowObj)
-    {
-        $this->_rows[] = $rowObj;
-    }
+	/**
+	 * @param $rowObj
+	 */
+	public function addRow($rowObj)
+	{
+		$this->_rows[] = $rowObj;
+	}
 
-    /**
-     * @param  bool $fetchOnly
-     * @param  bool $debug
-     * @return mixed|string|void
-     */
-    public function render($fetchOnly = false, $debug = false)
-    {
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+	/**
+	 * @param  bool $fetchOnly
+	 * @param  bool $debug
+	 * @return mixed|string|void
+	 */
+	public function render($fetchOnly = false, $debug = false)
+	{
+		require_once XOOPS_ROOT_PATH . '/class/template.php';
 
-        $this->_tpl             = new \XoopsTpl();
-        $vars                   = $this->_object->vars;
-        $smartobjectObjectArray = [];
+		$this->_tpl             = new \XoopsTpl();
+		$vars                   = $this->_object->vars;
+		$smartobjectObjectArray = [];
 
-        foreach ($this->_rows as $row) {
-            $key = $row->getKeyName();
-            if ($row->_customMethodForValue && method_exists($this->_object, $row->_customMethodForValue)) {
-                $method = $row->_customMethodForValue;
-                $value  = $this->_object->$method();
-            } else {
-                $value = $this->_object->getVar($row->getKeyName());
-            }
-            if ($row->isHeader()) {
-                $this->_tpl->assign('smartobject_single_view_header_caption', $this->_object->vars[$key]['form_caption']);
-                $this->_tpl->assign('smartobject_single_view_header_value', $value);
-            } else {
-                $smartobjectObjectArray[$key]['value']   = $value;
-                $smartobjectObjectArray[$key]['header']  = $row->isHeader();
-                $smartobjectObjectArray[$key]['caption'] = $this->_object->vars[$key]['form_caption'];
-            }
-        }
-        $action_row = '';
-        if (in_array('edit', $this->_actions)) {
-            $action_row .= $this->_object->getEditItemLink(false, true, true);
-        }
-        if (in_array('delete', $this->_actions)) {
-            $action_row .= $this->_object->getDeleteItemLink(false, true, true);
-        }
-        if ($action_row) {
-            $smartobjectObjectArray['zaction']['value']   = $action_row;
-            $smartobjectObjectArray['zaction']['caption'] = _CO_SOBJECT_ACTIONS;
-        }
+		foreach ($this->_rows as $row) {
+			$key = $row->getKeyName();
+			if ($row->_customMethodForValue && method_exists($this->_object, $row->_customMethodForValue)) {
+				$method = $row->_customMethodForValue;
+				$value  = $this->_object->$method();
+			} else {
+				$value = $this->_object->getVar($row->getKeyName());
+			}
+			if ($row->isHeader()) {
+				$this->_tpl->assign('smartobject_single_view_header_caption', $this->_object->vars[$key]['form_caption']);
+				$this->_tpl->assign('smartobject_single_view_header_value', $value);
+			} else {
+				$smartobjectObjectArray[$key]['value']   = $value;
+				$smartobjectObjectArray[$key]['header']  = $row->isHeader();
+				$smartobjectObjectArray[$key]['caption'] = $this->_object->vars[$key]['form_caption'];
+			}
+		}
+		$action_row = '';
+		if (in_array('edit', $this->_actions)) {
+			$action_row .= $this->_object->getEditItemLink(false, true, true);
+		}
+		if (in_array('delete', $this->_actions)) {
+			$action_row .= $this->_object->getDeleteItemLink(false, true, true);
+		}
+		if ($action_row) {
+			$smartobjectObjectArray['zaction']['value']   = $action_row;
+			$smartobjectObjectArray['zaction']['caption'] = _CO_SOBJECT_ACTIONS;
+		}
 
-        $this->_tpl->assign('smartobject_header_as_row', $this->_headerAsRow);
-        $this->_tpl->assign('smartobject_object_array', $smartobjectObjectArray);
+		$this->_tpl->assign('smartobject_header_as_row', $this->_headerAsRow);
+		$this->_tpl->assign('smartobject_object_array', $smartobjectObjectArray);
 
-        if ($fetchOnly) {
-            return $this->_tpl->fetch('db:smartobject_singleview_display.tpl');
-        } else {
-            $this->_tpl->display('db:smartobject_singleview_display.tpl');
-        }
-    }
+		if ($fetchOnly) {
+			return $this->_tpl->fetch('db:smartobject_singleview_display.tpl');
+		} else {
+			$this->_tpl->display('db:smartobject_singleview_display.tpl');
+		}
+	}
 
-    /**
-     * @param  bool $debug
-     * @return mixed|string|void
-     */
-    public function fetch($debug = false)
-    {
-        return $this->render(true, $debug);
-    }
+	/**
+	 * @param  bool $debug
+	 * @return mixed|string|void
+	 */
+	public function fetch($debug = false)
+	{
+		return $this->render(true, $debug);
+	}
 }

class/Table.php

Doc Comments +3 added lines, -3 removed lines

@@ -101,7 +101,7 @@ 
     }
 
     /**
-     * @param $columnObj
+     * @param ObjectColumn $columnObj
      */
     public function addColumn($columnObj)
     {
@@ -109,8 +109,8 @@ 
     }
 
     /**
-     * @param $name
-     * @param $location
+     * @param string $name
+     * @param string $location
      * @param $value
      */
     public function addIntroButton($name, $location, $value)

Indentation +794 added lines, -794 removed lines

@@ -25,800 +25,800 @@
  */
 class Table
 {
-    public $_id;
-    public $_objectHandler;
-    public $_columns;
-    public $_criteria;
-    public $_actions;
-    public $_objects = false;
-    public $_aObjects;
-    public $_custom_actions;
-    public $_sortsel;
-    public $_ordersel;
-    public $_limitsel;
-    public $_filtersel;
-    public $_filterseloptions;
-    public $_filtersel2;
-    public $_filtersel2options;
-    public $_filtersel2optionsDefault;
-
-    public $_tempObject;
-    public $_tpl;
-    public $_introButtons;
-    public $_quickSearch            = false;
-    public $_actionButtons          = false;
-    public $_head_css_class         = 'bg3';
-    public $_hasActions             = false;
-    public $_userSide               = false;
-    public $_printerFriendlyPage    = false;
-    public $_tableHeader            = false;
-    public $_tableFooter            = false;
-    public $_showActionsColumnTitle = true;
-    public $_isTree                 = false;
-    public $_showFilterAndLimit     = true;
-    public $_enableColumnsSorting   = true;
-    public $_customTemplate         = false;
-    public $_withSelectedActions    = [];
-
-    /**
-     * Constructor
-     *
-     * @param Smartobject\PersistableObjectHandler $objectHandler {@link Smartobject\SmartPersistableObjectHandler}
-     * @param \CriteriaElement                     $criteria
-     * @param array                                $actions       array representing the actions to offer
-     *
-     * @param bool                                 $userSide
-     */
-    public function __construct(Smartobject\PersistableObjectHandler $objectHandler, \CriteriaElement $criteria = null, $actions = ['edit', 'delete'], $userSide = false) {
-        $this->_id            = $objectHandler->className;
-        $this->_objectHandler = $objectHandler;
-
-        if (!$criteria) {
-            $criteria = new \CriteriaCompo();
-        }
-        $this->_criteria       = $criteria;
-        $this->_actions        = $actions;
-        $this->_custom_actions = [];
-        $this->_userSide       = $userSide;
-        if ($userSide) {
-            $this->_head_css_class = 'head';
-        }
-    }
-
-    /**
-     * @param      $op
-     * @param bool $caption
-     * @param bool $text
-     */
-    public function addActionButton($op, $caption = false, $text = false)
-    {
-        $action                 = [
-            'op'      => $op,
-            'caption' => $caption,
-            'text'    => $text
-        ];
-        $this->_actionButtons[] = $action;
-    }
-
-    /**
-     * @param $columnObj
-     */
-    public function addColumn($columnObj)
-    {
-        $this->_columns[] = $columnObj;
-    }
-
-    /**
-     * @param $name
-     * @param $location
-     * @param $value
-     */
-    public function addIntroButton($name, $location, $value)
-    {
-        $introButton             = [];
-        $introButton['name']     = $name;
-        $introButton['location'] = $location;
-        $introButton['value']    = $value;
-        $this->_introButtons[]   = $introButton;
-        unset($introButton);
-    }
-
-    public function addPrinterFriendlyLink()
-    {
-        $current_urls               = Smartobject\Utility::getCurrentUrls();
-        $current_url                = $current_urls['full'];
-        $this->_printerFriendlyPage = $current_url . '&print';
-    }
-
-    /**
-     * @param        $fields
-     * @param string $caption
-     */
-    public function addQuickSearch($fields, $caption = _CO_SOBJECT_QUICK_SEARCH)
-    {
-        $this->_quickSearch = ['fields' => $fields, 'caption' => $caption];
-    }
-
-    /**
-     * @param $content
-     */
-    public function addHeader($content)
-    {
-        $this->_tableHeader = $content;
-    }
-
-    /**
-     * @param $content
-     */
-    public function addFooter($content)
-    {
-        $this->_tableFooter = $content;
-    }
-
-    /**
-     * @param $caption
-     */
-    public function addDefaultIntroButton($caption)
-    {
-        $this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page . '?op=mod', $caption);
-    }
-
-    /**
-     * @param $method
-     */
-    public function addCustomAction($method)
-    {
-        $this->_custom_actions[] = $method;
-    }
-
-    /**
-     * @param $default_sort
-     */
-    public function setDefaultSort($default_sort)
-    {
-        $this->_sortsel = $default_sort;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultSort()
-    {
-        if ($this->_sortsel) {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
-        } else {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_objectHandler->identifierName);
-        }
-    }
-
-    /**
-     * @param $default_order
-     */
-    public function setDefaultOrder($default_order)
-    {
-        $this->_ordersel = $default_order;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultOrder()
-    {
-        if ($this->_ordersel) {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
-        } else {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', 'ASC');
-        }
-    }
-
-    /**
-     * @param array $actions
-     */
-    public function addWithSelectedActions($actions = [])
-    {
-        $this->addColumn(new ObjectColumn('checked', 'center', 20, false, false, ' '));
-        $this->_withSelectedActions = $actions;
-    }
-
-    /**
-     * Adding a filter in the table
-     *
-     * @param string $key    key to the field that will be used for sorting
-     * @param string $method method of the handler that will be called to populate the options when this filter is selected
-     * @param bool   $default
-     */
-    public function addFilter($key, $method, $default = false)
-    {
-        $this->_filterseloptions[$key]   = $method;
-        $this->_filtersel2optionsDefault = $default;
-    }
-
-    /**
-     * @param $default_filter
-     */
-    public function setDefaultFilter($default_filter)
-    {
-        $this->_filtersel = $default_filter;
-    }
-
-    public function isForUserSide()
-    {
-        $this->_userSide = true;
-    }
-
-    /**
-     * @param $template
-     */
-    public function setCustomTemplate($template)
-    {
-        $this->_customTemplate = $template;
-    }
-
-    public function setSortOrder()
-    {
-        $this->_sortsel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] : $this->getDefaultSort();
-        //$this->_sortsel = isset($_POST['sortsel']) ? $_POST['sortsel']: $this->_sortsel;
-        Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
-        $fieldsForSorting = $this->_tempObject->getFieldsForSorting($this->_sortsel);
-
-        if (isset($this->_tempObject->vars[$this->_sortsel]['itemName'])
-            && $this->_tempObject->vars[$this->_sortsel]['itemName']) {
-            $this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'] . '.' . $this->_sortsel);
-        } else {
-            $this->_criteria->setSort($this->_objectHandler->_itemname . '.' . $this->_sortsel);
-        }
-
-        $this->_ordersel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : $this->getDefaultOrder();
-        //$this->_ordersel = isset($_POST['ordersel']) ? $_POST['ordersel']:$this->_ordersel;
-        Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
-        $ordersArray = $this->getOrdersArray();
-        $this->_criteria->setOrder($this->_ordersel);
-    }
-
-    /**
-     * @param $id
-     */
-    public function setTableId($id)
-    {
-        $this->_id = $id;
-    }
-
-    /**
-     * @param $objects
-     */
-    public function setObjects($objects)
-    {
-        $this->_objects = $objects;
-    }
-
-    public function createTableRows()
-    {
-        $this->_aObjects = [];
-
-        $doWeHaveActions = false;
-
-        $objectclass = 'odd';
-        if (count($this->_objects) > 0) {
-            foreach ($this->_objects as $object) {
-                $aObject = [];
-
-                $i = 0;
-
-                $aColumns = [];
-
-                foreach ($this->_columns as $column) {
-                    $aColumn = [];
-
-                    if (0 == $i) {
-                        $class = 'head';
-                    } elseif (0 == $i % 2) {
-                        $class = 'even';
-                    } else {
-                        $class = 'odd';
-                    }
-                    if (method_exists($object, 'initiateCustomFields')) {
-                        //$object->initiateCustomFields();
-                    }
-                    if ('checked' === $column->_keyname) {
-                        $value = '<input type ="checkbox" name="selected_smartobjects[]" value="' . $object->id() . '">';
-                    } elseif ($column->_customMethodForValue
-                              && method_exists($object, $column->_customMethodForValue)) {
-                        $method = $column->_customMethodForValue;
-                        if ($column->_param) {
-                            $value = $object->$method($column->_param);
-                        } else {
-                            $value = $object->$method();
-                        }
-                    } else {
-                        /**
-                         * If the column is the identifier, then put a link on it
-                         */
-                        if ($column->getKeyName() == $this->_objectHandler->identifierName) {
-                            $value = $object->getItemLink();
-                        } else {
-                            $value = $object->getVar($column->getKeyName());
-                        }
-                    }
-
-                    $aColumn['value'] = $value;
-                    $aColumn['class'] = $class;
-                    $aColumn['width'] = $column->getWidth();
-                    $aColumn['align'] = $column->getAlign();
-
-                    $aColumns[] = $aColumn;
-                    ++$i;
-                }
-
-                $aObject['columns'] = $aColumns;
-                $aObject['id']      = $object->id();
-
-                $objectclass = ('even' === $objectclass) ? 'odd' : 'even';
-
-                $aObject['class'] = $objectclass;
-
-                $actions = [];
-
-                // Adding the custom actions if any
-                foreach ($this->_custom_actions as $action) {
-                    if (method_exists($object, $action)) {
-                        $actions[] = $object->$action();
-                    }
-                }
+	public $_id;
+	public $_objectHandler;
+	public $_columns;
+	public $_criteria;
+	public $_actions;
+	public $_objects = false;
+	public $_aObjects;
+	public $_custom_actions;
+	public $_sortsel;
+	public $_ordersel;
+	public $_limitsel;
+	public $_filtersel;
+	public $_filterseloptions;
+	public $_filtersel2;
+	public $_filtersel2options;
+	public $_filtersel2optionsDefault;
+
+	public $_tempObject;
+	public $_tpl;
+	public $_introButtons;
+	public $_quickSearch            = false;
+	public $_actionButtons          = false;
+	public $_head_css_class         = 'bg3';
+	public $_hasActions             = false;
+	public $_userSide               = false;
+	public $_printerFriendlyPage    = false;
+	public $_tableHeader            = false;
+	public $_tableFooter            = false;
+	public $_showActionsColumnTitle = true;
+	public $_isTree                 = false;
+	public $_showFilterAndLimit     = true;
+	public $_enableColumnsSorting   = true;
+	public $_customTemplate         = false;
+	public $_withSelectedActions    = [];
+
+	/**
+	 * Constructor
+	 *
+	 * @param Smartobject\PersistableObjectHandler $objectHandler {@link Smartobject\SmartPersistableObjectHandler}
+	 * @param \CriteriaElement                     $criteria
+	 * @param array                                $actions       array representing the actions to offer
+	 *
+	 * @param bool                                 $userSide
+	 */
+	public function __construct(Smartobject\PersistableObjectHandler $objectHandler, \CriteriaElement $criteria = null, $actions = ['edit', 'delete'], $userSide = false) {
+		$this->_id            = $objectHandler->className;
+		$this->_objectHandler = $objectHandler;
+
+		if (!$criteria) {
+			$criteria = new \CriteriaCompo();
+		}
+		$this->_criteria       = $criteria;
+		$this->_actions        = $actions;
+		$this->_custom_actions = [];
+		$this->_userSide       = $userSide;
+		if ($userSide) {
+			$this->_head_css_class = 'head';
+		}
+	}
+
+	/**
+	 * @param      $op
+	 * @param bool $caption
+	 * @param bool $text
+	 */
+	public function addActionButton($op, $caption = false, $text = false)
+	{
+		$action                 = [
+			'op'      => $op,
+			'caption' => $caption,
+			'text'    => $text
+		];
+		$this->_actionButtons[] = $action;
+	}
+
+	/**
+	 * @param $columnObj
+	 */
+	public function addColumn($columnObj)
+	{
+		$this->_columns[] = $columnObj;
+	}
+
+	/**
+	 * @param $name
+	 * @param $location
+	 * @param $value
+	 */
+	public function addIntroButton($name, $location, $value)
+	{
+		$introButton             = [];
+		$introButton['name']     = $name;
+		$introButton['location'] = $location;
+		$introButton['value']    = $value;
+		$this->_introButtons[]   = $introButton;
+		unset($introButton);
+	}
+
+	public function addPrinterFriendlyLink()
+	{
+		$current_urls               = Smartobject\Utility::getCurrentUrls();
+		$current_url                = $current_urls['full'];
+		$this->_printerFriendlyPage = $current_url . '&print';
+	}
+
+	/**
+	 * @param        $fields
+	 * @param string $caption
+	 */
+	public function addQuickSearch($fields, $caption = _CO_SOBJECT_QUICK_SEARCH)
+	{
+		$this->_quickSearch = ['fields' => $fields, 'caption' => $caption];
+	}
+
+	/**
+	 * @param $content
+	 */
+	public function addHeader($content)
+	{
+		$this->_tableHeader = $content;
+	}
+
+	/**
+	 * @param $content
+	 */
+	public function addFooter($content)
+	{
+		$this->_tableFooter = $content;
+	}
+
+	/**
+	 * @param $caption
+	 */
+	public function addDefaultIntroButton($caption)
+	{
+		$this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page . '?op=mod', $caption);
+	}
+
+	/**
+	 * @param $method
+	 */
+	public function addCustomAction($method)
+	{
+		$this->_custom_actions[] = $method;
+	}
+
+	/**
+	 * @param $default_sort
+	 */
+	public function setDefaultSort($default_sort)
+	{
+		$this->_sortsel = $default_sort;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultSort()
+	{
+		if ($this->_sortsel) {
+			return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
+		} else {
+			return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_objectHandler->identifierName);
+		}
+	}
+
+	/**
+	 * @param $default_order
+	 */
+	public function setDefaultOrder($default_order)
+	{
+		$this->_ordersel = $default_order;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultOrder()
+	{
+		if ($this->_ordersel) {
+			return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
+		} else {
+			return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', 'ASC');
+		}
+	}
+
+	/**
+	 * @param array $actions
+	 */
+	public function addWithSelectedActions($actions = [])
+	{
+		$this->addColumn(new ObjectColumn('checked', 'center', 20, false, false, '&nbsp;'));
+		$this->_withSelectedActions = $actions;
+	}
+
+	/**
+	 * Adding a filter in the table
+	 *
+	 * @param string $key    key to the field that will be used for sorting
+	 * @param string $method method of the handler that will be called to populate the options when this filter is selected
+	 * @param bool   $default
+	 */
+	public function addFilter($key, $method, $default = false)
+	{
+		$this->_filterseloptions[$key]   = $method;
+		$this->_filtersel2optionsDefault = $default;
+	}
+
+	/**
+	 * @param $default_filter
+	 */
+	public function setDefaultFilter($default_filter)
+	{
+		$this->_filtersel = $default_filter;
+	}
+
+	public function isForUserSide()
+	{
+		$this->_userSide = true;
+	}
+
+	/**
+	 * @param $template
+	 */
+	public function setCustomTemplate($template)
+	{
+		$this->_customTemplate = $template;
+	}
+
+	public function setSortOrder()
+	{
+		$this->_sortsel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] : $this->getDefaultSort();
+		//$this->_sortsel = isset($_POST['sortsel']) ? $_POST['sortsel']: $this->_sortsel;
+		Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
+		$fieldsForSorting = $this->_tempObject->getFieldsForSorting($this->_sortsel);
+
+		if (isset($this->_tempObject->vars[$this->_sortsel]['itemName'])
+			&& $this->_tempObject->vars[$this->_sortsel]['itemName']) {
+			$this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'] . '.' . $this->_sortsel);
+		} else {
+			$this->_criteria->setSort($this->_objectHandler->_itemname . '.' . $this->_sortsel);
+		}
+
+		$this->_ordersel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : $this->getDefaultOrder();
+		//$this->_ordersel = isset($_POST['ordersel']) ? $_POST['ordersel']:$this->_ordersel;
+		Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
+		$ordersArray = $this->getOrdersArray();
+		$this->_criteria->setOrder($this->_ordersel);
+	}
+
+	/**
+	 * @param $id
+	 */
+	public function setTableId($id)
+	{
+		$this->_id = $id;
+	}
+
+	/**
+	 * @param $objects
+	 */
+	public function setObjects($objects)
+	{
+		$this->_objects = $objects;
+	}
+
+	public function createTableRows()
+	{
+		$this->_aObjects = [];
+
+		$doWeHaveActions = false;
+
+		$objectclass = 'odd';
+		if (count($this->_objects) > 0) {
+			foreach ($this->_objects as $object) {
+				$aObject = [];
+
+				$i = 0;
+
+				$aColumns = [];
+
+				foreach ($this->_columns as $column) {
+					$aColumn = [];
+
+					if (0 == $i) {
+						$class = 'head';
+					} elseif (0 == $i % 2) {
+						$class = 'even';
+					} else {
+						$class = 'odd';
+					}
+					if (method_exists($object, 'initiateCustomFields')) {
+						//$object->initiateCustomFields();
+					}
+					if ('checked' === $column->_keyname) {
+						$value = '<input type ="checkbox" name="selected_smartobjects[]" value="' . $object->id() . '">';
+					} elseif ($column->_customMethodForValue
+							  && method_exists($object, $column->_customMethodForValue)) {
+						$method = $column->_customMethodForValue;
+						if ($column->_param) {
+							$value = $object->$method($column->_param);
+						} else {
+							$value = $object->$method();
+						}
+					} else {
+						/**
+						 * If the column is the identifier, then put a link on it
+						 */
+						if ($column->getKeyName() == $this->_objectHandler->identifierName) {
+							$value = $object->getItemLink();
+						} else {
+							$value = $object->getVar($column->getKeyName());
+						}
+					}
+
+					$aColumn['value'] = $value;
+					$aColumn['class'] = $class;
+					$aColumn['width'] = $column->getWidth();
+					$aColumn['align'] = $column->getAlign();
+
+					$aColumns[] = $aColumn;
+					++$i;
+				}
+
+				$aObject['columns'] = $aColumns;
+				$aObject['id']      = $object->id();
+
+				$objectclass = ('even' === $objectclass) ? 'odd' : 'even';
+
+				$aObject['class'] = $objectclass;
+
+				$actions = [];
+
+				// Adding the custom actions if any
+				foreach ($this->_custom_actions as $action) {
+					if (method_exists($object, $action)) {
+						$actions[] = $object->$action();
+					}
+				}
 
 //                require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
-                $controller = new ObjectController($this->_objectHandler);
-
-                if ((!is_array($this->_actions)) || in_array('edit', $this->_actions)) {
-                    $actions[] = $controller->getEditItemLink($object, false, true, $this->_userSide);
-                }
-                if ((!is_array($this->_actions)) || in_array('delete', $this->_actions)) {
-                    $actions[] = $controller->getDeleteItemLink($object, false, true, $this->_userSide);
-                }
-                $aObject['actions'] = $actions;
-
-                $this->_tpl->assign('smartobject_actions_column_width', count($actions) * 30);
-
-                $doWeHaveActions = $doWeHaveActions ? true : count($actions) > 0;
-
-                $this->_aObjects[] = $aObject;
-            }
-            $this->_tpl->assign('smartobject_objects', $this->_aObjects);
-        } else {
-            $colspan = count($this->_columns) + 1;
-            $this->_tpl->assign('smartobject_colspan', $colspan);
-        }
-        $this->_hasActions = $doWeHaveActions;
-    }
-
-    /**
-     * @param  bool $debug
-     * @return mixed
-     */
-    public function fetchObjects($debug = false)
-    {
-        return $this->_objectHandler->getObjects($this->_criteria, true, true, false, $debug);
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultFilter()
-    {
-        if ($this->_filtersel) {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
-        } else {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', 'default');
-        }
-    }
-
-    /**
-     * @return array|bool
-     */
-    public function getFiltersArray()
-    {
-        $ret               = [];
-        $field             = [];
-        $field['caption']  = _CO_OBJ_NONE;
-        $field['selected'] = '';
-        $ret['default']    = $field;
-        unset($field);
-
-        if ($this->_filterseloptions) {
-            foreach ($this->_filterseloptions as $key => $value) {
-                $field = [];
-                if (is_array($value)) {
-                    $field['caption']  = $key;
-                    $field['selected'] = $this->_filtersel == $key ? 'selected' : '';
-                } else {
-                    $field['caption']  = $this->_tempObject->vars[$key]['form_caption'];
-                    $field['selected'] = $this->_filtersel == $key ? 'selected' : '';
-                }
-                $ret[$key] = $field;
-                unset($field);
-            }
-        } else {
-            $ret = false;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param $default_filter2
-     */
-    public function setDefaultFilter2($default_filter2)
-    {
-        $this->_filtersel2 = $default_filter2;
-    }
-
-    /**
-     * @return string
-     */
-    public function getDefaultFilter2()
-    {
-        if ($this->_filtersel2) {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
-        } else {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', 'default');
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public function getFilters2Array()
-    {
-        $ret = [];
-
-        foreach ($this->_filtersel2options as $key => $value) {
-            $field             = [];
-            $field['caption']  = $value;
-            $field['selected'] = $this->_filtersel2 == $key ? 'selected' : '';
-            $ret[$key]         = $field;
-            unset($field);
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param $limitsArray
-     * @param $params_of_the_options_sel
-     */
-    public function renderOptionSelection($limitsArray, $params_of_the_options_sel)
-    {
-        // Rendering the form to select options on the table
-        $current_urls = Smartobject\Utility::getCurrentUrls();
-        $current_url  = $current_urls['full'];
-
-        /**
-         * What was $params_of_the_options_sel doing again ?
-         */
-        //$this->_tpl->assign('smartobject_optionssel_action', $_SERVER['PHP_SELF'] . "?" . implode('&', $params_of_the_options_sel));
-        $this->_tpl->assign('smartobject_optionssel_action', $current_url);
-        $this->_tpl->assign('smartobject_optionssel_limitsArray', $limitsArray);
-    }
-
-    /**
-     * @return array
-     */
-    public function getLimitsArray()
-    {
-        $ret                    = [];
-        $ret['all']['caption']  = _CO_SOBJECT_LIMIT_ALL;
-        $ret['all']['selected'] = ('all' === $this->_limitsel) ? 'selected' : '';
-
-        $ret['5']['caption']  = '5';
-        $ret['5']['selected'] = ('5' == $this->_limitsel) ? 'selected' : '';
-
-        $ret['10']['caption']  = '10';
-        $ret['10']['selected'] = ('10' == $this->_limitsel) ? 'selected' : '';
-
-        $ret['15']['caption']  = '15';
-        $ret['15']['selected'] = ('15' == $this->_limitsel) ? 'selected' : '';
-
-        $ret['20']['caption']  = '20';
-        $ret['20']['selected'] = ('20' == $this->_limitsel) ? 'selected' : '';
-
-        $ret['25']['caption']  = '25';
-        $ret['25']['selected'] = ('25' == $this->_limitsel) ? 'selected' : '';
-
-        $ret['30']['caption']  = '30';
-        $ret['30']['selected'] = ('30' == $this->_limitsel) ? 'selected' : '';
-
-        $ret['35']['caption']  = '35';
-        $ret['35']['selected'] = ('35' == $this->_limitsel) ? 'selected' : '';
-
-        $ret['40']['caption']  = '40';
-        $ret['40']['selected'] = ('40' == $this->_limitsel) ? 'selected' : '';
-
-        return $ret;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getObjects()
-    {
-        return $this->_objects;
-    }
-
-    public function hideActionColumnTitle()
-    {
-        $this->_showActionsColumnTitle = false;
-    }
-
-    public function hideFilterAndLimit()
-    {
-        $this->_showFilterAndLimit = false;
-    }
-
-    /**
-     * @return array
-     */
-    public function getOrdersArray()
-    {
-        $ret                    = [];
-        $ret['ASC']['caption']  = _CO_SOBJECT_SORT_ASC;
-        $ret['ASC']['selected'] = ('ASC' === $this->_ordersel) ? 'selected' : '';
-
-        $ret['DESC']['caption']  = _CO_SOBJECT_SORT_DESC;
-        $ret['DESC']['selected'] = ('DESC' === $this->_ordersel) ? 'selected' : '';
-
-        return $ret;
-    }
-
-    /**
-     * @return mixed|string|void
-     */
-    public function renderD()
-    {
-        return $this->render(false, true);
-    }
-
-    public function renderForPrint()
-    {
-    }
-
-    /**
-     * @param  bool $fetchOnly
-     * @param  bool $debug
-     * @return mixed|string|void
-     */
-    public function render($fetchOnly = false, $debug = false)
-    {
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
-
-        $this->_tpl = new \XoopsTpl();
-
-        /**
-         * We need access to the vars of the SmartObject for a few things in the table creation.
-         * Since we may not have a SmartObject to look into now, let's create one for this purpose
-         * and we will free it after
-         */
-        $this->_tempObject = $this->_objectHandler->create();
-
-        $this->_criteria->setStart(isset($_GET['start' . $this->_objectHandler->keyName]) ? (int)$_GET['start' . $this->_objectHandler->keyName] : 0);
-
-        $this->setSortOrder();
-
-        if (!$this->_isTree) {
-            $this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_limitsel', '15');
-        } else {
-            $this->_limitsel = 'all';
-        }
-
-        $this->_limitsel = isset($_POST['limitsel']) ? $_POST['limitsel'] : $this->_limitsel;
-        Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_limitsel', $this->_limitsel);
-        $limitsArray = $this->getLimitsArray();
-        $this->_criteria->setLimit($this->_limitsel);
-
-        $this->_filtersel = isset($_GET['filtersel']) ? $_GET['filtersel'] : $this->getDefaultFilter();
-        $this->_filtersel = isset($_POST['filtersel']) ? $_POST['filtersel'] : $this->_filtersel;
-        Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
-        $filtersArray = $this->getFiltersArray();
-
-        if ($filtersArray) {
-            $this->_tpl->assign('smartobject_optionssel_filtersArray', $filtersArray);
-        }
-
-        // Check if the selected filter is defined and if so, create the selfilter2
-        if (isset($this->_filterseloptions[$this->_filtersel])) {
-            // check if method associate with this filter exists in the handler
-            if (is_array($this->_filterseloptions[$this->_filtersel])) {
-                $filter = $this->_filterseloptions[$this->_filtersel];
-                $this->_criteria->add($filter['criteria']);
-            } else {
-                if (method_exists($this->_objectHandler, $this->_filterseloptions[$this->_filtersel])) {
-
-                    // then we will create the selfilter2 options by calling this method
-                    $method                   = $this->_filterseloptions[$this->_filtersel];
-                    $this->_filtersel2options = $this->_objectHandler->$method();
-
-                    $this->_filtersel2 = isset($_GET['filtersel2']) ? $_GET['filtersel2'] : $this->getDefaultFilter2();
-                    $this->_filtersel2 = isset($_POST['filtersel2']) ? $_POST['filtersel2'] : $this->_filtersel2;
-
-                    $filters2Array = $this->getFilters2Array();
-                    $this->_tpl->assign('smartobject_optionssel_filters2Array', $filters2Array);
-
-                    Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
-                    if ('default' !== $this->_filtersel2) {
-                        $this->_criteria->add(new \Criteria($this->_filtersel, $this->_filtersel2));
-                    }
-                }
-            }
-        }
-        // Check if we have a quicksearch
-
-        if (isset($_POST['quicksearch_' . $this->_id]) && '' != $_POST['quicksearch_' . $this->_id]) {
-            $quicksearch_criteria = new \CriteriaCompo();
-            if (is_array($this->_quickSearch['fields'])) {
-                foreach ($this->_quickSearch['fields'] as $v) {
-                    $quicksearch_criteria->add(new \Criteria($v, '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'), 'OR');
-                }
-            } else {
-                $quicksearch_criteria->add(new \Criteria($this->_quickSearch['fields'], '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'));
-            }
-            $this->_criteria->add($quicksearch_criteria);
-        }
-
-        $this->_objects = $this->fetchObjects($debug);
-
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-        if ($this->_criteria->getLimit() > 0) {
-
-            /**
-             * Geeting rid of the old params
-             * $new_get_array is an array containing the new GET parameters
-             */
-            $new_get_array = [];
-
-            /**
-             * $params_of_the_options_sel is an array with all the parameters of the page
-             * but without the pagenave parameters. This array will be used in the
-             * OptionsSelection
-             */
-            $params_of_the_options_sel = [];
-
-            $not_needed_params = ['sortsel', 'limitsel', 'ordersel', 'start' . $this->_objectHandler->keyName];
-            foreach ($_GET as $k => $v) {
-                if (!in_array($k, $not_needed_params)) {
-                    $new_get_array[]             = "$k=$v";
-                    $params_of_the_options_sel[] = "$k=$v";
-                }
-            }
-
-            /**
-             * Adding the new params of the pagenav
-             */
-            $new_get_array[] = 'sortsel=' . $this->_sortsel;
-            $new_get_array[] = 'ordersel=' . $this->_ordersel;
-            $new_get_array[] = 'limitsel=' . $this->_limitsel;
-            $otherParams     = implode('&', $new_get_array);
-
-            $pagenav = new \XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start' . $this->_objectHandler->keyName, $otherParams);
-            $this->_tpl->assign('smartobject_pagenav', $pagenav->renderNav());
-        }
-        $this->renderOptionSelection($limitsArray, $params_of_the_options_sel);
-
-        // retreive the current url and the query string
-        $current_urls = Smartobject\Utility::getCurrentUrls();
-        $current_url  = $current_urls['full_phpself'];
-        $query_string = $current_urls['querystring'];
-        if ($query_string) {
-            $query_string = str_replace('?', '', $query_string);
-        }
-        $query_stringArray     = explode('&', $query_string);
-        $new_query_stringArray = [];
-        foreach ($query_stringArray as $query_string) {
-            if (false === strpos($query_string, 'sortsel') && false === strpos($query_string, 'ordersel')) {
-                $new_query_stringArray[] = $query_string;
-            }
-        }
-        $new_query_string = implode('&', $new_query_stringArray);
-
-        $orderArray                     = [];
-        $orderArray['ASC']['image']     = 'desc.png';
-        $orderArray['ASC']['neworder']  = 'DESC';
-        $orderArray['DESC']['image']    = 'asc.png';
-        $orderArray['DESC']['neworder'] = 'ASC';
-
-        $aColumns = [];
-
-        foreach ($this->_columns as $column) {
-            $qs_param         = '';
-            $aColumn          = [];
-            $aColumn['width'] = $column->getWidth();
-            $aColumn['align'] = $column->getAlign();
-            $aColumn['key']   = $column->getKeyName();
-            if ('checked' === $column->_keyname) {
-                $aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"' . ' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_' . $this->_id . ', \'selected_smartobjects\');">';
-            } elseif ($column->getCustomCaption()) {
-                $aColumn['caption'] = $column->getCustomCaption();
-            } else {
-                $aColumn['caption'] = isset($this->_tempObject->vars[$column->getKeyName()]['form_caption']) ? $this->_tempObject->vars[$column->getKeyName()]['form_caption'] : $column->getKeyName();
-            }
-            // Are we doing a GET sort on this column ?
-            $getSort = (isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'])
-                        && $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] == $column->getKeyName())
-                       || ($this->_sortsel == $column->getKeyName());
-            $order   = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : 'DESC';
-
-            if (isset($_REQUEST['quicksearch_' . $this->_id]) && '' != $_REQUEST['quicksearch_' . $this->_id]) {
-                $qs_param = '&quicksearch_' . $this->_id . '=' . $_REQUEST['quicksearch_' . $this->_id];
-            }
-            if (!$this->_enableColumnsSorting || 'checked' === $column->_keyname || !$column->isSortable()) {
-                $aColumn['caption'] = $aColumn['caption'];
-            } elseif ($getSort) {
-                $aColumn['caption'] = '<a href="'
-                                      . $current_url
-                                      . '?'
-                                      . $this->_objectHandler->_itemname
-                                      . '_'
-                                      . 'sortsel='
-                                      . $column->getKeyName()
-                                      . '&'
-                                      . $this->_objectHandler->_itemname
-                                      . '_'
-                                      . 'ordersel='
-                                      . $orderArray[$order]['neworder']
-                                      . $qs_param
-                                      . '&'
-                                      . $new_query_string
-                                      . '">'
-                                      . $aColumn['caption']
-                                      . ' <img src="'
-                                      . SMARTOBJECT_IMAGES_ACTIONS_URL
-                                      . $orderArray[$order]['image']
-                                      . '" alt="ASC"></a>';
-            } else {
-                $aColumn['caption'] = '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=ASC' . $qs_param . '&' . $new_query_string . '">' . $aColumn['caption'] . '</a>';
-            }
-            $aColumns[] = $aColumn;
-        }
-        $this->_tpl->assign('smartobject_columns', $aColumns);
-
-        if ($this->_quickSearch) {
-            $this->_tpl->assign('smartobject_quicksearch', $this->_quickSearch['caption']);
-        }
-
-        $this->createTableRows();
-
-        $this->_tpl->assign('smartobject_showFilterAndLimit', $this->_showFilterAndLimit);
-        $this->_tpl->assign('smartobject_isTree', $this->_isTree);
-        $this->_tpl->assign('smartobject_show_action_column_title', $this->_showActionsColumnTitle);
-        $this->_tpl->assign('smartobject_table_header', $this->_tableHeader);
-        $this->_tpl->assign('smartobject_table_footer', $this->_tableFooter);
-        $this->_tpl->assign('smartobject_printer_friendly_page', $this->_printerFriendlyPage);
-        $this->_tpl->assign('smartobject_user_side', $this->_userSide);
-        $this->_tpl->assign('smartobject_has_actions', $this->_hasActions);
-        $this->_tpl->assign('smartobject_head_css_class', $this->_head_css_class);
-        $this->_tpl->assign('smartobject_actionButtons', $this->_actionButtons);
-        $this->_tpl->assign('smartobject_introButtons', $this->_introButtons);
-        $this->_tpl->assign('smartobject_id', $this->_id);
-        if (!empty($this->_withSelectedActions)) {
-            $this->_tpl->assign('smartobject_withSelectedActions', $this->_withSelectedActions);
-        }
-
-        $smartobjectTable_template = $this->_customTemplate ?: 'smartobject_smarttable_display.tpl';
-        if ($fetchOnly) {
-            return $this->_tpl->fetch('db:' . $smartobjectTable_template);
-        } else {
-            $this->_tpl->display('db:' . $smartobjectTable_template);
-        }
-    }
-
-    public function disableColumnsSorting()
-    {
-        $this->_enableColumnsSorting = false;
-    }
-
-    /**
-     * @param  bool $debug
-     * @return mixed|string|void
-     */
-    public function fetch($debug = false)
-    {
-        return $this->render(true, $debug);
-    }
+				$controller = new ObjectController($this->_objectHandler);
+
+				if ((!is_array($this->_actions)) || in_array('edit', $this->_actions)) {
+					$actions[] = $controller->getEditItemLink($object, false, true, $this->_userSide);
+				}
+				if ((!is_array($this->_actions)) || in_array('delete', $this->_actions)) {
+					$actions[] = $controller->getDeleteItemLink($object, false, true, $this->_userSide);
+				}
+				$aObject['actions'] = $actions;
+
+				$this->_tpl->assign('smartobject_actions_column_width', count($actions) * 30);
+
+				$doWeHaveActions = $doWeHaveActions ? true : count($actions) > 0;
+
+				$this->_aObjects[] = $aObject;
+			}
+			$this->_tpl->assign('smartobject_objects', $this->_aObjects);
+		} else {
+			$colspan = count($this->_columns) + 1;
+			$this->_tpl->assign('smartobject_colspan', $colspan);
+		}
+		$this->_hasActions = $doWeHaveActions;
+	}
+
+	/**
+	 * @param  bool $debug
+	 * @return mixed
+	 */
+	public function fetchObjects($debug = false)
+	{
+		return $this->_objectHandler->getObjects($this->_criteria, true, true, false, $debug);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultFilter()
+	{
+		if ($this->_filtersel) {
+			return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
+		} else {
+			return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', 'default');
+		}
+	}
+
+	/**
+	 * @return array|bool
+	 */
+	public function getFiltersArray()
+	{
+		$ret               = [];
+		$field             = [];
+		$field['caption']  = _CO_OBJ_NONE;
+		$field['selected'] = '';
+		$ret['default']    = $field;
+		unset($field);
+
+		if ($this->_filterseloptions) {
+			foreach ($this->_filterseloptions as $key => $value) {
+				$field = [];
+				if (is_array($value)) {
+					$field['caption']  = $key;
+					$field['selected'] = $this->_filtersel == $key ? 'selected' : '';
+				} else {
+					$field['caption']  = $this->_tempObject->vars[$key]['form_caption'];
+					$field['selected'] = $this->_filtersel == $key ? 'selected' : '';
+				}
+				$ret[$key] = $field;
+				unset($field);
+			}
+		} else {
+			$ret = false;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param $default_filter2
+	 */
+	public function setDefaultFilter2($default_filter2)
+	{
+		$this->_filtersel2 = $default_filter2;
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getDefaultFilter2()
+	{
+		if ($this->_filtersel2) {
+			return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
+		} else {
+			return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', 'default');
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getFilters2Array()
+	{
+		$ret = [];
+
+		foreach ($this->_filtersel2options as $key => $value) {
+			$field             = [];
+			$field['caption']  = $value;
+			$field['selected'] = $this->_filtersel2 == $key ? 'selected' : '';
+			$ret[$key]         = $field;
+			unset($field);
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param $limitsArray
+	 * @param $params_of_the_options_sel
+	 */
+	public function renderOptionSelection($limitsArray, $params_of_the_options_sel)
+	{
+		// Rendering the form to select options on the table
+		$current_urls = Smartobject\Utility::getCurrentUrls();
+		$current_url  = $current_urls['full'];
+
+		/**
+		 * What was $params_of_the_options_sel doing again ?
+		 */
+		//$this->_tpl->assign('smartobject_optionssel_action', $_SERVER['PHP_SELF'] . "?" . implode('&', $params_of_the_options_sel));
+		$this->_tpl->assign('smartobject_optionssel_action', $current_url);
+		$this->_tpl->assign('smartobject_optionssel_limitsArray', $limitsArray);
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getLimitsArray()
+	{
+		$ret                    = [];
+		$ret['all']['caption']  = _CO_SOBJECT_LIMIT_ALL;
+		$ret['all']['selected'] = ('all' === $this->_limitsel) ? 'selected' : '';
+
+		$ret['5']['caption']  = '5';
+		$ret['5']['selected'] = ('5' == $this->_limitsel) ? 'selected' : '';
+
+		$ret['10']['caption']  = '10';
+		$ret['10']['selected'] = ('10' == $this->_limitsel) ? 'selected' : '';
+
+		$ret['15']['caption']  = '15';
+		$ret['15']['selected'] = ('15' == $this->_limitsel) ? 'selected' : '';
+
+		$ret['20']['caption']  = '20';
+		$ret['20']['selected'] = ('20' == $this->_limitsel) ? 'selected' : '';
+
+		$ret['25']['caption']  = '25';
+		$ret['25']['selected'] = ('25' == $this->_limitsel) ? 'selected' : '';
+
+		$ret['30']['caption']  = '30';
+		$ret['30']['selected'] = ('30' == $this->_limitsel) ? 'selected' : '';
+
+		$ret['35']['caption']  = '35';
+		$ret['35']['selected'] = ('35' == $this->_limitsel) ? 'selected' : '';
+
+		$ret['40']['caption']  = '40';
+		$ret['40']['selected'] = ('40' == $this->_limitsel) ? 'selected' : '';
+
+		return $ret;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getObjects()
+	{
+		return $this->_objects;
+	}
+
+	public function hideActionColumnTitle()
+	{
+		$this->_showActionsColumnTitle = false;
+	}
+
+	public function hideFilterAndLimit()
+	{
+		$this->_showFilterAndLimit = false;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getOrdersArray()
+	{
+		$ret                    = [];
+		$ret['ASC']['caption']  = _CO_SOBJECT_SORT_ASC;
+		$ret['ASC']['selected'] = ('ASC' === $this->_ordersel) ? 'selected' : '';
+
+		$ret['DESC']['caption']  = _CO_SOBJECT_SORT_DESC;
+		$ret['DESC']['selected'] = ('DESC' === $this->_ordersel) ? 'selected' : '';
+
+		return $ret;
+	}
+
+	/**
+	 * @return mixed|string|void
+	 */
+	public function renderD()
+	{
+		return $this->render(false, true);
+	}
+
+	public function renderForPrint()
+	{
+	}
+
+	/**
+	 * @param  bool $fetchOnly
+	 * @param  bool $debug
+	 * @return mixed|string|void
+	 */
+	public function render($fetchOnly = false, $debug = false)
+	{
+		require_once XOOPS_ROOT_PATH . '/class/template.php';
+
+		$this->_tpl = new \XoopsTpl();
+
+		/**
+		 * We need access to the vars of the SmartObject for a few things in the table creation.
+		 * Since we may not have a SmartObject to look into now, let's create one for this purpose
+		 * and we will free it after
+		 */
+		$this->_tempObject = $this->_objectHandler->create();
+
+		$this->_criteria->setStart(isset($_GET['start' . $this->_objectHandler->keyName]) ? (int)$_GET['start' . $this->_objectHandler->keyName] : 0);
+
+		$this->setSortOrder();
+
+		if (!$this->_isTree) {
+			$this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_limitsel', '15');
+		} else {
+			$this->_limitsel = 'all';
+		}
+
+		$this->_limitsel = isset($_POST['limitsel']) ? $_POST['limitsel'] : $this->_limitsel;
+		Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_limitsel', $this->_limitsel);
+		$limitsArray = $this->getLimitsArray();
+		$this->_criteria->setLimit($this->_limitsel);
+
+		$this->_filtersel = isset($_GET['filtersel']) ? $_GET['filtersel'] : $this->getDefaultFilter();
+		$this->_filtersel = isset($_POST['filtersel']) ? $_POST['filtersel'] : $this->_filtersel;
+		Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
+		$filtersArray = $this->getFiltersArray();
+
+		if ($filtersArray) {
+			$this->_tpl->assign('smartobject_optionssel_filtersArray', $filtersArray);
+		}
+
+		// Check if the selected filter is defined and if so, create the selfilter2
+		if (isset($this->_filterseloptions[$this->_filtersel])) {
+			// check if method associate with this filter exists in the handler
+			if (is_array($this->_filterseloptions[$this->_filtersel])) {
+				$filter = $this->_filterseloptions[$this->_filtersel];
+				$this->_criteria->add($filter['criteria']);
+			} else {
+				if (method_exists($this->_objectHandler, $this->_filterseloptions[$this->_filtersel])) {
+
+					// then we will create the selfilter2 options by calling this method
+					$method                   = $this->_filterseloptions[$this->_filtersel];
+					$this->_filtersel2options = $this->_objectHandler->$method();
+
+					$this->_filtersel2 = isset($_GET['filtersel2']) ? $_GET['filtersel2'] : $this->getDefaultFilter2();
+					$this->_filtersel2 = isset($_POST['filtersel2']) ? $_POST['filtersel2'] : $this->_filtersel2;
+
+					$filters2Array = $this->getFilters2Array();
+					$this->_tpl->assign('smartobject_optionssel_filters2Array', $filters2Array);
+
+					Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
+					if ('default' !== $this->_filtersel2) {
+						$this->_criteria->add(new \Criteria($this->_filtersel, $this->_filtersel2));
+					}
+				}
+			}
+		}
+		// Check if we have a quicksearch
+
+		if (isset($_POST['quicksearch_' . $this->_id]) && '' != $_POST['quicksearch_' . $this->_id]) {
+			$quicksearch_criteria = new \CriteriaCompo();
+			if (is_array($this->_quickSearch['fields'])) {
+				foreach ($this->_quickSearch['fields'] as $v) {
+					$quicksearch_criteria->add(new \Criteria($v, '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'), 'OR');
+				}
+			} else {
+				$quicksearch_criteria->add(new \Criteria($this->_quickSearch['fields'], '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'));
+			}
+			$this->_criteria->add($quicksearch_criteria);
+		}
+
+		$this->_objects = $this->fetchObjects($debug);
+
+		require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+		if ($this->_criteria->getLimit() > 0) {
+
+			/**
+			 * Geeting rid of the old params
+			 * $new_get_array is an array containing the new GET parameters
+			 */
+			$new_get_array = [];
+
+			/**
+			 * $params_of_the_options_sel is an array with all the parameters of the page
+			 * but without the pagenave parameters. This array will be used in the
+			 * OptionsSelection
+			 */
+			$params_of_the_options_sel = [];
+
+			$not_needed_params = ['sortsel', 'limitsel', 'ordersel', 'start' . $this->_objectHandler->keyName];
+			foreach ($_GET as $k => $v) {
+				if (!in_array($k, $not_needed_params)) {
+					$new_get_array[]             = "$k=$v";
+					$params_of_the_options_sel[] = "$k=$v";
+				}
+			}
+
+			/**
+			 * Adding the new params of the pagenav
+			 */
+			$new_get_array[] = 'sortsel=' . $this->_sortsel;
+			$new_get_array[] = 'ordersel=' . $this->_ordersel;
+			$new_get_array[] = 'limitsel=' . $this->_limitsel;
+			$otherParams     = implode('&', $new_get_array);
+
+			$pagenav = new \XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start' . $this->_objectHandler->keyName, $otherParams);
+			$this->_tpl->assign('smartobject_pagenav', $pagenav->renderNav());
+		}
+		$this->renderOptionSelection($limitsArray, $params_of_the_options_sel);
+
+		// retreive the current url and the query string
+		$current_urls = Smartobject\Utility::getCurrentUrls();
+		$current_url  = $current_urls['full_phpself'];
+		$query_string = $current_urls['querystring'];
+		if ($query_string) {
+			$query_string = str_replace('?', '', $query_string);
+		}
+		$query_stringArray     = explode('&', $query_string);
+		$new_query_stringArray = [];
+		foreach ($query_stringArray as $query_string) {
+			if (false === strpos($query_string, 'sortsel') && false === strpos($query_string, 'ordersel')) {
+				$new_query_stringArray[] = $query_string;
+			}
+		}
+		$new_query_string = implode('&', $new_query_stringArray);
+
+		$orderArray                     = [];
+		$orderArray['ASC']['image']     = 'desc.png';
+		$orderArray['ASC']['neworder']  = 'DESC';
+		$orderArray['DESC']['image']    = 'asc.png';
+		$orderArray['DESC']['neworder'] = 'ASC';
+
+		$aColumns = [];
+
+		foreach ($this->_columns as $column) {
+			$qs_param         = '';
+			$aColumn          = [];
+			$aColumn['width'] = $column->getWidth();
+			$aColumn['align'] = $column->getAlign();
+			$aColumn['key']   = $column->getKeyName();
+			if ('checked' === $column->_keyname) {
+				$aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"' . ' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_' . $this->_id . ', \'selected_smartobjects\');">';
+			} elseif ($column->getCustomCaption()) {
+				$aColumn['caption'] = $column->getCustomCaption();
+			} else {
+				$aColumn['caption'] = isset($this->_tempObject->vars[$column->getKeyName()]['form_caption']) ? $this->_tempObject->vars[$column->getKeyName()]['form_caption'] : $column->getKeyName();
+			}
+			// Are we doing a GET sort on this column ?
+			$getSort = (isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'])
+						&& $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] == $column->getKeyName())
+					   || ($this->_sortsel == $column->getKeyName());
+			$order   = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : 'DESC';
+
+			if (isset($_REQUEST['quicksearch_' . $this->_id]) && '' != $_REQUEST['quicksearch_' . $this->_id]) {
+				$qs_param = '&quicksearch_' . $this->_id . '=' . $_REQUEST['quicksearch_' . $this->_id];
+			}
+			if (!$this->_enableColumnsSorting || 'checked' === $column->_keyname || !$column->isSortable()) {
+				$aColumn['caption'] = $aColumn['caption'];
+			} elseif ($getSort) {
+				$aColumn['caption'] = '<a href="'
+									  . $current_url
+									  . '?'
+									  . $this->_objectHandler->_itemname
+									  . '_'
+									  . 'sortsel='
+									  . $column->getKeyName()
+									  . '&'
+									  . $this->_objectHandler->_itemname
+									  . '_'
+									  . 'ordersel='
+									  . $orderArray[$order]['neworder']
+									  . $qs_param
+									  . '&'
+									  . $new_query_string
+									  . '">'
+									  . $aColumn['caption']
+									  . ' <img src="'
+									  . SMARTOBJECT_IMAGES_ACTIONS_URL
+									  . $orderArray[$order]['image']
+									  . '" alt="ASC"></a>';
+			} else {
+				$aColumn['caption'] = '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=ASC' . $qs_param . '&' . $new_query_string . '">' . $aColumn['caption'] . '</a>';
+			}
+			$aColumns[] = $aColumn;
+		}
+		$this->_tpl->assign('smartobject_columns', $aColumns);
+
+		if ($this->_quickSearch) {
+			$this->_tpl->assign('smartobject_quicksearch', $this->_quickSearch['caption']);
+		}
+
+		$this->createTableRows();
+
+		$this->_tpl->assign('smartobject_showFilterAndLimit', $this->_showFilterAndLimit);
+		$this->_tpl->assign('smartobject_isTree', $this->_isTree);
+		$this->_tpl->assign('smartobject_show_action_column_title', $this->_showActionsColumnTitle);
+		$this->_tpl->assign('smartobject_table_header', $this->_tableHeader);
+		$this->_tpl->assign('smartobject_table_footer', $this->_tableFooter);
+		$this->_tpl->assign('smartobject_printer_friendly_page', $this->_printerFriendlyPage);
+		$this->_tpl->assign('smartobject_user_side', $this->_userSide);
+		$this->_tpl->assign('smartobject_has_actions', $this->_hasActions);
+		$this->_tpl->assign('smartobject_head_css_class', $this->_head_css_class);
+		$this->_tpl->assign('smartobject_actionButtons', $this->_actionButtons);
+		$this->_tpl->assign('smartobject_introButtons', $this->_introButtons);
+		$this->_tpl->assign('smartobject_id', $this->_id);
+		if (!empty($this->_withSelectedActions)) {
+			$this->_tpl->assign('smartobject_withSelectedActions', $this->_withSelectedActions);
+		}
+
+		$smartobjectTable_template = $this->_customTemplate ?: 'smartobject_smarttable_display.tpl';
+		if ($fetchOnly) {
+			return $this->_tpl->fetch('db:' . $smartobjectTable_template);
+		} else {
+			$this->_tpl->display('db:' . $smartobjectTable_template);
+		}
+	}
+
+	public function disableColumnsSorting()
+	{
+		$this->_enableColumnsSorting = false;
+	}
+
+	/**
+	 * @param  bool $debug
+	 * @return mixed|string|void
+	 */
+	public function fetch($debug = false)
+	{
+		return $this->render(true, $debug);
+	}
 }

Spacing +42 added lines, -42 removed lines

@@ -92,7 +92,7 @@ 
      */
     public function addActionButton($op, $caption = false, $text = false)
     {
-        $action                 = [
+        $action = [
             'op'      => $op,
             'caption' => $caption,
             'text'    => $text
@@ -127,7 +127,7 @@ 
     {
         $current_urls               = Smartobject\Utility::getCurrentUrls();
         $current_url                = $current_urls['full'];
-        $this->_printerFriendlyPage = $current_url . '&print';
+        $this->_printerFriendlyPage = $current_url.'&print';
     }
 
     /**
@@ -160,7 +160,7 @@ 
      */
     public function addDefaultIntroButton($caption)
     {
-        $this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page . '?op=mod', $caption);
+        $this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page.'?op=mod', $caption);
     }
 
     /**
@@ -185,9 +185,9 @@ 
     public function getDefaultSort()
     {
         if ($this->_sortsel) {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
+            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_sortsel', $this->_sortsel);
         } else {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_objectHandler->identifierName);
+            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_sortsel', $this->_objectHandler->identifierName);
         }
     }
 
@@ -205,9 +205,9 @@ 
     public function getDefaultOrder()
     {
         if ($this->_ordersel) {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
+            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_ordersel', $this->_ordersel);
         } else {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', 'ASC');
+            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_ordersel', 'ASC');
         }
     }
 
@@ -256,21 +256,21 @@ 
 
     public function setSortOrder()
     {
-        $this->_sortsel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] : $this->getDefaultSort();
+        $this->_sortsel = isset($_GET[$this->_objectHandler->_itemname.'_'.'sortsel']) ? $_GET[$this->_objectHandler->_itemname.'_'.'sortsel'] : $this->getDefaultSort();
         //$this->_sortsel = isset($_POST['sortsel']) ? $_POST['sortsel']: $this->_sortsel;
-        Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
+        Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_sortsel', $this->_sortsel);
         $fieldsForSorting = $this->_tempObject->getFieldsForSorting($this->_sortsel);
 
         if (isset($this->_tempObject->vars[$this->_sortsel]['itemName'])
             && $this->_tempObject->vars[$this->_sortsel]['itemName']) {
-            $this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'] . '.' . $this->_sortsel);
+            $this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'].'.'.$this->_sortsel);
         } else {
-            $this->_criteria->setSort($this->_objectHandler->_itemname . '.' . $this->_sortsel);
+            $this->_criteria->setSort($this->_objectHandler->_itemname.'.'.$this->_sortsel);
         }
 
-        $this->_ordersel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : $this->getDefaultOrder();
+        $this->_ordersel = isset($_GET[$this->_objectHandler->_itemname.'_'.'ordersel']) ? $_GET[$this->_objectHandler->_itemname.'_'.'ordersel'] : $this->getDefaultOrder();
         //$this->_ordersel = isset($_POST['ordersel']) ? $_POST['ordersel']:$this->_ordersel;
-        Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
+        Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_ordersel', $this->_ordersel);
         $ordersArray = $this->getOrdersArray();
         $this->_criteria->setOrder($this->_ordersel);
     }
@@ -320,7 +320,7 @@ 
                         //$object->initiateCustomFields();
                     }
                     if ('checked' === $column->_keyname) {
-                        $value = '<input type ="checkbox" name="selected_smartobjects[]" value="' . $object->id() . '">';
+                        $value = '<input type ="checkbox" name="selected_smartobjects[]" value="'.$object->id().'">';
                     } elseif ($column->_customMethodForValue
                               && method_exists($object, $column->_customMethodForValue)) {
                         $method = $column->_customMethodForValue;
@@ -405,9 +405,9 @@ 
     public function getDefaultFilter()
     {
         if ($this->_filtersel) {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
+            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_filtersel', $this->_filtersel);
         } else {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', 'default');
+            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_filtersel', 'default');
         }
     }
 
@@ -457,9 +457,9 @@ 
     public function getDefaultFilter2()
     {
         if ($this->_filtersel2) {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
+            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_filtersel2', $this->_filtersel2);
         } else {
-            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', 'default');
+            return Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_filtersel2', 'default');
         }
     }
 
@@ -587,7 +587,7 @@ 
      */
     public function render($fetchOnly = false, $debug = false)
     {
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
 
         $this->_tpl = new \XoopsTpl();
 
@@ -598,24 +598,24 @@ 
          */
         $this->_tempObject = $this->_objectHandler->create();
 
-        $this->_criteria->setStart(isset($_GET['start' . $this->_objectHandler->keyName]) ? (int)$_GET['start' . $this->_objectHandler->keyName] : 0);
+        $this->_criteria->setStart(isset($_GET['start'.$this->_objectHandler->keyName]) ? (int) $_GET['start'.$this->_objectHandler->keyName] : 0);
 
         $this->setSortOrder();
 
         if (!$this->_isTree) {
-            $this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'] . '_limitsel', '15');
+            $this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : Smartobject\Utility::getCookieVar($_SERVER['PHP_SELF'].'_limitsel', '15');
         } else {
             $this->_limitsel = 'all';
         }
 
         $this->_limitsel = isset($_POST['limitsel']) ? $_POST['limitsel'] : $this->_limitsel;
-        Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_limitsel', $this->_limitsel);
+        Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'].'_limitsel', $this->_limitsel);
         $limitsArray = $this->getLimitsArray();
         $this->_criteria->setLimit($this->_limitsel);
 
         $this->_filtersel = isset($_GET['filtersel']) ? $_GET['filtersel'] : $this->getDefaultFilter();
         $this->_filtersel = isset($_POST['filtersel']) ? $_POST['filtersel'] : $this->_filtersel;
-        Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
+        Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_filtersel', $this->_filtersel);
         $filtersArray = $this->getFiltersArray();
 
         if ($filtersArray) {
@@ -641,7 +641,7 @@ 
                     $filters2Array = $this->getFilters2Array();
                     $this->_tpl->assign('smartobject_optionssel_filters2Array', $filters2Array);
 
-                    Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
+                    Smartobject\Utility::setCookieVar($_SERVER['PHP_SELF'].'_filtersel2', $this->_filtersel2);
                     if ('default' !== $this->_filtersel2) {
                         $this->_criteria->add(new \Criteria($this->_filtersel, $this->_filtersel2));
                     }
@@ -650,21 +650,21 @@ 
         }
         // Check if we have a quicksearch
 
-        if (isset($_POST['quicksearch_' . $this->_id]) && '' != $_POST['quicksearch_' . $this->_id]) {
+        if (isset($_POST['quicksearch_'.$this->_id]) && '' != $_POST['quicksearch_'.$this->_id]) {
             $quicksearch_criteria = new \CriteriaCompo();
             if (is_array($this->_quickSearch['fields'])) {
                 foreach ($this->_quickSearch['fields'] as $v) {
-                    $quicksearch_criteria->add(new \Criteria($v, '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'), 'OR');
+                    $quicksearch_criteria->add(new \Criteria($v, '%'.$_POST['quicksearch_'.$this->_id].'%', 'LIKE'), 'OR');
                 }
             } else {
-                $quicksearch_criteria->add(new \Criteria($this->_quickSearch['fields'], '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'));
+                $quicksearch_criteria->add(new \Criteria($this->_quickSearch['fields'], '%'.$_POST['quicksearch_'.$this->_id].'%', 'LIKE'));
             }
             $this->_criteria->add($quicksearch_criteria);
         }
 
         $this->_objects = $this->fetchObjects($debug);
 
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
         if ($this->_criteria->getLimit() > 0) {
 
             /**
@@ -680,7 +680,7 @@ 
              */
             $params_of_the_options_sel = [];
 
-            $not_needed_params = ['sortsel', 'limitsel', 'ordersel', 'start' . $this->_objectHandler->keyName];
+            $not_needed_params = ['sortsel', 'limitsel', 'ordersel', 'start'.$this->_objectHandler->keyName];
             foreach ($_GET as $k => $v) {
                 if (!in_array($k, $not_needed_params)) {
                     $new_get_array[]             = "$k=$v";
@@ -691,12 +691,12 @@ 
             /**
              * Adding the new params of the pagenav
              */
-            $new_get_array[] = 'sortsel=' . $this->_sortsel;
-            $new_get_array[] = 'ordersel=' . $this->_ordersel;
-            $new_get_array[] = 'limitsel=' . $this->_limitsel;
+            $new_get_array[] = 'sortsel='.$this->_sortsel;
+            $new_get_array[] = 'ordersel='.$this->_ordersel;
+            $new_get_array[] = 'limitsel='.$this->_limitsel;
             $otherParams     = implode('&', $new_get_array);
 
-            $pagenav = new \XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start' . $this->_objectHandler->keyName, $otherParams);
+            $pagenav = new \XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start'.$this->_objectHandler->keyName, $otherParams);
             $this->_tpl->assign('smartobject_pagenav', $pagenav->renderNav());
         }
         $this->renderOptionSelection($limitsArray, $params_of_the_options_sel);
@@ -732,20 +732,20 @@ 
             $aColumn['align'] = $column->getAlign();
             $aColumn['key']   = $column->getKeyName();
             if ('checked' === $column->_keyname) {
-                $aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"' . ' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_' . $this->_id . ', \'selected_smartobjects\');">';
+                $aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"'.' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_'.$this->_id.', \'selected_smartobjects\');">';
             } elseif ($column->getCustomCaption()) {
                 $aColumn['caption'] = $column->getCustomCaption();
             } else {
                 $aColumn['caption'] = isset($this->_tempObject->vars[$column->getKeyName()]['form_caption']) ? $this->_tempObject->vars[$column->getKeyName()]['form_caption'] : $column->getKeyName();
             }
             // Are we doing a GET sort on this column ?
-            $getSort = (isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'])
-                        && $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] == $column->getKeyName())
+            $getSort = (isset($_GET[$this->_objectHandler->_itemname.'_'.'sortsel'])
+                        && $_GET[$this->_objectHandler->_itemname.'_'.'sortsel'] == $column->getKeyName())
                        || ($this->_sortsel == $column->getKeyName());
-            $order   = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : 'DESC';
+            $order   = isset($_GET[$this->_objectHandler->_itemname.'_'.'ordersel']) ? $_GET[$this->_objectHandler->_itemname.'_'.'ordersel'] : 'DESC';
 
-            if (isset($_REQUEST['quicksearch_' . $this->_id]) && '' != $_REQUEST['quicksearch_' . $this->_id]) {
-                $qs_param = '&quicksearch_' . $this->_id . '=' . $_REQUEST['quicksearch_' . $this->_id];
+            if (isset($_REQUEST['quicksearch_'.$this->_id]) && '' != $_REQUEST['quicksearch_'.$this->_id]) {
+                $qs_param = '&quicksearch_'.$this->_id.'='.$_REQUEST['quicksearch_'.$this->_id];
             }
             if (!$this->_enableColumnsSorting || 'checked' === $column->_keyname || !$column->isSortable()) {
                 $aColumn['caption'] = $aColumn['caption'];
@@ -772,7 +772,7 @@ 
                                       . $orderArray[$order]['image']
                                       . '" alt="ASC"></a>';
             } else {
-                $aColumn['caption'] = '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=ASC' . $qs_param . '&' . $new_query_string . '">' . $aColumn['caption'] . '</a>';
+                $aColumn['caption'] = '<a href="'.$current_url.'?'.$this->_objectHandler->_itemname.'_'.'sortsel='.$column->getKeyName().'&'.$this->_objectHandler->_itemname.'_'.'ordersel=ASC'.$qs_param.'&'.$new_query_string.'">'.$aColumn['caption'].'</a>';
             }
             $aColumns[] = $aColumn;
         }
@@ -802,9 +802,9 @@ 
 
         $smartobjectTable_template = $this->_customTemplate ?: 'smartobject_smarttable_display.tpl';
         if ($fetchOnly) {
-            return $this->_tpl->fetch('db:' . $smartobjectTable_template);
+            return $this->_tpl->fetch('db:'.$smartobjectTable_template);
         } else {
-            $this->_tpl->display('db:' . $smartobjectTable_template);
+            $this->_tpl->display('db:'.$smartobjectTable_template);
         }
     }
 

class/Utility.php

Doc Comments +13 added lines, -13 removed lines

@@ -336,7 +336,7 @@ 
     }
 
     /**
-     * @param              $key
+     * @param              string $key
      * @param  bool        $moduleName
      * @param  string      $default
      * @return null|string
@@ -398,7 +398,7 @@ 
 
     /**
      * Thanks to the NewBB2 Development Team
-     * @param $target
+     * @param string $target
      * @return bool
      */
     public static function mkdirAsAdmin($target)
@@ -551,7 +551,7 @@ 
 
     /**
      * @param $dirname
-     * @return bool
+     * @return boolean|null
      */
     public static function deleteFile($dirname)
     {
@@ -744,7 +744,7 @@ 
     }
 
     /**
-     * @param $name
+     * @param string $name
      */
     public static function closeCollapsable($name)
     {
@@ -754,7 +754,7 @@ 
     }
 
     /**
-     * @param     $name
+     * @param     string $name
      * @param     $value
      * @param int $time
      */
@@ -768,7 +768,7 @@ 
     }
 
     /**
-     * @param         $name
+     * @param         string $name
      * @param  string $default
      * @return string
      */
@@ -917,7 +917,7 @@ 
     }
 
     /**
-     * @param $src
+     * @param string $src
      */
     public static function addScript($src)
     {
@@ -1096,8 +1096,8 @@ 
     }
 
     /**
-     * @param $module
-     * @param $file
+     * @param string $module
+     * @param string $file
      */
     public static function loadLanguageFile($module, $file)
     {
@@ -1215,7 +1215,7 @@ 
      * This function should be able to cover almost all floats that appear in an european environment.
      * @param            $str
      * @param  bool      $set
-     * @return float|int
+     * @return double
      */
     public static function getFloat($str, $set = false)
     {
@@ -1250,7 +1250,7 @@ 
     /**
      * @param                         $var
      * @param  bool                   $currencyObj
-     * @return float|int|mixed|string
+     * @return string
      */
     public static function getCurrency($var, $currencyObj = false)
     {
@@ -1278,7 +1278,7 @@ 
 
     /**
      * @param $var
-     * @return float|int|mixed|string
+     * @return string
      */
     public static function float($var)
     {
@@ -1326,7 +1326,7 @@ 
     /**
      * @param $moduleName
      * @param $items
-     * @return array
+     * @return string[]
      */
     public static function getTablesArray($moduleName, $items)
     {

Unused Use Statements -1 removed lines

@@ -1,6 +1,5 @@
 <?php namespace XoopsModules\Smartobject;
 
-use Xmf\Request;
 use XoopsModules\Smartobject;
 use XoopsModules\Smartobject\Common;
 

Indentation +1241 added lines, -1241 removed lines

@@ -9,186 +9,186 @@ 
  */
 class Utility
 {
-    use Common\VersionChecks; //checkVerXoops, checkVerPhp Traits
-
-    use Common\ServerStats; // getServerStats Trait
-
-    use Common\FilesManagement; // Files Management Trait
-
-    //--------------- Custom module methods -----------------------------
-
-
-
-    /**
-     * @param $cssfile
-     * @return string
-     */
-    public static function getCssLink($cssfile)
-    {
-        $ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '">';
-
-        return $ret;
-    }
-
-    /**
-     * @return string
-     */
-    public static function getPageBeforeForm()
-    {
-        global $smart_previous_page;
-
-        return isset($_POST['smart_page_before_form']) ? $_POST['smart_page_before_form'] : $smart_previous_page;
-    }
-
-    /**
-     * Checks if a user is admin of $module
-     *
-     * @param  bool $module
-     * @return bool: true if user is admin
-     */
-    public static function userIsAdmin($module = false)
-    {
-        global $xoopsUser;
-        static $smart_isAdmin;
-        if (!$module) {
-            global $xoopsModule;
-            $module = $xoopsModule->getVar('dirname');
-        }
-        if (isset($smart_isAdmin[$module])) {
-            return $smart_isAdmin[$module];
-        }
-        if (!$xoopsUser) {
-            $smart_isAdmin[$module] = false;
-
-            return $smart_isAdmin[$module];
-        }
-        $smart_isAdmin[$module] = false;
-        $smartModule            = static::getModuleInfo($module);
-        if (!is_object($smartModule)) {
-            return false;
-        }
-        $module_id              = $smartModule->getVar('mid');
-        $smart_isAdmin[$module] = $xoopsUser->isAdmin($module_id);
-
-        return $smart_isAdmin[$module];
-    }
-
-    /**
-     * @return bool
-     */
-    public static function isXoops22()
-    {
-        $xoops22 = false;
-        $xv      = str_replace('XOOPS ', '', XOOPS_VERSION);
-        if ('2' == substr($xv, 2, 1)) {
-            $xoops22 = true;
-        }
-
-        return $xoops22;
-    }
-
-    /**
-     * @param  bool $withLink
-     * @param  bool $forBreadCrumb
-     * @param  bool $moduleName
-     * @return string
-     */
-    public static function getModuleName($withLink = true, $forBreadCrumb = false, $moduleName = false)
-    {
-        if (!$moduleName) {
-            global $xoopsModule;
-            $moduleName = $xoopsModule->getVar('dirname');
-        }
-        $smartModule       = static::getModuleInfo($moduleName);
-        $smartModuleConfig = static::getModuleConfig($moduleName);
-        if (!isset($smartModule)) {
-            return '';
-        }
-
-        if ($forBreadCrumb
-            && (isset($smartModuleConfig['show_mod_name_breadcrumb'])
-                && !$smartModuleConfig['show_mod_name_breadcrumb'])) {
-            return '';
-        }
-        if (!$withLink) {
-            return $smartModule->getVar('name');
-        } else {
-            $seoMode = static::getModuleModeSEO($moduleName);
-            if ('rewrite' === $seoMode) {
-                $seoModuleName = static::getModuleNameForSEO($moduleName);
-                $ret           = XOOPS_URL . '/' . $seoModuleName . '/';
-            } elseif ('pathinfo' === $seoMode) {
-                $ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
-            } else {
-                $ret = XOOPS_URL . '/modules/' . $moduleName . '/';
-            }
-
-            return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
-        }
-    }
-
-    /**
-     * @param  bool $moduleName
-     * @return string
-     */
-    public static function getModuleNameForSEO($moduleName = false)
-    {
-        $smartModule       = static::getModuleInfo($moduleName);
-        $smartModuleConfig = static::getModuleConfig($moduleName);
-        if (isset($smartModuleConfig['seo_module_name'])) {
-            return $smartModuleConfig['seo_module_name'];
-        }
-        $ret = static::getModuleName(false, false, $moduleName);
-
-        return strtolower($ret);
-    }
-
-    /**
-     * @param  bool $moduleName
-     * @return bool
-     */
-    public static function getModuleModeSEO($moduleName = false)
-    {
-        $smartModule       = static::getModuleInfo($moduleName);
-        $smartModuleConfig = static::getModuleConfig($moduleName);
-
-        return isset($smartModuleConfig['seo_mode']) ? $smartModuleConfig['seo_mode'] : false;
-    }
-
-    /**
-     * @param  bool $moduleName
-     * @return bool
-     */
-    public static function getModuleIncludeIdSEO($moduleName = false)
-    {
-        $smartModule       = static::getModuleInfo($moduleName);
-        $smartModuleConfig = static::getModuleConfig($moduleName);
-
-        return !empty($smartModuleConfig['seo_inc_id']);
-    }
-
-    /**
-     * @param $key
-     * @return string
-     */
-    public static function getEnv($key)
-    {
-        $ret = '';
-        $ret = isset($_SERVER[$key]) ? $_SERVER[$key] : (isset($_ENV[$key]) ? $_ENV[$key] : '');
-
-        return $ret;
-    }
-
-    public static function getXoopsCpHeader()
-    {
-        xoops_cp_header();
-        global $xoopsModule, $xoopsConfig;
-        /**
-         * include SmartObject admin language file
-         */
-        /** @var Smartobject\Helper $helper */
-        $helper = Smartobject\Helper::getInstance();
-        $helper->loadLanguage('admin'); ?>
+	use Common\VersionChecks; //checkVerXoops, checkVerPhp Traits
+
+	use Common\ServerStats; // getServerStats Trait
+
+	use Common\FilesManagement; // Files Management Trait
+
+	//--------------- Custom module methods -----------------------------
+
+
+
+	/**
+	 * @param $cssfile
+	 * @return string
+	 */
+	public static function getCssLink($cssfile)
+	{
+		$ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '">';
+
+		return $ret;
+	}
+
+	/**
+	 * @return string
+	 */
+	public static function getPageBeforeForm()
+	{
+		global $smart_previous_page;
+
+		return isset($_POST['smart_page_before_form']) ? $_POST['smart_page_before_form'] : $smart_previous_page;
+	}
+
+	/**
+	 * Checks if a user is admin of $module
+	 *
+	 * @param  bool $module
+	 * @return bool: true if user is admin
+	 */
+	public static function userIsAdmin($module = false)
+	{
+		global $xoopsUser;
+		static $smart_isAdmin;
+		if (!$module) {
+			global $xoopsModule;
+			$module = $xoopsModule->getVar('dirname');
+		}
+		if (isset($smart_isAdmin[$module])) {
+			return $smart_isAdmin[$module];
+		}
+		if (!$xoopsUser) {
+			$smart_isAdmin[$module] = false;
+
+			return $smart_isAdmin[$module];
+		}
+		$smart_isAdmin[$module] = false;
+		$smartModule            = static::getModuleInfo($module);
+		if (!is_object($smartModule)) {
+			return false;
+		}
+		$module_id              = $smartModule->getVar('mid');
+		$smart_isAdmin[$module] = $xoopsUser->isAdmin($module_id);
+
+		return $smart_isAdmin[$module];
+	}
+
+	/**
+	 * @return bool
+	 */
+	public static function isXoops22()
+	{
+		$xoops22 = false;
+		$xv      = str_replace('XOOPS ', '', XOOPS_VERSION);
+		if ('2' == substr($xv, 2, 1)) {
+			$xoops22 = true;
+		}
+
+		return $xoops22;
+	}
+
+	/**
+	 * @param  bool $withLink
+	 * @param  bool $forBreadCrumb
+	 * @param  bool $moduleName
+	 * @return string
+	 */
+	public static function getModuleName($withLink = true, $forBreadCrumb = false, $moduleName = false)
+	{
+		if (!$moduleName) {
+			global $xoopsModule;
+			$moduleName = $xoopsModule->getVar('dirname');
+		}
+		$smartModule       = static::getModuleInfo($moduleName);
+		$smartModuleConfig = static::getModuleConfig($moduleName);
+		if (!isset($smartModule)) {
+			return '';
+		}
+
+		if ($forBreadCrumb
+			&& (isset($smartModuleConfig['show_mod_name_breadcrumb'])
+				&& !$smartModuleConfig['show_mod_name_breadcrumb'])) {
+			return '';
+		}
+		if (!$withLink) {
+			return $smartModule->getVar('name');
+		} else {
+			$seoMode = static::getModuleModeSEO($moduleName);
+			if ('rewrite' === $seoMode) {
+				$seoModuleName = static::getModuleNameForSEO($moduleName);
+				$ret           = XOOPS_URL . '/' . $seoModuleName . '/';
+			} elseif ('pathinfo' === $seoMode) {
+				$ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
+			} else {
+				$ret = XOOPS_URL . '/modules/' . $moduleName . '/';
+			}
+
+			return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
+		}
+	}
+
+	/**
+	 * @param  bool $moduleName
+	 * @return string
+	 */
+	public static function getModuleNameForSEO($moduleName = false)
+	{
+		$smartModule       = static::getModuleInfo($moduleName);
+		$smartModuleConfig = static::getModuleConfig($moduleName);
+		if (isset($smartModuleConfig['seo_module_name'])) {
+			return $smartModuleConfig['seo_module_name'];
+		}
+		$ret = static::getModuleName(false, false, $moduleName);
+
+		return strtolower($ret);
+	}
+
+	/**
+	 * @param  bool $moduleName
+	 * @return bool
+	 */
+	public static function getModuleModeSEO($moduleName = false)
+	{
+		$smartModule       = static::getModuleInfo($moduleName);
+		$smartModuleConfig = static::getModuleConfig($moduleName);
+
+		return isset($smartModuleConfig['seo_mode']) ? $smartModuleConfig['seo_mode'] : false;
+	}
+
+	/**
+	 * @param  bool $moduleName
+	 * @return bool
+	 */
+	public static function getModuleIncludeIdSEO($moduleName = false)
+	{
+		$smartModule       = static::getModuleInfo($moduleName);
+		$smartModuleConfig = static::getModuleConfig($moduleName);
+
+		return !empty($smartModuleConfig['seo_inc_id']);
+	}
+
+	/**
+	 * @param $key
+	 * @return string
+	 */
+	public static function getEnv($key)
+	{
+		$ret = '';
+		$ret = isset($_SERVER[$key]) ? $_SERVER[$key] : (isset($_ENV[$key]) ? $_ENV[$key] : '');
+
+		return $ret;
+	}
+
+	public static function getXoopsCpHeader()
+	{
+		xoops_cp_header();
+		global $xoopsModule, $xoopsConfig;
+		/**
+		 * include SmartObject admin language file
+		 */
+		/** @var Smartobject\Helper $helper */
+		$helper = Smartobject\Helper::getInstance();
+		$helper->loadLanguage('admin'); ?>
 
         <script type='text/javascript'>
             <!--
@@ -202,504 +202,504 @@ 
             src='<?php echo SMARTOBJECT_URL ?>include/smart.js'></script>
         <?php
 
-        /**
-         * Include the admin language constants for the SmartObject Framework
-         */
-        /** @var Smartobject\Helper $helper */
-        $helper = Smartobject\Helper::getInstance();
-        $helper->loadLanguage('admin');
-    }
-
-    /**
-     * Detemines if a table exists in the current db
-     *
-     * @param  string $table the table name (without XOOPS prefix)
-     * @return bool   True if table exists, false if not
-     *
-     * @access public
-     * @author xhelp development team
-     */
-    public static function isTable($table)
-    {
-        $bRetVal = false;
-        //Verifies that a MySQL table exists
-        $xoopsDB  = \XoopsDatabaseFactory::getDatabaseConnection();
-        $realname = $xoopsDB->prefix($table);
-        $sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
-        $ret      = $xoopsDB->queryF($sql);
-        while (false !== (list($m_table) = $xoopsDB->fetchRow($ret))) {
-            if ($m_table == $realname) {
-                $bRetVal = true;
-                break;
-            }
-        }
-        $xoopsDB->freeRecordSet($ret);
-
-        return $bRetVal;
-    }
-
-    /**
-     * Gets a value from a key in the xhelp_meta table
-     *
-     * @param  string $key
-     * @param  bool   $moduleName
-     * @return string $value
-     *
-     * @access public
-     * @author xhelp development team
-     */
-    public static function getMeta($key, $moduleName = false)
-    {
-        if (!$moduleName) {
-            $moduleName = static::getCurrentModuleName();
-        }
-        $xoopsDB = \XoopsDatabaseFactory::getDatabaseConnection();
-        $sql     = sprintf('SELECT metavalue FROM `%s` WHERE metakey=%s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
-        $ret     = $xoopsDB->query($sql);
-        if (!$ret) {
-            $value = false;
-        } else {
-            list($value) = $xoopsDB->fetchRow($ret);
-        }
-
-        return $value;
-    }
-
-    /**
-     * @return bool
-     */
-    public static function getCurrentModuleName()
-    {
-        global $xoopsModule;
-        if (is_object($xoopsModule)) {
-            return $xoopsModule->getVar('dirname');
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Sets a value for a key in the xhelp_meta table
-     *
-     * @param  string $key
-     * @param  string $value
-     * @param  bool   $moduleName
-     * @return bool   TRUE if success, FALSE if failure
-     *
-     * @access public
-     * @author xhelp development team
-     */
-    public static function setMeta($key, $value, $moduleName = false)
-    {
-        if (!$moduleName) {
-            $moduleName = static::getCurrentModuleName();
-        }
-        $xoopsDB = \XoopsDatabaseFactory::getDatabaseConnection();
-        $ret     = static::getMeta($key, $moduleName);
-        if ('0' === $ret || $ret > 0) {
-            $sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
-        } else {
-            $sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
-        }
-        $ret = $xoopsDB->queryF($sql);
-        if (!$ret) {
-            return false;
-        }
-
-        return true;
-    }
-
-    // Thanks to Mithrandir:-)
-    /**
-     * @param         $str
-     * @param         $start
-     * @param         $length
-     * @param  string $trimmarker
-     * @return string
-     */
-    public static function getSubstr($str, $start, $length, $trimmarker = '...')
-    {
-        // if the string is empty, let's get out ;-)
-        if ('' === $str) {
-            return $str;
-        }
-        // reverse a string that is shortened with '' as trimmarker
-        $reversed_string = strrev(xoops_substr($str, $start, $length, ''));
-        // find first space in reversed string
-        $position_of_space = strpos($reversed_string, ' ', 0);
-        // truncate the original string to a length of $length
-        // minus the position of the last space
-        // plus the length of the $trimmarker
-        $truncated_string = xoops_substr($str, $start, $length - $position_of_space + strlen($trimmarker), $trimmarker);
-
-        return $truncated_string;
-    }
-
-    /**
-     * @param              $key
-     * @param  bool        $moduleName
-     * @param  string      $default
-     * @return null|string
-     */
-    public static function getConfig($key, $moduleName = false, $default = 'default_is_undefined')
-    {
-        if (!$moduleName) {
-            $moduleName = static::getCurrentModuleName();
-        }
-        $configs = static::getModuleConfig($moduleName);
-        if (isset($configs[$key])) {
-            return $configs[$key];
-        } else {
-            if ('default_is_undefined' === $default) {
-                return null;
-            } else {
-                return $default;
-            }
-        }
-    }
-
-    /**
-     * Copy a file, or a folder and its contents
-     *
-     * @author      Aidan Lister <aidan@php.net>
-     * @param  string $source The source
-     * @param  string $dest   The destination
-     * @return bool   Returns true on success, false on failure
-     */
-    public static function copyr($source, $dest)
-    {
-        // Simple copy for a file
-        if (is_file($source)) {
-            return copy($source, $dest);
-        }
-        // Make destination directory
-        if (!is_dir($dest)) {
-            mkdir($dest);
-        }
-        // Loop through the folder
-        $dir = dir($source);
-        while (false !== $entry = $dir->read()) {
-            // Skip pointers
-            if ('.' === $entry || '..' === $entry) {
-                continue;
-            }
-            // Deep copy directories
-            if (is_dir("$source/$entry") && ("$source/$entry" !== $dest)) {
-                static::copyr("$source/$entry", "$dest/$entry");
-            } else {
-                copy("$source/$entry", "$dest/$entry");
-            }
-        }
-        // Clean up
-        $dir->close();
-
-        return true;
-    }
-
-    /**
-     * Thanks to the NewBB2 Development Team
-     * @param $target
-     * @return bool
-     */
-    public static function mkdirAsAdmin($target)
-    {
-        // http://www.php.net/manual/en/function.mkdir.php
-        // saint at corenova.com
-        // bart at cdasites dot com
-        if (is_dir($target) || empty($target)) {
-            return true; // best case check first
-        }
-        if (file_exists($target) && !is_dir($target)) {
-            return false;
-        }
-        if (Smartobject\Utility::mkdirAsAdmin(substr($target, 0, strrpos($target, '/')))) {
-            if (!file_exists($target)) {
-                $res = mkdir($target, 0777); // crawl back up & create dir tree
-                static::chmodAsAdmin($target);
-
-                return $res;
-            }
-        }
-        $res = is_dir($target);
-
-        return $res;
-    }
-
-    /**
-     * Thanks to the NewBB2 Development Team
-     * @param       $target
-     * @param  int  $mode
-     * @return bool
-     */
-    public static function chmodAsAdmin($target, $mode = 0777)
-    {
-        return @ chmod($target, $mode);
-    }
-
-    /**
-     * @param $src
-     * @param $maxWidth
-     * @param $maxHeight
-     * @return array
-     */
-    public static function imageResize($src, $maxWidth, $maxHeight)
-    {
-        $width  = '';
-        $height = '';
-        $type   = '';
-        $attr   = '';
-        if (file_exists($src)) {
-            list($width, $height, $type, $attr) = getimagesize($src);
-            if ($width > $maxWidth) {
-                $originalWidth = $width;
-                $width         = $maxWidth;
-                $height        = $width * $height / $originalWidth;
-            }
-            if ($height > $maxHeight) {
-                $originalHeight = $height;
-                $height         = $maxHeight;
-                $width          = $height * $width / $originalHeight;
-            }
-            $attr = " width='$width' height='$height'";
-        }
-
-        return [
-            $width,
-            $height,
-            $type,
-            $attr
-        ];
-    }
-
-    /**
-     * @param  bool $moduleName
-     * @return mixed
-     */
-    public static function getModuleInfo($moduleName = false)
-    {
-        static $smartModules;
-        if (isset($smartModules[$moduleName])) {
-            $ret =& $smartModules[$moduleName];
-
-            return $ret;
-        }
-        global $xoopsModule;
-        if (!$moduleName) {
-            if (isset($xoopsModule) && is_object($xoopsModule)) {
-                $smartModules[$xoopsModule->getVar('dirname')] = $xoopsModule;
-
-                return $smartModules[$xoopsModule->getVar('dirname')];
-            }
-        }
-        if (!isset($smartModules[$moduleName])) {
-            if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
-                $smartModules[$moduleName] = $xoopsModule;
-            } else {
-                $hModule = xoops_getHandler('module');
-                if ('xoops' !== $moduleName) {
-                    $smartModules[$moduleName] = $hModule->getByDirname($moduleName);
-                } else {
-                    $smartModules[$moduleName] = $hModule->getByDirname('system');
-                }
-            }
-        }
-
-        return $smartModules[$moduleName];
-    }
-
-    /**
-     * @param  bool $moduleName
-     * @return bool
-     */
-    public static function getModuleConfig($moduleName = false)
-    {
-        static $smartConfigs;
-        if (isset($smartConfigs[$moduleName])) {
-            $ret =& $smartConfigs[$moduleName];
-
-            return $ret;
-        }
-        global $xoopsModule, $xoopsModuleConfig;
-        if (!$moduleName) {
-            if (isset($xoopsModule) && is_object($xoopsModule)) {
-                $smartConfigs[$xoopsModule->getVar('dirname')] = $xoopsModuleConfig;
-
-                return $smartConfigs[$xoopsModule->getVar('dirname')];
-            }
-        }
-        // if we still did not found the xoopsModule, this is because there is none
-        if (!$moduleName) {
-            $ret = false;
-
-            return $ret;
-        }
-        if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
-            $smartConfigs[$moduleName] = $xoopsModuleConfig;
-        } else {
-            $module = static::getModuleInfo($moduleName);
-            if (!is_object($module)) {
-                $ret = false;
-
-                return $ret;
-            }
-            $hModConfig                = xoops_getHandler('config');
-            $smartConfigs[$moduleName] =& $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
-        }
-
-        return $smartConfigs[$moduleName];
-    }
-
-    /**
-     * @param $dirname
-     * @return bool
-     */
-    public static function deleteFile($dirname)
-    {
-        // Simple delete for a file
-        if (is_file($dirname)) {
-            return unlink($dirname);
-        }
-    }
-
-    /**
-     * @param  array $errors
-     * @return string
-     */
-    public static function formatErrors($errors = [])
-    {
-        $ret = '';
-        foreach ($errors as $key => $value) {
-            $ret .= '<br> - ' . $value;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * getLinkedUnameFromId()
-     *
-     * @param  integer $userid Userid of poster etc
-     * @param  integer $name   :  0 Use Usenamer 1 Use realname
-     * @param  array   $users
-     * @param  bool    $withContact
-     * @return string
-     */
-    public static function getLinkedUnameFromId($userid = 0, $name = 0, $users = [], $withContact = false)
-    {
-        if (!is_numeric($userid)) {
-            return $userid;
-        }
-        $userid = (int)$userid;
-        if ($userid > 0) {
-            if ($users == []) {
-                //fetching users
-                $memberHandler = xoops_getHandler('member');
-                $user          =& $memberHandler->getUser($userid);
-            } else {
-                if (!isset($users[$userid])) {
-                    return $GLOBALS['xoopsConfig']['anonymous'];
-                }
-                $user =& $users[$userid];
-            }
-            if (is_object($user)) {
-                $ts        = \MyTextSanitizer:: getInstance();
-                $username  = $user->getVar('uname');
-                $fullname  = '';
-                $fullname2 = $user->getVar('name');
-                if ($name && !empty($fullname2)) {
-                    $fullname = $user->getVar('name');
-                }
-                if (!empty($fullname)) {
-                    $linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
-                } else {
-                    $linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
-                }
-                // add contact info: email + PM
-                if ($withContact) {
-                    $linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"></a>';
-                    $js         = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
-                    $linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"></a>';
-                }
-
-                return $linkeduser;
-            }
-        }
-
-        return $GLOBALS['xoopsConfig']['anonymous'];
-    }
-
-    /**
-     * @param int    $currentoption
-     * @param string $breadcrumb
-     * @param bool   $submenus
-     * @param int    $currentsub
-     */
-    public static function getAdminMenu($currentoption = 0, $breadcrumb = '', $submenus = false, $currentsub = -1)
-    {
-        global $xoopsModule, $xoopsConfig;
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
-
-
-        /** @var Smartobject\Helper $helper */
-        $helper = Smartobject\Helper::getInstance();
-        $helper->loadLanguage('admin');
-        $helper->loadLanguage('modinfo');
-        $headermenu  = [];
-        $adminObject = [];
-        include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
-        $tpl = new \XoopsTpl();
-        $tpl->assign([
-                         'headermenu'      => $headermenu,
-                         'adminmenu'       => $adminObject,
-                         'current'         => $currentoption,
-                         'breadcrumb'      => $breadcrumb,
-                         'headermenucount' => count($headermenu),
-                         'submenus'        => $submenus,
-                         'currentsub'      => $currentsub,
-                         'submenuscount'   => count($submenus)
-                     ]);
-        $tpl->display('db:smartobject_admin_menu.tpl');
-    }
-
-    /**
-     * @param string $id
-     * @param string $title
-     * @param string $dsc
-     */
-    public static function getCollapsableBar($id = '', $title = '', $dsc = '')
-    {
-        global $xoopsModule;
-        echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
-        echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
-        echo "<div id='" . $id . "'>";
-        if ('' !== $dsc) {
-            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . $dsc . '</span>';
-        }
-    }
-
-    /**
-     * @param string $id
-     * @param string $title
-     * @param string $dsc
-     */
-    public static function getAjaxCollapsableBar($id = '', $title = '', $dsc = '')
-    {
-        global $xoopsModule;
-        $onClick = "ajaxtogglecollapse('$id')";
-        //$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
-        echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
-        echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
-        echo "<div id='" . $id . "'>";
-        if ('' !== $dsc) {
-            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . $dsc . '</span>';
-        }
-    }
-
-    /**
-     * Ajax testing......
-     * @param $name
-     */
-    /*
+		/**
+		 * Include the admin language constants for the SmartObject Framework
+		 */
+		/** @var Smartobject\Helper $helper */
+		$helper = Smartobject\Helper::getInstance();
+		$helper->loadLanguage('admin');
+	}
+
+	/**
+	 * Detemines if a table exists in the current db
+	 *
+	 * @param  string $table the table name (without XOOPS prefix)
+	 * @return bool   True if table exists, false if not
+	 *
+	 * @access public
+	 * @author xhelp development team
+	 */
+	public static function isTable($table)
+	{
+		$bRetVal = false;
+		//Verifies that a MySQL table exists
+		$xoopsDB  = \XoopsDatabaseFactory::getDatabaseConnection();
+		$realname = $xoopsDB->prefix($table);
+		$sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
+		$ret      = $xoopsDB->queryF($sql);
+		while (false !== (list($m_table) = $xoopsDB->fetchRow($ret))) {
+			if ($m_table == $realname) {
+				$bRetVal = true;
+				break;
+			}
+		}
+		$xoopsDB->freeRecordSet($ret);
+
+		return $bRetVal;
+	}
+
+	/**
+	 * Gets a value from a key in the xhelp_meta table
+	 *
+	 * @param  string $key
+	 * @param  bool   $moduleName
+	 * @return string $value
+	 *
+	 * @access public
+	 * @author xhelp development team
+	 */
+	public static function getMeta($key, $moduleName = false)
+	{
+		if (!$moduleName) {
+			$moduleName = static::getCurrentModuleName();
+		}
+		$xoopsDB = \XoopsDatabaseFactory::getDatabaseConnection();
+		$sql     = sprintf('SELECT metavalue FROM `%s` WHERE metakey=%s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
+		$ret     = $xoopsDB->query($sql);
+		if (!$ret) {
+			$value = false;
+		} else {
+			list($value) = $xoopsDB->fetchRow($ret);
+		}
+
+		return $value;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public static function getCurrentModuleName()
+	{
+		global $xoopsModule;
+		if (is_object($xoopsModule)) {
+			return $xoopsModule->getVar('dirname');
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	 * Sets a value for a key in the xhelp_meta table
+	 *
+	 * @param  string $key
+	 * @param  string $value
+	 * @param  bool   $moduleName
+	 * @return bool   TRUE if success, FALSE if failure
+	 *
+	 * @access public
+	 * @author xhelp development team
+	 */
+	public static function setMeta($key, $value, $moduleName = false)
+	{
+		if (!$moduleName) {
+			$moduleName = static::getCurrentModuleName();
+		}
+		$xoopsDB = \XoopsDatabaseFactory::getDatabaseConnection();
+		$ret     = static::getMeta($key, $moduleName);
+		if ('0' === $ret || $ret > 0) {
+			$sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
+		} else {
+			$sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
+		}
+		$ret = $xoopsDB->queryF($sql);
+		if (!$ret) {
+			return false;
+		}
+
+		return true;
+	}
+
+	// Thanks to Mithrandir:-)
+	/**
+	 * @param         $str
+	 * @param         $start
+	 * @param         $length
+	 * @param  string $trimmarker
+	 * @return string
+	 */
+	public static function getSubstr($str, $start, $length, $trimmarker = '...')
+	{
+		// if the string is empty, let's get out ;-)
+		if ('' === $str) {
+			return $str;
+		}
+		// reverse a string that is shortened with '' as trimmarker
+		$reversed_string = strrev(xoops_substr($str, $start, $length, ''));
+		// find first space in reversed string
+		$position_of_space = strpos($reversed_string, ' ', 0);
+		// truncate the original string to a length of $length
+		// minus the position of the last space
+		// plus the length of the $trimmarker
+		$truncated_string = xoops_substr($str, $start, $length - $position_of_space + strlen($trimmarker), $trimmarker);
+
+		return $truncated_string;
+	}
+
+	/**
+	 * @param              $key
+	 * @param  bool        $moduleName
+	 * @param  string      $default
+	 * @return null|string
+	 */
+	public static function getConfig($key, $moduleName = false, $default = 'default_is_undefined')
+	{
+		if (!$moduleName) {
+			$moduleName = static::getCurrentModuleName();
+		}
+		$configs = static::getModuleConfig($moduleName);
+		if (isset($configs[$key])) {
+			return $configs[$key];
+		} else {
+			if ('default_is_undefined' === $default) {
+				return null;
+			} else {
+				return $default;
+			}
+		}
+	}
+
+	/**
+	 * Copy a file, or a folder and its contents
+	 *
+	 * @author      Aidan Lister <aidan@php.net>
+	 * @param  string $source The source
+	 * @param  string $dest   The destination
+	 * @return bool   Returns true on success, false on failure
+	 */
+	public static function copyr($source, $dest)
+	{
+		// Simple copy for a file
+		if (is_file($source)) {
+			return copy($source, $dest);
+		}
+		// Make destination directory
+		if (!is_dir($dest)) {
+			mkdir($dest);
+		}
+		// Loop through the folder
+		$dir = dir($source);
+		while (false !== $entry = $dir->read()) {
+			// Skip pointers
+			if ('.' === $entry || '..' === $entry) {
+				continue;
+			}
+			// Deep copy directories
+			if (is_dir("$source/$entry") && ("$source/$entry" !== $dest)) {
+				static::copyr("$source/$entry", "$dest/$entry");
+			} else {
+				copy("$source/$entry", "$dest/$entry");
+			}
+		}
+		// Clean up
+		$dir->close();
+
+		return true;
+	}
+
+	/**
+	 * Thanks to the NewBB2 Development Team
+	 * @param $target
+	 * @return bool
+	 */
+	public static function mkdirAsAdmin($target)
+	{
+		// http://www.php.net/manual/en/function.mkdir.php
+		// saint at corenova.com
+		// bart at cdasites dot com
+		if (is_dir($target) || empty($target)) {
+			return true; // best case check first
+		}
+		if (file_exists($target) && !is_dir($target)) {
+			return false;
+		}
+		if (Smartobject\Utility::mkdirAsAdmin(substr($target, 0, strrpos($target, '/')))) {
+			if (!file_exists($target)) {
+				$res = mkdir($target, 0777); // crawl back up & create dir tree
+				static::chmodAsAdmin($target);
+
+				return $res;
+			}
+		}
+		$res = is_dir($target);
+
+		return $res;
+	}
+
+	/**
+	 * Thanks to the NewBB2 Development Team
+	 * @param       $target
+	 * @param  int  $mode
+	 * @return bool
+	 */
+	public static function chmodAsAdmin($target, $mode = 0777)
+	{
+		return @ chmod($target, $mode);
+	}
+
+	/**
+	 * @param $src
+	 * @param $maxWidth
+	 * @param $maxHeight
+	 * @return array
+	 */
+	public static function imageResize($src, $maxWidth, $maxHeight)
+	{
+		$width  = '';
+		$height = '';
+		$type   = '';
+		$attr   = '';
+		if (file_exists($src)) {
+			list($width, $height, $type, $attr) = getimagesize($src);
+			if ($width > $maxWidth) {
+				$originalWidth = $width;
+				$width         = $maxWidth;
+				$height        = $width * $height / $originalWidth;
+			}
+			if ($height > $maxHeight) {
+				$originalHeight = $height;
+				$height         = $maxHeight;
+				$width          = $height * $width / $originalHeight;
+			}
+			$attr = " width='$width' height='$height'";
+		}
+
+		return [
+			$width,
+			$height,
+			$type,
+			$attr
+		];
+	}
+
+	/**
+	 * @param  bool $moduleName
+	 * @return mixed
+	 */
+	public static function getModuleInfo($moduleName = false)
+	{
+		static $smartModules;
+		if (isset($smartModules[$moduleName])) {
+			$ret =& $smartModules[$moduleName];
+
+			return $ret;
+		}
+		global $xoopsModule;
+		if (!$moduleName) {
+			if (isset($xoopsModule) && is_object($xoopsModule)) {
+				$smartModules[$xoopsModule->getVar('dirname')] = $xoopsModule;
+
+				return $smartModules[$xoopsModule->getVar('dirname')];
+			}
+		}
+		if (!isset($smartModules[$moduleName])) {
+			if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
+				$smartModules[$moduleName] = $xoopsModule;
+			} else {
+				$hModule = xoops_getHandler('module');
+				if ('xoops' !== $moduleName) {
+					$smartModules[$moduleName] = $hModule->getByDirname($moduleName);
+				} else {
+					$smartModules[$moduleName] = $hModule->getByDirname('system');
+				}
+			}
+		}
+
+		return $smartModules[$moduleName];
+	}
+
+	/**
+	 * @param  bool $moduleName
+	 * @return bool
+	 */
+	public static function getModuleConfig($moduleName = false)
+	{
+		static $smartConfigs;
+		if (isset($smartConfigs[$moduleName])) {
+			$ret =& $smartConfigs[$moduleName];
+
+			return $ret;
+		}
+		global $xoopsModule, $xoopsModuleConfig;
+		if (!$moduleName) {
+			if (isset($xoopsModule) && is_object($xoopsModule)) {
+				$smartConfigs[$xoopsModule->getVar('dirname')] = $xoopsModuleConfig;
+
+				return $smartConfigs[$xoopsModule->getVar('dirname')];
+			}
+		}
+		// if we still did not found the xoopsModule, this is because there is none
+		if (!$moduleName) {
+			$ret = false;
+
+			return $ret;
+		}
+		if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == $moduleName) {
+			$smartConfigs[$moduleName] = $xoopsModuleConfig;
+		} else {
+			$module = static::getModuleInfo($moduleName);
+			if (!is_object($module)) {
+				$ret = false;
+
+				return $ret;
+			}
+			$hModConfig                = xoops_getHandler('config');
+			$smartConfigs[$moduleName] =& $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
+		}
+
+		return $smartConfigs[$moduleName];
+	}
+
+	/**
+	 * @param $dirname
+	 * @return bool
+	 */
+	public static function deleteFile($dirname)
+	{
+		// Simple delete for a file
+		if (is_file($dirname)) {
+			return unlink($dirname);
+		}
+	}
+
+	/**
+	 * @param  array $errors
+	 * @return string
+	 */
+	public static function formatErrors($errors = [])
+	{
+		$ret = '';
+		foreach ($errors as $key => $value) {
+			$ret .= '<br> - ' . $value;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * getLinkedUnameFromId()
+	 *
+	 * @param  integer $userid Userid of poster etc
+	 * @param  integer $name   :  0 Use Usenamer 1 Use realname
+	 * @param  array   $users
+	 * @param  bool    $withContact
+	 * @return string
+	 */
+	public static function getLinkedUnameFromId($userid = 0, $name = 0, $users = [], $withContact = false)
+	{
+		if (!is_numeric($userid)) {
+			return $userid;
+		}
+		$userid = (int)$userid;
+		if ($userid > 0) {
+			if ($users == []) {
+				//fetching users
+				$memberHandler = xoops_getHandler('member');
+				$user          =& $memberHandler->getUser($userid);
+			} else {
+				if (!isset($users[$userid])) {
+					return $GLOBALS['xoopsConfig']['anonymous'];
+				}
+				$user =& $users[$userid];
+			}
+			if (is_object($user)) {
+				$ts        = \MyTextSanitizer:: getInstance();
+				$username  = $user->getVar('uname');
+				$fullname  = '';
+				$fullname2 = $user->getVar('name');
+				if ($name && !empty($fullname2)) {
+					$fullname = $user->getVar('name');
+				}
+				if (!empty($fullname)) {
+					$linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
+				} else {
+					$linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
+				}
+				// add contact info: email + PM
+				if ($withContact) {
+					$linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"></a>';
+					$js         = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
+					$linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"></a>';
+				}
+
+				return $linkeduser;
+			}
+		}
+
+		return $GLOBALS['xoopsConfig']['anonymous'];
+	}
+
+	/**
+	 * @param int    $currentoption
+	 * @param string $breadcrumb
+	 * @param bool   $submenus
+	 * @param int    $currentsub
+	 */
+	public static function getAdminMenu($currentoption = 0, $breadcrumb = '', $submenus = false, $currentsub = -1)
+	{
+		global $xoopsModule, $xoopsConfig;
+		require_once XOOPS_ROOT_PATH . '/class/template.php';
+
+
+		/** @var Smartobject\Helper $helper */
+		$helper = Smartobject\Helper::getInstance();
+		$helper->loadLanguage('admin');
+		$helper->loadLanguage('modinfo');
+		$headermenu  = [];
+		$adminObject = [];
+		include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
+		$tpl = new \XoopsTpl();
+		$tpl->assign([
+						 'headermenu'      => $headermenu,
+						 'adminmenu'       => $adminObject,
+						 'current'         => $currentoption,
+						 'breadcrumb'      => $breadcrumb,
+						 'headermenucount' => count($headermenu),
+						 'submenus'        => $submenus,
+						 'currentsub'      => $currentsub,
+						 'submenuscount'   => count($submenus)
+					 ]);
+		$tpl->display('db:smartobject_admin_menu.tpl');
+	}
+
+	/**
+	 * @param string $id
+	 * @param string $title
+	 * @param string $dsc
+	 */
+	public static function getCollapsableBar($id = '', $title = '', $dsc = '')
+	{
+		global $xoopsModule;
+		echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
+		echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
+		echo "<div id='" . $id . "'>";
+		if ('' !== $dsc) {
+			echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . $dsc . '</span>';
+		}
+	}
+
+	/**
+	 * @param string $id
+	 * @param string $title
+	 * @param string $dsc
+	 */
+	public static function getAjaxCollapsableBar($id = '', $title = '', $dsc = '')
+	{
+		global $xoopsModule;
+		$onClick = "ajaxtogglecollapse('$id')";
+		//$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
+		echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
+		echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
+		echo "<div id='" . $id . "'>";
+		if ('' !== $dsc) {
+			echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . $dsc . '</span>';
+		}
+	}
+
+	/**
+	 * Ajax testing......
+	 * @param $name
+	 */
+	/*
      public static function getCollapsableBar($id = '', $title = '', $dsc='')
      {
     
@@ -717,22 +717,22 @@ 
      }
      }
      */
-    public static function opencloseCollapsable($name)
-    {
-        $urls        = static::getCurrentUrls();
-        $path        = $urls['phpself'];
-        $cookie_name = $path . '_smart_collaps_' . $name;
-        $cookie_name = str_replace('.', '_', $cookie_name);
-        $cookie      = static::getCookieVar($cookie_name, '');
-        if ('none' === $cookie) {
-            echo '
+	public static function opencloseCollapsable($name)
+	{
+		$urls        = static::getCurrentUrls();
+		$path        = $urls['phpself'];
+		$cookie_name = $path . '_smart_collaps_' . $name;
+		$cookie_name = str_replace('.', '_', $cookie_name);
+		$cookie      = static::getCookieVar($cookie_name, '');
+		if ('none' === $cookie) {
+			echo '
                 <script type="text/javascript"><!--
                 togglecollapse("' . $name . '"); toggleIcon("' . $name . '_icon");
                     //-->
                 </script>
                 ';
-        }
-        /*  if ($cookie == 'none') {
+		}
+		/*  if ($cookie == 'none') {
          echo '
          <script type="text/javascript"><!--
          hideElement("' . $name . '");
@@ -741,96 +741,96 @@ 
          ';
          }
          */
-    }
-
-    /**
-     * @param $name
-     */
-    public static function closeCollapsable($name)
-    {
-        echo '</div>';
-        static::opencloseCollapsable($name);
-        echo '<br>';
-    }
-
-    /**
-     * @param     $name
-     * @param     $value
-     * @param int $time
-     */
-    public static function setCookieVar($name, $value, $time = 0)
-    {
-        if (0 == $time) {
-            $time = time() + 3600 * 24 * 365;
-            //$time = '';
-        }
-        setcookie($name, $value, $time, '/');
-    }
-
-    /**
-     * @param         $name
-     * @param  string $default
-     * @return string
-     */
-    public static function getCookieVar($name, $default = '')
-    {
-        $name = str_replace('.', '_', $name);
-        if (isset($_COOKIE[$name]) && ($_COOKIE[$name] > '')) {
-            return $_COOKIE[$name];
-        } else {
-            return $default;
-        }
-    }
-
-    /**
-     * @return array
-     */
-    public static function getCurrentUrls()
-    {
-        $urls        = [];
-        $http        = (false === strpos(XOOPS_URL, 'https://')) ? 'http://' : 'https://';
-        $phpself     = $_SERVER['PHP_SELF'];
-        $httphost    = $_SERVER['HTTP_HOST'];
-        $querystring = $_SERVER['QUERY_STRING'];
-        if ('' !== $querystring) {
-            $querystring = '?' . $querystring;
-        }
-        $currenturl           = $http . $httphost . $phpself . $querystring;
-        $urls                 = [];
-        $urls['http']         = $http;
-        $urls['httphost']     = $httphost;
-        $urls['phpself']      = $phpself;
-        $urls['querystring']  = $querystring;
-        $urls['full_phpself'] = $http . $httphost . $phpself;
-        $urls['full']         = $currenturl;
-        $urls['isHomePage']   = (XOOPS_URL . '/index.php') == ($http . $httphost . $phpself);
-
-        return $urls;
-    }
-
-    /**
-     * @return mixed
-     */
-    public static function getCurrentPage()
-    {
-        $urls = static::getCurrentUrls();
-
-        return $urls['full'];
-    }
-
-    /**
-     * Create a title for the short_url field of an article
-     *
-     * @credit psylove
-     *
-     * @var    string $title   title of the article
-     * @var    string $withExt do we add an html extension or not
-     * @return string sort_url for the article
-     */
-    /**
-     * Moved in SmartMetaGenClass
-     */
-    /*
+	}
+
+	/**
+	 * @param $name
+	 */
+	public static function closeCollapsable($name)
+	{
+		echo '</div>';
+		static::opencloseCollapsable($name);
+		echo '<br>';
+	}
+
+	/**
+	 * @param     $name
+	 * @param     $value
+	 * @param int $time
+	 */
+	public static function setCookieVar($name, $value, $time = 0)
+	{
+		if (0 == $time) {
+			$time = time() + 3600 * 24 * 365;
+			//$time = '';
+		}
+		setcookie($name, $value, $time, '/');
+	}
+
+	/**
+	 * @param         $name
+	 * @param  string $default
+	 * @return string
+	 */
+	public static function getCookieVar($name, $default = '')
+	{
+		$name = str_replace('.', '_', $name);
+		if (isset($_COOKIE[$name]) && ($_COOKIE[$name] > '')) {
+			return $_COOKIE[$name];
+		} else {
+			return $default;
+		}
+	}
+
+	/**
+	 * @return array
+	 */
+	public static function getCurrentUrls()
+	{
+		$urls        = [];
+		$http        = (false === strpos(XOOPS_URL, 'https://')) ? 'http://' : 'https://';
+		$phpself     = $_SERVER['PHP_SELF'];
+		$httphost    = $_SERVER['HTTP_HOST'];
+		$querystring = $_SERVER['QUERY_STRING'];
+		if ('' !== $querystring) {
+			$querystring = '?' . $querystring;
+		}
+		$currenturl           = $http . $httphost . $phpself . $querystring;
+		$urls                 = [];
+		$urls['http']         = $http;
+		$urls['httphost']     = $httphost;
+		$urls['phpself']      = $phpself;
+		$urls['querystring']  = $querystring;
+		$urls['full_phpself'] = $http . $httphost . $phpself;
+		$urls['full']         = $currenturl;
+		$urls['isHomePage']   = (XOOPS_URL . '/index.php') == ($http . $httphost . $phpself);
+
+		return $urls;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public static function getCurrentPage()
+	{
+		$urls = static::getCurrentUrls();
+
+		return $urls['full'];
+	}
+
+	/**
+	 * Create a title for the short_url field of an article
+	 *
+	 * @credit psylove
+	 *
+	 * @var    string $title   title of the article
+	 * @var    string $withExt do we add an html extension or not
+	 * @return string sort_url for the article
+	 */
+	/**
+	 * Moved in SmartMetaGenClass
+	 */
+	/*
      public static function smart_seo_title($title='', $withExt=true)
      {
      // Transformation de la chaine en minuscule
@@ -876,468 +876,468 @@ 
      return '';
      }
      */
-    public static function getModFooter()
-    {
-        global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
-
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
-        $tpl = new \XoopsTpl();
-
-        $hModule      = xoops_getHandler('module');
-        $versioninfo  =& $hModule->get($xoopsModule->getVar('mid'));
-        $modfootertxt = 'Module ' . $versioninfo->getInfo('name') . ' - Version ' . $versioninfo->getInfo('version') . '';
-        $modfooter    = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/assets/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'></a>";
-        $tpl->assign('modfooter', $modfooter);
-
-        if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
-            define('_AM_SOBJECT_XOOPS_PRO', 'Do you need help with this module ?<br>Do you need new features not yet available?');
-        }
-        $smartobjectConfig = static::getModuleConfig('smartobject');
-        $tpl->assign('smartobject_enable_admin_footer', $smartobjectConfig['enable_admin_footer']);
-        $tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.tpl');
-    }
-
-    public static function getXoopsCpFooter()
-    {
-        static::getModFooter();
-        xoops_cp_footer();
-    }
-
-    /**
-     * @param $text
-     * @return mixed
-     */
-    public static function sanitizeForCommonTags($text)
-    {
-        global $xoopsConfig;
-        $text = str_replace('{X_SITENAME}', $xoopsConfig['sitename'], $text);
-        $text = str_replace('{X_ADMINMAIL}', $xoopsConfig['adminmail'], $text);
-
-        return $text;
-    }
-
-    /**
-     * @param $src
-     */
-    public static function addScript($src)
-    {
-        echo '<script src="' . $src . '" type="text/javascript"></script>';
-    }
-
-    /**
-     * @param $src
-     */
-    public static function addStyle($src)
-    {
-        if ('smartobject' === $src) {
-            $src = SMARTOBJECT_URL . 'assets/css/module.css';
-        }
-        echo static::getCssLink($src);
-    }
-
-    public static function addAdminAjaxSupport()
-    {
-        static::addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
-        static::addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
-        static::addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
-    }
-
-    /**
-     * @param $text
-     * @return mixed
-     */
-    public static function sanitizeForSmartpopupLink($text)
-    {
-        $patterns[]     = "/\[smartpopup=(['\"]?)([^\"'<>]*)\\1](.*)\[\/smartpopup\]/sU";
-        $replacements[] = "<a href=\"javascript:openWithSelfMain('\\2', 'smartpopup', 700, 519);\">\\3</a>";
-        $ret            = preg_replace($patterns, $replacements, $text);
-
-        return $ret;
-    }
-
-    /**
-     * Finds the width and height of an image (can also be a flash file)
-     *
-     * @credit phppp
-     *
-     * @var    string $url    path of the image file
-     * @var    string $width  reference to the width
-     * @var    string $height reference to the height
-     * @return bool   false if impossible to find dimension
-     */
-    public static function getImageSize($url, & $width, & $height)
-    {
-        if (empty($width) || empty($height)) {
-            if (!$dimension = @ getimagesize($url)) {
-                return false;
-            }
-            if (!empty($width)) {
-                $height = $dimension[1] * $width / $dimension[0];
-            } elseif (!empty($height)) {
-                $width = $dimension[0] * $height / $dimension[1];
-            } else {
-                list($width, $height) = [
-                    $dimension[0],
-                    $dimension[1]
-                ];
-            }
-
-            return true;
-        } else {
-            return true;
-        }
-    }
-
-    /**
-     * Convert characters to decimal values
-     *
-     * @author eric.wallet at yahoo.fr
-     * @link   http://ca.php.net/manual/en/function.htmlentities.php#69913
-     * @param $str
-     * @return mixed
-     */
-    public static function getHtmlnumericentities($str)
-    {
-        //    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
-        return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) {
-            return '&#' . ord($m[0]) . chr(59);
-        }, $str);
-    }
-
-    /**
-     * @param        $name
-     * @param  bool  $optional
-     * @return mixed
-     */
-    public static function getCoreHandler($name, $optional = false)
-    {
-        static $handlers;
-        $name = strtolower(trim($name));
-        if (!isset($handlers[$name])) {
-            if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
-                require_once $hnd_file;
-            }
-            $class = 'Xoops' . ucfirst($name) . 'Handler';
-            if (class_exists($class)) {
-                $handlers[$name] = new $class($GLOBALS['xoopsDB'], 'xoops');
-            }
-        }
-        if (!isset($handlers[$name]) && !$optional) {
-            trigger_error('Class <b>' . $class . '</b> does not exist<br>Handler Name: ' . $name, E_USER_ERROR);
-        }
-        if (isset($handlers[$name])) {
-            return $handlers[$name];
-        }
-        $inst = false;
-    }
-
-    /**
-     * @param $matches
-     * @return string
-     */
-    public static function sanitizeAdsenses_callback($matches)
-    {
-        global $smartobjectAdsenseHandler;
-        if (isset($smartobjectAdsenseHandler->objects[$matches[1]])) {
-            $adsenseObj = $smartobjectAdsenseHandler->objects[$matches[1]];
-            $ret        = $adsenseObj->render();
-
-            return $ret;
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * @param $text
-     * @return mixed
-     */
-    public static function sanitizeAdsenses($text)
-    {
-        $patterns     = [];
-        $replacements = [];
-
-        $patterns[] = "/\[adsense](.*)\[\/adsense\]/sU";
-        $text       = preg_replace_callback($patterns, 'Smartobject\Utility::sanitizeAdsenses_callback', $text);
-
-        return $text;
-    }
-
-    /**
-     * @param $matches
-     * @return string
-     */
-    public static function sanitizeCustomtags_callback($matches)
-    {
-        global $smartobjectCustomtagHandler;
-        if (isset($smartobjectCustomtagHandler->objects[$matches[1]])) {
-            $customObj = $smartobjectCustomtagHandler->objects[$matches[1]];
-            $ret       = $customObj->renderWithPhp();
-
-            return $ret;
-        } else {
-            return '';
-        }
-    }
-
-    /**
-     * @param $text
-     * @return mixed
-     */
-    public static function sanitizeCustomtags($text)
-    {
-        $patterns     = [];
-        $replacements = [];
-
-        $patterns[] = "/\[customtag](.*)\[\/customtag\]/sU";
-        $text       = preg_replace_callback($patterns, 'Smartobject\Utility::sanitizeCustomtags_callback', $text);
-
-        return $text;
-    }
-
-    /**
-     * @param $module
-     * @param $file
-     */
-    public static function loadLanguageFile($module, $file)
-    {
-        global $xoopsConfig;
-
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
-        if (!file_exists($filename)) {
-            $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
-        }
-        if (file_exists($filename)) {
-            require_once $filename;
-        }
-    }
-
-    public static function loadCommonLanguageFile()
-    {
-        static::loadLanguageFile('smartobject', 'common');
-    }
-
-    /**
-     * @param               $text
-     * @param  bool         $keyword
-     * @return mixed|string
-     */
-    public static function purifyText($text, $keyword = false)
-    {
-        global $myts;
-        $text = str_replace('&nbsp;', ' ', $text);
-        $text = str_replace('<br>', ' ', $text);
-        $text = str_replace('<br>', ' ', $text);
-        $text = str_replace('<br', ' ', $text);
-        $text = strip_tags($text);
-        $text = html_entity_decode($text);
-        $text = $myts->undoHtmlSpecialChars($text);
-        $text = str_replace(')', ' ', $text);
-        $text = str_replace('(', ' ', $text);
-        $text = str_replace(':', ' ', $text);
-        $text = str_replace('&euro', ' euro ', $text);
-        $text = str_replace('&hellip', '...', $text);
-        $text = str_replace('&rsquo', ' ', $text);
-        $text = str_replace('!', ' ', $text);
-        $text = str_replace('?', ' ', $text);
-        $text = str_replace('"', ' ', $text);
-        $text = str_replace('-', ' ', $text);
-        $text = str_replace('\n', ' ', $text);
-        $text = str_replace('&#8213;', ' ', $text);
-
-        if ($keyword) {
-            $text = str_replace('.', ' ', $text);
-            $text = str_replace(',', ' ', $text);
-            $text = str_replace('\'', ' ', $text);
-        }
-        $text = str_replace(';', ' ', $text);
-
-        return $text;
-    }
-
-    /**
-     * @param $document
-     * @return mixed
-     */
-    public static function getHtml2text($document)
-    {
-        // PHP Manual:: function preg_replace
-        // $document should contain an HTML document.
-        // This will remove HTML tags, javascript sections
-        // and white space. It will also convert some
-        // common HTML entities to their text equivalent.
-        // Credits: newbb2
-        $search = [
-            "'<script[^>]*?>.*?</script>'si", // Strip out javascript
-            "'<img.*?>'si", // Strip out img tags
-            "'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags
-            "'([\r\n])[\s]+'", // Strip out white space
-            "'&(quot|#34);'i", // Replace HTML entities
-            "'&(amp|#38);'i",
-            "'&(lt|#60);'i",
-            "'&(gt|#62);'i",
-            "'&(nbsp|#160);'i",
-            "'&(iexcl|#161);'i",
-            "'&(cent|#162);'i",
-            "'&(pound|#163);'i",
-            "'&(copy|#169);'i"
-        ]; // evaluate as php
-
-        $replace = [
-            '',
-            '',
-            '',
-            "\\1",
-            '"',
-            '&',
-            '<',
-            '>',
-            ' ',
-            chr(161),
-            chr(162),
-            chr(163),
-            chr(169),
-        ];
-
-        $text = preg_replace($search, $replace, $document);
-
-        preg_replace_callback('/&#(\d+);/', function ($matches) {
-            return chr($matches[1]);
-        }, $document);
-
-        return $text;
-    }
-
-    /**
-     * @author pillepop2003 at yahoo dot de
-     *
-     * Use this snippet to extract any float out of a string. You can choose how a single dot is treated with the (bool) 'single_dot_as_decimal' directive.
-     * This function should be able to cover almost all floats that appear in an european environment.
-     * @param            $str
-     * @param  bool      $set
-     * @return float|int
-     */
-    public static function getFloat($str, $set = false)
-    {
-        if (preg_match("/([0-9\.,-]+)/", $str, $match)) {
-            // Found number in $str, so set $str that number
-            $str = $match[0];
-            if (false !== strpos($str, ',')) {
-                // A comma exists, that makes it easy, cos we assume it separates the decimal part.
-                $str = str_replace('.', '', $str);    // Erase thousand seps
-                $str = str_replace(',', '.', $str);    // Convert , to . for floatval command
-
-                return (float)$str;
-            } else {
-                // No comma exists, so we have to decide, how a single dot shall be treated
-                if (true === preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) && true === $set['single_dot_as_decimal']) {
-                    // Treat single dot as decimal separator
-                    return (float)$str;
-                } else {
-                    //echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br><br> ";
-                    // Else, treat all dots as thousand seps
-                    $str = str_replace('.', '', $str);    // Erase thousand seps
-
-                    return (float)$str;
-                }
-            }
-        } else {
-            // No number found, return zero
-            return 0;
-        }
-    }
-
-    /**
-     * @param                         $var
-     * @param  bool                   $currencyObj
-     * @return float|int|mixed|string
-     */
-    public static function getCurrency($var, $currencyObj = false)
-    {
-        $ret = static::getFloat($var, ['single_dot_as_decimal' => true]);
-        $ret = round($ret, 2);
-        // make sur we have at least .00 in the $var
-        $decimal_section_original = strstr($ret, '.');
-        $decimal_section          = $decimal_section_original;
-        if ($decimal_section) {
-            if (1 == strlen($decimal_section)) {
-                $decimal_section = '.00';
-            } elseif (2 == strlen($decimal_section)) {
-                $decimal_section .= '0';
-            }
-            $ret = str_replace($decimal_section_original, $decimal_section, $ret);
-        } else {
-            $ret .= '.00';
-        }
-        if ($currencyObj) {
-            $ret = $ret . ' ' . $currencyObj->getCode();
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param $var
-     * @return float|int|mixed|string
-     */
-    public static function float($var)
-    {
-        return static::getCurrency($var);
-    }
-
-    /**
-     * @param  bool $moduleName
-     * @return string
-     */
-    public static function getModuleAdminLink($moduleName = false)
-    {
-        global $xoopsModule;
-        if (!$moduleName && (isset($xoopsModule) && is_object($xoopsModule))) {
-            $moduleName = $xoopsModule->getVar('dirname');
-        }
-        $ret = '';
-        if ($moduleName) {
-            $ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . '</a>';
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @return array|bool
-     */
-    public static function getEditors()
-    {
-        $filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
-        if (!file_exists($filename)) {
-            return false;
-        }
-        require_once $filename;
-        $xoopseditorHandler = \XoopsEditorHandler::getInstance();
-        $aList              = $xoopseditorHandler->getList();
-        $ret                = [];
-        foreach ($aList as $k => $v) {
-            $ret[$v] = $k;
-        }
-
-        return $ret;
-    }
-
-    /**
-     * @param $moduleName
-     * @param $items
-     * @return array
-     */
-    public static function getTablesArray($moduleName, $items)
-    {
-        $ret = [];
-        foreach ($items as $item) {
-            $ret[] = $moduleName . '_' . $item;
-        }
-        $ret[] = $moduleName . '_meta';
-
-        return $ret;
-    }
+	public static function getModFooter()
+	{
+		global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
+
+		require_once XOOPS_ROOT_PATH . '/class/template.php';
+		$tpl = new \XoopsTpl();
+
+		$hModule      = xoops_getHandler('module');
+		$versioninfo  =& $hModule->get($xoopsModule->getVar('mid'));
+		$modfootertxt = 'Module ' . $versioninfo->getInfo('name') . ' - Version ' . $versioninfo->getInfo('version') . '';
+		$modfooter    = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/assets/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'></a>";
+		$tpl->assign('modfooter', $modfooter);
+
+		if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
+			define('_AM_SOBJECT_XOOPS_PRO', 'Do you need help with this module ?<br>Do you need new features not yet available?');
+		}
+		$smartobjectConfig = static::getModuleConfig('smartobject');
+		$tpl->assign('smartobject_enable_admin_footer', $smartobjectConfig['enable_admin_footer']);
+		$tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.tpl');
+	}
+
+	public static function getXoopsCpFooter()
+	{
+		static::getModFooter();
+		xoops_cp_footer();
+	}
+
+	/**
+	 * @param $text
+	 * @return mixed
+	 */
+	public static function sanitizeForCommonTags($text)
+	{
+		global $xoopsConfig;
+		$text = str_replace('{X_SITENAME}', $xoopsConfig['sitename'], $text);
+		$text = str_replace('{X_ADMINMAIL}', $xoopsConfig['adminmail'], $text);
+
+		return $text;
+	}
+
+	/**
+	 * @param $src
+	 */
+	public static function addScript($src)
+	{
+		echo '<script src="' . $src . '" type="text/javascript"></script>';
+	}
+
+	/**
+	 * @param $src
+	 */
+	public static function addStyle($src)
+	{
+		if ('smartobject' === $src) {
+			$src = SMARTOBJECT_URL . 'assets/css/module.css';
+		}
+		echo static::getCssLink($src);
+	}
+
+	public static function addAdminAjaxSupport()
+	{
+		static::addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
+		static::addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
+		static::addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
+	}
+
+	/**
+	 * @param $text
+	 * @return mixed
+	 */
+	public static function sanitizeForSmartpopupLink($text)
+	{
+		$patterns[]     = "/\[smartpopup=(['\"]?)([^\"'<>]*)\\1](.*)\[\/smartpopup\]/sU";
+		$replacements[] = "<a href=\"javascript:openWithSelfMain('\\2', 'smartpopup', 700, 519);\">\\3</a>";
+		$ret            = preg_replace($patterns, $replacements, $text);
+
+		return $ret;
+	}
+
+	/**
+	 * Finds the width and height of an image (can also be a flash file)
+	 *
+	 * @credit phppp
+	 *
+	 * @var    string $url    path of the image file
+	 * @var    string $width  reference to the width
+	 * @var    string $height reference to the height
+	 * @return bool   false if impossible to find dimension
+	 */
+	public static function getImageSize($url, & $width, & $height)
+	{
+		if (empty($width) || empty($height)) {
+			if (!$dimension = @ getimagesize($url)) {
+				return false;
+			}
+			if (!empty($width)) {
+				$height = $dimension[1] * $width / $dimension[0];
+			} elseif (!empty($height)) {
+				$width = $dimension[0] * $height / $dimension[1];
+			} else {
+				list($width, $height) = [
+					$dimension[0],
+					$dimension[1]
+				];
+			}
+
+			return true;
+		} else {
+			return true;
+		}
+	}
+
+	/**
+	 * Convert characters to decimal values
+	 *
+	 * @author eric.wallet at yahoo.fr
+	 * @link   http://ca.php.net/manual/en/function.htmlentities.php#69913
+	 * @param $str
+	 * @return mixed
+	 */
+	public static function getHtmlnumericentities($str)
+	{
+		//    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
+		return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) {
+			return '&#' . ord($m[0]) . chr(59);
+		}, $str);
+	}
+
+	/**
+	 * @param        $name
+	 * @param  bool  $optional
+	 * @return mixed
+	 */
+	public static function getCoreHandler($name, $optional = false)
+	{
+		static $handlers;
+		$name = strtolower(trim($name));
+		if (!isset($handlers[$name])) {
+			if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
+				require_once $hnd_file;
+			}
+			$class = 'Xoops' . ucfirst($name) . 'Handler';
+			if (class_exists($class)) {
+				$handlers[$name] = new $class($GLOBALS['xoopsDB'], 'xoops');
+			}
+		}
+		if (!isset($handlers[$name]) && !$optional) {
+			trigger_error('Class <b>' . $class . '</b> does not exist<br>Handler Name: ' . $name, E_USER_ERROR);
+		}
+		if (isset($handlers[$name])) {
+			return $handlers[$name];
+		}
+		$inst = false;
+	}
+
+	/**
+	 * @param $matches
+	 * @return string
+	 */
+	public static function sanitizeAdsenses_callback($matches)
+	{
+		global $smartobjectAdsenseHandler;
+		if (isset($smartobjectAdsenseHandler->objects[$matches[1]])) {
+			$adsenseObj = $smartobjectAdsenseHandler->objects[$matches[1]];
+			$ret        = $adsenseObj->render();
+
+			return $ret;
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * @param $text
+	 * @return mixed
+	 */
+	public static function sanitizeAdsenses($text)
+	{
+		$patterns     = [];
+		$replacements = [];
+
+		$patterns[] = "/\[adsense](.*)\[\/adsense\]/sU";
+		$text       = preg_replace_callback($patterns, 'Smartobject\Utility::sanitizeAdsenses_callback', $text);
+
+		return $text;
+	}
+
+	/**
+	 * @param $matches
+	 * @return string
+	 */
+	public static function sanitizeCustomtags_callback($matches)
+	{
+		global $smartobjectCustomtagHandler;
+		if (isset($smartobjectCustomtagHandler->objects[$matches[1]])) {
+			$customObj = $smartobjectCustomtagHandler->objects[$matches[1]];
+			$ret       = $customObj->renderWithPhp();
+
+			return $ret;
+		} else {
+			return '';
+		}
+	}
+
+	/**
+	 * @param $text
+	 * @return mixed
+	 */
+	public static function sanitizeCustomtags($text)
+	{
+		$patterns     = [];
+		$replacements = [];
+
+		$patterns[] = "/\[customtag](.*)\[\/customtag\]/sU";
+		$text       = preg_replace_callback($patterns, 'Smartobject\Utility::sanitizeCustomtags_callback', $text);
+
+		return $text;
+	}
+
+	/**
+	 * @param $module
+	 * @param $file
+	 */
+	public static function loadLanguageFile($module, $file)
+	{
+		global $xoopsConfig;
+
+		$filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
+		if (!file_exists($filename)) {
+			$filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
+		}
+		if (file_exists($filename)) {
+			require_once $filename;
+		}
+	}
+
+	public static function loadCommonLanguageFile()
+	{
+		static::loadLanguageFile('smartobject', 'common');
+	}
+
+	/**
+	 * @param               $text
+	 * @param  bool         $keyword
+	 * @return mixed|string
+	 */
+	public static function purifyText($text, $keyword = false)
+	{
+		global $myts;
+		$text = str_replace('&nbsp;', ' ', $text);
+		$text = str_replace('<br>', ' ', $text);
+		$text = str_replace('<br>', ' ', $text);
+		$text = str_replace('<br', ' ', $text);
+		$text = strip_tags($text);
+		$text = html_entity_decode($text);
+		$text = $myts->undoHtmlSpecialChars($text);
+		$text = str_replace(')', ' ', $text);
+		$text = str_replace('(', ' ', $text);
+		$text = str_replace(':', ' ', $text);
+		$text = str_replace('&euro', ' euro ', $text);
+		$text = str_replace('&hellip', '...', $text);
+		$text = str_replace('&rsquo', ' ', $text);
+		$text = str_replace('!', ' ', $text);
+		$text = str_replace('?', ' ', $text);
+		$text = str_replace('"', ' ', $text);
+		$text = str_replace('-', ' ', $text);
+		$text = str_replace('\n', ' ', $text);
+		$text = str_replace('&#8213;', ' ', $text);
+
+		if ($keyword) {
+			$text = str_replace('.', ' ', $text);
+			$text = str_replace(',', ' ', $text);
+			$text = str_replace('\'', ' ', $text);
+		}
+		$text = str_replace(';', ' ', $text);
+
+		return $text;
+	}
+
+	/**
+	 * @param $document
+	 * @return mixed
+	 */
+	public static function getHtml2text($document)
+	{
+		// PHP Manual:: function preg_replace
+		// $document should contain an HTML document.
+		// This will remove HTML tags, javascript sections
+		// and white space. It will also convert some
+		// common HTML entities to their text equivalent.
+		// Credits: newbb2
+		$search = [
+			"'<script[^>]*?>.*?</script>'si", // Strip out javascript
+			"'<img.*?>'si", // Strip out img tags
+			"'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags
+			"'([\r\n])[\s]+'", // Strip out white space
+			"'&(quot|#34);'i", // Replace HTML entities
+			"'&(amp|#38);'i",
+			"'&(lt|#60);'i",
+			"'&(gt|#62);'i",
+			"'&(nbsp|#160);'i",
+			"'&(iexcl|#161);'i",
+			"'&(cent|#162);'i",
+			"'&(pound|#163);'i",
+			"'&(copy|#169);'i"
+		]; // evaluate as php
+
+		$replace = [
+			'',
+			'',
+			'',
+			"\\1",
+			'"',
+			'&',
+			'<',
+			'>',
+			' ',
+			chr(161),
+			chr(162),
+			chr(163),
+			chr(169),
+		];
+
+		$text = preg_replace($search, $replace, $document);
+
+		preg_replace_callback('/&#(\d+);/', function ($matches) {
+			return chr($matches[1]);
+		}, $document);
+
+		return $text;
+	}
+
+	/**
+	 * @author pillepop2003 at yahoo dot de
+	 *
+	 * Use this snippet to extract any float out of a string. You can choose how a single dot is treated with the (bool) 'single_dot_as_decimal' directive.
+	 * This function should be able to cover almost all floats that appear in an european environment.
+	 * @param            $str
+	 * @param  bool      $set
+	 * @return float|int
+	 */
+	public static function getFloat($str, $set = false)
+	{
+		if (preg_match("/([0-9\.,-]+)/", $str, $match)) {
+			// Found number in $str, so set $str that number
+			$str = $match[0];
+			if (false !== strpos($str, ',')) {
+				// A comma exists, that makes it easy, cos we assume it separates the decimal part.
+				$str = str_replace('.', '', $str);    // Erase thousand seps
+				$str = str_replace(',', '.', $str);    // Convert , to . for floatval command
+
+				return (float)$str;
+			} else {
+				// No comma exists, so we have to decide, how a single dot shall be treated
+				if (true === preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) && true === $set['single_dot_as_decimal']) {
+					// Treat single dot as decimal separator
+					return (float)$str;
+				} else {
+					//echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br><br> ";
+					// Else, treat all dots as thousand seps
+					$str = str_replace('.', '', $str);    // Erase thousand seps
+
+					return (float)$str;
+				}
+			}
+		} else {
+			// No number found, return zero
+			return 0;
+		}
+	}
+
+	/**
+	 * @param                         $var
+	 * @param  bool                   $currencyObj
+	 * @return float|int|mixed|string
+	 */
+	public static function getCurrency($var, $currencyObj = false)
+	{
+		$ret = static::getFloat($var, ['single_dot_as_decimal' => true]);
+		$ret = round($ret, 2);
+		// make sur we have at least .00 in the $var
+		$decimal_section_original = strstr($ret, '.');
+		$decimal_section          = $decimal_section_original;
+		if ($decimal_section) {
+			if (1 == strlen($decimal_section)) {
+				$decimal_section = '.00';
+			} elseif (2 == strlen($decimal_section)) {
+				$decimal_section .= '0';
+			}
+			$ret = str_replace($decimal_section_original, $decimal_section, $ret);
+		} else {
+			$ret .= '.00';
+		}
+		if ($currencyObj) {
+			$ret = $ret . ' ' . $currencyObj->getCode();
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param $var
+	 * @return float|int|mixed|string
+	 */
+	public static function float($var)
+	{
+		return static::getCurrency($var);
+	}
+
+	/**
+	 * @param  bool $moduleName
+	 * @return string
+	 */
+	public static function getModuleAdminLink($moduleName = false)
+	{
+		global $xoopsModule;
+		if (!$moduleName && (isset($xoopsModule) && is_object($xoopsModule))) {
+			$moduleName = $xoopsModule->getVar('dirname');
+		}
+		$ret = '';
+		if ($moduleName) {
+			$ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . '</a>';
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @return array|bool
+	 */
+	public static function getEditors()
+	{
+		$filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
+		if (!file_exists($filename)) {
+			return false;
+		}
+		require_once $filename;
+		$xoopseditorHandler = \XoopsEditorHandler::getInstance();
+		$aList              = $xoopseditorHandler->getList();
+		$ret                = [];
+		foreach ($aList as $k => $v) {
+			$ret[$v] = $k;
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * @param $moduleName
+	 * @param $items
+	 * @return array
+	 */
+	public static function getTablesArray($moduleName, $items)
+	{
+		$ret = [];
+		foreach ($items as $item) {
+			$ret[] = $moduleName . '_' . $item;
+		}
+		$ret[] = $moduleName . '_meta';
+
+		return $ret;
+	}
     
     
 }

Spacing +66 added lines, -66 removed lines

@@ -25,7 +25,7 @@ 
      */
     public static function getCssLink($cssfile)
     {
-        $ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '">';
+        $ret = '<link rel="stylesheet" type="text/css" href="'.$cssfile.'">';
 
         return $ret;
     }
@@ -116,14 +116,14 @@ 
             $seoMode = static::getModuleModeSEO($moduleName);
             if ('rewrite' === $seoMode) {
                 $seoModuleName = static::getModuleNameForSEO($moduleName);
-                $ret           = XOOPS_URL . '/' . $seoModuleName . '/';
+                $ret           = XOOPS_URL.'/'.$seoModuleName.'/';
             } elseif ('pathinfo' === $seoMode) {
-                $ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
+                $ret = XOOPS_URL.'/modules/'.$moduleName.'/seo.php/'.$seoModuleName.'/';
             } else {
-                $ret = XOOPS_URL . '/modules/' . $moduleName . '/';
+                $ret = XOOPS_URL.'/modules/'.$moduleName.'/';
             }
 
-            return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
+            return '<a href="'.$ret.'">'.$smartModule->getVar('name').'</a>';
         }
     }
 
@@ -225,7 +225,7 @@ 
         //Verifies that a MySQL table exists
         $xoopsDB  = \XoopsDatabaseFactory::getDatabaseConnection();
         $realname = $xoopsDB->prefix($table);
-        $sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
+        $sql      = 'SHOW TABLES FROM '.XOOPS_DB_NAME;
         $ret      = $xoopsDB->queryF($sql);
         while (false !== (list($m_table) = $xoopsDB->fetchRow($ret))) {
             if ($m_table == $realname) {
@@ -254,7 +254,7 @@ 
             $moduleName = static::getCurrentModuleName();
         }
         $xoopsDB = \XoopsDatabaseFactory::getDatabaseConnection();
-        $sql     = sprintf('SELECT metavalue FROM `%s` WHERE metakey=%s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
+        $sql     = sprintf('SELECT metavalue FROM `%s` WHERE metakey=%s', $xoopsDB->prefix($moduleName.'_meta'), $xoopsDB->quoteString($key));
         $ret     = $xoopsDB->query($sql);
         if (!$ret) {
             $value = false;
@@ -297,9 +297,9 @@ 
         $xoopsDB = \XoopsDatabaseFactory::getDatabaseConnection();
         $ret     = static::getMeta($key, $moduleName);
         if ('0' === $ret || $ret > 0) {
-            $sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
+            $sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName.'_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
         } else {
-            $sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
+            $sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName.'_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
         }
         $ret = $xoopsDB->queryF($sql);
         if (!$ret) {
@@ -479,7 +479,7 @@ 
     {
         static $smartModules;
         if (isset($smartModules[$moduleName])) {
-            $ret =& $smartModules[$moduleName];
+            $ret = & $smartModules[$moduleName];
 
             return $ret;
         }
@@ -515,7 +515,7 @@ 
     {
         static $smartConfigs;
         if (isset($smartConfigs[$moduleName])) {
-            $ret =& $smartConfigs[$moduleName];
+            $ret = & $smartConfigs[$moduleName];
 
             return $ret;
         }
@@ -543,7 +543,7 @@ 
                 return $ret;
             }
             $hModConfig                = xoops_getHandler('config');
-            $smartConfigs[$moduleName] =& $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
+            $smartConfigs[$moduleName] = & $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
         }
 
         return $smartConfigs[$moduleName];
@@ -569,7 +569,7 @@ 
     {
         $ret = '';
         foreach ($errors as $key => $value) {
-            $ret .= '<br> - ' . $value;
+            $ret .= '<br> - '.$value;
         }
 
         return $ret;
@@ -589,17 +589,17 @@ 
         if (!is_numeric($userid)) {
             return $userid;
         }
-        $userid = (int)$userid;
+        $userid = (int) $userid;
         if ($userid > 0) {
             if ($users == []) {
                 //fetching users
                 $memberHandler = xoops_getHandler('member');
-                $user          =& $memberHandler->getUser($userid);
+                $user          = & $memberHandler->getUser($userid);
             } else {
                 if (!isset($users[$userid])) {
                     return $GLOBALS['xoopsConfig']['anonymous'];
                 }
-                $user =& $users[$userid];
+                $user = & $users[$userid];
             }
             if (is_object($user)) {
                 $ts        = \MyTextSanitizer:: getInstance();
@@ -610,15 +610,15 @@ 
                     $fullname = $user->getVar('name');
                 }
                 if (!empty($fullname)) {
-                    $linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
+                    $linkeduser = "$fullname [<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".$ts->htmlSpecialChars($username).'</a>]';
                 } else {
-                    $linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
+                    $linkeduser = "<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".ucwords($ts->htmlSpecialChars($username)).'</a>';
                 }
                 // add contact info: email + PM
                 if ($withContact) {
-                    $linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"></a>';
-                    $js         = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
-                    $linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"></a>';
+                    $linkeduser .= ' <a href="mailto:'.$user->getVar('email').'"><img style="vertical-align: middle;" src="'.XOOPS_URL.'/images/icons/email.gif'.'" alt="'._CO_SOBJECT_SEND_EMAIL.'" title="'._CO_SOBJECT_SEND_EMAIL.'"></a>';
+                    $js = "javascript:openWithSelfMain('".XOOPS_URL.'/pmlite.php?send2=1&to_userid='.$userid."', 'pmlite',450,370);";
+                    $linkeduser .= ' <a href="'.$js.'"><img style="vertical-align: middle;" src="'.XOOPS_URL.'/images/icons/pm.gif'.'" alt="'._CO_SOBJECT_SEND_PM.'" title="'._CO_SOBJECT_SEND_PM.'"></a>';
                 }
 
                 return $linkeduser;
@@ -637,7 +637,7 @@ 
     public static function getAdminMenu($currentoption = 0, $breadcrumb = '', $submenus = false, $currentsub = -1)
     {
         global $xoopsModule, $xoopsConfig;
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
 
 
         /** @var Smartobject\Helper $helper */
@@ -646,7 +646,7 @@ 
         $helper->loadLanguage('modinfo');
         $headermenu  = [];
         $adminObject = [];
-        include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
+        include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/admin/menu.php';
         $tpl = new \XoopsTpl();
         $tpl->assign([
                          'headermenu'      => $headermenu,
@@ -669,11 +669,11 @@ 
     public static function getCollapsableBar($id = '', $title = '', $dsc = '')
     {
         global $xoopsModule;
-        echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
-        echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
-        echo "<div id='" . $id . "'>";
+        echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('".$id."'); toggleIcon('".$id."_icon')\";>";
+        echo "<img id='".$id."_icon' src=".SMARTOBJECT_URL."assets/images/close12.gif alt=''></a>&nbsp;".$title.'</h3>';
+        echo "<div id='".$id."'>";
         if ('' !== $dsc) {
-            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . $dsc . '</span>';
+            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.$dsc.'</span>';
         }
     }
 
@@ -687,11 +687,11 @@ 
         global $xoopsModule;
         $onClick = "ajaxtogglecollapse('$id')";
         //$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
-        echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
-        echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
-        echo "<div id='" . $id . "'>";
+        echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="'.$onClick.'">';
+        echo "<img id='".$id."_icon' src=".SMARTOBJECT_URL."assets/images/close12.gif alt=''></a>&nbsp;".$title.'</h3>';
+        echo "<div id='".$id."'>";
         if ('' !== $dsc) {
-            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . $dsc . '</span>';
+            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.$dsc.'</span>';
         }
     }
 
@@ -721,13 +721,13 @@ 
     {
         $urls        = static::getCurrentUrls();
         $path        = $urls['phpself'];
-        $cookie_name = $path . '_smart_collaps_' . $name;
+        $cookie_name = $path.'_smart_collaps_'.$name;
         $cookie_name = str_replace('.', '_', $cookie_name);
         $cookie      = static::getCookieVar($cookie_name, '');
         if ('none' === $cookie) {
             echo '
                 <script type="text/javascript"><!--
-                togglecollapse("' . $name . '"); toggleIcon("' . $name . '_icon");
+                togglecollapse("' . $name.'"); toggleIcon("'.$name.'_icon");
                     //-->
                 </script>
                 ';
@@ -793,17 +793,17 @@ 
         $httphost    = $_SERVER['HTTP_HOST'];
         $querystring = $_SERVER['QUERY_STRING'];
         if ('' !== $querystring) {
-            $querystring = '?' . $querystring;
+            $querystring = '?'.$querystring;
         }
-        $currenturl           = $http . $httphost . $phpself . $querystring;
+        $currenturl           = $http.$httphost.$phpself.$querystring;
         $urls                 = [];
         $urls['http']         = $http;
         $urls['httphost']     = $httphost;
         $urls['phpself']      = $phpself;
         $urls['querystring']  = $querystring;
-        $urls['full_phpself'] = $http . $httphost . $phpself;
+        $urls['full_phpself'] = $http.$httphost.$phpself;
         $urls['full']         = $currenturl;
-        $urls['isHomePage']   = (XOOPS_URL . '/index.php') == ($http . $httphost . $phpself);
+        $urls['isHomePage']   = (XOOPS_URL.'/index.php') == ($http.$httphost.$phpself);
 
         return $urls;
     }
@@ -880,13 +880,13 @@ 
     {
         global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
 
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
         $tpl = new \XoopsTpl();
 
         $hModule      = xoops_getHandler('module');
-        $versioninfo  =& $hModule->get($xoopsModule->getVar('mid'));
-        $modfootertxt = 'Module ' . $versioninfo->getInfo('name') . ' - Version ' . $versioninfo->getInfo('version') . '';
-        $modfooter    = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/assets/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'></a>";
+        $versioninfo  = & $hModule->get($xoopsModule->getVar('mid'));
+        $modfootertxt = 'Module '.$versioninfo->getInfo('name').' - Version '.$versioninfo->getInfo('version').'';
+        $modfooter    = "<a href='".$versioninfo->getInfo('support_site_url')."' target='_blank'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/assets/images/cssbutton.gif' title='".$modfootertxt."' alt='".$modfootertxt."'></a>";
         $tpl->assign('modfooter', $modfooter);
 
         if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
@@ -894,7 +894,7 @@ 
         }
         $smartobjectConfig = static::getModuleConfig('smartobject');
         $tpl->assign('smartobject_enable_admin_footer', $smartobjectConfig['enable_admin_footer']);
-        $tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.tpl');
+        $tpl->display(SMARTOBJECT_ROOT_PATH.'templates/smartobject_admin_footer.tpl');
     }
 
     public static function getXoopsCpFooter()
@@ -921,7 +921,7 @@ 
      */
     public static function addScript($src)
     {
-        echo '<script src="' . $src . '" type="text/javascript"></script>';
+        echo '<script src="'.$src.'" type="text/javascript"></script>';
     }
 
     /**
@@ -930,16 +930,16 @@ 
     public static function addStyle($src)
     {
         if ('smartobject' === $src) {
-            $src = SMARTOBJECT_URL . 'assets/css/module.css';
+            $src = SMARTOBJECT_URL.'assets/css/module.css';
         }
         echo static::getCssLink($src);
     }
 
     public static function addAdminAjaxSupport()
     {
-        static::addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
-        static::addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
-        static::addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
+        static::addScript(SMARTOBJECT_URL.'include/scriptaculous/lib/prototype.js');
+        static::addScript(SMARTOBJECT_URL.'include/scriptaculous/src/scriptaculous.js');
+        static::addScript(SMARTOBJECT_URL.'include/scriptaculous/src/smart.js');
     }
 
     /**
@@ -999,8 +999,8 @@ 
     public static function getHtmlnumericentities($str)
     {
         //    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
-        return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) {
-            return '&#' . ord($m[0]) . chr(59);
+        return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function($m) {
+            return '&#'.ord($m[0]).chr(59);
         }, $str);
     }
 
@@ -1014,16 +1014,16 @@ 
         static $handlers;
         $name = strtolower(trim($name));
         if (!isset($handlers[$name])) {
-            if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
+            if (file_exists($hnd_file = XOOPS_ROOT_PATH.'/kernel/'.$name.'.php')) {
                 require_once $hnd_file;
             }
-            $class = 'Xoops' . ucfirst($name) . 'Handler';
+            $class = 'Xoops'.ucfirst($name).'Handler';
             if (class_exists($class)) {
                 $handlers[$name] = new $class($GLOBALS['xoopsDB'], 'xoops');
             }
         }
         if (!isset($handlers[$name]) && !$optional) {
-            trigger_error('Class <b>' . $class . '</b> does not exist<br>Handler Name: ' . $name, E_USER_ERROR);
+            trigger_error('Class <b>'.$class.'</b> does not exist<br>Handler Name: '.$name, E_USER_ERROR);
         }
         if (isset($handlers[$name])) {
             return $handlers[$name];
@@ -1103,9 +1103,9 @@ 
     {
         global $xoopsConfig;
 
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
+        $filename = XOOPS_ROOT_PATH.'/modules/'.$module.'/language/'.$xoopsConfig['language'].'/'.$file.'.php';
         if (!file_exists($filename)) {
-            $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
+            $filename = XOOPS_ROOT_PATH.'/modules/'.$module.'/language/english/'.$file.'.php';
         }
         if (file_exists($filename)) {
             require_once $filename;
@@ -1201,7 +1201,7 @@ 
 
         $text = preg_replace($search, $replace, $document);
 
-        preg_replace_callback('/&#(\d+);/', function ($matches) {
+        preg_replace_callback('/&#(\d+);/', function($matches) {
             return chr($matches[1]);
         }, $document);
 
@@ -1224,21 +1224,21 @@ 
             $str = $match[0];
             if (false !== strpos($str, ',')) {
                 // A comma exists, that makes it easy, cos we assume it separates the decimal part.
-                $str = str_replace('.', '', $str);    // Erase thousand seps
-                $str = str_replace(',', '.', $str);    // Convert , to . for floatval command
+                $str = str_replace('.', '', $str); // Erase thousand seps
+                $str = str_replace(',', '.', $str); // Convert , to . for floatval command
 
-                return (float)$str;
+                return (float) $str;
             } else {
                 // No comma exists, so we have to decide, how a single dot shall be treated
                 if (true === preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) && true === $set['single_dot_as_decimal']) {
                     // Treat single dot as decimal separator
-                    return (float)$str;
+                    return (float) $str;
                 } else {
                     //echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br><br> ";
                     // Else, treat all dots as thousand seps
-                    $str = str_replace('.', '', $str);    // Erase thousand seps
+                    $str = str_replace('.', '', $str); // Erase thousand seps
 
-                    return (float)$str;
+                    return (float) $str;
                 }
             }
         } else {
@@ -1270,7 +1270,7 @@ 
             $ret .= '.00';
         }
         if ($currencyObj) {
-            $ret = $ret . ' ' . $currencyObj->getCode();
+            $ret = $ret.' '.$currencyObj->getCode();
         }
 
         return $ret;
@@ -1297,7 +1297,7 @@ 
         }
         $ret = '';
         if ($moduleName) {
-            $ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . '</a>';
+            $ret = "<a href='".XOOPS_URL."/modules/$moduleName/admin/index.php'>"._CO_SOBJECT_ADMIN_PAGE.'</a>';
         }
 
         return $ret;
@@ -1308,7 +1308,7 @@ 
      */
     public static function getEditors()
     {
-        $filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
+        $filename = XOOPS_ROOT_PATH.'/class/xoopseditor/xoopseditor.php';
         if (!file_exists($filename)) {
             return false;
         }
@@ -1332,9 +1332,9 @@ 
     {
         $ret = [];
         foreach ($items as $item) {
-            $ret[] = $moduleName . '_' . $item;
+            $ret[] = $moduleName.'_'.$item;
         }
-        $ret[] = $moduleName . '_meta';
+        $ret[] = $moduleName.'_meta';
 
         return $ret;
     }

sendlink.php

Indentation +74 added lines, -74 removed lines

@@ -28,82 +28,82 @@
 $op = isset($_POST['op']) ? $_POST['op'] : '';
 
 switch ($op) {
-    case 'sendlink':
+	case 'sendlink':
 
 //        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new XoopsModules\Smartobject\ObjectController($smartobjectLinkHandler);
-
-        $linkObj = $controller->storeSmartObject();
-        if ($linkObj->hasError()) {
-            /**
-             * @todo inform user and propose to close the window if a problem occured when saving the link
-             */
-        }
-
-        $xoopsMailer = xoops_getMailer();
-        $xoopsMailer->useMail();
-        $xoopsMailer->setTemplateDir('language/' . $xoopsConfig['language'] . '/mail_template');
-
-        $xoopsMailer->setTemplate('sendlink.tpl');
-        $xoopsMailer->assign('X_SITENAME', $xoopsConfig['sitename']);
-        $xoopsMailer->assign('TO_NAME', $linkObj->getVar('to_name'));
-        $xoopsMailer->assign('FROM_NAME', $linkObj->getVar('from_name'));
-        $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
-        $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
-        $xoopsMailer->assign('MESSAGE', $_POST['body']);
-        $xoopsMailer->setToEmails($linkObj->getVar('to_email'));
-        $xoopsMailer->setFromEmail($linkObj->getVar('from_email'));
-        $xoopsMailer->setFromName($xoopsConfig['sitename']);
-        $xoopsMailer->setSubject(sprintf(_CO_SOBJECT_SUBJECT_DEFAULT, $myts->oopsStripSlashesGPC($xoopsConfig['sitename'])));
-
-        if (!$xoopsMailer->send(true)) {
-            $xoopsTpl->assign('send_error', sprintf(_CO_SOBJECT_SEND_ERROR, $xoopsConfig['adminmail']) . '<br>' . $xoopsMailer->getErrors(true));
-        } else {
-            $xoopsTpl->assign('send_success', _CO_SOBJECT_SEND_SUCCESS);
-        }
-
-        break;
-
-    default:
-        if (isset($_GET['mid'])) {
-            $mid = $_GET['mid'];
-        } else {
-            /**
-             * @todo close the window if no mid is passed as GET
-             */
-        }
-
-        $hModule = xoops_getHandler('module');
-        $module  = $hModule->get($mid);
-        $linkObj->setVar('mid', $module->getVar('mid'));
-        $linkObj->setVar('mid_name', $module->getVar('name'));
-
-        if (isset($_GET['link'])) {
-            $link = $_GET['link'];
-        } else {
-            /**
-             * @todo close the window if no link is passed as GET
-             */
-        }
-        $linkObj->setVar('link', $link);
-
-        if (is_object($xoopsUser)) {
-            $linkObj->setVar('from_uid', $xoopsUser->getVar('uid'));
-            $linkObj->setVar('from_name', '' !== $xoopsUser->getVar('name') ? $xoopsUser->getVar('name') : $xoopsUser->getVar('uname'));
-            $linkObj->setVar('from_email', $xoopsUser->getVar('email'));
-        }
-
-        $linkObj->setVar('subject', sprintf(_CO_SOBJECT_SUBJECT_DEFAULT, $xoopsConfig['sitename']));
-        $linkObj->setVar('body', sprintf(_CO_SOBJECT_BODY_DEFAULT, $xoopsConfig['sitename'], $link));
-        $linkObj->setVar('date', time());
-        $linkObj->hideFieldFromForm(['from_uid', 'to_uid', 'link', 'mid', 'mid_name']);
-
-        $form = $linkObj->getForm(_CO_SOBJECT_SEND_LINK_FORM, 'sendlink', false, _SEND, 'javascript:window.close();');
-
-        $form->assign($xoopsTpl);
-
-        $xoopsTpl->assign('showform', true);
-        break;
+		$controller = new XoopsModules\Smartobject\ObjectController($smartobjectLinkHandler);
+
+		$linkObj = $controller->storeSmartObject();
+		if ($linkObj->hasError()) {
+			/**
+			 * @todo inform user and propose to close the window if a problem occured when saving the link
+			 */
+		}
+
+		$xoopsMailer = xoops_getMailer();
+		$xoopsMailer->useMail();
+		$xoopsMailer->setTemplateDir('language/' . $xoopsConfig['language'] . '/mail_template');
+
+		$xoopsMailer->setTemplate('sendlink.tpl');
+		$xoopsMailer->assign('X_SITENAME', $xoopsConfig['sitename']);
+		$xoopsMailer->assign('TO_NAME', $linkObj->getVar('to_name'));
+		$xoopsMailer->assign('FROM_NAME', $linkObj->getVar('from_name'));
+		$xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
+		$xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
+		$xoopsMailer->assign('MESSAGE', $_POST['body']);
+		$xoopsMailer->setToEmails($linkObj->getVar('to_email'));
+		$xoopsMailer->setFromEmail($linkObj->getVar('from_email'));
+		$xoopsMailer->setFromName($xoopsConfig['sitename']);
+		$xoopsMailer->setSubject(sprintf(_CO_SOBJECT_SUBJECT_DEFAULT, $myts->oopsStripSlashesGPC($xoopsConfig['sitename'])));
+
+		if (!$xoopsMailer->send(true)) {
+			$xoopsTpl->assign('send_error', sprintf(_CO_SOBJECT_SEND_ERROR, $xoopsConfig['adminmail']) . '<br>' . $xoopsMailer->getErrors(true));
+		} else {
+			$xoopsTpl->assign('send_success', _CO_SOBJECT_SEND_SUCCESS);
+		}
+
+		break;
+
+	default:
+		if (isset($_GET['mid'])) {
+			$mid = $_GET['mid'];
+		} else {
+			/**
+			 * @todo close the window if no mid is passed as GET
+			 */
+		}
+
+		$hModule = xoops_getHandler('module');
+		$module  = $hModule->get($mid);
+		$linkObj->setVar('mid', $module->getVar('mid'));
+		$linkObj->setVar('mid_name', $module->getVar('name'));
+
+		if (isset($_GET['link'])) {
+			$link = $_GET['link'];
+		} else {
+			/**
+			 * @todo close the window if no link is passed as GET
+			 */
+		}
+		$linkObj->setVar('link', $link);
+
+		if (is_object($xoopsUser)) {
+			$linkObj->setVar('from_uid', $xoopsUser->getVar('uid'));
+			$linkObj->setVar('from_name', '' !== $xoopsUser->getVar('name') ? $xoopsUser->getVar('name') : $xoopsUser->getVar('uname'));
+			$linkObj->setVar('from_email', $xoopsUser->getVar('email'));
+		}
+
+		$linkObj->setVar('subject', sprintf(_CO_SOBJECT_SUBJECT_DEFAULT, $xoopsConfig['sitename']));
+		$linkObj->setVar('body', sprintf(_CO_SOBJECT_BODY_DEFAULT, $xoopsConfig['sitename'], $link));
+		$linkObj->setVar('date', time());
+		$linkObj->hideFieldFromForm(['from_uid', 'to_uid', 'link', 'mid', 'mid_name']);
+
+		$form = $linkObj->getForm(_CO_SOBJECT_SEND_LINK_FORM, 'sendlink', false, _SEND, 'javascript:window.close();');
+
+		$form->assign($xoopsTpl);
+
+		$xoopsTpl->assign('showform', true);
+		break;
 }
 
 $xoopsTpl->display('db:smartobject_sendlink.tpl');

Spacing +6 added lines, -6 removed lines

@@ -9,17 +9,17 @@ 
 
 use XoopsModules\Smartobject\ObjectController;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartloader.php';
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectlink.php';
-require_once XOOPS_ROOT_PATH . '/class/template.php';
+require_once XOOPS_ROOT_PATH.'/class/template.php';
 
 $xoopsTpl                = new \XoopsTpl();
 $myts                    = \MyTextSanitizer::getInstance();
 $xoopsConfig['sitename'] = $myts->displayTarea($xoopsConfig['sitename']);
 
 xoops_header(false);
-echo Smartobject\Utility::getCssLink(SMARTOBJECT_URL . 'assets/css/module.css');
+echo Smartobject\Utility::getCssLink(SMARTOBJECT_URL.'assets/css/module.css');
 echo '</head><body>';
 
 $smartobjectLinkHandler = Smartobject\Helper::getInstance()->getHandler('link', 'smartobject');
@@ -42,13 +42,13 @@ 
 
         $xoopsMailer = xoops_getMailer();
         $xoopsMailer->useMail();
-        $xoopsMailer->setTemplateDir('language/' . $xoopsConfig['language'] . '/mail_template');
+        $xoopsMailer->setTemplateDir('language/'.$xoopsConfig['language'].'/mail_template');
 
         $xoopsMailer->setTemplate('sendlink.tpl');
         $xoopsMailer->assign('X_SITENAME', $xoopsConfig['sitename']);
         $xoopsMailer->assign('TO_NAME', $linkObj->getVar('to_name'));
         $xoopsMailer->assign('FROM_NAME', $linkObj->getVar('from_name'));
-        $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
+        $xoopsMailer->assign('SITEURL', XOOPS_URL.'/');
         $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
         $xoopsMailer->assign('MESSAGE', $_POST['body']);
         $xoopsMailer->setToEmails($linkObj->getVar('to_email'));
@@ -57,7 +57,7 @@ 
         $xoopsMailer->setSubject(sprintf(_CO_SOBJECT_SUBJECT_DEFAULT, $myts->oopsStripSlashesGPC($xoopsConfig['sitename'])));
 
         if (!$xoopsMailer->send(true)) {
-            $xoopsTpl->assign('send_error', sprintf(_CO_SOBJECT_SEND_ERROR, $xoopsConfig['adminmail']) . '<br>' . $xoopsMailer->getErrors(true));
+            $xoopsTpl->assign('send_error', sprintf(_CO_SOBJECT_SEND_ERROR, $xoopsConfig['adminmail']).'<br>'.$xoopsMailer->getErrors(true));
         } else {
             $xoopsTpl->assign('send_success', _CO_SOBJECT_SEND_SUCCESS);
         }

class/FileHandler.php

Indentation +8 added lines, -8 removed lines

@@ -31,12 +31,12 @@
  */
 class FileHandler extends Smartobject\PersistableObjectHandler
 {
-    /**
-     * SmartobjectFileHandler constructor.
-     * @param \XoopsDatabase $db
-     */
-    public function __construct(\XoopsDatabase $db)
-    {
-        parent::__construct($db, File::class, 'fileid', 'caption', 'desc', 'smartobject');
-    }
+	/**
+	 * SmartobjectFileHandler constructor.
+	 * @param \XoopsDatabase $db
+	 */
+	public function __construct(\XoopsDatabase $db)
+	{
+		parent::__construct($db, File::class, 'fileid', 'caption', 'desc', 'smartobject');
+	}
 }

class/BasedUrl.php

Indentation +24 added lines, -24 removed lines

@@ -29,29 +29,29 @@
  */
 class BasedUrl extends Smartobject\BaseSmartObject
 {
-    /**
-     * SmartobjectBasedUrl constructor.
-     */
-    public function __construct()
-    {
-        $this->quickInitVar('caption', XOBJ_DTYPE_TXTBOX, false);
-        $this->quickInitVar('description', XOBJ_DTYPE_TXTBOX, false);
-        $this->quickInitVar('url', XOBJ_DTYPE_TXTBOX, false);
-    }
+	/**
+	 * SmartobjectBasedUrl constructor.
+	 */
+	public function __construct()
+	{
+		$this->quickInitVar('caption', XOBJ_DTYPE_TXTBOX, false);
+		$this->quickInitVar('description', XOBJ_DTYPE_TXTBOX, false);
+		$this->quickInitVar('url', XOBJ_DTYPE_TXTBOX, false);
+	}
 
-    /**
-     * @param  string $key
-     * @param  string $format
-     * @return mixed
-     */
-    public function getVar($key, $format = 'e')
-    {
-        if (0 === strpos($key, 'url_')) {
-            return parent::getVar('url', $format);
-        } elseif (0 === strpos($key, 'caption_')) {
-            return parent::getVar('caption', $format);
-        } else {
-            return parent::getVar($key, $format);
-        }
-    }
+	/**
+	 * @param  string $key
+	 * @param  string $format
+	 * @return mixed
+	 */
+	public function getVar($key, $format = 'e')
+	{
+		if (0 === strpos($key, 'url_')) {
+			return parent::getVar('url', $format);
+		} elseif (0 === strpos($key, 'caption_')) {
+			return parent::getVar('caption', $format);
+		} else {
+			return parent::getVar($key, $format);
+		}
+	}
 }