mambax7 / smartobject

admin/menu.php

Indentation +31 added lines, -31 removed lines

@@ -19,7 +19,7 @@ 
 $pathLanguage    = $path . $pathModuleAdmin;
 
 if (!file_exists($fileinc = $pathLanguage . '/language/' . $GLOBALS['xoopsConfig']['language'] . '/' . 'main.php')) {
-    $fileinc = $pathLanguage . '/language/english/main.php';
+	$fileinc = $pathLanguage . '/language/english/main.php';
 }
 
 include_once $fileinc;
@@ -60,43 +60,43 @@ 
 //---------------------------------
 
 if (!defined('SMARTOBJECT_ROOT_PATH')) {
-    include_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php';
+	include_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php';
 }
 
 $smartobjectConfig = smart_getModuleConfig('smartobject');
 
 if (isset($smartobjectConfig['enable_currencyman']) && $smartobjectConfig['enable_currencyman'] == true) {
-    ++$i;
-    $adminmenu[$i]['title'] = _MI_SOBJECT_CURRENCIES;
-    $adminmenu[$i]['link']  = 'admin/currency.php';
-    $adminmenu[$i]['icon']  = $pathIcon32 . '/cash_stack.png';
+	++$i;
+	$adminmenu[$i]['title'] = _MI_SOBJECT_CURRENCIES;
+	$adminmenu[$i]['link']  = 'admin/currency.php';
+	$adminmenu[$i]['icon']  = $pathIcon32 . '/cash_stack.png';
 }
 
 global $xoopsModule;
 if (isset($xoopsModule)) {
-    //  $i = -1;
-
-    // --- for XCL ---
-    //  $headermenu[$i]['link'] = '../../system/admin.php?fct=preferences&op=showmod&mod=' . $xoopsModule->getVar('mid');
-    $mid = $xoopsModule->getVar('mid');
-    if (defined('XOOPS_CUBE_LEGACY')) {
-        $link_pref = XOOPS_URL . '/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id=' . $mid;
-    } else {
-        $link_pref = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mid;
-    }
-    $headermenu[$i]['link'] = $link_pref;
-    // -----
-
-    // --- for XCL ---
-    //  $headermenu[$i]['link'] = XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=update&module=" . $xoopsModule->getVar('dirname');
-    $dirname = $xoopsModule->getVar('dirname');
-    if (defined('XOOPS_CUBE_LEGACY')) {
-        $link_module = XOOPS_URL . '/modules/legacy/admin/index.php?action=ModuleUpdate&dirname=' . $dirname;
-    } else {
-        $link_module = XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&op=update&module=' . $dirname;
-    }
-    $headermenu[$i]['link'] = $link_module;
-    // -----
-
-    ++$i;
+	//  $i = -1;
+
+	// --- for XCL ---
+	//  $headermenu[$i]['link'] = '../../system/admin.php?fct=preferences&op=showmod&mod=' . $xoopsModule->getVar('mid');
+	$mid = $xoopsModule->getVar('mid');
+	if (defined('XOOPS_CUBE_LEGACY')) {
+		$link_pref = XOOPS_URL . '/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id=' . $mid;
+	} else {
+		$link_pref = XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mid;
+	}
+	$headermenu[$i]['link'] = $link_pref;
+	// -----
+
+	// --- for XCL ---
+	//  $headermenu[$i]['link'] = XOOPS_URL . "/modules/system/admin.php?fct=modulesadmin&op=update&module=" . $xoopsModule->getVar('dirname');
+	$dirname = $xoopsModule->getVar('dirname');
+	if (defined('XOOPS_CUBE_LEGACY')) {
+		$link_module = XOOPS_URL . '/modules/legacy/admin/index.php?action=ModuleUpdate&dirname=' . $dirname;
+	} else {
+		$link_module = XOOPS_URL . '/modules/system/admin.php?fct=modulesadmin&op=update&module=' . $dirname;
+	}
+	$headermenu[$i]['link'] = $link_module;
+	// -----
+
+	++$i;
 }

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 include_once $path . '/mainfile.php';
 
 $dirname         = basename(dirname(__DIR__));
-$moduleHandler  = xoops_getHandler('module');
+$moduleHandler = xoops_getHandler('module');
 $module          = $moduleHandler->getByDirname($dirname);
 $pathIcon32      = $module->getInfo('icons32');
 $pathModuleAdmin = $module->getInfo('dirmoduleadmin');

admin/currency.php

Indentation +73 added lines, -73 removed lines

@@ -10,29 +10,29 @@ 
 
 function editclass($showmenu = false, $currencyid = 0)
 {
-    global $smartobjectCurrencyHandler;
-
-    $currencyObj = $smartobjectCurrencyHandler->get($currencyid);
-
-    if (!$currencyObj->isNew()) {
-        if ($showmenu) {
-            //smart_adminMenu(5, _AM_SOBJECT_CURRENCIES . " > " . _AM_SOBJECT_EDITING);
-        }
-        smart_collapsableBar('currencyedit', _AM_SOBJECT_CURRENCIES_EDIT, _AM_SOBJECT_CURRENCIES_EDIT_INFO);
-
-        $sform = $currencyObj->getForm(_AM_SOBJECT_CURRENCIES_EDIT, 'addcurrency');
-        $sform->display();
-        smart_close_collapsable('currencyedit');
-    } else {
-        if ($showmenu) {
-            //smart_adminMenu(5, _AM_SOBJECT_CURRENCIES . " > " . _CO_SOBJECT_CREATINGNEW);
-        }
-
-        smart_collapsableBar('currencycreate', _AM_SOBJECT_CURRENCIES_CREATE, _AM_SOBJECT_CURRENCIES_CREATE_INFO);
-        $sform = $currencyObj->getForm(_AM_SOBJECT_CURRENCIES_CREATE, 'addcurrency');
-        $sform->display();
-        smart_close_collapsable('currencycreate');
-    }
+	global $smartobjectCurrencyHandler;
+
+	$currencyObj = $smartobjectCurrencyHandler->get($currencyid);
+
+	if (!$currencyObj->isNew()) {
+		if ($showmenu) {
+			//smart_adminMenu(5, _AM_SOBJECT_CURRENCIES . " > " . _AM_SOBJECT_EDITING);
+		}
+		smart_collapsableBar('currencyedit', _AM_SOBJECT_CURRENCIES_EDIT, _AM_SOBJECT_CURRENCIES_EDIT_INFO);
+
+		$sform = $currencyObj->getForm(_AM_SOBJECT_CURRENCIES_EDIT, 'addcurrency');
+		$sform->display();
+		smart_close_collapsable('currencyedit');
+	} else {
+		if ($showmenu) {
+			//smart_adminMenu(5, _AM_SOBJECT_CURRENCIES . " > " . _CO_SOBJECT_CREATINGNEW);
+		}
+
+		smart_collapsableBar('currencycreate', _AM_SOBJECT_CURRENCIES_CREATE, _AM_SOBJECT_CURRENCIES_CREATE_INFO);
+		$sform = $currencyObj->getForm(_AM_SOBJECT_CURRENCIES_CREATE, 'addcurrency');
+		$sform->display();
+		smart_close_collapsable('currencycreate');
+	}
 }
 
 include_once __DIR__ . '/admin_header.php';
@@ -43,37 +43,37 @@ 
 $op = '';
 
 if (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 }
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 switch ($op) {
-    case 'mod':
-        $currencyid = isset($_GET['currencyid']) ? (int)$_GET['currencyid'] : 0;
+	case 'mod':
+		$currencyid = isset($_GET['currencyid']) ? (int)$_GET['currencyid'] : 0;
 
-        smart_xoops_cp_header();
+		smart_xoops_cp_header();
 
-        editclass(true, $currencyid);
-        break;
+		editclass(true, $currencyid);
+		break;
 
-    case 'updateCurrencies':
+	case 'updateCurrencies':
 
-        if (!isset($_POST['SmartobjectCurrency_objects']) || count($_POST['SmartobjectCurrency_objects']) == 0) {
-            redirect_header($smart_previous_page, 3, _AM_SOBJECT_NO_RECORDS_TO_UPDATE);
-            exit;
-        }
+		if (!isset($_POST['SmartobjectCurrency_objects']) || count($_POST['SmartobjectCurrency_objects']) == 0) {
+			redirect_header($smart_previous_page, 3, _AM_SOBJECT_NO_RECORDS_TO_UPDATE);
+			exit;
+		}
 
-        if (isset($_POST['default_currency'])) {
-            $newDefaultCurrency = $_POST['default_currency'];
-            $sql                  = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
-            $smartobjectCurrencyHandler->query($sql);
-            $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=1 WHERE currencyid=' . $newDefaultCurrency;
-            $smartobjectCurrencyHandler->query($sql);
-        }
+		if (isset($_POST['default_currency'])) {
+			$newDefaultCurrency = $_POST['default_currency'];
+			$sql                  = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
+			$smartobjectCurrencyHandler->query($sql);
+			$sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=1 WHERE currencyid=' . $newDefaultCurrency;
+			$smartobjectCurrencyHandler->query($sql);
+		}
 
-        /*
+		/*
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('currencyid', '(' . implode(', ', $_POST['SmartobjectCurrency_objects']) . ')', 'IN'));
         $currenciesObj = $smartobjectCurrencyHandler->getObjects($criteria, true);
@@ -83,51 +83,51 @@ 
             $smartobjectCurrencyHandler->insert($currencyObj);
         }
         */
-        redirect_header($smart_previous_page, 3, _AM_SOBJECT_RECORDS_UPDATED);
-        exit;
+		redirect_header($smart_previous_page, 3, _AM_SOBJECT_RECORDS_UPDATED);
+		exit;
 
-        break;
+		break;
 
-    case 'addcurrency':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectCurrencyHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL . 'admin/currency.php');
+	case 'addcurrency':
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectCurrencyHandler);
+		$controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL . 'admin/currency.php');
 
-        break;
+		break;
 
-    case 'del':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectCurrencyHandler);
-        $controller->handleObjectDeletion();
+	case 'del':
+		include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectCurrencyHandler);
+		$controller->handleObjectDeletion();
 
-        break;
+		break;
 
-    default:
+	default:
 
-        smart_xoops_cp_header();
+		smart_xoops_cp_header();
 
-        //smart_adminMenu(5, _AM_SOBJECT_CURRENCIES);
+		//smart_adminMenu(5, _AM_SOBJECT_CURRENCIES);
 
-        smart_collapsableBar('createdcurrencies', _AM_SOBJECT_CURRENCIES, _AM_SOBJECT_CURRENCIES_DSC);
+		smart_collapsableBar('createdcurrencies', _AM_SOBJECT_CURRENCIES, _AM_SOBJECT_CURRENCIES_DSC);
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectCurrencyHandler);
-        $objectTable->addColumn(new SmartObjectColumn('name', 'left', false, 'getCurrencyLink'));
-        $objectTable->addColumn(new SmartObjectColumn('rate', 'center', 150));
-        $objectTable->addColumn(new SmartObjectColumn('iso4217', 'center', 150));
-        $objectTable->addColumn(new SmartObjectColumn('default_currency', 'center', 150, 'getDefaultCurrencyControl'));
+		include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+		$objectTable = new SmartObjectTable($smartobjectCurrencyHandler);
+		$objectTable->addColumn(new SmartObjectColumn('name', 'left', false, 'getCurrencyLink'));
+		$objectTable->addColumn(new SmartObjectColumn('rate', 'center', 150));
+		$objectTable->addColumn(new SmartObjectColumn('iso4217', 'center', 150));
+		$objectTable->addColumn(new SmartObjectColumn('default_currency', 'center', 150, 'getDefaultCurrencyControl'));
 
-        $objectTable->addIntroButton('addcurrency', 'currency.php?op=mod', _AM_SOBJECT_CURRENCIES_CREATE);
+		$objectTable->addIntroButton('addcurrency', 'currency.php?op=mod', _AM_SOBJECT_CURRENCIES_CREATE);
 
-        $objectTable->addActionButton('updateCurrencies', _SUBMIT, _AM_SOBJECT_CURRENCY_UPDATE_ALL);
+		$objectTable->addActionButton('updateCurrencies', _SUBMIT, _AM_SOBJECT_CURRENCY_UPDATE_ALL);
 
-        $objectTable->render();
+		$objectTable->render();
 
-        echo '<br />';
-        smart_close_collapsable('createdcurrencies');
-        echo '<br>';
+		echo '<br />';
+		smart_close_collapsable('createdcurrencies');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //smart_modFooter();

Switch Indentation +48 added lines, -48 removed lines

@@ -50,30 +50,30 @@ 
 }
 
 switch ($op) {
-    case 'mod':
-        $currencyid = isset($_GET['currencyid']) ? (int)$_GET['currencyid'] : 0;
+    	case 'mod':
+        	$currencyid = isset($_GET['currencyid']) ? (int)$_GET['currencyid'] : 0;
 
-        smart_xoops_cp_header();
+        	smart_xoops_cp_header();
 
-        editclass(true, $currencyid);
-        break;
+        	editclass(true, $currencyid);
+        	break;
 
-    case 'updateCurrencies':
+    	case 'updateCurrencies':
 
-        if (!isset($_POST['SmartobjectCurrency_objects']) || count($_POST['SmartobjectCurrency_objects']) == 0) {
-            redirect_header($smart_previous_page, 3, _AM_SOBJECT_NO_RECORDS_TO_UPDATE);
-            exit;
-        }
+        	if (!isset($_POST['SmartobjectCurrency_objects']) || count($_POST['SmartobjectCurrency_objects']) == 0) {
+            	redirect_header($smart_previous_page, 3, _AM_SOBJECT_NO_RECORDS_TO_UPDATE);
+            	exit;
+        	}
 
-        if (isset($_POST['default_currency'])) {
-            $newDefaultCurrency = $_POST['default_currency'];
-            $sql                  = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
-            $smartobjectCurrencyHandler->query($sql);
-            $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=1 WHERE currencyid=' . $newDefaultCurrency;
-            $smartobjectCurrencyHandler->query($sql);
-        }
+        	if (isset($_POST['default_currency'])) {
+            	$newDefaultCurrency = $_POST['default_currency'];
+            	$sql                  = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
+            	$smartobjectCurrencyHandler->query($sql);
+            	$sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=1 WHERE currencyid=' . $newDefaultCurrency;
+            	$smartobjectCurrencyHandler->query($sql);
+        	}
 
-        /*
+        	/*
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('currencyid', '(' . implode(', ', $_POST['SmartobjectCurrency_objects']) . ')', 'IN'));
         $currenciesObj = $smartobjectCurrencyHandler->getObjects($criteria, true);
@@ -83,51 +83,51 @@ 
             $smartobjectCurrencyHandler->insert($currencyObj);
         }
         */
-        redirect_header($smart_previous_page, 3, _AM_SOBJECT_RECORDS_UPDATED);
-        exit;
+        	redirect_header($smart_previous_page, 3, _AM_SOBJECT_RECORDS_UPDATED);
+        	exit;
 
-        break;
+        	break;
 
-    case 'addcurrency':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectCurrencyHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL . 'admin/currency.php');
+    	case 'addcurrency':
+        	include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new SmartObjectController($smartobjectCurrencyHandler);
+        	$controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL . 'admin/currency.php');
 
-        break;
+        	break;
 
-    case 'del':
-        include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectCurrencyHandler);
-        $controller->handleObjectDeletion();
+    	case 'del':
+        	include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new SmartObjectController($smartobjectCurrencyHandler);
+        	$controller->handleObjectDeletion();
 
-        break;
+        	break;
 
-    default:
+    	default:
 
-        smart_xoops_cp_header();
+        	smart_xoops_cp_header();
 
-        //smart_adminMenu(5, _AM_SOBJECT_CURRENCIES);
+        	//smart_adminMenu(5, _AM_SOBJECT_CURRENCIES);
 
-        smart_collapsableBar('createdcurrencies', _AM_SOBJECT_CURRENCIES, _AM_SOBJECT_CURRENCIES_DSC);
+        	smart_collapsableBar('createdcurrencies', _AM_SOBJECT_CURRENCIES, _AM_SOBJECT_CURRENCIES_DSC);
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectCurrencyHandler);
-        $objectTable->addColumn(new SmartObjectColumn('name', 'left', false, 'getCurrencyLink'));
-        $objectTable->addColumn(new SmartObjectColumn('rate', 'center', 150));
-        $objectTable->addColumn(new SmartObjectColumn('iso4217', 'center', 150));
-        $objectTable->addColumn(new SmartObjectColumn('default_currency', 'center', 150, 'getDefaultCurrencyControl'));
+        	include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        	$objectTable = new SmartObjectTable($smartobjectCurrencyHandler);
+        	$objectTable->addColumn(new SmartObjectColumn('name', 'left', false, 'getCurrencyLink'));
+        	$objectTable->addColumn(new SmartObjectColumn('rate', 'center', 150));
+        	$objectTable->addColumn(new SmartObjectColumn('iso4217', 'center', 150));
+        	$objectTable->addColumn(new SmartObjectColumn('default_currency', 'center', 150, 'getDefaultCurrencyControl'));
 
-        $objectTable->addIntroButton('addcurrency', 'currency.php?op=mod', _AM_SOBJECT_CURRENCIES_CREATE);
+        	$objectTable->addIntroButton('addcurrency', 'currency.php?op=mod', _AM_SOBJECT_CURRENCIES_CREATE);
 
-        $objectTable->addActionButton('updateCurrencies', _SUBMIT, _AM_SOBJECT_CURRENCY_UPDATE_ALL);
+        	$objectTable->addActionButton('updateCurrencies', _SUBMIT, _AM_SOBJECT_CURRENCY_UPDATE_ALL);
 
-        $objectTable->render();
+        	$objectTable->render();
 
-        echo '<br />';
-        smart_close_collapsable('createdcurrencies');
-        echo '<br>';
+        	echo '<br />';
+        	smart_close_collapsable('createdcurrencies');
+        	echo '<br>';
 
-        break;
+        	break;
 }
 
 //smart_modFooter();

Spacing +2 added lines, -2 removed lines

@@ -51,7 +51,7 @@ 
 
 switch ($op) {
     case 'mod':
-        $currencyid = isset($_GET['currencyid']) ? (int)$_GET['currencyid'] : 0;
+        $currencyid = isset($_GET['currencyid']) ? (int) $_GET['currencyid'] : 0;
 
         smart_xoops_cp_header();
 
@@ -67,7 +67,7 @@ 
 
         if (isset($_POST['default_currency'])) {
             $newDefaultCurrency = $_POST['default_currency'];
-            $sql                  = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
+            $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
             $smartobjectCurrencyHandler->query($sql);
             $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=1 WHERE currencyid=' . $newDefaultCurrency;
             $smartobjectCurrencyHandler->query($sql);

admin/update.php

Indentation +272 added lines, -272 removed lines

@@ -18,180 +18,180 @@ 
 // =========================================================================================
 function update_tables_to_300()
 {
-    $dbupdater = new WfdownloadsDbupdater();
+	$dbupdater = new WfdownloadsDbupdater();
 
-    if (!wfdownloads_TableExists('wfdownloads_meta')) {
-        // Create table wfdownloads_meta
-        $table = new WfdownloadsTable('wfdownloads_meta');
-        $table->setStructure("CREATE TABLE %s (
+	if (!wfdownloads_TableExists('wfdownloads_meta')) {
+		// Create table wfdownloads_meta
+		$table = new WfdownloadsTable('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 />';
-        }
-    }
+		$table->setData(sprintf("'version', %s", round($GLOBALS['xoopsModule']->getVar('version') / 100, 2)));
+		if ($dbupdater->updateTable($table)) {
+			echo 'wfdownloads_meta table created<br />';
+		}
+	}
 
-    $download_fields = array(
-        'lid'           => array('Type' => 'int(11) unsigned NOT NULL auto_increment', 'Default' => false),
-        'cid'           => array('Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true),
-        'title'         => array('Type' => "varchar(100) NOT NULL default ''", 'Default' => true),
-        'url'           => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'filename'      => array('Type' => "varchar(150) NOT NULL default ''", 'Default' => true),
-        'filetype'      => array('Type' => "varchar(100) NOT NULL default ''", 'Default' => true),
-        'homepage'      => array('Type' => "varchar(100) NOT NULL default ''", 'Default' => true),
-        'version'       => array('Type' => "varchar(20) NOT NULL default ''", 'Default' => true),
-        'size'          => array('Type' => "int(8) NOT NULL default '0'", 'Default' => true),
-        'platform'      => array('Type' => "varchar(50) NOT NULL default ''", 'Default' => true),
-        'screenshot'    => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'submitter'     => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
-        'publisher'     => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'status'        => array('Type' => "tinyint(2) NOT NULL default '0'", 'Default' => true),
-        'date'          => array('Type' => "int(10) NOT NULL default '0'", 'Default' => true),
-        'hits'          => array('Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true),
-        'rating'        => array('Type' => "double(6,4) NOT NULL default '0.0000'", 'Default' => true),
-        'votes'         => array('Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true),
-        'comments'      => array('Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true),
-        'license'       => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'mirror'        => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'price'         => array('Type' => "varchar(10) NOT NULL default 'Free'", 'Default' => true),
-        'paypalemail'   => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'features'      => array('Type' => 'text NOT NULL', 'Default' => false),
-        'requirements'  => array('Type' => 'text NOT NULL', 'Default' => false),
-        'homepagetitle' => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'forumid'       => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
-        'limitations'   => array('Type' => "varchar(255) NOT NULL default '30 day trial'", 'Default' => true),
-        'dhistory'      => array('Type' => 'text NOT NULL', 'Default' => false),
-        'published'     => array('Type' => "int(11) NOT NULL default '1089662528'", 'Default' => true),
-        'expired'       => array('Type' => "int(10) NOT NULL default '0'", 'Default' => true),
-        'updated'       => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
-        'offline'       => array('Type' => "tinyint(1) NOT NULL default '0'", 'Default' => true),
-        'description'   => array('Type' => 'text NOT NULL', 'Default' => false),
-        'ipaddress'     => array('Type' => "varchar(120) NOT NULL default '0'", 'Default' => true),
-        'notifypub'     => array('Type' => "int(1) NOT NULL default '0'", 'Default' => true),
-        'summary'       => array('Type' => 'text NOT NULL', 'Default' => false)
-    );
+	$download_fields = array(
+		'lid'           => array('Type' => 'int(11) unsigned NOT NULL auto_increment', 'Default' => false),
+		'cid'           => array('Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true),
+		'title'         => array('Type' => "varchar(100) NOT NULL default ''", 'Default' => true),
+		'url'           => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'filename'      => array('Type' => "varchar(150) NOT NULL default ''", 'Default' => true),
+		'filetype'      => array('Type' => "varchar(100) NOT NULL default ''", 'Default' => true),
+		'homepage'      => array('Type' => "varchar(100) NOT NULL default ''", 'Default' => true),
+		'version'       => array('Type' => "varchar(20) NOT NULL default ''", 'Default' => true),
+		'size'          => array('Type' => "int(8) NOT NULL default '0'", 'Default' => true),
+		'platform'      => array('Type' => "varchar(50) NOT NULL default ''", 'Default' => true),
+		'screenshot'    => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'submitter'     => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
+		'publisher'     => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'status'        => array('Type' => "tinyint(2) NOT NULL default '0'", 'Default' => true),
+		'date'          => array('Type' => "int(10) NOT NULL default '0'", 'Default' => true),
+		'hits'          => array('Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true),
+		'rating'        => array('Type' => "double(6,4) NOT NULL default '0.0000'", 'Default' => true),
+		'votes'         => array('Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true),
+		'comments'      => array('Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true),
+		'license'       => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'mirror'        => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'price'         => array('Type' => "varchar(10) NOT NULL default 'Free'", 'Default' => true),
+		'paypalemail'   => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'features'      => array('Type' => 'text NOT NULL', 'Default' => false),
+		'requirements'  => array('Type' => 'text NOT NULL', 'Default' => false),
+		'homepagetitle' => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'forumid'       => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
+		'limitations'   => array('Type' => "varchar(255) NOT NULL default '30 day trial'", 'Default' => true),
+		'dhistory'      => array('Type' => 'text NOT NULL', 'Default' => false),
+		'published'     => array('Type' => "int(11) NOT NULL default '1089662528'", 'Default' => true),
+		'expired'       => array('Type' => "int(10) NOT NULL default '0'", 'Default' => true),
+		'updated'       => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
+		'offline'       => array('Type' => "tinyint(1) NOT NULL default '0'", 'Default' => true),
+		'description'   => array('Type' => 'text NOT NULL', 'Default' => false),
+		'ipaddress'     => array('Type' => "varchar(120) NOT NULL default '0'", 'Default' => true),
+		'notifypub'     => array('Type' => "int(1) NOT NULL default '0'", 'Default' => true),
+		'summary'       => array('Type' => 'text NOT NULL', 'Default' => false)
+	);
 
-    $renamed_fields = array(
-        'logourl' => 'screenshot'
-    );
+	$renamed_fields = array(
+		'logourl' => 'screenshot'
+	);
 
-    echo '<br /><B>Checking Download table</B><br />';
-    $downloadHandler = xoops_getModuleHandler('download', 'wfdownloads');
-    $download_table   = new WfdownloadsTable('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);
+	echo '<br /><B>Checking Download table</B><br />';
+	$downloadHandler = xoops_getModuleHandler('download', 'wfdownloads');
+	$download_table   = new WfdownloadsTable('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 = array(
-        'requestid'       => array('Type' => 'int(11) NOT NULL auto_increment', 'Default' => false),
-        'lid'             => array('Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true),
-        'cid'             => array('Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true),
-        'title'           => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'url'             => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'filename'        => array('Type' => "varchar(150) NOT NULL default ''", 'Default' => true),
-        'filetype'        => array('Type' => "varchar(100) NOT NULL default ''", 'Default' => true),
-        'homepage'        => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'version'         => array('Type' => "varchar(20) NOT NULL default ''", 'Default' => true),
-        'size'            => array('Type' => "int(8) NOT NULL default '0'", 'Default' => true),
-        'platform'        => array('Type' => "varchar(50) NOT NULL default ''", 'Default' => true),
-        'screenshot'      => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'submitter'       => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
-        'publisher'       => array('Type' => 'text NOT NULL', 'Default' => false),
-        'status'          => array('Type' => "tinyint(2) NOT NULL default '0'", 'Default' => true),
-        'date'            => array('Type' => "int(10) NOT NULL default '0'", 'Default' => true),
-        'hits'            => array('Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true),
-        'rating'          => array('Type' => "double(6,4) NOT NULL default '0.0000'", 'Default' => true),
-        'votes'           => array('Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true),
-        'comments'        => array('Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true),
-        'license'         => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'mirror'          => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'price'           => array('Type' => "varchar(10) NOT NULL default 'Free'", 'Default' => true),
-        'paypalemail'     => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'features'        => array('Type' => 'text NOT NULL', 'Default' => false),
-        'requirements'    => array('Type' => 'text NOT NULL', 'Default' => false),
-        'homepagetitle'   => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'forumid'         => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
-        'limitations'     => array('Type' => "varchar(255) NOT NULL default '30 day trial'", 'Default' => true),
-        'dhistory'        => array('Type' => 'text NOT NULL', 'Default' => false),
-        'published'       => array('Type' => "int(10) NOT NULL default '0'", 'Default' => true),
-        'expired'         => array('Type' => "int(10) NOT NULL default '0'", 'Default' => true),
-        'updated'         => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
-        'offline'         => array('Type' => "tinyint(1) NOT NULL default '0'", 'Default' => true),
-        'summary'         => array('Type' => 'text NOT NULL', 'Default' => false),
-        'description'     => array('Type' => 'text NOT NULL', 'Default' => false),
-        'modifysubmitter' => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
-        'requestdate'     => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true)
-    );
+	$mod_fields = array(
+		'requestid'       => array('Type' => 'int(11) NOT NULL auto_increment', 'Default' => false),
+		'lid'             => array('Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true),
+		'cid'             => array('Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true),
+		'title'           => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'url'             => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'filename'        => array('Type' => "varchar(150) NOT NULL default ''", 'Default' => true),
+		'filetype'        => array('Type' => "varchar(100) NOT NULL default ''", 'Default' => true),
+		'homepage'        => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'version'         => array('Type' => "varchar(20) NOT NULL default ''", 'Default' => true),
+		'size'            => array('Type' => "int(8) NOT NULL default '0'", 'Default' => true),
+		'platform'        => array('Type' => "varchar(50) NOT NULL default ''", 'Default' => true),
+		'screenshot'      => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'submitter'       => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
+		'publisher'       => array('Type' => 'text NOT NULL', 'Default' => false),
+		'status'          => array('Type' => "tinyint(2) NOT NULL default '0'", 'Default' => true),
+		'date'            => array('Type' => "int(10) NOT NULL default '0'", 'Default' => true),
+		'hits'            => array('Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true),
+		'rating'          => array('Type' => "double(6,4) NOT NULL default '0.0000'", 'Default' => true),
+		'votes'           => array('Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true),
+		'comments'        => array('Type' => "int(11) unsigned NOT NULL default '0'", 'Default' => true),
+		'license'         => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'mirror'          => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'price'           => array('Type' => "varchar(10) NOT NULL default 'Free'", 'Default' => true),
+		'paypalemail'     => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'features'        => array('Type' => 'text NOT NULL', 'Default' => false),
+		'requirements'    => array('Type' => 'text NOT NULL', 'Default' => false),
+		'homepagetitle'   => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'forumid'         => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
+		'limitations'     => array('Type' => "varchar(255) NOT NULL default '30 day trial'", 'Default' => true),
+		'dhistory'        => array('Type' => 'text NOT NULL', 'Default' => false),
+		'published'       => array('Type' => "int(10) NOT NULL default '0'", 'Default' => true),
+		'expired'         => array('Type' => "int(10) NOT NULL default '0'", 'Default' => true),
+		'updated'         => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
+		'offline'         => array('Type' => "tinyint(1) NOT NULL default '0'", 'Default' => true),
+		'summary'         => array('Type' => 'text NOT NULL', 'Default' => false),
+		'description'     => array('Type' => 'text NOT NULL', 'Default' => false),
+		'modifysubmitter' => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
+		'requestdate'     => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true)
+	);
 
-    $renamed_fields = array(
-        'logourl' => 'screenshot'
-    );
+	$renamed_fields = array(
+		'logourl' => 'screenshot'
+	);
 
-    echo '<br /><B>Checking Modified Downloads table</B><br />';
-    $modHandler = xoops_getModuleHandler('modification', 'wfdownloads');
-    $mod_table   = new WfdownloadsTable('wfdownloads_mod');
-    $fields      = get_table_info($modHandler->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);
+	echo '<br /><B>Checking Modified Downloads table</B><br />';
+	$modHandler = xoops_getModuleHandler('modification', 'wfdownloads');
+	$mod_table   = new WfdownloadsTable('wfdownloads_mod');
+	$fields      = get_table_info($modHandler->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 = array(
-        'cid'          => array('Type' => 'int(5) unsigned NOT NULL auto_increment', 'Default' => false),
-        'pid'          => array('Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true),
-        'title'        => array('Type' => "varchar(50) NOT NULL default ''", 'Default' => true),
-        'imgurl'       => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
-        'description'  => array('Type' => "text NOT NULL default ''", 'Default' => true),
-        'total'        => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
-        'summary'      => array('Type' => 'text NOT NULL', 'Default' => false),
-        'spotlighttop' => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
-        'spotlighthis' => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
-        'dohtml'       => array('Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true),
-        'dosmiley'     => array('Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true),
-        'doxcode'      => array('Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true),
-        'doimage'      => array('Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true),
-        'dobr'         => array('Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true),
-        'weight'       => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true)
-    );
-    echo '<br /><B>Checking Category table</B><br />';
-    $catHandler = xoops_getModuleHandler('category', 'wfdownloads');
-    $cat_table   = new WfdownloadsTable('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);
+	$cat_fields = array(
+		'cid'          => array('Type' => 'int(5) unsigned NOT NULL auto_increment', 'Default' => false),
+		'pid'          => array('Type' => "int(5) unsigned NOT NULL default '0'", 'Default' => true),
+		'title'        => array('Type' => "varchar(50) NOT NULL default ''", 'Default' => true),
+		'imgurl'       => array('Type' => "varchar(255) NOT NULL default ''", 'Default' => true),
+		'description'  => array('Type' => "text NOT NULL default ''", 'Default' => true),
+		'total'        => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
+		'summary'      => array('Type' => 'text NOT NULL', 'Default' => false),
+		'spotlighttop' => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
+		'spotlighthis' => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
+		'dohtml'       => array('Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true),
+		'dosmiley'     => array('Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true),
+		'doxcode'      => array('Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true),
+		'doimage'      => array('Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true),
+		'dobr'         => array('Type' => "tinyint(1) NOT NULL default '1'", 'Default' => true),
+		'weight'       => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true)
+	);
+	echo '<br /><B>Checking Category table</B><br />';
+	$catHandler = xoops_getModuleHandler('category', 'wfdownloads');
+	$cat_table   = new WfdownloadsTable('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 = array(
-        'reportid'     => array('Type' => 'int(5) NOT NULL auto_increment', 'Default' => false),
-        'lid'          => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
-        'sender'       => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
-        'ip'           => array('Type' => "varchar(20) NOT NULL default ''", 'Default' => true),
-        'date'         => array('Type' => "varchar(11) NOT NULL default '0'", 'Default' => true),
-        'confirmed'    => array('Type' => "enum('0','1') NOT NULL default '0'", 'Default' => true),
-        'acknowledged' => array('Type' => "enum('0','1') NOT NULL default '0'", 'Default' => true)
-    );
-    echo '<br /><B>Checking Broken Report table</B><br />';
-    $brokenHandler = xoops_getModuleHandler('report', 'wfdownloads');
-    $broken_table   = new WfdownloadsTable('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_fields = array(
+		'reportid'     => array('Type' => 'int(5) NOT NULL auto_increment', 'Default' => false),
+		'lid'          => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
+		'sender'       => array('Type' => "int(11) NOT NULL default '0'", 'Default' => true),
+		'ip'           => array('Type' => "varchar(20) NOT NULL default ''", 'Default' => true),
+		'date'         => array('Type' => "varchar(11) NOT NULL default '0'", 'Default' => true),
+		'confirmed'    => array('Type' => "enum('0','1') NOT NULL default '0'", 'Default' => true),
+		'acknowledged' => array('Type' => "enum('0','1') NOT NULL default '0'", 'Default' => true)
+	);
+	echo '<br /><B>Checking Broken Report table</B><br />';
+	$brokenHandler = xoops_getModuleHandler('report', 'wfdownloads');
+	$broken_table   = new WfdownloadsTable('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);
 }
 
 // =========================================================================================
@@ -204,48 +204,48 @@ 
  */
 function invert_nohtm_dohtml_values()
 {
-    $ret = array();
-    global $xoopsDB;
-    $catHandler = xoops_getModuleHandler('category', 'wfdownloads');
-    $result      = $xoopsDB->query('SHOW COLUMNS FROM ' . $catHandler->table);
-    while ($existing_field = $xoopsDB->fetchArray($result)) {
-        $fields[$existing_field['field']] = $existing_field['type'];
-    }
-    if (in_array('nohtml', array_keys($fields))) {
-        $dbupdater = new WfdownloadsDbupdater();
-        //Invert column values
-        // alter options in wfdownloads_cat
-        $table = new WfdownloadsTable('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'");
+	$ret = array();
+	global $xoopsDB;
+	$catHandler = xoops_getModuleHandler('category', 'wfdownloads');
+	$result      = $xoopsDB->query('SHOW COLUMNS FROM ' . $catHandler->table);
+	while ($existing_field = $xoopsDB->fetchArray($result)) {
+		$fields[$existing_field['field']] = $existing_field['type'];
+	}
+	if (in_array('nohtml', array_keys($fields))) {
+		$dbupdater = new WfdownloadsDbupdater();
+		//Invert column values
+		// alter options in wfdownloads_cat
+		$table = new WfdownloadsTable('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');
+		//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('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('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);
-    }
+		$table->addUpdatedWhere('doimage', 2, '=1');
+		$table->addUpdatedWhere('doimage', 1, '=0');
+		$table->addUpdatedWhere('doimage', 0, '=2');
+		$ret = $dbupdater->updateTable($table);
+	}
 
-    return $ret;
+	return $ret;
 }
 
 /**
@@ -258,22 +258,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 />";
+		}
+	}
 }
 
 /**
@@ -286,22 +286,22 @@ 
  */
 function get_table_info($table, $default_fields)
 {
-    global $xoopsDB;
-    $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $table);
-    while ($existing_field = $xoopsDB->fetchArray($result)) {
-        $fields[$existing_field['Field']] = $existing_field['Type'];
-        if ($existing_field['Null'] !== 'YES') {
-            $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'] . "'";
-        }
-    }
+	global $xoopsDB;
+	$result = $xoopsDB->query('SHOW COLUMNS FROM ' . $table);
+	while ($existing_field = $xoopsDB->fetchArray($result)) {
+		$fields[$existing_field['Field']] = $existing_field['Type'];
+		if ($existing_field['Null'] !== 'YES') {
+			$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;
+	return $fields;
 }
 
 /**
@@ -315,59 +315,59 @@ 
  */
 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 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;
+	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']);
+	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?
-        $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);
-        }
+		//Is MyDownloads installed?
+		$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);
-        }
+		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;
+		$form->addElement(new XoopsFormHidden('op', 0));
+		$form->display();
+		break;
 }
 //wfdownloads_modFooter();
 //xoops_cp_footer();

Spacing +3 added lines, -3 removed lines

@@ -207,7 +207,7 @@ 
     $ret = array();
     global $xoopsDB;
     $catHandler = xoops_getModuleHandler('category', 'wfdownloads');
-    $result      = $xoopsDB->query('SHOW COLUMNS FROM ' . $catHandler->table);
+    $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $catHandler->table);
     while ($existing_field = $xoopsDB->fetchArray($result)) {
         $fields[$existing_field['field']] = $existing_field['type'];
     }
@@ -328,7 +328,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
@@ -351,7 +351,7 @@ 
         $form = new XoopsThemeForm('Upgrade WF-Downloads', 'form', $_SERVER['REQUEST_URI']);
 
         //Is MyDownloads installed?
-        $moduleHandler    = xoops_getHandler('module');
+        $moduleHandler = xoops_getHandler('module');
         $mydownloadsModule = $moduleHandler->getByDirname('mydownloads');
         if (is_object($mydownloadsModule)) {
             $mydownloadsButton = new XoopsFormButton('Import data from MyDownloads', 'myd_button', 'Import', 'submit');

admin/admin_header.php

Spacing +1 added lines, -1 removed lines

@@ -37,6 +37,6 @@
 
 $pathIcon16      = '../' . $xoopsModule->getInfo('icons16');
 $pathIcon32      = '../' . $xoopsModule->getInfo('icons32');
-$pathModuleAdmin =& $xoopsModule->getInfo('dirmoduleadmin');
+$pathModuleAdmin = & $xoopsModule->getInfo('dirmoduleadmin');
 
 include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');

class/smartobjecttreetable.php

Indentation +149 added lines, -149 removed lines

@@ -22,153 +22,153 @@
  */
 class SmartObjectTreeTable extends SmartObjectTable
 {
-    /**
-     * SmartObjectTreeTable constructor.
-     * @param object $objectHandler
-     * @param bool   $criteria
-     * @param array  $actions
-     * @param bool   $userSide
-     */
-    public function __construct(&$objectHandler, $criteria = false, $actions = array('edit', 'delete'), $userSide = false)
-    {
-        $this->SmartObjectTable($objectHandler, $criteria, $actions, $userSide);
-        $this->_isTree = true;
-    }
-
-    /**
-     * Get children objects given a specific parentid
-     *
-     * @var    int $parentid id of the parent which children we want to retreive
-     * @return array of SmartObject
-     */
-    public function getChildrenOf($parentid = 0)
-    {
-        return isset($this->_objects[$parentid]) ? $this->_objects[$parentid] : false;
-    }
-
-    /**
-     * @param     $object
-     * @param int $level
-     */
-    public function createTableRow($object, $level = 0)
-    {
-        $aObject = array();
-
-        $i = 0;
-
-        $aColumns        = array();
-        $doWeHaveActions = false;
-
-        foreach ($this->_columns as $column) {
-            $aColumn = array();
-
-            if ($i == 0) {
-                $class = 'head';
-            } elseif ($i % 2 == 0) {
-                $class = 'even';
-            } else {
-                $class = 'odd';
-            }
-
-            if ($column->_customMethodForValue && method_exists($object, $column->_customMethodForValue)) {
-                $method = $column->_customMethodForValue;
-                $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());
-                }
-            }
-
-            $space = '';
-            if ($column->getKeyName() == $this->_objectHandler->identifierName) {
-                for ($i = 0; $i < $level; ++$i) {
-                    $space = $space . '--';
-                }
-            }
-
-            if ($space != '') {
-                $space .= '&nbsp;';
-            }
-
-            $aColumn['value'] = $space . $value;
-            $aColumn['class'] = $class;
-            $aColumn['width'] = $column->getWidth();
-            $aColumn['align'] = $column->getAlign();
-            $aColumn['key']   = $column->getKeyName();
-
-            $aColumns[] = $aColumn;
-            ++$i;
-        }
-
-        $aObject['columns'] = $aColumns;
-
-        $class            = $class === 'even' ? 'odd' : 'even';
-        $aObject['class'] = $class;
-
-        $actions = array();
-
-        // Adding the custom actions if any
-        foreach ($this->_custom_actions as $action) {
-            if (method_exists($object, $action)) {
-                $actions[] = $object->$action();
-            }
-        }
-
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($this->_objectHandler);
-
-        if (in_array('edit', $this->_actions)) {
-            $actions[] = $controller->getEditItemLink($object, false, true);
-        }
-        if (in_array('delete', $this->_actions)) {
-            $actions[] = $controller->getDeleteItemLink($object, false, true);
-        }
-        $aObject['actions'] = $actions;
-
-        $this->_tpl->assign('smartobject_actions_column_width', count($actions) * 30);
-        $aObject['id']     = $object->id();
-        $this->_aObjects[] = $aObject;
-
-        $childrenObjects = $this->getChildrenOf($object->id());
-
-        $this->_hasActions = $this->_hasActions ? true : count($actions) > 0;
-
-        if ($childrenObjects) {
-            ++$level;
-            foreach ($childrenObjects as $subObject) {
-                $this->createTableRow($subObject, $level);
-            }
-        }
-    }
-
-    public function createTableRows()
-    {
-        $this->_aObjects = array();
-
-        if (count($this->_objects) > 0) {
-            foreach ($this->getChildrenOf() as $object) {
-                $this->createTableRow($object);
-            }
-
-            $this->_tpl->assign('smartobject_objects', $this->_aObjects);
-        } else {
-            $colspan = count($this->_columns) + 1;
-            $this->_tpl->assign('smartobject_colspan', $colspan);
-        }
-    }
-
-    /**
-     * @return mixed
-     */
-    public function fetchObjects()
-    {
-        $ret = $this->_objectHandler->getObjects($this->_criteria, 'parentid');
-
-        return $ret;
-    }
+	/**
+	 * SmartObjectTreeTable constructor.
+	 * @param object $objectHandler
+	 * @param bool   $criteria
+	 * @param array  $actions
+	 * @param bool   $userSide
+	 */
+	public function __construct(&$objectHandler, $criteria = false, $actions = array('edit', 'delete'), $userSide = false)
+	{
+		$this->SmartObjectTable($objectHandler, $criteria, $actions, $userSide);
+		$this->_isTree = true;
+	}
+
+	/**
+	 * Get children objects given a specific parentid
+	 *
+	 * @var    int $parentid id of the parent which children we want to retreive
+	 * @return array of SmartObject
+	 */
+	public function getChildrenOf($parentid = 0)
+	{
+		return isset($this->_objects[$parentid]) ? $this->_objects[$parentid] : false;
+	}
+
+	/**
+	 * @param     $object
+	 * @param int $level
+	 */
+	public function createTableRow($object, $level = 0)
+	{
+		$aObject = array();
+
+		$i = 0;
+
+		$aColumns        = array();
+		$doWeHaveActions = false;
+
+		foreach ($this->_columns as $column) {
+			$aColumn = array();
+
+			if ($i == 0) {
+				$class = 'head';
+			} elseif ($i % 2 == 0) {
+				$class = 'even';
+			} else {
+				$class = 'odd';
+			}
+
+			if ($column->_customMethodForValue && method_exists($object, $column->_customMethodForValue)) {
+				$method = $column->_customMethodForValue;
+				$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());
+				}
+			}
+
+			$space = '';
+			if ($column->getKeyName() == $this->_objectHandler->identifierName) {
+				for ($i = 0; $i < $level; ++$i) {
+					$space = $space . '--';
+				}
+			}
+
+			if ($space != '') {
+				$space .= '&nbsp;';
+			}
+
+			$aColumn['value'] = $space . $value;
+			$aColumn['class'] = $class;
+			$aColumn['width'] = $column->getWidth();
+			$aColumn['align'] = $column->getAlign();
+			$aColumn['key']   = $column->getKeyName();
+
+			$aColumns[] = $aColumn;
+			++$i;
+		}
+
+		$aObject['columns'] = $aColumns;
+
+		$class            = $class === 'even' ? 'odd' : 'even';
+		$aObject['class'] = $class;
+
+		$actions = array();
+
+		// Adding the custom actions if any
+		foreach ($this->_custom_actions as $action) {
+			if (method_exists($object, $action)) {
+				$actions[] = $object->$action();
+			}
+		}
+
+		include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($this->_objectHandler);
+
+		if (in_array('edit', $this->_actions)) {
+			$actions[] = $controller->getEditItemLink($object, false, true);
+		}
+		if (in_array('delete', $this->_actions)) {
+			$actions[] = $controller->getDeleteItemLink($object, false, true);
+		}
+		$aObject['actions'] = $actions;
+
+		$this->_tpl->assign('smartobject_actions_column_width', count($actions) * 30);
+		$aObject['id']     = $object->id();
+		$this->_aObjects[] = $aObject;
+
+		$childrenObjects = $this->getChildrenOf($object->id());
+
+		$this->_hasActions = $this->_hasActions ? true : count($actions) > 0;
+
+		if ($childrenObjects) {
+			++$level;
+			foreach ($childrenObjects as $subObject) {
+				$this->createTableRow($subObject, $level);
+			}
+		}
+	}
+
+	public function createTableRows()
+	{
+		$this->_aObjects = array();
+
+		if (count($this->_objects) > 0) {
+			foreach ($this->getChildrenOf() as $object) {
+				$this->createTableRow($object);
+			}
+
+			$this->_tpl->assign('smartobject_objects', $this->_aObjects);
+		} else {
+			$colspan = count($this->_columns) + 1;
+			$this->_tpl->assign('smartobject_colspan', $colspan);
+		}
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function fetchObjects()
+	{
+		$ret = $this->_objectHandler->getObjects($this->_criteria, 'parentid');
+
+		return $ret;
+	}
 }

class/rating.php

Indentation +208 added lines, -208 removed lines

@@ -37,125 +37,125 @@ 
  */
 class SmartobjectRating extends SmartObject
 {
-    public $_modulePlugin = false;
-
-    /**
-     * SmartobjectRating constructor.
-     */
-    public function __construct()
-    {
-        $this->quickInitVar('ratingid', XOBJ_DTYPE_INT, true);
-        $this->quickInitVar('dirname', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_DIRNAME);
-        $this->quickInitVar('item', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_ITEM);
-        $this->quickInitVar('itemid', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_ITEMID);
-        $this->quickInitVar('uid', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_UID);
-        $this->quickInitVar('date', XOBJ_DTYPE_LTIME, true, _CO_SOBJECT_RATING_DATE);
-        $this->quickInitVar('rate', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_RATE);
-
-        $this->initNonPersistableVar('name', XOBJ_DTYPE_TXTBOX, 'user', _CO_SOBJECT_RATING_NAME);
-
-        $this->setControl('dirname', array(
-            'handler'  => 'rating',
-            'method'   => 'getModuleList',
-            'onSelect' => 'submit'
-        ));
-
-        $this->setControl('item', array(
-            'object' => &$this,
-            'method' => 'getItemList'
-        ));
-
-        $this->setControl('uid', 'user');
-
-        $this->setControl('rate', array(
-            'handler' => 'rating',
-            'method'  => 'getRateList'
-        ));
-    }
-
-    /**
-     * @param  string $key
-     * @param  string $format
-     * @return mixed
-     */
-    public function getVar($key, $format = 's')
-    {
-        if ($format === 's' && in_array($key, array('name', 'dirname'))) {
-            //            return call_user_func(array($this, $key));
-            return $this->{$key}();
-        }
-
-        return parent::getVar($key, $format);
-    }
-
-    /**
-     * @return string
-     */
-    public function name()
-    {
-        $ret = smart_getLinkedUnameFromId($this->getVar('uid', 'e'), true, array());
-
-        return $ret;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function dirname()
-    {
-        global $smartobjectRatingHandler;
-        $moduleArray = $smartobjectRatingHandler->getModuleList();
-
-        return $moduleArray[$this->getVar('dirname', 'n')];
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getItemList()
-    {
-        $plugin = $this->getModulePlugin();
-
-        return $plugin->getItemList();
-    }
-
-    /**
-     * @return string
-     */
-    public function getItemValue()
-    {
-        $moduleUrl      = XOOPS_URL . '/modules/' . $this->getVar('dirname', 'n') . '/';
-        $plugin         = $this->getModulePlugin();
-        $pluginItemInfo = $plugin->getItemInfo($this->getVar('item'));
-        if (!$pluginItemInfo) {
-            return '';
-        }
-        $itemPath = sprintf($pluginItemInfo['url'], $this->getVar('itemid'));
-        $ret      = '<a href="' . $moduleUrl . $itemPath . '">' . $pluginItemInfo['caption'] . '</a>';
-
-        return $ret;
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getRateValue()
-    {
-        return $this->getVar('rate');
-    }
-
-    /**
-     * @return bool
-     */
-    public function getModulePlugin()
-    {
-        if (!$this->_modulePlugin) {
-            global $smartobjectRatingHandler;
-            $this->_modulePlugin = $smartobjectRatingHandler->pluginsObject->getPlugin($this->getVar('dirname', 'n'));
-        }
-
-        return $this->_modulePlugin;
-    }
+	public $_modulePlugin = false;
+
+	/**
+	 * SmartobjectRating constructor.
+	 */
+	public function __construct()
+	{
+		$this->quickInitVar('ratingid', XOBJ_DTYPE_INT, true);
+		$this->quickInitVar('dirname', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_DIRNAME);
+		$this->quickInitVar('item', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_ITEM);
+		$this->quickInitVar('itemid', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_ITEMID);
+		$this->quickInitVar('uid', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_UID);
+		$this->quickInitVar('date', XOBJ_DTYPE_LTIME, true, _CO_SOBJECT_RATING_DATE);
+		$this->quickInitVar('rate', XOBJ_DTYPE_INT, true, _CO_SOBJECT_RATING_RATE);
+
+		$this->initNonPersistableVar('name', XOBJ_DTYPE_TXTBOX, 'user', _CO_SOBJECT_RATING_NAME);
+
+		$this->setControl('dirname', array(
+			'handler'  => 'rating',
+			'method'   => 'getModuleList',
+			'onSelect' => 'submit'
+		));
+
+		$this->setControl('item', array(
+			'object' => &$this,
+			'method' => 'getItemList'
+		));
+
+		$this->setControl('uid', 'user');
+
+		$this->setControl('rate', array(
+			'handler' => 'rating',
+			'method'  => 'getRateList'
+		));
+	}
+
+	/**
+	 * @param  string $key
+	 * @param  string $format
+	 * @return mixed
+	 */
+	public function getVar($key, $format = 's')
+	{
+		if ($format === 's' && in_array($key, array('name', 'dirname'))) {
+			//            return call_user_func(array($this, $key));
+			return $this->{$key}();
+		}
+
+		return parent::getVar($key, $format);
+	}
+
+	/**
+	 * @return string
+	 */
+	public function name()
+	{
+		$ret = smart_getLinkedUnameFromId($this->getVar('uid', 'e'), true, array());
+
+		return $ret;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function dirname()
+	{
+		global $smartobjectRatingHandler;
+		$moduleArray = $smartobjectRatingHandler->getModuleList();
+
+		return $moduleArray[$this->getVar('dirname', 'n')];
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getItemList()
+	{
+		$plugin = $this->getModulePlugin();
+
+		return $plugin->getItemList();
+	}
+
+	/**
+	 * @return string
+	 */
+	public function getItemValue()
+	{
+		$moduleUrl      = XOOPS_URL . '/modules/' . $this->getVar('dirname', 'n') . '/';
+		$plugin         = $this->getModulePlugin();
+		$pluginItemInfo = $plugin->getItemInfo($this->getVar('item'));
+		if (!$pluginItemInfo) {
+			return '';
+		}
+		$itemPath = sprintf($pluginItemInfo['url'], $this->getVar('itemid'));
+		$ret      = '<a href="' . $moduleUrl . $itemPath . '">' . $pluginItemInfo['caption'] . '</a>';
+
+		return $ret;
+	}
+
+	/**
+	 * @return mixed
+	 */
+	public function getRateValue()
+	{
+		return $this->getVar('rate');
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getModulePlugin()
+	{
+		if (!$this->_modulePlugin) {
+			global $smartobjectRatingHandler;
+			$this->_modulePlugin = $smartobjectRatingHandler->pluginsObject->getPlugin($this->getVar('dirname', 'n'));
+		}
+
+		return $this->_modulePlugin;
+	}
 }
 
 /**
@@ -163,93 +163,93 @@ 
  */
 class SmartobjectRatingHandler extends SmartPersistableObjectHandler
 {
-    public $_rateOptions = array();
-    public $_moduleList  = false;
-    public $pluginsObject;
-
-    /**
-     * SmartobjectRatingHandler constructor.
-     * @param XoopsDatabase $db
-     */
-    public function __construct($db)
-    {
-        parent::__construct($db, 'rating', 'ratingid', 'rate', '', 'smartobject');
-        $this->generalSQL = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->db->prefix('users') . ' AS user ON ' . $this->_itemname . '.uid=user.uid';
-
-        $this->_rateOptions[1] = 1;
-        $this->_rateOptions[2] = 2;
-        $this->_rateOptions[3] = 3;
-        $this->_rateOptions[4] = 4;
-        $this->_rateOptions[5] = 5;
-
-        $this->pluginsObject = new SmartPluginHandler();
-    }
-
-    /**
-     * @return bool
-     */
-    public function getModuleList()
-    {
-        if (!$this->_moduleList) {
-            $moduleArray          = $this->pluginsObject->getPluginsArray();
-            $this->_moduleList[0] = _CO_SOBJECT_MAKE_SELECTION;
-            foreach ($moduleArray as $k => $v) {
-                $this->_moduleList[$k] = $v;
-            }
-        }
-
-        return $this->_moduleList;
-    }
-
-    /**
-     * @return array
-     */
-    public function getRateList()
-    {
-        return $this->_rateOptions;
-    }
-
-    /**
-     * @param $itemid
-     * @param $dirname
-     * @param $item
-     * @return int
-     */
-    public function getRatingAverageByItemId($itemid, $dirname, $item)
-    {
-        $sql    = 'SELECT AVG(rate), COUNT(ratingid) FROM ' . $this->table . " WHERE itemid=$itemid AND dirname='$dirname' AND item='$item' GROUP BY itemid";
-        $result = $this->db->query($sql);
-        if (!$result) {
-            return 0;
-        }
-        list($average, $sum) = $this->db->fetchRow($result);
-        $ret['average'] = isset($average) ? $average : 0;
-        $ret['sum']     = isset($sum) ? $sum : 0;
-
-        return $ret;
-    }
-
-    /**
-     * @param $item
-     * @param $itemid
-     * @param $dirname
-     * @param $uid
-     * @return bool
-     */
-    public function already_rated($item, $itemid, $dirname, $uid)
-    {
-        $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('item', $item));
-        $criteria->add(new Criteria('itemid', $itemid));
-        $criteria->add(new Criteria('dirname', $dirname));
-        $criteria->add(new Criteria('user.uid', $uid));
-
-        $ret = $this->getObjects($criteria);
-
-        if (!$ret) {
-            return false;
-        } else {
-            return $ret[0];
-        }
-    }
+	public $_rateOptions = array();
+	public $_moduleList  = false;
+	public $pluginsObject;
+
+	/**
+	 * SmartobjectRatingHandler constructor.
+	 * @param XoopsDatabase $db
+	 */
+	public function __construct($db)
+	{
+		parent::__construct($db, 'rating', 'ratingid', 'rate', '', 'smartobject');
+		$this->generalSQL = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->db->prefix('users') . ' AS user ON ' . $this->_itemname . '.uid=user.uid';
+
+		$this->_rateOptions[1] = 1;
+		$this->_rateOptions[2] = 2;
+		$this->_rateOptions[3] = 3;
+		$this->_rateOptions[4] = 4;
+		$this->_rateOptions[5] = 5;
+
+		$this->pluginsObject = new SmartPluginHandler();
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function getModuleList()
+	{
+		if (!$this->_moduleList) {
+			$moduleArray          = $this->pluginsObject->getPluginsArray();
+			$this->_moduleList[0] = _CO_SOBJECT_MAKE_SELECTION;
+			foreach ($moduleArray as $k => $v) {
+				$this->_moduleList[$k] = $v;
+			}
+		}
+
+		return $this->_moduleList;
+	}
+
+	/**
+	 * @return array
+	 */
+	public function getRateList()
+	{
+		return $this->_rateOptions;
+	}
+
+	/**
+	 * @param $itemid
+	 * @param $dirname
+	 * @param $item
+	 * @return int
+	 */
+	public function getRatingAverageByItemId($itemid, $dirname, $item)
+	{
+		$sql    = 'SELECT AVG(rate), COUNT(ratingid) FROM ' . $this->table . " WHERE itemid=$itemid AND dirname='$dirname' AND item='$item' GROUP BY itemid";
+		$result = $this->db->query($sql);
+		if (!$result) {
+			return 0;
+		}
+		list($average, $sum) = $this->db->fetchRow($result);
+		$ret['average'] = isset($average) ? $average : 0;
+		$ret['sum']     = isset($sum) ? $sum : 0;
+
+		return $ret;
+	}
+
+	/**
+	 * @param $item
+	 * @param $itemid
+	 * @param $dirname
+	 * @param $uid
+	 * @return bool
+	 */
+	public function already_rated($item, $itemid, $dirname, $uid)
+	{
+		$criteria = new CriteriaCompo();
+		$criteria->add(new Criteria('item', $item));
+		$criteria->add(new Criteria('itemid', $itemid));
+		$criteria->add(new Criteria('dirname', $dirname));
+		$criteria->add(new Criteria('user.uid', $uid));
+
+		$ret = $this->getObjects($criteria);
+
+		if (!$ret) {
+			return false;
+		} else {
+			return $ret[0];
+		}
+	}
 }

class/smartaddto.php

Indentation +51 added lines, -51 removed lines

@@ -9,66 +9,66 @@
 
 class SmartAddto
 {
-    public $_layout;
-    public $_method;
+	public $_layout;
+	public $_method;
 
-    /**
-     * Constructor of SmartAddTo
-     *
-     * @param int $layout 0=Horizontal 1 row, 1=Horizontal 2 rows, 2=Vertical with icons, 3=Vertical no icons
-     * @param int $method 0=directpage, 1=popup
-     */
-    public function __construct($layout = 0, $method = 1)
-    {
-        $layout = (int)$layout;
-        if ($layout < 0 || $layout > 3) {
-            $layout = 0;
-        }
-        $this->_layout = $layout;
+	/**
+	 * Constructor of SmartAddTo
+	 *
+	 * @param int $layout 0=Horizontal 1 row, 1=Horizontal 2 rows, 2=Vertical with icons, 3=Vertical no icons
+	 * @param int $method 0=directpage, 1=popup
+	 */
+	public function __construct($layout = 0, $method = 1)
+	{
+		$layout = (int)$layout;
+		if ($layout < 0 || $layout > 3) {
+			$layout = 0;
+		}
+		$this->_layout = $layout;
 
-        $method = (int)$method;
-        if ($method < 0 || $method > 1) {
-            $method = 1;
-        }
-        $this->_method = $method;
-    }
+		$method = (int)$method;
+		if ($method < 0 || $method > 1) {
+			$method = 1;
+		}
+		$this->_method = $method;
+	}
 
-    /**
-     * @param  bool $fetchOnly
-     * @return mixed|string|void
-     */
-    public function render($fetchOnly = false)
-    {
-        global $xoTheme, $xoopsTpl;
+	/**
+	 * @param  bool $fetchOnly
+	 * @return mixed|string|void
+	 */
+	public function render($fetchOnly = false)
+	{
+		global $xoTheme, $xoopsTpl;
 
-        $xoTheme->addStylesheet(SMARTOBJECT_URL . 'include/addto/addto.css');
+		$xoTheme->addStylesheet(SMARTOBJECT_URL . 'include/addto/addto.css');
 
-        $xoopsTpl->assign('smartobject_addto_method', $this->_method);
-        $xoopsTpl->assign('smartobject_addto_layout', $this->_layout);
+		$xoopsTpl->assign('smartobject_addto_method', $this->_method);
+		$xoopsTpl->assign('smartobject_addto_layout', $this->_layout);
 
-        $xoopsTpl->assign('smartobject_addto_url', SMARTOBJECT_URL . 'include/addto/');
+		$xoopsTpl->assign('smartobject_addto_url', SMARTOBJECT_URL . 'include/addto/');
 
-        if ($fetchOnly) {
-            return $xoopsTpl->fetch('db:smartobject_addto.tpl');
-        } else {
-            $xoopsTpl->display('db:smartobject_addto.tpl');
-        }
-    }
+		if ($fetchOnly) {
+			return $xoopsTpl->fetch('db:smartobject_addto.tpl');
+		} else {
+			$xoopsTpl->display('db:smartobject_addto.tpl');
+		}
+	}
 
-    /**
-     * @return array
-     */
-    public function renderForBlock()
-    {
-        global $xoTheme;
+	/**
+	 * @return array
+	 */
+	public function renderForBlock()
+	{
+		global $xoTheme;
 
-        $xoTheme->addStylesheet(SMARTOBJECT_URL . 'include/addto/addto.css');
+		$xoTheme->addStylesheet(SMARTOBJECT_URL . 'include/addto/addto.css');
 
-        $block                             = array();
-        $block['smartobject_addto_method'] = $this->_method;
-        $block['smartobject_addto_layout'] = $this->_layout;
-        $block['smartobject_addto_url']    = SMARTOBJECT_URL . 'include/addto/';
+		$block                             = array();
+		$block['smartobject_addto_method'] = $this->_method;
+		$block['smartobject_addto_layout'] = $this->_layout;
+		$block['smartobject_addto_url']    = SMARTOBJECT_URL . 'include/addto/';
 
-        return $block;
-    }
+		return $block;
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -20,13 +20,13 @@
      */
     public function __construct($layout = 0, $method = 1)
     {
-        $layout = (int)$layout;
+        $layout = (int) $layout;
         if ($layout < 0 || $layout > 3) {
             $layout = 0;
         }
         $this->_layout = $layout;
 
-        $method = (int)$method;
+        $method = (int) $method;
         if ($method < 0 || $method > 1) {
             $method = 1;
         }

class/file.php

Indentation +16 added lines, -16 removed lines

@@ -8,14 +8,14 @@ 
  */
 class SmartobjectFile extends SmartobjectBasedUrl
 {
-    /**
-     * SmartobjectFile constructor.
-     */
-    public function __construct()
-    {
-        parent::__construct();
-        $this->quickInitVar('fileid', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_DIRNAME);
-    }
+	/**
+	 * SmartobjectFile constructor.
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->quickInitVar('fileid', XOBJ_DTYPE_TXTBOX, true, _CO_SOBJECT_RATING_DIRNAME);
+	}
 }
 
 /**
@@ -23,12 +23,12 @@ 
  */
 class SmartobjectFileHandler extends SmartPersistableObjectHandler
 {
-    /**
-     * SmartobjectFileHandler constructor.
-     * @param object|XoopsDatabase $db
-     */
-    public function __construct($db)
-    {
-        parent::__construct($db, 'file', 'fileid', 'caption', 'desc', 'smartobject');
-    }
+	/**
+	 * SmartobjectFileHandler constructor.
+	 * @param object|XoopsDatabase $db
+	 */
+	public function __construct($db)
+	{
+		parent::__construct($db, 'file', 'fileid', 'caption', 'desc', 'smartobject');
+	}
 }

class/smarttip.php

Indentation +39 added lines, -39 removed lines

@@ -10,45 +10,45 @@
 
 class SmartTip
 {
-    public $id;
-    public $caption;
-    public $message;
-    public $visible;
-    public $_tpl;
+	public $id;
+	public $caption;
+	public $message;
+	public $visible;
+	public $_tpl;
 
-    /**
-     * SmartTip constructor.
-     * @param      $id
-     * @param      $caption
-     * @param      $message
-     * @param bool $visible
-     */
-    public function __construct($id, $caption, $message, $visible = false)
-    {
-        $this->id      = $id;
-        $this->caption = $caption;
-        $this->message = $message;
-        $this->visible = $visible;
-        $this->_tpl    = new XoopsTpl();
-    }
+	/**
+	 * SmartTip constructor.
+	 * @param      $id
+	 * @param      $caption
+	 * @param      $message
+	 * @param bool $visible
+	 */
+	public function __construct($id, $caption, $message, $visible = false)
+	{
+		$this->id      = $id;
+		$this->caption = $caption;
+		$this->message = $message;
+		$this->visible = $visible;
+		$this->_tpl    = new XoopsTpl();
+	}
 
-    /**
-     * @param  bool $outputNow
-     * @return mixed|string|void
-     */
-    public function render($outputNow = true)
-    {
-        $aTip = array(
-            'id'      => $this->id,
-            'caption' => $this->caption,
-            'message' => $this->message,
-            'visible' => $this->visible ? 'block' : 'none'
-        );
-        $this->_tpl->assign('tip', $aTip);
-        if ($outputNow) {
-            $this->_tpl->display('db:smartobject_tip.tpl');
-        } else {
-            return $this->_tpl->fetch('db:smartobject_tip.tpl');
-        }
-    }
+	/**
+	 * @param  bool $outputNow
+	 * @return mixed|string|void
+	 */
+	public function render($outputNow = true)
+	{
+		$aTip = array(
+			'id'      => $this->id,
+			'caption' => $this->caption,
+			'message' => $this->message,
+			'visible' => $this->visible ? 'block' : 'none'
+		);
+		$this->_tpl->assign('tip', $aTip);
+		if ($outputNow) {
+			$this->_tpl->display('db:smartobject_tip.tpl');
+		} else {
+			return $this->_tpl->fetch('db:smartobject_tip.tpl');
+		}
+	}
 }