Inspection of "[ImgBot] Optimize images" - mambax7/smartobject - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Pull Request — master (#1)

unknown

created 2019-01-19 04:05 UTC

Status

Switch Indentation +48 added lines, -48 removed lines patch added patch discarded remove patch

@@ -68,65 +68,65 @@  discard block
 block discarded – undo
 }
 
 switch ($op) {
-    case 'mod':
+    	case 'mod':
 
-        $adsenseid = \Xmf\Request::getInt('adsenseid', 0, 'GET');
+        	$adsenseid = \Xmf\Request::getInt('adsenseid', 0, 'GET');
 
-        Smartobject\Utility::getXoopsCpHeader();
-        $adminObject->displayNavigation(basename(__FILE__));
+        	Smartobject\Utility::getXoopsCpHeader();
+        	$adminObject->displayNavigation(basename(__FILE__));
 
-        editclass(true, $adsenseid);
-        break;
+        	editclass(true, $adsenseid);
+        	break;
 
-    case 'clone':
+    	case 'clone':
 
-        $adsenseid = \Xmf\Request::getInt('adsenseid', 0, 'GET');
+        	$adsenseid = \Xmf\Request::getInt('adsenseid', 0, 'GET');
 
-        Smartobject\Utility::getXoopsCpHeader();
-        $adminObject->displayNavigation(basename(__FILE__));
+        	Smartobject\Utility::getXoopsCpHeader();
+        	$adminObject->displayNavigation(basename(__FILE__));
 
-        editclass(true, $adsenseid, true);
-        break;
+        	editclass(true, $adsenseid, true);
+        	break;
 
-    case 'addadsense':
-        if (@require_once SMARTOBJECT_ROOT_PATH . 'include/captcha/captcha.php') {
-            $xoopsCaptcha = XoopsCaptcha::getInstance();
-            if (!$xoopsCaptcha->verify()) {
-                redirect_header('javascript:history.go(-1);', 3, $xoopsCaptcha->getMessage());
-            }
-        }
-//        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new XoopsModules\Smartobject\ObjectController($smartobjectAdsenseHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_ADSENSES_CREATED, _AM_SOBJECT_ADSENSES_MODIFIED);
-        break;
+    	case 'addadsense':
+        	if (@require_once SMARTOBJECT_ROOT_PATH . 'include/captcha/captcha.php') {
+            	$xoopsCaptcha = XoopsCaptcha::getInstance();
+            	if (!$xoopsCaptcha->verify()) {
+                	redirect_header('javascript:history.go(-1);', 3, $xoopsCaptcha->getMessage());
+            	}
+        	}
+	//        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new XoopsModules\Smartobject\ObjectController($smartobjectAdsenseHandler);
+        	$controller->storeFromDefaultForm(_AM_SOBJECT_ADSENSES_CREATED, _AM_SOBJECT_ADSENSES_MODIFIED);
+        	break;
 
-    case 'del':
+    	case 'del':
 
-//        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new XoopsModules\Smartobject\ObjectController($smartobjectAdsenseHandler);
-        $controller->handleObjectDeletion();
+	//        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new XoopsModules\Smartobject\ObjectController($smartobjectAdsenseHandler);
+        	$controller->handleObjectDeletion();
 
-        break;
+        	break;
 
-    default:
+    	default:
 
-        Smartobject\Utility::getXoopsCpHeader();
-        $adminObject->displayNavigation(basename(__FILE__));
+        	Smartobject\Utility::getXoopsCpHeader();
+        	$adminObject->displayNavigation(basename(__FILE__));
 
-        //Smartobject\Utility::getAdminMenu(3, _AM_SOBJECT_ADSENSES);
+        	//Smartobject\Utility::getAdminMenu(3, _AM_SOBJECT_ADSENSES);
 
-        Smartobject\Utility::getCollapsableBar('createdadsenses', _AM_SOBJECT_ADSENSES, _AM_SOBJECT_ADSENSES_DSC);
+        	Smartobject\Utility::getCollapsableBar('createdadsenses', _AM_SOBJECT_ADSENSES, _AM_SOBJECT_ADSENSES_DSC);
 
-//        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new XoopsModules\Smartobject\Table($smartobjectAdsenseHandler);
-        $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('description', 'left'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn(_AM_SOBJECT_ADSENSE_TAG, 'center', 200, 'getXoopsCode'));
+	//        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        	$objectTable = new XoopsModules\Smartobject\Table($smartobjectAdsenseHandler);
+        	$objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('description', 'left'));
+        	$objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn(_AM_SOBJECT_ADSENSE_TAG, 'center', 200, 'getXoopsCode'));
 
-        //      $objectTable->addCustomAction('getCreateItemLink');
-        //      $objectTable->addCustomAction('getCreateAttributLink');
+        	//      $objectTable->addCustomAction('getCreateItemLink');
+        	//      $objectTable->addCustomAction('getCreateAttributLink');
 
-        $objectTable->addIntroButton('addadsense', 'adsense.php?op=mod', _AM_SOBJECT_ADSENSES_CREATE);
-        /*
+        	$objectTable->addIntroButton('addadsense', 'adsense.php?op=mod', _AM_SOBJECT_ADSENSES_CREATE);
+        	/*
                 $criteria_upcoming = new \CriteriaCompo();
                 $criteria_upcoming->add(new \Criteria('start_date', time(), '>'));
                 $objectTable->addFilter(_AM_SOBJECT_FILTER_UPCOMING, array(
@@ -150,16 +150,16 @@  discard block
 block discarded – undo
                                             'criteria' => $criteria_last30days
                 ));
         */
-        $objectTable->addQuickSearch(['title', 'summary', 'description']);
-        $objectTable->addCustomAction('getCloneLink');
+        	$objectTable->addQuickSearch(['title', 'summary', 'description']);
+        	$objectTable->addCustomAction('getCloneLink');
 
-        $objectTable->render();
+        	$objectTable->render();
 
-        echo '<br>';
-        Smartobject\Utility::closeCollapsable('createdadsenses');
-        echo '<br>';
+        	echo '<br>';
+        	Smartobject\Utility::closeCollapsable('createdadsenses');
+        	echo '<br>';
 
-        break;
+        	break;
 }
 
 //Smartobject\Utility::getModFooter();

Please login to merge, or discard this patch.

admin/link.php 1 patch

Switch Indentation +45 added lines, -45 removed lines patch added patch discarded remove patch

@@ -34,73 +34,73 @@
 block discarded – undo
 
 switch ($op) {
 
-    case 'del':
-//        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new XoopsModules\Smartobject\ObjectController($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\ObjectController($smartobjectLinkHandler);
+        	$controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
 
-        break;
+        	break;
 
-    case 'view':
-        $linkid  = \Xmf\Request::getInt('linkid', 0, 'GET');
-        $linkObj = $smartobjectLinkHandler->get($linkid);
+    	case 'view':
+        	$linkid  = \Xmf\Request::getInt('linkid', 0, 'GET');
+        	$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);
+        	}
 
-        Smartobject\Utility::getXoopsCpHeader();
+        	Smartobject\Utility::getXoopsCpHeader();
 
-        //Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
+        	//Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
 
-        Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
+        	Smartobject\Utility::getCollapsableBar('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>';
-        Smartobject\Utility::closeCollapsable('sentlinks');
-        echo '<br>';
+        	echo '<br>';
+        	Smartobject\Utility::closeCollapsable('sentlinks');
+        	echo '<br>';
 
-        break;
+        	break;
 
-    default:
+    	default:
 
-        Smartobject\Utility::getXoopsCpHeader();
+        	Smartobject\Utility::getXoopsCpHeader();
 
-        $adminObject->displayNavigation(basename(__FILE__));
+        	$adminObject->displayNavigation(basename(__FILE__));
 
-        //Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINKS);
+        	//Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINKS);
 
-        Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
+        	Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
 
-//        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new Smartobject\Table($smartobjectLinkHandler, null, ['delete']);
-        $objectTable->addColumn(new Smartobject\ObjectColumn('date'));
-        $objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
-        $objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
-        $objectTable->addColumn(new Smartobject\ObjectColumn('link'));
+	//        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        	$objectTable = new Smartobject\Table($smartobjectLinkHandler, null, ['delete']);
+        	$objectTable->addColumn(new Smartobject\ObjectColumn('date'));
+        	$objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
+        	$objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
+        	$objectTable->addColumn(new Smartobject\ObjectColumn('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>';
-        Smartobject\Utility::closeCollapsable('sentlinks');
-        echo '<br>';
+        	echo '<br>';
+        	Smartobject\Utility::closeCollapsable('sentlinks');
+        	echo '<br>';
 
-        break;
+        	break;
 }
 
 //Smartobject\Utility::getModFooter();

Please login to merge, or discard this patch.

admin/currency.php 1 patch

Switch Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch

@@ -55,29 +55,29 @@  discard block
 block discarded – undo
 }
 
 switch ($op) {
-    case 'mod':
-        $currencyid = \Xmf\Request::getInt('currencyid', 0, 'GET');
+    	case 'mod':
+        	$currencyid = \Xmf\Request::getInt('currencyid', 0, 'GET');
 
-        Smartobject\Utility::getXoopsCpHeader();
+        	Smartobject\Utility::getXoopsCpHeader();
 
-        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);
@@ -87,49 +87,49 @@  discard block
 block discarded – undo
             $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 ObjectController($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 ObjectController($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 ObjectController($smartobjectCurrencyHandler);
-        $controller->handleObjectDeletion();
+    	case 'del':
+	//        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new ObjectController($smartobjectCurrencyHandler);
+        	$controller->handleObjectDeletion();
 
-        break;
+        	break;
 
-    default:
+    	default:
 
-        Smartobject\Utility::getXoopsCpHeader();
+        	Smartobject\Utility::getXoopsCpHeader();
 
-        //Smartobject\Utility::getAdminMenu(5, _AM_SOBJECT_CURRENCIES);
+        	//Smartobject\Utility::getAdminMenu(5, _AM_SOBJECT_CURRENCIES);
 
-        Smartobject\Utility::getCollapsableBar('createdcurrencies', _AM_SOBJECT_CURRENCIES, _AM_SOBJECT_CURRENCIES_DSC);
+        	Smartobject\Utility::getCollapsableBar('createdcurrencies', _AM_SOBJECT_CURRENCIES, _AM_SOBJECT_CURRENCIES_DSC);
 
-//        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new Table($smartobjectCurrencyHandler);
-        $objectTable->addColumn(new ObjectColumn('name', 'left', false, 'getCurrencyLink'));
-        $objectTable->addColumn(new ObjectColumn('rate', 'center', 150));
-        $objectTable->addColumn(new ObjectColumn('iso4217', 'center', 150));
-        $objectTable->addColumn(new ObjectColumn('default_currency', 'center', 150, 'getDefaultCurrencyControl'));
+	//        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        	$objectTable = new Table($smartobjectCurrencyHandler);
+        	$objectTable->addColumn(new ObjectColumn('name', 'left', false, 'getCurrencyLink'));
+        	$objectTable->addColumn(new ObjectColumn('rate', 'center', 150));
+        	$objectTable->addColumn(new ObjectColumn('iso4217', 'center', 150));
+        	$objectTable->addColumn(new ObjectColumn('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>';
-        Smartobject\Utility::closeCollapsable('createdcurrencies');
-        echo '<br>';
+        	echo '<br>';
+        	Smartobject\Utility::closeCollapsable('createdcurrencies');
+        	echo '<br>';
 
-        break;
+        	break;
 }
 
 //Smartobject\Utility::getModFooter();

Please login to merge, or discard this patch.

admin/customtag.php 1 patch

Switch Indentation +45 added lines, -45 removed lines patch added patch discarded remove patch

@@ -64,63 +64,63 @@  discard block
 block discarded – undo
 }
 
 switch ($op) {
-    case 'mod':
+    	case 'mod':
 
-        $customtagid = \Xmf\Request::getInt('customtagid', 0, 'GET');
+        	$customtagid = \Xmf\Request::getInt('customtagid', 0, 'GET');
 
-        Smartobject\Utility::getXoopsCpHeader();
-        $adminObject->displayNavigation(basename(__FILE__));
+        	Smartobject\Utility::getXoopsCpHeader();
+        	$adminObject->displayNavigation(basename(__FILE__));
 
-        editcustomtag(true, $customtagid);
-        break;
+        	editcustomtag(true, $customtagid);
+        	break;
 
-    case 'clone':
+    	case 'clone':
 
-        $customtagid = \Xmf\Request::getInt('customtagid', 0, 'GET');
+        	$customtagid = \Xmf\Request::getInt('customtagid', 0, 'GET');
 
-        Smartobject\Utility::getXoopsCpHeader();
-        $adminObject->displayNavigation(basename(__FILE__));
+        	Smartobject\Utility::getXoopsCpHeader();
+        	$adminObject->displayNavigation(basename(__FILE__));
 
-        editcustomtag(true, $customtagid, true);
-        break;
+        	editcustomtag(true, $customtagid, true);
+        	break;
 
-    case 'addcustomtag':
-//        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new XoopsModules\Smartobject\ObjectController($smartobjectCustomtagHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_CUSTOMTAGS_CREATED, _AM_SOBJECT_CUSTOMTAGS_MODIFIED);
-        break;
+    	case 'addcustomtag':
+	//        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new XoopsModules\Smartobject\ObjectController($smartobjectCustomtagHandler);
+        	$controller->storeFromDefaultForm(_AM_SOBJECT_CUSTOMTAGS_CREATED, _AM_SOBJECT_CUSTOMTAGS_MODIFIED);
+        	break;
 
-    case 'del':
+    	case 'del':
 
-//        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
-        $controller = new XoopsModules\Smartobject\ObjectController($smartobjectCustomtagHandler);
-        $controller->handleObjectDeletion();
+	//        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new XoopsModules\Smartobject\ObjectController($smartobjectCustomtagHandler);
+        	$controller->handleObjectDeletion();
 
-        break;
+        	break;
 
-    default:
+    	default:
 
-        Smartobject\Utility::getXoopsCpHeader();
-        $adminObject->displayNavigation(basename(__FILE__));
-        $adminObject->addItemButton(_AM_SOBJECT_CUSTOMTAGS_CREATE, 'customtag.php?op=mod', 'add', '');
-        $adminObject->displayButton('left', '');
+        	Smartobject\Utility::getXoopsCpHeader();
+        	$adminObject->displayNavigation(basename(__FILE__));
+        	$adminObject->addItemButton(_AM_SOBJECT_CUSTOMTAGS_CREATE, 'customtag.php?op=mod', 'add', '');
+        	$adminObject->displayButton('left', '');
 
-        //Smartobject\Utility::getAdminMenu(2, _AM_SOBJECT_CUSTOMTAGS);
+        	//Smartobject\Utility::getAdminMenu(2, _AM_SOBJECT_CUSTOMTAGS);
 
-        Smartobject\Utility::getCollapsableBar('createdcustomtags', _AM_SOBJECT_CUSTOMTAGS, _AM_SOBJECT_CUSTOMTAGS_DSC);
+        	Smartobject\Utility::getCollapsableBar('createdcustomtags', _AM_SOBJECT_CUSTOMTAGS, _AM_SOBJECT_CUSTOMTAGS_DSC);
 
-//        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new XoopsModules\Smartobject\Table($smartobjectCustomtagHandler);
-        $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('name', 'left', 150, 'getCustomtagName'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('description', 'left'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('language', 'center', 150));
+	//        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        	$objectTable = new XoopsModules\Smartobject\Table($smartobjectCustomtagHandler);
+        	$objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('name', 'left', 150, 'getCustomtagName'));
+        	$objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('description', 'left'));
+        	$objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('language', 'center', 150));
 
-        //      $objectTable->addCustomAction('getCreateItemLink');
-        //      $objectTable->addCustomAction('getCreateAttributLink');
+        	//      $objectTable->addCustomAction('getCreateItemLink');
+        	//      $objectTable->addCustomAction('getCreateAttributLink');
 
-        //      $objectTable->addIntroButton('addcustomtag', 'customtag.php?op=mod', _AM_SOBJECT_CUSTOMTAGS_CREATE); //mb button
+        	//      $objectTable->addIntroButton('addcustomtag', 'customtag.php?op=mod', _AM_SOBJECT_CUSTOMTAGS_CREATE); //mb button
 
-        /*
+        	/*
                 $criteria_upcoming = new \CriteriaCompo();
                 $criteria_upcoming->add(new \Criteria('start_date', time(), '>'));
                 $objectTable->addFilter(_AM_SOBJECT_FILTER_UPCOMING, array(
@@ -144,16 +144,16 @@  discard block
 block discarded – undo
                                             'criteria' => $criteria_last30days
                 ));
         */
-        $objectTable->addQuickSearch(['title', 'summary', 'description']);
-        $objectTable->addCustomAction('getCloneLink');
+        	$objectTable->addQuickSearch(['title', 'summary', 'description']);
+        	$objectTable->addCustomAction('getCloneLink');
 
-        $objectTable->render();
+        	$objectTable->render();
 
-        echo '<br>';
-        Smartobject\Utility::closeCollapsable('createdcustomtags');
-        echo '<br>';
+        	echo '<br>';
+        	Smartobject\Utility::closeCollapsable('createdcustomtags');
+        	echo '<br>';
 
-        break;
+        	break;
 }
 
 //Smartobject\Utility::getModFooter();

Please login to merge, or discard this patch.

admin/rating.php 1 patch

Switch Indentation +38 added lines, -38 removed lines patch added patch discarded remove patch

@@ -72,53 +72,53 @@  discard block
 block discarded – undo
 }
 
 switch ($op) {
-    case 'mod':
-    case 'changedField':
+    	case 'mod':
+    	case 'changedField':
 
-        $ratingid = \Xmf\Request::getInt('ratingid', 0, 'GET');
+        	$ratingid = \Xmf\Request::getInt('ratingid', 0, 'GET');
 
-        Smartobject\Utility::getXoopsCpHeader();
-        $adminObject->displayNavigation(basename(__FILE__));
+        	Smartobject\Utility::getXoopsCpHeader();
+        	$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\ObjectController($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\ObjectController($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\ObjectController($smartobjectRatingHandler);
-        $controller->handleObjectDeletion();
+    	case 'del':
+	//        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        	$controller = new XoopsModules\Smartobject\ObjectController($smartobjectRatingHandler);
+        	$controller->handleObjectDeletion();
 
-        break;
+        	break;
 
-    default:
+    	default:
 
-        Smartobject\Utility::getXoopsCpHeader();
-        $adminObject->displayNavigation(basename(__FILE__));
+        	Smartobject\Utility::getXoopsCpHeader();
+        	$adminObject->displayNavigation(basename(__FILE__));
 
-        //Smartobject\Utility::getAdminMenu(4, _AM_SOBJECT_RATINGS);
+        	//Smartobject\Utility::getAdminMenu(4, _AM_SOBJECT_RATINGS);
 
-        Smartobject\Utility::getCollapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
+        	Smartobject\Utility::getCollapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
 
-//        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-        $objectTable = new XoopsModules\Smartobject\Table($smartobjectRatingHandler);
-        $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('name', 'left'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('dirname', 'left'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('item', 'left', false, 'getItemValue'));
-        $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('date', 'center', 150));
-        $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('rate', 'center', 40, 'getRateValue'));
+	//        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        	$objectTable = new XoopsModules\Smartobject\Table($smartobjectRatingHandler);
+        	$objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('name', 'left'));
+        	$objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('dirname', 'left'));
+        	$objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('item', 'left', false, 'getItemValue'));
+        	$objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('date', 'center', 150));
+        	$objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('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(
@@ -143,13 +143,13 @@  discard block
 block discarded – undo
                 ));
         */
 
-        $objectTable->render();
+        	$objectTable->render();
 
-        echo '<br>';
-        Smartobject\Utility::closeCollapsable('createdratings');
-        echo '<br>';
+        	echo '<br>';
+        	Smartobject\Utility::closeCollapsable('createdratings');
+        	echo '<br>';
 
-        break;
+        	break;
 }
 
 //Smartobject\Utility::getModFooter();

Please login to merge, or discard this patch.

		@@ -68,65 +68,65 @@ discard block
		block discarded – undo
68	68	}
69	69
70	70	switch ($op) {
71		- case 'mod':
	71	+ case 'mod':
72	72
73		- $adsenseid = \Xmf\Request::getInt('adsenseid', 0, 'GET');
	73	+ $adsenseid = \Xmf\Request::getInt('adsenseid', 0, 'GET');
74	74
75		- Smartobject\Utility::getXoopsCpHeader();
76		- $adminObject->displayNavigation(basename(__FILE__));
	75	+ Smartobject\Utility::getXoopsCpHeader();
	76	+ $adminObject->displayNavigation(basename(__FILE__));
77	77
78		- editclass(true, $adsenseid);
79		- break;
	78	+ editclass(true, $adsenseid);
	79	+ break;
80	80
81		- case 'clone':
	81	+ case 'clone':
82	82
83		- $adsenseid = \Xmf\Request::getInt('adsenseid', 0, 'GET');
	83	+ $adsenseid = \Xmf\Request::getInt('adsenseid', 0, 'GET');
84	84
85		- Smartobject\Utility::getXoopsCpHeader();
86		- $adminObject->displayNavigation(basename(__FILE__));
	85	+ Smartobject\Utility::getXoopsCpHeader();
	86	+ $adminObject->displayNavigation(basename(__FILE__));
87	87
88		- editclass(true, $adsenseid, true);
89		- break;
	88	+ editclass(true, $adsenseid, true);
	89	+ break;
90	90
91		- case 'addadsense':
92		- if (@require_once SMARTOBJECT_ROOT_PATH . 'include/captcha/captcha.php') {
93		- $xoopsCaptcha = XoopsCaptcha::getInstance();
94		- if (!$xoopsCaptcha->verify()) {
95		- redirect_header('javascript:history.go(-1);', 3, $xoopsCaptcha->getMessage());
96		- }
97		- }
98		-// require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
99		- $controller = new XoopsModules\Smartobject\ObjectController($smartobjectAdsenseHandler);
100		- $controller->storeFromDefaultForm(_AM_SOBJECT_ADSENSES_CREATED, _AM_SOBJECT_ADSENSES_MODIFIED);
101		- break;
	91	+ case 'addadsense':
	92	+ if (@require_once SMARTOBJECT_ROOT_PATH . 'include/captcha/captcha.php') {
	93	+ $xoopsCaptcha = XoopsCaptcha::getInstance();
	94	+ if (!$xoopsCaptcha->verify()) {
	95	+ redirect_header('javascript:history.go(-1);', 3, $xoopsCaptcha->getMessage());
	96	+ }
	97	+ }
	98	+ // require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
	99	+ $controller = new XoopsModules\Smartobject\ObjectController($smartobjectAdsenseHandler);
	100	+ $controller->storeFromDefaultForm(_AM_SOBJECT_ADSENSES_CREATED, _AM_SOBJECT_ADSENSES_MODIFIED);
	101	+ break;
102	102
103		- case 'del':
	103	+ case 'del':
104	104
105		-// require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
106		- $controller = new XoopsModules\Smartobject\ObjectController($smartobjectAdsenseHandler);
107		- $controller->handleObjectDeletion();
	105	+ // require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
	106	+ $controller = new XoopsModules\Smartobject\ObjectController($smartobjectAdsenseHandler);
	107	+ $controller->handleObjectDeletion();
108	108
109		- break;
	109	+ break;
110	110
111		- default:
	111	+ default:
112	112
113		- Smartobject\Utility::getXoopsCpHeader();
114		- $adminObject->displayNavigation(basename(__FILE__));
	113	+ Smartobject\Utility::getXoopsCpHeader();
	114	+ $adminObject->displayNavigation(basename(__FILE__));
115	115
116		- //Smartobject\Utility::getAdminMenu(3, _AM_SOBJECT_ADSENSES);
	116	+ //Smartobject\Utility::getAdminMenu(3, _AM_SOBJECT_ADSENSES);
117	117
118		- Smartobject\Utility::getCollapsableBar('createdadsenses', _AM_SOBJECT_ADSENSES, _AM_SOBJECT_ADSENSES_DSC);
	118	+ Smartobject\Utility::getCollapsableBar('createdadsenses', _AM_SOBJECT_ADSENSES, _AM_SOBJECT_ADSENSES_DSC);
119	119
120		-// require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
121		- $objectTable = new XoopsModules\Smartobject\Table($smartobjectAdsenseHandler);
122		- $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('description', 'left'));
123		- $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn(_AM_SOBJECT_ADSENSE_TAG, 'center', 200, 'getXoopsCode'));
	120	+ // require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
	121	+ $objectTable = new XoopsModules\Smartobject\Table($smartobjectAdsenseHandler);
	122	+ $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('description', 'left'));
	123	+ $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn(_AM_SOBJECT_ADSENSE_TAG, 'center', 200, 'getXoopsCode'));
124	124
125		- // $objectTable->addCustomAction('getCreateItemLink');
126		- // $objectTable->addCustomAction('getCreateAttributLink');
	125	+ // $objectTable->addCustomAction('getCreateItemLink');
	126	+ // $objectTable->addCustomAction('getCreateAttributLink');
127	127
128		- $objectTable->addIntroButton('addadsense', 'adsense.php?op=mod', _AM_SOBJECT_ADSENSES_CREATE);
129		- /*
	128	+ $objectTable->addIntroButton('addadsense', 'adsense.php?op=mod', _AM_SOBJECT_ADSENSES_CREATE);
	129	+ /*
130	130	$criteria_upcoming = new \CriteriaCompo();
131	131	$criteria_upcoming->add(new \Criteria('start_date', time(), '>'));
132	132	$objectTable->addFilter(_AM_SOBJECT_FILTER_UPCOMING, array(
		@@ -150,16 +150,16 @@ discard block
		block discarded – undo
150	150	'criteria' => $criteria_last30days
151	151	));
152	152	*/
153		- $objectTable->addQuickSearch(['title', 'summary', 'description']);
154		- $objectTable->addCustomAction('getCloneLink');
	153	+ $objectTable->addQuickSearch(['title', 'summary', 'description']);
	154	+ $objectTable->addCustomAction('getCloneLink');
155	155
156		- $objectTable->render();
	156	+ $objectTable->render();
157	157
158		- echo '<br>';
159		- Smartobject\Utility::closeCollapsable('createdadsenses');
160		- echo '<br>';
	158	+ echo '<br>';
	159	+ Smartobject\Utility::closeCollapsable('createdadsenses');
	160	+ echo '<br>';
161	161
162		- break;
	162	+ break;
163	163	}
164	164
165	165	//Smartobject\Utility::getModFooter();

		@@ -55,29 +55,29 @@ discard block
		block discarded – undo
55	55	}
56	56
57	57	switch ($op) {
58		- case 'mod':
59		- $currencyid = \Xmf\Request::getInt('currencyid', 0, 'GET');
	58	+ case 'mod':
	59	+ $currencyid = \Xmf\Request::getInt('currencyid', 0, 'GET');
60	60
61		- Smartobject\Utility::getXoopsCpHeader();
	61	+ Smartobject\Utility::getXoopsCpHeader();
62	62
63		- editclass(true, $currencyid);
64		- break;
	63	+ editclass(true, $currencyid);
	64	+ break;
65	65
66		- case 'updateCurrencies':
	66	+ case 'updateCurrencies':
67	67
68		- if (!isset($_POST['SmartobjectCurrency_objects']) \|\| 0 == count($_POST['SmartobjectCurrency_objects'])) {
69		- redirect_header($smart_previous_page, 3, _AM_SOBJECT_NO_RECORDS_TO_UPDATE);
70		- }
	68	+ if (!isset($_POST['SmartobjectCurrency_objects']) \|\| 0 == count($_POST['SmartobjectCurrency_objects'])) {
	69	+ redirect_header($smart_previous_page, 3, _AM_SOBJECT_NO_RECORDS_TO_UPDATE);
	70	+ }
71	71
72		- if (isset($_POST['default_currency'])) {
73		- $newDefaultCurrency = $_POST['default_currency'];
74		- $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
75		- $smartobjectCurrencyHandler->query($sql);
76		- $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=1 WHERE currencyid=' . $newDefaultCurrency;
77		- $smartobjectCurrencyHandler->query($sql);
78		- }
	72	+ if (isset($_POST['default_currency'])) {
	73	+ $newDefaultCurrency = $_POST['default_currency'];
	74	+ $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
	75	+ $smartobjectCurrencyHandler->query($sql);
	76	+ $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=1 WHERE currencyid=' . $newDefaultCurrency;
	77	+ $smartobjectCurrencyHandler->query($sql);
	78	+ }
79	79
80		- /*
	80	+ /*
81	81	$criteria = new \CriteriaCompo();
82	82	$criteria->add(new \Criteria('currencyid', '(' . implode(', ', $_POST['SmartobjectCurrency_objects']) . ')', 'IN'));
83	83	$currenciesObj = $smartobjectCurrencyHandler->getObjects($criteria, true);
		@@ -87,49 +87,49 @@ discard block
		block discarded – undo
87	87	$smartobjectCurrencyHandler->insert($currencyObj);
88	88	}
89	89	*/
90		- redirect_header($smart_previous_page, 3, _AM_SOBJECT_RECORDS_UPDATED);
91		- break;
	90	+ redirect_header($smart_previous_page, 3, _AM_SOBJECT_RECORDS_UPDATED);
	91	+ break;
92	92
93		- case 'addcurrency':
94		-// require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
95		- $controller = new ObjectController($smartobjectCurrencyHandler);
96		- $controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL . 'admin/currency.php');
	93	+ case 'addcurrency':
	94	+ // require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
	95	+ $controller = new ObjectController($smartobjectCurrencyHandler);
	96	+ $controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL . 'admin/currency.php');
97	97
98		- break;
	98	+ break;
99	99
100		- case 'del':
101		-// require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
102		- $controller = new ObjectController($smartobjectCurrencyHandler);
103		- $controller->handleObjectDeletion();
	100	+ case 'del':
	101	+ // require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
	102	+ $controller = new ObjectController($smartobjectCurrencyHandler);
	103	+ $controller->handleObjectDeletion();
104	104
105		- break;
	105	+ break;
106	106
107		- default:
	107	+ default:
108	108
109		- Smartobject\Utility::getXoopsCpHeader();
	109	+ Smartobject\Utility::getXoopsCpHeader();
110	110
111		- //Smartobject\Utility::getAdminMenu(5, _AM_SOBJECT_CURRENCIES);
	111	+ //Smartobject\Utility::getAdminMenu(5, _AM_SOBJECT_CURRENCIES);
112	112
113		- Smartobject\Utility::getCollapsableBar('createdcurrencies', _AM_SOBJECT_CURRENCIES, _AM_SOBJECT_CURRENCIES_DSC);
	113	+ Smartobject\Utility::getCollapsableBar('createdcurrencies', _AM_SOBJECT_CURRENCIES, _AM_SOBJECT_CURRENCIES_DSC);
114	114
115		-// require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
116		- $objectTable = new Table($smartobjectCurrencyHandler);
117		- $objectTable->addColumn(new ObjectColumn('name', 'left', false, 'getCurrencyLink'));
118		- $objectTable->addColumn(new ObjectColumn('rate', 'center', 150));
119		- $objectTable->addColumn(new ObjectColumn('iso4217', 'center', 150));
120		- $objectTable->addColumn(new ObjectColumn('default_currency', 'center', 150, 'getDefaultCurrencyControl'));
	115	+ // require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
	116	+ $objectTable = new Table($smartobjectCurrencyHandler);
	117	+ $objectTable->addColumn(new ObjectColumn('name', 'left', false, 'getCurrencyLink'));
	118	+ $objectTable->addColumn(new ObjectColumn('rate', 'center', 150));
	119	+ $objectTable->addColumn(new ObjectColumn('iso4217', 'center', 150));
	120	+ $objectTable->addColumn(new ObjectColumn('default_currency', 'center', 150, 'getDefaultCurrencyControl'));
121	121
122		- $objectTable->addIntroButton('addcurrency', 'currency.php?op=mod', _AM_SOBJECT_CURRENCIES_CREATE);
	122	+ $objectTable->addIntroButton('addcurrency', 'currency.php?op=mod', _AM_SOBJECT_CURRENCIES_CREATE);
123	123
124		- $objectTable->addActionButton('updateCurrencies', _SUBMIT, _AM_SOBJECT_CURRENCY_UPDATE_ALL);
	124	+ $objectTable->addActionButton('updateCurrencies', _SUBMIT, _AM_SOBJECT_CURRENCY_UPDATE_ALL);
125	125
126		- $objectTable->render();
	126	+ $objectTable->render();
127	127
128		- echo '<br>';
129		- Smartobject\Utility::closeCollapsable('createdcurrencies');
130		- echo '<br>';
	128	+ echo '<br>';
	129	+ Smartobject\Utility::closeCollapsable('createdcurrencies');
	130	+ echo '<br>';
131	131
132		- break;
	132	+ break;
133	133	}
134	134
135	135	//Smartobject\Utility::getModFooter();

		@@ -64,63 +64,63 @@ discard block
		block discarded – undo
64	64	}
65	65
66	66	switch ($op) {
67		- case 'mod':
	67	+ case 'mod':
68	68
69		- $customtagid = \Xmf\Request::getInt('customtagid', 0, 'GET');
	69	+ $customtagid = \Xmf\Request::getInt('customtagid', 0, 'GET');
70	70
71		- Smartobject\Utility::getXoopsCpHeader();
72		- $adminObject->displayNavigation(basename(__FILE__));
	71	+ Smartobject\Utility::getXoopsCpHeader();
	72	+ $adminObject->displayNavigation(basename(__FILE__));
73	73
74		- editcustomtag(true, $customtagid);
75		- break;
	74	+ editcustomtag(true, $customtagid);
	75	+ break;
76	76
77		- case 'clone':
	77	+ case 'clone':
78	78
79		- $customtagid = \Xmf\Request::getInt('customtagid', 0, 'GET');
	79	+ $customtagid = \Xmf\Request::getInt('customtagid', 0, 'GET');
80	80
81		- Smartobject\Utility::getXoopsCpHeader();
82		- $adminObject->displayNavigation(basename(__FILE__));
	81	+ Smartobject\Utility::getXoopsCpHeader();
	82	+ $adminObject->displayNavigation(basename(__FILE__));
83	83
84		- editcustomtag(true, $customtagid, true);
85		- break;
	84	+ editcustomtag(true, $customtagid, true);
	85	+ break;
86	86
87		- case 'addcustomtag':
88		-// require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
89		- $controller = new XoopsModules\Smartobject\ObjectController($smartobjectCustomtagHandler);
90		- $controller->storeFromDefaultForm(_AM_SOBJECT_CUSTOMTAGS_CREATED, _AM_SOBJECT_CUSTOMTAGS_MODIFIED);
91		- break;
	87	+ case 'addcustomtag':
	88	+ // require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
	89	+ $controller = new XoopsModules\Smartobject\ObjectController($smartobjectCustomtagHandler);
	90	+ $controller->storeFromDefaultForm(_AM_SOBJECT_CUSTOMTAGS_CREATED, _AM_SOBJECT_CUSTOMTAGS_MODIFIED);
	91	+ break;
92	92
93		- case 'del':
	93	+ case 'del':
94	94
95		-// require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
96		- $controller = new XoopsModules\Smartobject\ObjectController($smartobjectCustomtagHandler);
97		- $controller->handleObjectDeletion();
	95	+ // require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
	96	+ $controller = new XoopsModules\Smartobject\ObjectController($smartobjectCustomtagHandler);
	97	+ $controller->handleObjectDeletion();
98	98
99		- break;
	99	+ break;
100	100
101		- default:
	101	+ default:
102	102
103		- Smartobject\Utility::getXoopsCpHeader();
104		- $adminObject->displayNavigation(basename(__FILE__));
105		- $adminObject->addItemButton(_AM_SOBJECT_CUSTOMTAGS_CREATE, 'customtag.php?op=mod', 'add', '');
106		- $adminObject->displayButton('left', '');
	103	+ Smartobject\Utility::getXoopsCpHeader();
	104	+ $adminObject->displayNavigation(basename(__FILE__));
	105	+ $adminObject->addItemButton(_AM_SOBJECT_CUSTOMTAGS_CREATE, 'customtag.php?op=mod', 'add', '');
	106	+ $adminObject->displayButton('left', '');
107	107
108		- //Smartobject\Utility::getAdminMenu(2, _AM_SOBJECT_CUSTOMTAGS);
	108	+ //Smartobject\Utility::getAdminMenu(2, _AM_SOBJECT_CUSTOMTAGS);
109	109
110		- Smartobject\Utility::getCollapsableBar('createdcustomtags', _AM_SOBJECT_CUSTOMTAGS, _AM_SOBJECT_CUSTOMTAGS_DSC);
	110	+ Smartobject\Utility::getCollapsableBar('createdcustomtags', _AM_SOBJECT_CUSTOMTAGS, _AM_SOBJECT_CUSTOMTAGS_DSC);
111	111
112		-// require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
113		- $objectTable = new XoopsModules\Smartobject\Table($smartobjectCustomtagHandler);
114		- $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('name', 'left', 150, 'getCustomtagName'));
115		- $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('description', 'left'));
116		- $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('language', 'center', 150));
	112	+ // require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
	113	+ $objectTable = new XoopsModules\Smartobject\Table($smartobjectCustomtagHandler);
	114	+ $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('name', 'left', 150, 'getCustomtagName'));
	115	+ $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('description', 'left'));
	116	+ $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('language', 'center', 150));
117	117
118		- // $objectTable->addCustomAction('getCreateItemLink');
119		- // $objectTable->addCustomAction('getCreateAttributLink');
	118	+ // $objectTable->addCustomAction('getCreateItemLink');
	119	+ // $objectTable->addCustomAction('getCreateAttributLink');
120	120
121		- // $objectTable->addIntroButton('addcustomtag', 'customtag.php?op=mod', _AM_SOBJECT_CUSTOMTAGS_CREATE); //mb button
	121	+ // $objectTable->addIntroButton('addcustomtag', 'customtag.php?op=mod', _AM_SOBJECT_CUSTOMTAGS_CREATE); //mb button
122	122
123		- /*
	123	+ /*
124	124	$criteria_upcoming = new \CriteriaCompo();
125	125	$criteria_upcoming->add(new \Criteria('start_date', time(), '>'));
126	126	$objectTable->addFilter(_AM_SOBJECT_FILTER_UPCOMING, array(
		@@ -144,16 +144,16 @@ discard block
		block discarded – undo
144	144	'criteria' => $criteria_last30days
145	145	));
146	146	*/
147		- $objectTable->addQuickSearch(['title', 'summary', 'description']);
148		- $objectTable->addCustomAction('getCloneLink');
	147	+ $objectTable->addQuickSearch(['title', 'summary', 'description']);
	148	+ $objectTable->addCustomAction('getCloneLink');
149	149
150		- $objectTable->render();
	150	+ $objectTable->render();
151	151
152		- echo '<br>';
153		- Smartobject\Utility::closeCollapsable('createdcustomtags');
154		- echo '<br>';
	152	+ echo '<br>';
	153	+ Smartobject\Utility::closeCollapsable('createdcustomtags');
	154	+ echo '<br>';
155	155
156		- break;
	156	+ break;
157	157	}
158	158
159	159	//Smartobject\Utility::getModFooter();

		@@ -72,53 +72,53 @@ discard block
		block discarded – undo
72	72	}
73	73
74	74	switch ($op) {
75		- case 'mod':
76		- case 'changedField':
	75	+ case 'mod':
	76	+ case 'changedField':
77	77
78		- $ratingid = \Xmf\Request::getInt('ratingid', 0, 'GET');
	78	+ $ratingid = \Xmf\Request::getInt('ratingid', 0, 'GET');
79	79
80		- Smartobject\Utility::getXoopsCpHeader();
81		- $adminObject->displayNavigation(basename(__FILE__));
	80	+ Smartobject\Utility::getXoopsCpHeader();
	81	+ $adminObject->displayNavigation(basename(__FILE__));
82	82
83		- editclass(true, $ratingid);
84		- break;
	83	+ editclass(true, $ratingid);
	84	+ break;
85	85
86		- case 'addrating':
87		-// require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
88		- $controller = new XoopsModules\Smartobject\ObjectController($smartobjectRatingHandler);
89		- $controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
	86	+ case 'addrating':
	87	+ // require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
	88	+ $controller = new XoopsModules\Smartobject\ObjectController($smartobjectRatingHandler);
	89	+ $controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
90	90
91		- break;
	91	+ break;
92	92
93		- case 'del':
94		-// require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
95		- $controller = new XoopsModules\Smartobject\ObjectController($smartobjectRatingHandler);
96		- $controller->handleObjectDeletion();
	93	+ case 'del':
	94	+ // require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
	95	+ $controller = new XoopsModules\Smartobject\ObjectController($smartobjectRatingHandler);
	96	+ $controller->handleObjectDeletion();
97	97
98		- break;
	98	+ break;
99	99
100		- default:
	100	+ default:
101	101
102		- Smartobject\Utility::getXoopsCpHeader();
103		- $adminObject->displayNavigation(basename(__FILE__));
	102	+ Smartobject\Utility::getXoopsCpHeader();
	103	+ $adminObject->displayNavigation(basename(__FILE__));
104	104
105		- //Smartobject\Utility::getAdminMenu(4, _AM_SOBJECT_RATINGS);
	105	+ //Smartobject\Utility::getAdminMenu(4, _AM_SOBJECT_RATINGS);
106	106
107		- Smartobject\Utility::getCollapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
	107	+ Smartobject\Utility::getCollapsableBar('createdratings', _AM_SOBJECT_RATINGS, _AM_SOBJECT_RATINGS_DSC);
108	108
109		-// require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
110		- $objectTable = new XoopsModules\Smartobject\Table($smartobjectRatingHandler);
111		- $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('name', 'left'));
112		- $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('dirname', 'left'));
113		- $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('item', 'left', false, 'getItemValue'));
114		- $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('date', 'center', 150));
115		- $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('rate', 'center', 40, 'getRateValue'));
	109	+ // require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
	110	+ $objectTable = new XoopsModules\Smartobject\Table($smartobjectRatingHandler);
	111	+ $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('name', 'left'));
	112	+ $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('dirname', 'left'));
	113	+ $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('item', 'left', false, 'getItemValue'));
	114	+ $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('date', 'center', 150));
	115	+ $objectTable->addColumn(new XoopsModules\Smartobject\ObjectColumn('rate', 'center', 40, 'getRateValue'));
116	116
117		- // $objectTable->addCustomAction('getCreateItemLink');
118		- // $objectTable->addCustomAction('getCreateAttributLink');
	117	+ // $objectTable->addCustomAction('getCreateItemLink');
	118	+ // $objectTable->addCustomAction('getCreateAttributLink');
119	119
120		- $objectTable->addIntroButton('addrating', 'rating.php?op=mod', _AM_SOBJECT_RATINGS_CREATE);
121		- /*
	120	+ $objectTable->addIntroButton('addrating', 'rating.php?op=mod', _AM_SOBJECT_RATINGS_CREATE);
	121	+ /*
122	122	$criteria_upcoming = new \CriteriaCompo();
123	123	$criteria_upcoming->add(new \Criteria('start_date', time(), '>'));
124	124	$objectTable->addFilter(_AM_SOBJECT_FILTER_UPCOMING, array(
		@@ -143,13 +143,13 @@ discard block
		block discarded – undo
143	143	));
144	144	*/
145	145
146		- $objectTable->render();
	146	+ $objectTable->render();
147	147
148		- echo '<br>';
149		- Smartobject\Utility::closeCollapsable('createdratings');
150		- echo '<br>';
	148	+ echo '<br>';
	149	+ Smartobject\Utility::closeCollapsable('createdratings');
	150	+ echo '<br>';
151	151
152		- break;
	152	+ break;
153	153	}
154	154
155	155	//Smartobject\Utility::getModFooter();

		@@ -34,73 +34,73 @@
		block discarded – undo
34	34
35	35	switch ($op) {
36	36
37		- case 'del':
38		-// require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
39		- $controller = new XoopsModules\Smartobject\ObjectController($smartobjectLinkHandler);
40		- $controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
	37	+ case 'del':
	38	+ // require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
	39	+ $controller = new XoopsModules\Smartobject\ObjectController($smartobjectLinkHandler);
	40	+ $controller->handleObjectDeletion(_AM_SOBJECT_SENT_LINK_DELETE_CONFIRM);
41	41
42		- break;
	42	+ break;
43	43
44		- case 'view':
45		- $linkid = \Xmf\Request::getInt('linkid', 0, 'GET');
46		- $linkObj = $smartobjectLinkHandler->get($linkid);
	44	+ case 'view':
	45	+ $linkid = \Xmf\Request::getInt('linkid', 0, 'GET');
	46	+ $linkObj = $smartobjectLinkHandler->get($linkid);
47	47
48		- if ($linkObj->isNew()) {
49		- redirect_header(SMARTOBJECT_URL . 'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
50		- }
	48	+ if ($linkObj->isNew()) {
	49	+ redirect_header(SMARTOBJECT_URL . 'admin/link.php', 3, _AM_SOBJECT_LINK_NOT_FOUND);
	50	+ }
51	51
52		- Smartobject\Utility::getXoopsCpHeader();
	52	+ Smartobject\Utility::getXoopsCpHeader();
53	53
54		- //Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
	54	+ //Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINK_DISPLAY);
55	55
56		- Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
	56	+ Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINK_DISPLAY, _AM_SOBJECT_SENT_LINK_DISPLAY_INFO);
57	57
58		- require_once XOOPS_ROOT_PATH . '/class/template.php';
	58	+ require_once XOOPS_ROOT_PATH . '/class/template.php';
59	59
60		- // ---
61		- // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
62		- // $xoopsTpl = new \XoopsTpl();
63		- $xoopsTpl = new \XoopsTpl();
64		- //---
	60	+ // ---
	61	+ // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
	62	+ // $xoopsTpl = new \XoopsTpl();
	63	+ $xoopsTpl = new \XoopsTpl();
	64	+ //---
65	65
66		- $xoopsTpl->assign('link', $linkObj->toArray());
67		- $xoopsTpl->display('db:smartobject_sentlink_display.tpl');
	66	+ $xoopsTpl->assign('link', $linkObj->toArray());
	67	+ $xoopsTpl->display('db:smartobject_sentlink_display.tpl');
68	68
69		- echo '<br>';
70		- Smartobject\Utility::closeCollapsable('sentlinks');
71		- echo '<br>';
	69	+ echo '<br>';
	70	+ Smartobject\Utility::closeCollapsable('sentlinks');
	71	+ echo '<br>';
72	72
73		- break;
	73	+ break;
74	74
75		- default:
	75	+ default:
76	76
77		- Smartobject\Utility::getXoopsCpHeader();
	77	+ Smartobject\Utility::getXoopsCpHeader();
78	78
79		- $adminObject->displayNavigation(basename(__FILE__));
	79	+ $adminObject->displayNavigation(basename(__FILE__));
80	80
81		- //Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINKS);
	81	+ //Smartobject\Utility::getAdminMenu(1, _AM_SOBJECT_SENT_LINKS);
82	82
83		- Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
	83	+ Smartobject\Utility::getCollapsableBar('sentlinks', _AM_SOBJECT_SENT_LINKS, _AM_SOBJECT_SENT_LINKS_INFO);
84	84
85		-// require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
86		- $objectTable = new Smartobject\Table($smartobjectLinkHandler, null, ['delete']);
87		- $objectTable->addColumn(new Smartobject\ObjectColumn('date'));
88		- $objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
89		- $objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
90		- $objectTable->addColumn(new Smartobject\ObjectColumn('link'));
	85	+ // require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
	86	+ $objectTable = new Smartobject\Table($smartobjectLinkHandler, null, ['delete']);
	87	+ $objectTable->addColumn(new Smartobject\ObjectColumn('date'));
	88	+ $objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_FROM, $align = 'left', $width = false, 'getFromInfo'));
	89	+ $objectTable->addColumn(new Smartobject\ObjectColumn(_AM_SOBJECT_SENT_LINKS_TO, $align = 'left', $width = false, 'getToInfo'));
	90	+ $objectTable->addColumn(new Smartobject\ObjectColumn('link'));
91	91
92		- $objectTable->addCustomAction('getViewItemLink');
	92	+ $objectTable->addCustomAction('getViewItemLink');
93	93
94		- $objectTable->setDefaultSort('date');
95		- $objectTable->setDefaultOrder('DESC');
	94	+ $objectTable->setDefaultSort('date');
	95	+ $objectTable->setDefaultOrder('DESC');
96	96
97		- $objectTable->render();
	97	+ $objectTable->render();
98	98
99		- echo '<br>';
100		- Smartobject\Utility::closeCollapsable('sentlinks');
101		- echo '<br>';
	99	+ echo '<br>';
	100	+ Smartobject\Utility::closeCollapsable('sentlinks');
	101	+ echo '<br>';
102	102
103		- break;
	103	+ break;
104	104	}
105	105
106	106	//Smartobject\Utility::getModFooter();

mambax7 / smartobject

Pull Request — master (#1)

Status

Category

Switch Indentation +48 added lines, -48 removed lines patch added patch discarded remove patch

Switch Indentation +45 added lines, -45 removed lines patch added patch discarded remove patch

Switch Indentation +46 added lines, -46 removed lines patch added patch discarded remove patch

Switch Indentation +45 added lines, -45 removed lines patch added patch discarded remove patch

Switch Indentation +38 added lines, -38 removed lines patch added patch discarded remove patch