mambax7 / smartobject

blocks/addto.php

Indentation +14 added lines, -14 removed lines

@@ -8,12 +8,12 @@ 
  */
 function smartobject_addto_show($options)
 {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
-    require_once SMARTOBJECT_ROOT_PATH . 'class/smartaddto.php';
-    $smartaddto = new XoopsModules\Smartobject\SmartAddTo($options[0]);
-    $block      = $smartaddto->renderForBlock();
+	require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+	require_once SMARTOBJECT_ROOT_PATH . 'class/smartaddto.php';
+	$smartaddto = new XoopsModules\Smartobject\SmartAddTo($options[0]);
+	$block      = $smartaddto->renderForBlock();
 
-    return $block;
+	return $block;
 }
 
 /**
@@ -22,16 +22,16 @@ 
  */
 function smartobject_addto_edit($options)
 {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+	require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
 
-    $form = '';
+	$form = '';
 
-    $layout_select = new \XoopsFormSelect(_MB_SOBJECT_BLOCKS_ADDTO_LAYOUT, 'options[]', $options[0]);
-    $layout_select->addOption(0, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION0);
-    $layout_select->addOption(1, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION1);
-    $layout_select->addOption(2, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION2);
-    $layout_select->addOption(3, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION3);
-    $form .= $layout_select->getCaption() . ' ' . $layout_select->render() . '<br>';
+	$layout_select = new \XoopsFormSelect(_MB_SOBJECT_BLOCKS_ADDTO_LAYOUT, 'options[]', $options[0]);
+	$layout_select->addOption(0, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION0);
+	$layout_select->addOption(1, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION1);
+	$layout_select->addOption(2, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION2);
+	$layout_select->addOption(3, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION3);
+	$form .= $layout_select->getCaption() . ' ' . $layout_select->render() . '<br>';
 
-    return $form;
+	return $form;
 }

Spacing +4 added lines, -4 removed lines

@@ -8,8 +8,8 @@ 
  */
 function smartobject_addto_show($options)
 {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
-    require_once SMARTOBJECT_ROOT_PATH . 'class/smartaddto.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
+    require_once SMARTOBJECT_ROOT_PATH.'class/smartaddto.php';
     $smartaddto = new XoopsModules\Smartobject\SmartAddTo($options[0]);
     $block      = $smartaddto->renderForBlock();
 
@@ -22,7 +22,7 @@ 
  */
 function smartobject_addto_edit($options)
 {
-    require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
     $form = '';
 
@@ -31,7 +31,7 @@ 
     $layout_select->addOption(1, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION1);
     $layout_select->addOption(2, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION2);
     $layout_select->addOption(3, _MB_SOBJECT_BLOCKS_ADDTO_LAYOUT_OPTION3);
-    $form .= $layout_select->getCaption() . ' ' . $layout_select->render() . '<br>';
+    $form .= $layout_select->getCaption().' '.$layout_select->render().'<br>';
 
     return $form;
 }

xoops_version.php

Spacing +4 added lines, -4 removed lines

@@ -10,7 +10,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once __DIR__ . '/preloads/autoloader.php';
+require_once __DIR__.'/preloads/autoloader.php';
 
 $modversion['version']       = '1.12';
 $modversion['module_status'] = 'RC 2';
@@ -33,7 +33,7 @@ 
 //$modversion['status'] = "Final";
 $modversion['modicons16']          = 'assets/images/icons/16';
 $modversion['modicons32']          = 'assets/images/icons/32';
-$modversion['release_file']        = XOOPS_URL . '/modules/' . $modversion['dirname'] . '/docs/changelog.txt';
+$modversion['release_file']        = XOOPS_URL.'/modules/'.$modversion['dirname'].'/docs/changelog.txt';
 $modversion['module_website_url']  = 'www.xoops.org';
 $modversion['module_website_name'] = 'XOOPS';
 $modversion['min_php']             = '5.5';
@@ -66,12 +66,12 @@ 
 // ----- BUG: not read other language file -----
 //include_once(XOOPS_ROOT_PATH.'/modules/smartobject/language/english/common.php');
 global $xoopsConfig;
-$common_file = XOOPS_ROOT_PATH . '/modules/smartobject/language/' . $xoopsConfig['language'] . '/common.php';
+$common_file = XOOPS_ROOT_PATH.'/modules/smartobject/language/'.$xoopsConfig['language'].'/common.php';
 if (file_exists($common_file)) {
     $flag_common = true;
     require_once $common_file;
 } else {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/language/english/common.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartobject/language/english/common.php';
 }
 // -----
 

admin/link.php

Indentation +47 added lines, -47 removed lines

@@ -25,81 +25,81 @@
 $op = '';
 
 if (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 }
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 switch ($op) {
 
-    case 'del':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectLinkHandler);
-        $controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
+	case 'del':
+		require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectLinkHandler);
+		$controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
 
-        break;
+		break;
 
-    case 'view':
-        $linkid  = isset($_GET['linkid']) ? $_GET['linkid'] : 0;
-        $linkObj = $smartobjectLinkHandler->get($linkid);
+	case 'view':
+		$linkid  = isset($_GET['linkid']) ? $_GET['linkid'] : 0;
+		$linkObj = $smartobjectLinkHandler->get($linkid);
 
-        if ($linkObj->isNew()) {
-            redirect_header(SMARTOBJECT_URL . 'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
-        }
+		if ($linkObj->isNew()) {
+			redirect_header(SMARTOBJECT_URL . 'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
+		}
 
-        smart_xoops_cp_header();
+		smart_xoops_cp_header();
 
-        //smart_adminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
+		//smart_adminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
 
-        smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
+		smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
 
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+		require_once XOOPS_ROOT_PATH . '/class/template.php';
 
-        // ---
-        // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
-        //      $xoopsTpl = new \XoopsTpl();
-        $xoopsTpl = new \XoopsTpl();
-        //---
+		// ---
+		// 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
+		//      $xoopsTpl = new \XoopsTpl();
+		$xoopsTpl = new \XoopsTpl();
+		//---
 
-        $xoopsTpl->assign('link', $linkObj->toArray());
-        $xoopsTpl->display('db:smartobject_sentlink_display.tpl');
+		$xoopsTpl->assign('link', $linkObj->toArray());
+		$xoopsTpl->display('db:smartobject_sentlink_display.tpl');
 
-        echo '<br>';
-        smart_close_collapsable('sentlinks');
-        echo '<br>';
+		echo '<br>';
+		smart_close_collapsable('sentlinks');
+		echo '<br>';
 
-        break;
+		break;
 
-    default:
+	default:
 
-        smart_xoops_cp_header();
+		smart_xoops_cp_header();
 
-        $adminObject->displayNavigation(basename(__FILE__));
+		$adminObject->displayNavigation(basename(__FILE__));
 
-        //smart_adminMenu(1, _AM_SOBJECT_SENT_LINKS);
+		//smart_adminMenu(1, _AM_SOBJECT_SENT_LINKS);
 
-        smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
+		smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
 
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new XoopsModules\Smartobject\SmartObjectTable($smartobjectLinkHandler, null, ['delete']);
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('date'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('link'));
+		require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+		$objectTable = new XoopsModules\Smartobject\SmartObjectTable($smartobjectLinkHandler, null, ['delete']);
+		$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('date'));
+		$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
+		$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
+		$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('link'));
 
-        $objectTable->addCustomAction('getViewItemLink');
+		$objectTable->addCustomAction('getViewItemLink');
 
-        $objectTable->setDefaultSort('date');
-        $objectTable->setDefaultOrder('DESC');
+		$objectTable->setDefaultSort('date');
+		$objectTable->setDefaultOrder('DESC');
 
-        $objectTable->render();
+		$objectTable->render();
 
-        echo '<br>';
-        smart_close_collapsable('sentlinks');
-        echo '<br>';
+		echo '<br>';
+		smart_close_collapsable('sentlinks');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //smart_modFooter();

Switch Indentation +45 added lines, -45 removed lines

@@ -33,73 +33,73 @@
 
 switch ($op) {
 
-    case 'del':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectLinkHandler);
-        $controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
+    	case 'del':
+        	require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectLinkHandler);
+        	$controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
 
-        break;
+        	break;
 
-    case 'view':
-        $linkid  = isset($_GET['linkid']) ? $_GET['linkid'] : 0;
-        $linkObj = $smartobjectLinkHandler->get($linkid);
+    	case 'view':
+        	$linkid  = isset($_GET['linkid']) ? $_GET['linkid'] : 0;
+        	$linkObj = $smartobjectLinkHandler->get($linkid);
 
-        if ($linkObj->isNew()) {
-            redirect_header(SMARTOBJECT_URL . 'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
-        }
+        	if ($linkObj->isNew()) {
+            	redirect_header(SMARTOBJECT_URL . 'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
+        	}
 
-        smart_xoops_cp_header();
+        	smart_xoops_cp_header();
 
-        //smart_adminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
+        	//smart_adminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
 
-        smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
+        	smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
 
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        	require_once XOOPS_ROOT_PATH . '/class/template.php';
 
-        // ---
-        // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
-        //      $xoopsTpl = new \XoopsTpl();
-        $xoopsTpl = new \XoopsTpl();
-        //---
+        	// ---
+        	// 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
+        	//      $xoopsTpl = new \XoopsTpl();
+        	$xoopsTpl = new \XoopsTpl();
+        	//---
 
-        $xoopsTpl->assign('link', $linkObj->toArray());
-        $xoopsTpl->display('db:smartobject_sentlink_display.tpl');
+        	$xoopsTpl->assign('link', $linkObj->toArray());
+        	$xoopsTpl->display('db:smartobject_sentlink_display.tpl');
 
-        echo '<br>';
-        smart_close_collapsable('sentlinks');
-        echo '<br>';
+        	echo '<br>';
+        	smart_close_collapsable('sentlinks');
+        	echo '<br>';
 
-        break;
+        	break;
 
-    default:
+    	default:
 
-        smart_xoops_cp_header();
+        	smart_xoops_cp_header();
 
-        $adminObject->displayNavigation(basename(__FILE__));
+        	$adminObject->displayNavigation(basename(__FILE__));
 
-        //smart_adminMenu(1, _AM_SOBJECT_SENT_LINKS);
+        	//smart_adminMenu(1, _AM_SOBJECT_SENT_LINKS);
 
-        smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
+        	smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
 
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new XoopsModules\Smartobject\SmartObjectTable($smartobjectLinkHandler, null, ['delete']);
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('date'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('link'));
+        	require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        	$objectTable = new XoopsModules\Smartobject\SmartObjectTable($smartobjectLinkHandler, null, ['delete']);
+        	$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('date'));
+        	$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
+        	$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
+        	$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('link'));
 
-        $objectTable->addCustomAction('getViewItemLink');
+        	$objectTable->addCustomAction('getViewItemLink');
 
-        $objectTable->setDefaultSort('date');
-        $objectTable->setDefaultOrder('DESC');
+        	$objectTable->setDefaultSort('date');
+        	$objectTable->setDefaultOrder('DESC');
 
-        $objectTable->render();
+        	$objectTable->render();
 
-        echo '<br>';
-        smart_close_collapsable('sentlinks');
-        echo '<br>';
+        	echo '<br>';
+        	smart_close_collapsable('sentlinks');
+        	echo '<br>';
 
-        break;
+        	break;
 }
 
 //smart_modFooter();

Spacing +8 added lines, -8 removed lines

@@ -15,9 +15,9 @@ 
 use XoopsModules\Smartobject\SmartObjectController;
 use XoopsModules\Smartobject\SmartObjectTable;
 
-require_once __DIR__ . '/admin_header.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectlink.php';
+require_once __DIR__.'/admin_header.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/smartobjecttable.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/smartobjectlink.php';
 $adminObject = \Xmf\Module\Admin::getInstance();
 
 $smartobjectLinkHandler = xoops_getModuleHandler('link');
@@ -34,7 +34,7 @@ 
 switch ($op) {
 
     case 'del':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobjectcontroller.php';
         $controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectLinkHandler);
         $controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
 
@@ -45,7 +45,7 @@ 
         $linkObj = $smartobjectLinkHandler->get($linkid);
 
         if ($linkObj->isNew()) {
-            redirect_header(SMARTOBJECT_URL . 'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
+            redirect_header(SMARTOBJECT_URL.'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
         }
 
         smart_xoops_cp_header();
@@ -54,7 +54,7 @@ 
 
         smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
 
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
 
         // ---
         // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
@@ -81,7 +81,7 @@ 
 
         smart_collapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
 
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        require_once SMARTOBJECT_ROOT_PATH.'class/smartobjecttable.php';
         $objectTable = new XoopsModules\Smartobject\SmartObjectTable($smartobjectLinkHandler, null, ['delete']);
         $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('date'));
         $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
@@ -104,4 +104,4 @@ 
 
 //smart_modFooter();
 //xoops_cp_footer();
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/update.php

Indentation +273 added lines, -273 removed lines

@@ -19,180 +19,180 @@ 
 // =========================================================================================
 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>';
-        }
-    }
+		$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]
-    ];
+	$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'
-    ];
+	$renamed_fields = [
+		'logourl' => 'screenshot'
+	];
 
-    echo '<br><b>Checking Download table</b><br>';
-    $downloadHandler = xoops_getModuleHandler('download', 'wfdownloads');
-    $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);
+	echo '<br><b>Checking Download table</b><br>';
+	$downloadHandler = xoops_getModuleHandler('download', 'wfdownloads');
+	$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]
-    ];
+	$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'
-    ];
+	$renamed_fields = [
+		'logourl' => 'screenshot'
+	];
 
-    echo '<br><b>Checking Modified Downloads table</b><br>';
-    $moduleHandler = xoops_getModuleHandler('modification', 'wfdownloads');
-    $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);
+	echo '<br><b>Checking Modified Downloads table</b><br>';
+	$moduleHandler = xoops_getModuleHandler('modification', 'wfdownloads');
+	$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');
-    $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);
+	$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');
+	$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>';
-    $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_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>';
+	$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);
 }
 
 // =========================================================================================
@@ -205,48 +205,48 @@ 
  */
 function invert_nohtm_dohtml_values()
 {
-    $ret = [];
-    global $xoopsDB;
-    $catHandler = xoops_getModuleHandler('category', 'wfdownloads');
-    $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'");
+	$ret = [];
+	global $xoopsDB;
+	$catHandler = xoops_getModuleHandler('category', 'wfdownloads');
+	$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');
+		//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;
 }
 
 /**
@@ -259,22 +259,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>";
+		}
+	}
 }
 
 /**
@@ -287,22 +287,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'] . "'";
-        }
-    }
+	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;
+	return $fields;
 }
 
 /**
@@ -316,60 +316,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 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?
-        /** @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);
-        }
+		//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);
-        }
+		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 +11 added lines, -11 removed lines

@@ -8,8 +8,8 @@ 
  */
 
 use XoopsModules\Wfdownloads;
-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();
 
@@ -208,7 +208,7 @@ 
     $ret = [];
     global $xoopsDB;
     $catHandler = xoops_getModuleHandler('category', 'wfdownloads');
-    $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'];
     }
@@ -267,7 +267,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>";
@@ -288,17 +288,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']."'";
         }
     }
 
@@ -320,7 +320,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;
@@ -329,7 +329,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
@@ -348,7 +348,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?
@@ -373,4 +373,4 @@ 
 }
 //wfdownloads_modFooter();
 //xoops_cp_footer();
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/admin_header.php

Indentation +2 added lines, -2 removed lines

@@ -41,6 +41,6 @@
 $myts = \MyTextSanitizer::getInstance();
 
 if (!isset($GLOBALS['xoopsTpl']) || !($GLOBALS['xoopsTpl'] instanceof XoopsTpl)) {
-    require_once $GLOBALS['xoops']->path('class/template.php');
-    $xoopsTpl = new \XoopsTpl();
+	require_once $GLOBALS['xoops']->path('class/template.php');
+	$xoopsTpl = new \XoopsTpl();
 }

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
 
 use XoopsModules\Smartobject;
 
-require_once __DIR__ . '/../../../include/cp_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
 //require_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
 
 // require_once __DIR__ . '/../class/Utility.php';
-require_once __DIR__ . '/../include/common.php';
+require_once __DIR__.'/../include/common.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 $helper = Smartobject\Helper::getInstance();

admin/rating.php

Indentation +78 added lines, -78 removed lines

@@ -15,44 +15,44 @@ 
 
 function editclass($showmenu = false, $ratingid = 0)
 {
-    global $smartobjectRatingHandler;
-
-    $ratingObj = $smartobjectRatingHandler->get($ratingid);
-
-    if (!$ratingObj->isNew()) {
-        if ($showmenu) {
-            //smart_adminMenu(4, _AM_SOBJECT_RATINGS . " > " . _AM_SOBJECT_EDITING);
-        }
-        smart_collapsableBar('ratingedit', _AM_SOBJECT_RATINGS_EDIT, _AM_SOBJECT_RATINGS_EDIT_INFO);
-
-        $sform = $ratingObj->getForm(_AM_SOBJECT_RATINGS_EDIT, 'addrating');
-        $sform->display();
-        smart_close_collapsable('ratingedit');
-    } else {
-        $ratingObj->hideFieldFromForm(['item', 'itemid', 'uid', 'date', 'rate']);
-
-        if (isset($_POST['op'])) {
-            $controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectRatingHandler);
-            $controller->postDataToObject($ratingObj);
-
-            if ('changedField' === $_POST['op']) {
-                switch ($_POST['changedField']) {
-                    case 'dirname':
-                        $ratingObj->showFieldOnForm(['item', 'itemid', 'uid', 'date', 'rate']);
-                        break;
-                }
-            }
-        }
-
-        if ($showmenu) {
-            //smart_adminMenu(4, _AM_SOBJECT_RATINGS . " > " . _CO_SOBJECT_CREATINGNEW);
-        }
-
-        smart_collapsableBar('ratingcreate', _AM_SOBJECT_RATINGS_CREATE, _AM_SOBJECT_RATINGS_CREATE_INFO);
-        $sform = $ratingObj->getForm(_AM_SOBJECT_RATINGS_CREATE, 'addrating');
-        $sform->display();
-        smart_close_collapsable('ratingcreate');
-    }
+	global $smartobjectRatingHandler;
+
+	$ratingObj = $smartobjectRatingHandler->get($ratingid);
+
+	if (!$ratingObj->isNew()) {
+		if ($showmenu) {
+			//smart_adminMenu(4, _AM_SOBJECT_RATINGS . " > " . _AM_SOBJECT_EDITING);
+		}
+		smart_collapsableBar('ratingedit', _AM_SOBJECT_RATINGS_EDIT, _AM_SOBJECT_RATINGS_EDIT_INFO);
+
+		$sform = $ratingObj->getForm(_AM_SOBJECT_RATINGS_EDIT, 'addrating');
+		$sform->display();
+		smart_close_collapsable('ratingedit');
+	} else {
+		$ratingObj->hideFieldFromForm(['item', 'itemid', 'uid', 'date', 'rate']);
+
+		if (isset($_POST['op'])) {
+			$controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectRatingHandler);
+			$controller->postDataToObject($ratingObj);
+
+			if ('changedField' === $_POST['op']) {
+				switch ($_POST['changedField']) {
+					case 'dirname':
+						$ratingObj->showFieldOnForm(['item', 'itemid', 'uid', 'date', 'rate']);
+						break;
+				}
+			}
+		}
+
+		if ($showmenu) {
+			//smart_adminMenu(4, _AM_SOBJECT_RATINGS . " > " . _CO_SOBJECT_CREATINGNEW);
+		}
+
+		smart_collapsableBar('ratingcreate', _AM_SOBJECT_RATINGS_CREATE, _AM_SOBJECT_RATINGS_CREATE_INFO);
+		$sform = $ratingObj->getForm(_AM_SOBJECT_RATINGS_CREATE, 'addrating');
+		$sform->display();
+		smart_close_collapsable('ratingcreate');
+	}
 }
 
 require_once __DIR__ . '/admin_header.php';
@@ -64,60 +64,60 @@ 
 $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':
-    case 'changedField':
+	case 'mod':
+	case 'changedField':
 
-        $ratingid = isset($_GET['ratingid']) ? (int)$_GET['ratingid'] : 0;
+		$ratingid = isset($_GET['ratingid']) ? (int)$_GET['ratingid'] : 0;
 
-        smart_xoops_cp_header();
-        $adminObject->displayNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		$adminObject->displayNavigation(basename(__FILE__));
 
-        editclass(true, $ratingid);
-        break;
+		editclass(true, $ratingid);
+		break;
 
-    case 'addrating':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectRatingHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
+	case 'addrating':
+		require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectRatingHandler);
+		$controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
 
-        break;
+		break;
 
-    case 'del':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectRatingHandler);
-        $controller->handleObjectDeletion();
+	case 'del':
+		require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectRatingHandler);
+		$controller->handleObjectDeletion();
 
-        break;
+		break;
 
-    default:
+	default:
 
-        smart_xoops_cp_header();
-        $adminObject->displayNavigation(basename(__FILE__));
+		smart_xoops_cp_header();
+		$adminObject->displayNavigation(basename(__FILE__));
 
-        //smart_adminMenu(4, _AM_SOBJECT_RATINGS);
+		//smart_adminMenu(4, _AM_SOBJECT_RATINGS);
 
-        smart_collapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
+		smart_collapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
 
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new XoopsModules\Smartobject\SmartObjectTable($smartobjectRatingHandler);
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('name', 'left'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('dirname', 'left'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('item', 'left', false, 'getItemValue'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('date', 'center', 150));
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('rate', 'center', 40, 'getRateValue'));
+		require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+		$objectTable = new XoopsModules\Smartobject\SmartObjectTable($smartobjectRatingHandler);
+		$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('name', 'left'));
+		$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('dirname', 'left'));
+		$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('item', 'left', false, 'getItemValue'));
+		$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('date', 'center', 150));
+		$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('rate', 'center', 40, 'getRateValue'));
 
-        //      $objectTable->addCustomAction('getCreateItemLink');
-        //      $objectTable->addCustomAction('getCreateAttributLink');
+		//      $objectTable->addCustomAction('getCreateItemLink');
+		//      $objectTable->addCustomAction('getCreateAttributLink');
 
-        $objectTable->addIntroButton('addrating', 'rating.php?op=mod', _AM_SOBJECT_RATINGS_CREATE);
-        /*
+		$objectTable->addIntroButton('addrating', 'rating.php?op=mod', _AM_SOBJECT_RATINGS_CREATE);
+		/*
                 $criteria_upcoming = new \CriteriaCompo();
                 $criteria_upcoming->add(new \Criteria('start_date', time(), '>'));
                 $objectTable->addFilter(_AM_SOBJECT_FILTER_UPCOMING, array(
@@ -142,13 +142,13 @@ 
                 ));
         */
 
-        $objectTable->render();
+		$objectTable->render();
 
-        echo '<br>';
-        smart_close_collapsable('createdratings');
-        echo '<br>';
+		echo '<br>';
+		smart_close_collapsable('createdratings');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //smart_modFooter();

Switch Indentation +38 added lines, -38 removed lines

@@ -71,53 +71,53 @@ 
 }
 
 switch ($op) {
-    case 'mod':
-    case 'changedField':
+    	case 'mod':
+    	case 'changedField':
 
-        $ratingid = isset($_GET['ratingid']) ? (int)$_GET['ratingid'] : 0;
+        	$ratingid = isset($_GET['ratingid']) ? (int)$_GET['ratingid'] : 0;
 
-        smart_xoops_cp_header();
-        $adminObject->displayNavigation(basename(__FILE__));
+        	smart_xoops_cp_header();
+        	$adminObject->displayNavigation(basename(__FILE__));
 
-        editclass(true, $ratingid);
-        break;
+        	editclass(true, $ratingid);
+        	break;
 
-    case 'addrating':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectRatingHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
+    	case 'addrating':
+        	require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectRatingHandler);
+        	$controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
 
-        break;
+        	break;
 
-    case 'del':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectRatingHandler);
-        $controller->handleObjectDeletion();
+    	case 'del':
+        	require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectRatingHandler);
+        	$controller->handleObjectDeletion();
 
-        break;
+        	break;
 
-    default:
+    	default:
 
-        smart_xoops_cp_header();
-        $adminObject->displayNavigation(basename(__FILE__));
+        	smart_xoops_cp_header();
+        	$adminObject->displayNavigation(basename(__FILE__));
 
-        //smart_adminMenu(4, _AM_SOBJECT_RATINGS);
+        	//smart_adminMenu(4, _AM_SOBJECT_RATINGS);
 
-        smart_collapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
+        	smart_collapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
 
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new XoopsModules\Smartobject\SmartObjectTable($smartobjectRatingHandler);
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('name', 'left'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('dirname', 'left'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('item', 'left', false, 'getItemValue'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('date', 'center', 150));
-        $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('rate', 'center', 40, 'getRateValue'));
+        	require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        	$objectTable = new XoopsModules\Smartobject\SmartObjectTable($smartobjectRatingHandler);
+        	$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('name', 'left'));
+        	$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('dirname', 'left'));
+        	$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('item', 'left', false, 'getItemValue'));
+        	$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('date', 'center', 150));
+        	$objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('rate', 'center', 40, 'getRateValue'));
 
-        //      $objectTable->addCustomAction('getCreateItemLink');
-        //      $objectTable->addCustomAction('getCreateAttributLink');
+        	//      $objectTable->addCustomAction('getCreateItemLink');
+        	//      $objectTable->addCustomAction('getCreateAttributLink');
 
-        $objectTable->addIntroButton('addrating', 'rating.php?op=mod', _AM_SOBJECT_RATINGS_CREATE);
-        /*
+        	$objectTable->addIntroButton('addrating', 'rating.php?op=mod', _AM_SOBJECT_RATINGS_CREATE);
+        	/*
                 $criteria_upcoming = new \CriteriaCompo();
                 $criteria_upcoming->add(new \Criteria('start_date', time(), '>'));
                 $objectTable->addFilter(_AM_SOBJECT_FILTER_UPCOMING, array(
@@ -142,13 +142,13 @@ 
                 ));
         */
 
-        $objectTable->render();
+        	$objectTable->render();
 
-        echo '<br>';
-        smart_close_collapsable('createdratings');
-        echo '<br>';
+        	echo '<br>';
+        	smart_close_collapsable('createdratings');
+        	echo '<br>';
 
-        break;
+        	break;
 }
 
 //smart_modFooter();

Spacing +9 added lines, -9 removed lines

@@ -55,9 +55,9 @@ 
     }
 }
 
-require_once __DIR__ . '/admin_header.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/rating.php';
+require_once __DIR__.'/admin_header.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/smartobjecttable.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/rating.php';
 $smartobjectRatingHandler = xoops_getModuleHandler('rating');
 $indexAdmin               = \Xmf\Module\Admin::getInstance();
 
@@ -74,7 +74,7 @@ 
     case 'mod':
     case 'changedField':
 
-        $ratingid = isset($_GET['ratingid']) ? (int)$_GET['ratingid'] : 0;
+        $ratingid = isset($_GET['ratingid']) ? (int) $_GET['ratingid'] : 0;
 
         smart_xoops_cp_header();
         $adminObject->displayNavigation(basename(__FILE__));
@@ -83,14 +83,14 @@ 
         break;
 
     case 'addrating':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobjectcontroller.php';
         $controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectRatingHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
+        $controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL.'admin/rating.php');
 
         break;
 
     case 'del':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobjectcontroller.php';
         $controller = new XoopsModules\Smartobject\SmartObjectController($smartobjectRatingHandler);
         $controller->handleObjectDeletion();
 
@@ -105,7 +105,7 @@ 
 
         smart_collapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
 
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        require_once SMARTOBJECT_ROOT_PATH.'class/smartobjecttable.php';
         $objectTable = new XoopsModules\Smartobject\SmartObjectTable($smartobjectRatingHandler);
         $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('name', 'left'));
         $objectTable->addColumn(new XoopsModules\Smartobject\SmartObjectColumn('dirname', 'left'));
@@ -153,4 +153,4 @@ 
 
 //smart_modFooter();
 //xoops_cp_footer();
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/about2.php

Spacing +2 added lines, -2 removed lines

@@ -7,8 +7,8 @@
  * Licence: GNU
  */
 //
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
-require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectabout.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/smartobjectabout.php';
 $aboutObj = new XoopsModules\Smartobject\SmartobjectAbout();
 $aboutObj->render();

admin/currency.php

Indentation +71 added lines, -71 removed lines

@@ -14,29 +14,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');
+	}
 }
 
 require_once __DIR__ . '/admin_header.php';
@@ -47,36 +47,36 @@ 
 $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']) || 0 == count($_POST['SmartobjectCurrency_objects'])) {
-            redirect_header($smart_previous_page, 3, _AM_SOBJECT_NO_RECORDS_TO_UPDATE);
-        }
+		if (!isset($_POST['SmartobjectCurrency_objects']) || 0 == count($_POST['SmartobjectCurrency_objects'])) {
+			redirect_header($smart_previous_page, 3, _AM_SOBJECT_NO_RECORDS_TO_UPDATE);
+		}
 
-        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);
@@ -86,49 +86,49 @@ 
             $smartobjectCurrencyHandler->insert($currencyObj);
         }
         */
-        redirect_header($smart_previous_page, 3, _AM_SOBJECT_RECORDS_UPDATED);
-        break;
+		redirect_header($smart_previous_page, 3, _AM_SOBJECT_RECORDS_UPDATED);
+		break;
 
-    case 'addcurrency':
-        require_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':
+		require_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':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectCurrencyHandler);
-        $controller->handleObjectDeletion();
+	case 'del':
+		require_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);
 
-        require_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'));
+		require_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 +46 added lines, -46 removed lines

@@ -54,29 +54,29 @@ 
 }
 
 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']) || 0 == count($_POST['SmartobjectCurrency_objects'])) {
-            redirect_header($smart_previous_page, 3, _AM_SOBJECT_NO_RECORDS_TO_UPDATE);
-        }
+        	if (!isset($_POST['SmartobjectCurrency_objects']) || 0 == count($_POST['SmartobjectCurrency_objects'])) {
+            	redirect_header($smart_previous_page, 3, _AM_SOBJECT_NO_RECORDS_TO_UPDATE);
+        	}
 
-        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);
@@ -86,49 +86,49 @@ 
             $smartobjectCurrencyHandler->insert($currencyObj);
         }
         */
-        redirect_header($smart_previous_page, 3, _AM_SOBJECT_RECORDS_UPDATED);
-        break;
+        	redirect_header($smart_previous_page, 3, _AM_SOBJECT_RECORDS_UPDATED);
+        	break;
 
-    case 'addcurrency':
-        require_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':
+        	require_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':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectCurrencyHandler);
-        $controller->handleObjectDeletion();
+    	case 'del':
+        	require_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);
 
-        require_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'));
+        	require_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();

admin/tag.php

Indentation +84 added lines, -84 removed lines

@@ -16,45 +16,45 @@ 
 
 function edittag($tagid = 0, $language = false, $fct = false)
 {
-    global $smartobjectTagHandler;
-
-    $tagObj = $smartobjectTagHandler->get($tagid);
-
-    if ($tagObj->isNew()) {
-        $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_CREATE;
-        $title                 = _AM_SOBJECT_TAG_CREATE;
-        $info                  = _AM_SOBJECT_TAG_CREATE_INFO;
-        $collaps_name          = 'tagcreate';
-        $form_name             = _AM_SOBJECT_TAG_CREATE;
-        $submit_button_caption = null;
-    //$tagObj->stripMultilanguageFields();
-    } else {
-        if ($language) {
-            $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_EDITING_LANGUAGE;
-            $title                 = _AM_SOBJECT_TAG_EDIT_LANGUAGE;
-            $info                  = _AM_SOBJECT_TAG_EDIT_LANGUAGE_INFO;
-            $collaps_name          = 'tageditlanguage';
-            $form_name             = _AM_SOBJECT_TAG_EDIT_LANGUAGE;
-            $submit_button_caption = null;
-            $tagObj->makeNonMLFieldReadOnly();
-        } else {
-            $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_EDITING;
-            $title                 = _AM_SOBJECT_TAG_EDIT;
-            $info                  = _AM_SOBJECT_TAG_EDIT_INFO;
-            $collaps_name          = 'tagedit';
-            $form_name             = _AM_SOBJECT_TAG_EDIT;
-            $submit_button_caption = null;
-            $tagObj->stripMultilanguageFields();
-        }
-    }
-
-    //smart_adminMenu(2, $breadcrumb);
-
-    smart_collapsableBar($collaps_name, $title, $info);
-
-    $sform = $tagObj->getForm($form_name, 'addtag', false, $submit_button_caption);
-    $sform->display();
-    smart_close_collapsable($collaps_name);
+	global $smartobjectTagHandler;
+
+	$tagObj = $smartobjectTagHandler->get($tagid);
+
+	if ($tagObj->isNew()) {
+		$breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_CREATE;
+		$title                 = _AM_SOBJECT_TAG_CREATE;
+		$info                  = _AM_SOBJECT_TAG_CREATE_INFO;
+		$collaps_name          = 'tagcreate';
+		$form_name             = _AM_SOBJECT_TAG_CREATE;
+		$submit_button_caption = null;
+	//$tagObj->stripMultilanguageFields();
+	} else {
+		if ($language) {
+			$breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_EDITING_LANGUAGE;
+			$title                 = _AM_SOBJECT_TAG_EDIT_LANGUAGE;
+			$info                  = _AM_SOBJECT_TAG_EDIT_LANGUAGE_INFO;
+			$collaps_name          = 'tageditlanguage';
+			$form_name             = _AM_SOBJECT_TAG_EDIT_LANGUAGE;
+			$submit_button_caption = null;
+			$tagObj->makeNonMLFieldReadOnly();
+		} else {
+			$breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_EDITING;
+			$title                 = _AM_SOBJECT_TAG_EDIT;
+			$info                  = _AM_SOBJECT_TAG_EDIT_INFO;
+			$collaps_name          = 'tagedit';
+			$form_name             = _AM_SOBJECT_TAG_EDIT;
+			$submit_button_caption = null;
+			$tagObj->stripMultilanguageFields();
+		}
+	}
+
+	//smart_adminMenu(2, $breadcrumb);
+
+	smart_collapsableBar($collaps_name, $title, $info);
+
+	$sform = $tagObj->getForm($form_name, 'addtag', false, $submit_button_caption);
+	$sform->display();
+	smart_close_collapsable($collaps_name);
 }
 
 require_once __DIR__ . '/admin_header.php';
@@ -66,10 +66,10 @@ 
 $op = '';
 
 if (isset($_GET['op'])) {
-    $op = $_GET['op'];
+	$op = $_GET['op'];
 }
 if (isset($_POST['op'])) {
-    $op = $_POST['op'];
+	$op = $_POST['op'];
 }
 
 $tagid    = isset($_GET['tagid']) ? $_GET['tagid'] : 0;
@@ -78,65 +78,65 @@ 
 
 switch ($op) {
 
-    case 'del':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectTagHandler);
-        $controller->handleObjectDeletion(_AM_SOBJECT_TAG_DELETE_CONFIRM);
+	case 'del':
+		require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectTagHandler);
+		$controller->handleObjectDeletion(_AM_SOBJECT_TAG_DELETE_CONFIRM);
 
-        break;
+		break;
 
-    case 'addtag':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new SmartObjectController($smartobjectTagHandler);
-        $tagObj     = $controller->storeSmartObject();
-        if ($tagObj->hasError()) {
-            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
-        }
+	case 'addtag':
+		require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+		$controller = new SmartObjectController($smartobjectTagHandler);
+		$tagObj     = $controller->storeSmartObject();
+		if ($tagObj->hasError()) {
+			redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
+		}
 
-        if ($tagObj->hasError()) {
-            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
-        } else {
-            redirect_header(smart_get_page_before_form(), 3, _CO_SOBJECT_SAVE_SUCCESS);
-        }
-        exit;
-        break;
+		if ($tagObj->hasError()) {
+			redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
+		} else {
+			redirect_header(smart_get_page_before_form(), 3, _CO_SOBJECT_SAVE_SUCCESS);
+		}
+		exit;
+		break;
 
-    case 'mod':
-        smart_xoops_cp_header();
-        edittag($tagid, $language, $fct);
-        break;
+	case 'mod':
+		smart_xoops_cp_header();
+		edittag($tagid, $language, $fct);
+		break;
 
-    default:
+	default:
 
-        smart_xoops_cp_header();
+		smart_xoops_cp_header();
 
-        //smart_adminMenu(2, _AM_SOBJECT_TAGS);
+		//smart_adminMenu(2, _AM_SOBJECT_TAGS);
 
-        smart_collapsableBar('tags', _AM_SOBJECT_TAGS, _AM_SOBJECT_TAGS_INFO);
+		smart_collapsableBar('tags', _AM_SOBJECT_TAGS, _AM_SOBJECT_TAGS_INFO);
 
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new SmartObjectTable($smartobjectTagHandler, false, ['delete']);
-        $objectTable->addColumn(new SmartObjectColumn('name'));
-        $objectTable->addColumn(new SmartObjectColumn('language'));
-        $objectTable->addColumn(new SmartObjectColumn('value'));
-        //      $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_TAGS_FROM, $align='left', $width=false, 'getFromInfo'));
+		require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+		$objectTable = new SmartObjectTable($smartobjectTagHandler, false, ['delete']);
+		$objectTable->addColumn(new SmartObjectColumn('name'));
+		$objectTable->addColumn(new SmartObjectColumn('language'));
+		$objectTable->addColumn(new SmartObjectColumn('value'));
+		//      $objectTable->addColumn(new SmartObjectColumn(_AM_SOBJECT_SENT_TAGS_FROM, $align='left', $width=false, 'getFromInfo'));
 
-        $objectTable->addFilter('language', 'getLanguages');
+		$objectTable->addFilter('language', 'getLanguages');
 
-        $objectTable->addCustomAction('getEditLanguageLink');
-        $objectTable->addCustomAction('getEditItemLink');
+		$objectTable->addCustomAction('getEditLanguageLink');
+		$objectTable->addCustomAction('getEditItemLink');
 
-        $objectTable->setDefaultSort('tagid');
+		$objectTable->setDefaultSort('tagid');
 
-        $objectTable->addIntroButton('addtag', 'tag.php?op=mod', _AM_SOBJECT_TAG_CREATE);
+		$objectTable->addIntroButton('addtag', 'tag.php?op=mod', _AM_SOBJECT_TAG_CREATE);
 
-        $objectTable->render();
+		$objectTable->render();
 
-        echo '<br>';
-        smart_close_collapsable('tags');
-        echo '<br>';
+		echo '<br>';
+		smart_close_collapsable('tags');
+		echo '<br>';
 
-        break;
+		break;
 }
 
 //smart_modFooter();

Spacing +12 added lines, -12 removed lines

@@ -21,7 +21,7 @@ 
     $tagObj = $smartobjectTagHandler->get($tagid);
 
     if ($tagObj->isNew()) {
-        $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_CREATE;
+        $breadcrumb            = _AM_SOBJECT_TAGS.' > '._AM_SOBJECT_TAG_CREATE;
         $title                 = _AM_SOBJECT_TAG_CREATE;
         $info                  = _AM_SOBJECT_TAG_CREATE_INFO;
         $collaps_name          = 'tagcreate';
@@ -30,7 +30,7 @@ 
     //$tagObj->stripMultilanguageFields();
     } else {
         if ($language) {
-            $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_TAG_EDITING_LANGUAGE;
+            $breadcrumb            = _AM_SOBJECT_TAGS.' > '._AM_SOBJECT_TAG_EDITING_LANGUAGE;
             $title                 = _AM_SOBJECT_TAG_EDIT_LANGUAGE;
             $info                  = _AM_SOBJECT_TAG_EDIT_LANGUAGE_INFO;
             $collaps_name          = 'tageditlanguage';
@@ -38,7 +38,7 @@ 
             $submit_button_caption = null;
             $tagObj->makeNonMLFieldReadOnly();
         } else {
-            $breadcrumb            = _AM_SOBJECT_TAGS . ' > ' . _AM_SOBJECT_EDITING;
+            $breadcrumb            = _AM_SOBJECT_TAGS.' > '._AM_SOBJECT_EDITING;
             $title                 = _AM_SOBJECT_TAG_EDIT;
             $info                  = _AM_SOBJECT_TAG_EDIT_INFO;
             $collaps_name          = 'tagedit';
@@ -57,9 +57,9 @@ 
     smart_close_collapsable($collaps_name);
 }
 
-require_once __DIR__ . '/admin_header.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttag.php';
+require_once __DIR__.'/admin_header.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/smartobjecttable.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/smartobjecttag.php';
 
 $smartobjectTagHandler = xoops_getModuleHandler('tag');
 
@@ -79,22 +79,22 @@ 
 switch ($op) {
 
     case 'del':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobjectcontroller.php';
         $controller = new SmartObjectController($smartobjectTagHandler);
         $controller->handleObjectDeletion(_AM_SOBJECT_TAG_DELETE_CONFIRM);
 
         break;
 
     case 'addtag':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobjectcontroller.php';
         $controller = new SmartObjectController($smartobjectTagHandler);
         $tagObj     = $controller->storeSmartObject();
         if ($tagObj->hasError()) {
-            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
+            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR.$tagObj->getHtmlErrors());
         }
 
         if ($tagObj->hasError()) {
-            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $tagObj->getHtmlErrors());
+            redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR.$tagObj->getHtmlErrors());
         } else {
             redirect_header(smart_get_page_before_form(), 3, _CO_SOBJECT_SAVE_SUCCESS);
         }
@@ -114,7 +114,7 @@ 
 
         smart_collapsableBar('tags', _AM_SOBJECT_TAGS, _AM_SOBJECT_TAGS_INFO);
 
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        require_once SMARTOBJECT_ROOT_PATH.'class/smartobjecttable.php';
         $objectTable = new SmartObjectTable($smartobjectTagHandler, false, ['delete']);
         $objectTable->addColumn(new SmartObjectColumn('name'));
         $objectTable->addColumn(new SmartObjectColumn('language'));
@@ -141,4 +141,4 @@ 
 
 //smart_modFooter();
 //xoops_cp_footer();
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';