Inspection of "updates" - mambax7/smartobject - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( bf34f3...88111b )

by Michael

created 2018-03-21 16:40 UTC

Status

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -6,7 +6,7 @@
 block discarded – undo
  * Licence: GNU
  */
 
-include __DIR__ . '/../../mainfile.php';
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+include __DIR__.'/../../mainfile.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 
 smart_loadCommonLanguageFile();

Please login to merge, or discard this patch.

admin/admin_header2.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@
 block discarded – undo
  * Licence: GNU
  */
 
-require_once __DIR__ . '/../../../include/cp_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 smart_loadCommonLanguageFile();

Please login to merge, or discard this patch.

admin/index.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -17,8 +17,8 @@  discard block
 block discarded – undo
  * @author       XOOPS Development Team
  */
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+require_once __DIR__.'/admin_header.php';
 
 xoops_cp_header();
 
@@ -27,4 +27,4 @@  discard block
 block discarded – undo
 $adminObject->displayNavigation(basename(__FILE__));
 $adminObject->displayIndex();
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

Please login to merge, or discard this patch.

admin/currency.php 3 patches

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -35,9 +35,9 @@  discard block
 block discarded – undo
     }
 }
 
-require_once __DIR__ . '/admin_header.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/currency.php';
+require_once __DIR__.'/admin_header.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/smartobjecttable.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/currency.php';
 $smartobjectCurrencyHandler = xoops_getModuleHandler('currency');
 
 $op = '';
@@ -51,7 +51,7 @@  discard block
 block discarded – undo
 
 switch ($op) {
     case 'mod':
-        $currencyid = isset($_GET['currencyid']) ? (int)$_GET['currencyid'] : 0;
+        $currencyid = isset($_GET['currencyid']) ? (int) $_GET['currencyid'] : 0;
 
         smart_xoops_cp_header();
 
@@ -66,9 +66,9 @@  discard block
 block discarded – undo
 
         if (isset($_POST['default_currency'])) {
             $newDefaultCurrency = $_POST['default_currency'];
-            $sql                = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
+            $sql                = 'UPDATE '.$smartobjectCurrencyHandler->table.' SET default_currency=0';
             $smartobjectCurrencyHandler->query($sql);
-            $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=1 WHERE currencyid=' . $newDefaultCurrency;
+            $sql = 'UPDATE '.$smartobjectCurrencyHandler->table.' SET default_currency=1 WHERE currencyid='.$newDefaultCurrency;
             $smartobjectCurrencyHandler->query($sql);
         }
 
@@ -86,14 +86,14 @@  discard block
 block discarded – undo
         break;
 
     case 'addcurrency':
-        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
+        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');
+        $controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL.'admin/currency.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 SmartObjectController($smartobjectCurrencyHandler);
         $controller->handleObjectDeletion();
 
@@ -107,7 +107,7 @@  discard block
 block discarded – undo
 
         smart_collapsableBar('createdcurrencies', _AM_SOBJECT_CURRENCIES, _AM_SOBJECT_CURRENCIES_DSC);
 
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
+        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));
@@ -129,4 +129,4 @@  discard block
 block discarded – undo
 
 //smart_modFooter();
 //xoops_cp_footer();
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

Please login to merge, or discard this patch.

Indentation +71 added lines, -71 removed lines patch added patch discarded remove patch

@@ -14,29 +14,29 @@  discard block
 block discarded – undo
 
 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 @@  discard block
 block discarded – undo
 $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 @@  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 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();

Please login to merge, or discard this patch.

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

@@ -54,29 +54,29 @@  discard block
 block discarded – undo
 }
 
 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 @@  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 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();

Please login to merge, or discard this patch.

admin/admin_footer.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -18,6 +18,6 @@
 block discarded – undo
  */
 
 $pathIcon32 = \Xmf\Module\Admin::iconUrl('', 32);
-echo "<div class='adminfooter'>\n" . "  <div style='text-align: center;'>\n" . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . "  </div>\n" . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . '</div>';
+echo "<div class='adminfooter'>\n"."  <div style='text-align: center;'>\n"."    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"."  </div>\n".'  '._AM_MODULEADMIN_ADMIN_FOOTER."\n".'</div>';
 
 xoops_cp_footer();

Please login to merge, or discard this patch.

include/adsense.php 2 patches

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -10,16 +10,16 @@
 block discarded – undo
 
 function smart_adsense_initiate_smartytags()
 {
-    global $xoopsTpl, $smartobjectAdsenseHandler;
-    if (is_object($xoopsTpl)) {
-        foreach ($smartobjectAdsenseHandler->objects as $k => $v) {
-            $xoopsTpl->assign('adsense_' . $k, $v->render());
-        }
-    }
+	global $xoopsTpl, $smartobjectAdsenseHandler;
+	if (is_object($xoopsTpl)) {
+		foreach ($smartobjectAdsenseHandler->objects as $k => $v) {
+			$xoopsTpl->assign('adsense_' . $k, $v->render());
+		}
+	}
 }
 
 if (!defined('SMARTOBJECT_URL')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+	require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
 }
 
 require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php';

Please login to merge, or discard this patch.

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -13,17 +13,17 @@
 block discarded – undo
     global $xoopsTpl, $smartobjectAdsenseHandler;
     if (is_object($xoopsTpl)) {
         foreach ($smartobjectAdsenseHandler->objects as $k => $v) {
-            $xoopsTpl->assign('adsense_' . $k, $v->render());
+            $xoopsTpl->assign('adsense_'.$k, $v->render());
         }
     }
 }
 
 if (!defined('SMARTOBJECT_URL')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 }
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/adsense.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/functions.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/adsense.php';
 
 $smartobjectAdsenseHandler = xoops_getModuleHandler('adsense', 'smartobject');
 $smartobjectAdsensesObj    = $smartobjectAdsenseHandler->getAdsensesByTag();

Please login to merge, or discard this patch.

include/customtag.php 2 patches

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -10,16 +10,16 @@
 block discarded – undo
 
 function smart_customtag_initiate()
 {
-    global $xoopsTpl, $smartobjectCustomtagHandler;
-    if (is_object($xoopsTpl)) {
-        foreach ($smartobjectCustomtagHandler->objects as $k => $v) {
-            $xoopsTpl->assign($k, $v->render());
-        }
-    }
+	global $xoopsTpl, $smartobjectCustomtagHandler;
+	if (is_object($xoopsTpl)) {
+		foreach ($smartobjectCustomtagHandler->objects as $k => $v) {
+			$xoopsTpl->assign($k, $v->render());
+		}
+	}
 }
 
 if (!defined('SMARTOBJECT_URL')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+	require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
 }
 
 smart_loadLanguageFile('smartobject', 'customtag');

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -19,13 +19,13 @@
 block discarded – undo
 }
 
 if (!defined('SMARTOBJECT_URL')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+    require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 }
 
 smart_loadLanguageFile('smartobject', 'customtag');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/customtag.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/functions.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/customtag.php';
 
 $smartobjectCustomtagHandler = xoops_getModuleHandler('customtag', 'smartobject');
 $smartobjectCustomTagsObj    = $smartobjectCustomtagHandler->getCustomtagsByName();

Please login to merge, or discard this patch.

include/projax/projax.php 2 patches

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -14,16 +14,16 @@
 block discarded – undo
  */
 
 if (!class_exists('Projax')) {
-    include __DIR__ . '/classes/JavaScript.php';
-    include __DIR__ . '/classes/Prototype.php';
-    include __DIR__ . '/classes/Scriptaculous.php';
+	include __DIR__ . '/classes/JavaScript.php';
+	include __DIR__ . '/classes/Prototype.php';
+	include __DIR__ . '/classes/Scriptaculous.php';
 
-    // For $projax = new Projax();
+	// For $projax = new Projax();
 
-    /**
-     * Class projax
-     */
-    class projax extends Scriptaculous
-    {
-    }
+	/**
+	 * Class projax
+	 */
+	class projax extends Scriptaculous
+	{
+	}
 }

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -14,9 +14,9 @@
 block discarded – undo
  */
 
 if (!class_exists('Projax')) {
-    include __DIR__ . '/classes/JavaScript.php';
-    include __DIR__ . '/classes/Prototype.php';
-    include __DIR__ . '/classes/Scriptaculous.php';
+    include __DIR__.'/classes/JavaScript.php';
+    include __DIR__.'/classes/Prototype.php';
+    include __DIR__.'/classes/Scriptaculous.php';
 
     // For $projax = new Projax();
 

Please login to merge, or discard this patch.

include/captcha/text.php 2 patches

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -42,7 +42,7 @@  discard block
 block discarded – undo
 
     public function setCode()
     {
-        $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
+        $_SESSION['XoopsCaptcha_sessioncode'] = (string) $this->code;
     }
 
     /**
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
      */
     public function render()
     {
-        $form = $this->loadText() . "&nbsp;&nbsp; <input type='text' name='" . $this->config['name'] . "' id='" . $this->config['name'] . "' size='" . $this->config['num_chars'] . "' maxlength='" . $this->config['num_chars'] . "' value=''>";
+        $form = $this->loadText()."&nbsp;&nbsp; <input type='text' name='".$this->config['name']."' id='".$this->config['name']."' size='".$this->config['num_chars']."' maxlength='".$this->config['num_chars']."' value=''>";
         $rule = constant('XOOPS_CAPTCHA_RULE_TEXT');
         if (!empty($rule)) {
             $form .= "&nbsp;&nbsp;<small>{$rule}</small>";

Please login to merge, or discard this patch.

Indentation +61 added lines, -61 removed lines patch added patch discarded remove patch

@@ -7,75 +7,75 @@
 block discarded – undo
  */
 class XoopsCaptchaText
 {
-    public $config = [];
-    public $code;
+	public $config = [];
+	public $code;
 
-    /**
-     * XoopsCaptchaText constructor.
-     */
-    public function __construct()
-    {
-    }
+	/**
+	 * XoopsCaptchaText constructor.
+	 */
+	public function __construct()
+	{
+	}
 
-    /**
-     * @return XoopsCaptchaText
-     */
-    public static function getInstance()
-    {
-        static $instance;
-        if (null === $instance) {
-            $instance = new static();
-        }
+	/**
+	 * @return XoopsCaptchaText
+	 */
+	public static function getInstance()
+	{
+		static $instance;
+		if (null === $instance) {
+			$instance = new static();
+		}
 
-        return $instance;
-    }
+		return $instance;
+	}
 
-    /**
-     * Loading configs from CAPTCHA class
-     * @param array $config
-     */
-    public function loadConfig($config = [])
-    {
-        // Loading default preferences
-        $this->config = $config;
-    }
+	/**
+	 * Loading configs from CAPTCHA class
+	 * @param array $config
+	 */
+	public function loadConfig($config = [])
+	{
+		// Loading default preferences
+		$this->config = $config;
+	}
 
-    public function setCode()
-    {
-        $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
-    }
+	public function setCode()
+	{
+		$_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
+	}
 
-    /**
-     * @return string
-     */
-    public function render()
-    {
-        $form = $this->loadText() . "&nbsp;&nbsp; <input type='text' name='" . $this->config['name'] . "' id='" . $this->config['name'] . "' size='" . $this->config['num_chars'] . "' maxlength='" . $this->config['num_chars'] . "' value=''>";
-        $rule = constant('XOOPS_CAPTCHA_RULE_TEXT');
-        if (!empty($rule)) {
-            $form .= "&nbsp;&nbsp;<small>{$rule}</small>";
-        }
+	/**
+	 * @return string
+	 */
+	public function render()
+	{
+		$form = $this->loadText() . "&nbsp;&nbsp; <input type='text' name='" . $this->config['name'] . "' id='" . $this->config['name'] . "' size='" . $this->config['num_chars'] . "' maxlength='" . $this->config['num_chars'] . "' value=''>";
+		$rule = constant('XOOPS_CAPTCHA_RULE_TEXT');
+		if (!empty($rule)) {
+			$form .= "&nbsp;&nbsp;<small>{$rule}</small>";
+		}
 
-        $this->setCode();
+		$this->setCode();
 
-        return $form;
-    }
+		return $form;
+	}
 
-    /**
-     * @return string
-     */
-    public function loadText()
-    {
-        $val_a = mt_rand(0, 9);
-        $val_b = mt_rand(0, 9);
-        if ($val_a > $val_b) {
-            $expression = "{$val_a} - {$val_b} = ?";
-            $this->code = $val_a - $val_b;
-        } else {
-            $expression = "{$val_a} + {$val_b} = ?";
-            $this->code = $val_a + $val_b;
-        }
+	/**
+	 * @return string
+	 */
+	public function loadText()
+	{
+		$val_a = mt_rand(0, 9);
+		$val_b = mt_rand(0, 9);
+		if ($val_a > $val_b) {
+			$expression = "{$val_a} - {$val_b} = ?";
+			$this->code = $val_a - $val_b;
+		} else {
+			$expression = "{$val_a} + {$val_b} = ?";
+			$this->code = $val_a + $val_b;
+		}
 
-        return "<span style='font-style: normal; font-weight: bold; font-size: 100%; font-color: #333; border: 1px solid #333; padding: 1px 5px;'>{$expression}</span>";
-    }
+		return "<span style='font-style: normal; font-weight: bold; font-size: 100%; font-color: #333; border: 1px solid #333; padding: 1px 5px;'>{$expression}</span>";
+	}
 }

Please login to merge, or discard this patch.

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

		@@ -6,7 +6,7 @@
		block discarded – undo
6	6	* Licence: GNU
7	7	*/
8	8
9		-include __DIR__ . '/../../mainfile.php';
10		-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
	9	+include __DIR__.'/../../mainfile.php';
	10	+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
11	11
12	12	smart_loadCommonLanguageFile();

		@@ -7,7 +7,7 @@
		block discarded – undo
7	7	* Licence: GNU
8	8	*/
9	9
10		-require_once __DIR__ . '/../../../include/cp_header.php';
	10	+require_once __DIR__.'/../../../include/cp_header.php';
11	11
12		-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
	12	+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
13	13	smart_loadCommonLanguageFile();

		@@ -17,8 +17,8 @@ discard block
		block discarded – undo
17	17	* @author XOOPS Development Team
18	18	*/
19	19
20		-require_once __DIR__ . '/../../../include/cp_header.php';
21		-require_once __DIR__ . '/admin_header.php';
	20	+require_once __DIR__.'/../../../include/cp_header.php';
	21	+require_once __DIR__.'/admin_header.php';
22	22
23	23	xoops_cp_header();
24	24
		@@ -27,4 +27,4 @@ discard block
		block discarded – undo
27	27	$adminObject->displayNavigation(basename(__FILE__));
28	28	$adminObject->displayIndex();
29	29
30		-require_once __DIR__ . '/admin_footer.php';
	30	+require_once __DIR__.'/admin_footer.php';

		@@ -35,9 +35,9 @@ discard block
		block discarded – undo
35	35	}
36	36	}
37	37
38		-require_once __DIR__ . '/admin_header.php';
39		-require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
40		-require_once SMARTOBJECT_ROOT_PATH . 'class/currency.php';
	38	+require_once __DIR__.'/admin_header.php';
	39	+require_once SMARTOBJECT_ROOT_PATH.'class/smartobjecttable.php';
	40	+require_once SMARTOBJECT_ROOT_PATH.'class/currency.php';
41	41	$smartobjectCurrencyHandler = xoops_getModuleHandler('currency');
42	42
43	43	$op = '';
		@@ -51,7 +51,7 @@ discard block
		block discarded – undo
51	51
52	52	switch ($op) {
53	53	case 'mod':
54		- $currencyid = isset($_GET['currencyid']) ? (int)$_GET['currencyid'] : 0;
	54	+ $currencyid = isset($_GET['currencyid']) ? (int) $_GET['currencyid'] : 0;
55	55
56	56	smart_xoops_cp_header();
57	57
		@@ -66,9 +66,9 @@ discard block
		block discarded – undo
66	66
67	67	if (isset($_POST['default_currency'])) {
68	68	$newDefaultCurrency = $_POST['default_currency'];
69		- $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
	69	+ $sql = 'UPDATE '.$smartobjectCurrencyHandler->table.' SET default_currency=0';
70	70	$smartobjectCurrencyHandler->query($sql);
71		- $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=1 WHERE currencyid=' . $newDefaultCurrency;
	71	+ $sql = 'UPDATE '.$smartobjectCurrencyHandler->table.' SET default_currency=1 WHERE currencyid='.$newDefaultCurrency;
72	72	$smartobjectCurrencyHandler->query($sql);
73	73	}
74	74
		@@ -86,14 +86,14 @@ discard block
		block discarded – undo
86	86	break;
87	87
88	88	case 'addcurrency':
89		- require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
	89	+ require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobjectcontroller.php';
90	90	$controller = new SmartObjectController($smartobjectCurrencyHandler);
91		- $controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL . 'admin/currency.php');
	91	+ $controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL.'admin/currency.php');
92	92
93	93	break;
94	94
95	95	case 'del':
96		- require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
	96	+ require_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobjectcontroller.php';
97	97	$controller = new SmartObjectController($smartobjectCurrencyHandler);
98	98	$controller->handleObjectDeletion();
99	99
		@@ -107,7 +107,7 @@ discard block
		block discarded – undo
107	107
108	108	smart_collapsableBar('createdcurrencies', _AM_SOBJECT_CURRENCIES, _AM_SOBJECT_CURRENCIES_DSC);
109	109
110		- require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
	110	+ require_once SMARTOBJECT_ROOT_PATH.'class/smartobjecttable.php';
111	111	$objectTable = new SmartObjectTable($smartobjectCurrencyHandler);
112	112	$objectTable->addColumn(new SmartObjectColumn('name', 'left', false, 'getCurrencyLink'));
113	113	$objectTable->addColumn(new SmartObjectColumn('rate', 'center', 150));
		@@ -129,4 +129,4 @@ discard block
		block discarded – undo
129	129
130	130	//smart_modFooter();
131	131	//xoops_cp_footer();
132		-require_once __DIR__ . '/admin_footer.php';
	132	+require_once __DIR__.'/admin_footer.php';

		@@ -14,29 +14,29 @@ discard block
		block discarded – undo
14	14
15	15	function editclass($showmenu = false, $currencyid = 0)
16	16	{
17		- global $smartobjectCurrencyHandler;
18		-
19		- $currencyObj = $smartobjectCurrencyHandler->get($currencyid);
20		-
21		- if (!$currencyObj->isNew()) {
22		- if ($showmenu) {
23		- //smart_adminMenu(5, _AM_SOBJECT_CURRENCIES . " > " . _AM_SOBJECT_EDITING);
24		- }
25		- smart_collapsableBar('currencyedit', _AM_SOBJECT_CURRENCIES_EDIT, _AM_SOBJECT_CURRENCIES_EDIT_INFO);
26		-
27		- $sform = $currencyObj->getForm(_AM_SOBJECT_CURRENCIES_EDIT, 'addcurrency');
28		- $sform->display();
29		- smart_close_collapsable('currencyedit');
30		- } else {
31		- if ($showmenu) {
32		- //smart_adminMenu(5, _AM_SOBJECT_CURRENCIES . " > " . _CO_SOBJECT_CREATINGNEW);
33		- }
34		-
35		- smart_collapsableBar('currencycreate', _AM_SOBJECT_CURRENCIES_CREATE, _AM_SOBJECT_CURRENCIES_CREATE_INFO);
36		- $sform = $currencyObj->getForm(_AM_SOBJECT_CURRENCIES_CREATE, 'addcurrency');
37		- $sform->display();
38		- smart_close_collapsable('currencycreate');
39		- }
	17	+ global $smartobjectCurrencyHandler;
	18	+
	19	+ $currencyObj = $smartobjectCurrencyHandler->get($currencyid);
	20	+
	21	+ if (!$currencyObj->isNew()) {
	22	+ if ($showmenu) {
	23	+ //smart_adminMenu(5, _AM_SOBJECT_CURRENCIES . " > " . _AM_SOBJECT_EDITING);
	24	+ }
	25	+ smart_collapsableBar('currencyedit', _AM_SOBJECT_CURRENCIES_EDIT, _AM_SOBJECT_CURRENCIES_EDIT_INFO);
	26	+
	27	+ $sform = $currencyObj->getForm(_AM_SOBJECT_CURRENCIES_EDIT, 'addcurrency');
	28	+ $sform->display();
	29	+ smart_close_collapsable('currencyedit');
	30	+ } else {
	31	+ if ($showmenu) {
	32	+ //smart_adminMenu(5, _AM_SOBJECT_CURRENCIES . " > " . _CO_SOBJECT_CREATINGNEW);
	33	+ }
	34	+
	35	+ smart_collapsableBar('currencycreate', _AM_SOBJECT_CURRENCIES_CREATE, _AM_SOBJECT_CURRENCIES_CREATE_INFO);
	36	+ $sform = $currencyObj->getForm(_AM_SOBJECT_CURRENCIES_CREATE, 'addcurrency');
	37	+ $sform->display();
	38	+ smart_close_collapsable('currencycreate');
	39	+ }
40	40	}
41	41
42	42	require_once __DIR__ . '/admin_header.php';
		@@ -47,36 +47,36 @@ discard block
		block discarded – undo
47	47	$op = '';
48	48
49	49	if (isset($_GET['op'])) {
50		- $op = $_GET['op'];
	50	+ $op = $_GET['op'];
51	51	}
52	52	if (isset($_POST['op'])) {
53		- $op = $_POST['op'];
	53	+ $op = $_POST['op'];
54	54	}
55	55
56	56	switch ($op) {
57		- case 'mod':
58		- $currencyid = isset($_GET['currencyid']) ? (int)$_GET['currencyid'] : 0;
	57	+ case 'mod':
	58	+ $currencyid = isset($_GET['currencyid']) ? (int)$_GET['currencyid'] : 0;
59	59
60		- smart_xoops_cp_header();
	60	+ smart_xoops_cp_header();
61	61
62		- editclass(true, $currencyid);
63		- break;
	62	+ editclass(true, $currencyid);
	63	+ break;
64	64
65		- case 'updateCurrencies':
	65	+ case 'updateCurrencies':
66	66
67		- if (!isset($_POST['SmartobjectCurrency_objects']) \|\| 0 == count($_POST['SmartobjectCurrency_objects'])) {
68		- redirect_header($smart_previous_page, 3, _AM_SOBJECT_NO_RECORDS_TO_UPDATE);
69		- }
	67	+ if (!isset($_POST['SmartobjectCurrency_objects']) \|\| 0 == count($_POST['SmartobjectCurrency_objects'])) {
	68	+ redirect_header($smart_previous_page, 3, _AM_SOBJECT_NO_RECORDS_TO_UPDATE);
	69	+ }
70	70
71		- if (isset($_POST['default_currency'])) {
72		- $newDefaultCurrency = $_POST['default_currency'];
73		- $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
74		- $smartobjectCurrencyHandler->query($sql);
75		- $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=1 WHERE currencyid=' . $newDefaultCurrency;
76		- $smartobjectCurrencyHandler->query($sql);
77		- }
	71	+ if (isset($_POST['default_currency'])) {
	72	+ $newDefaultCurrency = $_POST['default_currency'];
	73	+ $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
	74	+ $smartobjectCurrencyHandler->query($sql);
	75	+ $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=1 WHERE currencyid=' . $newDefaultCurrency;
	76	+ $smartobjectCurrencyHandler->query($sql);
	77	+ }
78	78
79		- /*
	79	+ /*
80	80	$criteria = new \CriteriaCompo();
81	81	$criteria->add(new \Criteria('currencyid', '(' . implode(', ', $_POST['SmartobjectCurrency_objects']) . ')', 'IN'));
82	82	$currenciesObj = $smartobjectCurrencyHandler->getObjects($criteria, true);
		@@ -86,49 +86,49 @@ discard block
		block discarded – undo
86	86	$smartobjectCurrencyHandler->insert($currencyObj);
87	87	}
88	88	*/
89		- redirect_header($smart_previous_page, 3, _AM_SOBJECT_RECORDS_UPDATED);
90		- break;
	89	+ redirect_header($smart_previous_page, 3, _AM_SOBJECT_RECORDS_UPDATED);
	90	+ break;
91	91
92		- case 'addcurrency':
93		- require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
94		- $controller = new SmartObjectController($smartobjectCurrencyHandler);
95		- $controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL . 'admin/currency.php');
	92	+ case 'addcurrency':
	93	+ require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
	94	+ $controller = new SmartObjectController($smartobjectCurrencyHandler);
	95	+ $controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL . 'admin/currency.php');
96	96
97		- break;
	97	+ break;
98	98
99		- case 'del':
100		- require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
101		- $controller = new SmartObjectController($smartobjectCurrencyHandler);
102		- $controller->handleObjectDeletion();
	99	+ case 'del':
	100	+ require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
	101	+ $controller = new SmartObjectController($smartobjectCurrencyHandler);
	102	+ $controller->handleObjectDeletion();
103	103
104		- break;
	104	+ break;
105	105
106		- default:
	106	+ default:
107	107
108		- smart_xoops_cp_header();
	108	+ smart_xoops_cp_header();
109	109
110		- //smart_adminMenu(5, _AM_SOBJECT_CURRENCIES);
	110	+ //smart_adminMenu(5, _AM_SOBJECT_CURRENCIES);
111	111
112		- smart_collapsableBar('createdcurrencies', _AM_SOBJECT_CURRENCIES, _AM_SOBJECT_CURRENCIES_DSC);
	112	+ smart_collapsableBar('createdcurrencies', _AM_SOBJECT_CURRENCIES, _AM_SOBJECT_CURRENCIES_DSC);
113	113
114		- require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
115		- $objectTable = new SmartObjectTable($smartobjectCurrencyHandler);
116		- $objectTable->addColumn(new SmartObjectColumn('name', 'left', false, 'getCurrencyLink'));
117		- $objectTable->addColumn(new SmartObjectColumn('rate', 'center', 150));
118		- $objectTable->addColumn(new SmartObjectColumn('iso4217', 'center', 150));
119		- $objectTable->addColumn(new SmartObjectColumn('default_currency', 'center', 150, 'getDefaultCurrencyControl'));
	114	+ require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
	115	+ $objectTable = new SmartObjectTable($smartobjectCurrencyHandler);
	116	+ $objectTable->addColumn(new SmartObjectColumn('name', 'left', false, 'getCurrencyLink'));
	117	+ $objectTable->addColumn(new SmartObjectColumn('rate', 'center', 150));
	118	+ $objectTable->addColumn(new SmartObjectColumn('iso4217', 'center', 150));
	119	+ $objectTable->addColumn(new SmartObjectColumn('default_currency', 'center', 150, 'getDefaultCurrencyControl'));
120	120
121		- $objectTable->addIntroButton('addcurrency', 'currency.php?op=mod', _AM_SOBJECT_CURRENCIES_CREATE);
	121	+ $objectTable->addIntroButton('addcurrency', 'currency.php?op=mod', _AM_SOBJECT_CURRENCIES_CREATE);
122	122
123		- $objectTable->addActionButton('updateCurrencies', _SUBMIT, _AM_SOBJECT_CURRENCY_UPDATE_ALL);
	123	+ $objectTable->addActionButton('updateCurrencies', _SUBMIT, _AM_SOBJECT_CURRENCY_UPDATE_ALL);
124	124
125		- $objectTable->render();
	125	+ $objectTable->render();
126	126
127		- echo '<br>';
128		- smart_close_collapsable('createdcurrencies');
129		- echo '<br>';
	127	+ echo '<br>';
	128	+ smart_close_collapsable('createdcurrencies');
	129	+ echo '<br>';
130	130
131		- break;
	131	+ break;
132	132	}
133	133
134	134	//smart_modFooter();

		@@ -18,6 +18,6 @@
		block discarded – undo
18	18	*/
19	19
20	20	$pathIcon32 = \Xmf\Module\Admin::iconUrl('', 32);
21		-echo "<div class='adminfooter'>\n" . " <div style='text-align: center;'>\n" . " <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n" . " </div>\n" . ' ' . _AM_MODULEADMIN_ADMIN_FOOTER . "\n" . '</div>';
	21	+echo "<div class='adminfooter'>\n"." <div style='text-align: center;'>\n"." <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"." </div>\n".' '._AM_MODULEADMIN_ADMIN_FOOTER."\n".'</div>';
22	22
23	23	xoops_cp_footer();

		@@ -10,16 +10,16 @@
		block discarded – undo
10	10
11	11	function smart_adsense_initiate_smartytags()
12	12	{
13		- global $xoopsTpl, $smartobjectAdsenseHandler;
14		- if (is_object($xoopsTpl)) {
15		- foreach ($smartobjectAdsenseHandler->objects as $k => $v) {
16		- $xoopsTpl->assign('adsense_' . $k, $v->render());
17		- }
18		- }
	13	+ global $xoopsTpl, $smartobjectAdsenseHandler;
	14	+ if (is_object($xoopsTpl)) {
	15	+ foreach ($smartobjectAdsenseHandler->objects as $k => $v) {
	16	+ $xoopsTpl->assign('adsense_' . $k, $v->render());
	17	+ }
	18	+ }
19	19	}
20	20
21	21	if (!defined('SMARTOBJECT_URL')) {
22		- require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
	22	+ require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
23	23	}
24	24
25	25	require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php';

		@@ -13,17 +13,17 @@
		block discarded – undo
13	13	global $xoopsTpl, $smartobjectAdsenseHandler;
14	14	if (is_object($xoopsTpl)) {
15	15	foreach ($smartobjectAdsenseHandler->objects as $k => $v) {
16		- $xoopsTpl->assign('adsense_' . $k, $v->render());
	16	+ $xoopsTpl->assign('adsense_'.$k, $v->render());
17	17	}
18	18	}
19	19	}
20	20
21	21	if (!defined('SMARTOBJECT_URL')) {
22		- require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
	22	+ require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
23	23	}
24	24
25		-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php';
26		-require_once SMARTOBJECT_ROOT_PATH . 'class/adsense.php';
	25	+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/functions.php';
	26	+require_once SMARTOBJECT_ROOT_PATH.'class/adsense.php';
27	27
28	28	$smartobjectAdsenseHandler = xoops_getModuleHandler('adsense', 'smartobject');
29	29	$smartobjectAdsensesObj = $smartobjectAdsenseHandler->getAdsensesByTag();

		@@ -10,16 +10,16 @@
		block discarded – undo
10	10
11	11	function smart_customtag_initiate()
12	12	{
13		- global $xoopsTpl, $smartobjectCustomtagHandler;
14		- if (is_object($xoopsTpl)) {
15		- foreach ($smartobjectCustomtagHandler->objects as $k => $v) {
16		- $xoopsTpl->assign($k, $v->render());
17		- }
18		- }
	13	+ global $xoopsTpl, $smartobjectCustomtagHandler;
	14	+ if (is_object($xoopsTpl)) {
	15	+ foreach ($smartobjectCustomtagHandler->objects as $k => $v) {
	16	+ $xoopsTpl->assign($k, $v->render());
	17	+ }
	18	+ }
19	19	}
20	20
21	21	if (!defined('SMARTOBJECT_URL')) {
22		- require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
	22	+ require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
23	23	}
24	24
25	25	smart_loadLanguageFile('smartobject', 'customtag');

		@@ -19,13 +19,13 @@
		block discarded – undo
19	19	}
20	20
21	21	if (!defined('SMARTOBJECT_URL')) {
22		- require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
	22	+ require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
23	23	}
24	24
25	25	smart_loadLanguageFile('smartobject', 'customtag');
26	26
27		-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/functions.php';
28		-require_once SMARTOBJECT_ROOT_PATH . 'class/customtag.php';
	27	+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/functions.php';
	28	+require_once SMARTOBJECT_ROOT_PATH.'class/customtag.php';
29	29
30	30	$smartobjectCustomtagHandler = xoops_getModuleHandler('customtag', 'smartobject');
31	31	$smartobjectCustomTagsObj = $smartobjectCustomtagHandler->getCustomtagsByName();

		@@ -14,16 +14,16 @@
		block discarded – undo
14	14	*/
15	15
16	16	if (!class_exists('Projax')) {
17		- include __DIR__ . '/classes/JavaScript.php';
18		- include __DIR__ . '/classes/Prototype.php';
19		- include __DIR__ . '/classes/Scriptaculous.php';
	17	+ include __DIR__ . '/classes/JavaScript.php';
	18	+ include __DIR__ . '/classes/Prototype.php';
	19	+ include __DIR__ . '/classes/Scriptaculous.php';
20	20
21		- // For $projax = new Projax();
	21	+ // For $projax = new Projax();
22	22
23		- /**
24		- * Class projax
25		- */
26		- class projax extends Scriptaculous
27		- {
28		- }
	23	+ /**
	24	+ * Class projax
	25	+ */
	26	+ class projax extends Scriptaculous
	27	+ {
	28	+ }
29	29	}

		@@ -14,9 +14,9 @@
		block discarded – undo
14	14	*/
15	15
16	16	if (!class_exists('Projax')) {
17		- include __DIR__ . '/classes/JavaScript.php';
18		- include __DIR__ . '/classes/Prototype.php';
19		- include __DIR__ . '/classes/Scriptaculous.php';
	17	+ include __DIR__.'/classes/JavaScript.php';
	18	+ include __DIR__.'/classes/Prototype.php';
	19	+ include __DIR__.'/classes/Scriptaculous.php';
20	20
21	21	// For $projax = new Projax();
22	22

		@@ -42,7 +42,7 @@ discard block
		block discarded – undo
42	42
43	43	public function setCode()
44	44	{
45		- $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
	45	+ $_SESSION['XoopsCaptcha_sessioncode'] = (string) $this->code;
46	46	}
47	47
48	48	/**
		@@ -50,7 +50,7 @@ discard block
		block discarded – undo
50	50	*/
51	51	public function render()
52	52	{
53		- $form = $this->loadText() . "   <input type='text' name='" . $this->config['name'] . "' id='" . $this->config['name'] . "' size='" . $this->config['num_chars'] . "' maxlength='" . $this->config['num_chars'] . "' value=''>";
	53	+ $form = $this->loadText()."   <input type='text' name='".$this->config['name']."' id='".$this->config['name']."' size='".$this->config['num_chars']."' maxlength='".$this->config['num_chars']."' value=''>";
54	54	$rule = constant('XOOPS_CAPTCHA_RULE_TEXT');
55	55	if (!empty($rule)) {
56	56	$form .= "  <small>{$rule}</small>";

		@@ -7,75 +7,75 @@
		block discarded – undo
7	7	*/
8	8	class XoopsCaptchaText
9	9	{
10		- public $config = [];
11		- public $code;
	10	+ public $config = [];
	11	+ public $code;
12	12
13		- /**
14		- * XoopsCaptchaText constructor.
15		- */
16		- public function __construct()
17		- {
18		- }
	13	+ /**
	14	+ * XoopsCaptchaText constructor.
	15	+ */
	16	+ public function __construct()
	17	+ {
	18	+ }
19	19
20		- /**
21		- * @return XoopsCaptchaText
22		- */
23		- public static function getInstance()
24		- {
25		- static $instance;
26		- if (null === $instance) {
27		- $instance = new static();
28		- }
	20	+ /**
	21	+ * @return XoopsCaptchaText
	22	+ */
	23	+ public static function getInstance()
	24	+ {
	25	+ static $instance;
	26	+ if (null === $instance) {
	27	+ $instance = new static();
	28	+ }
29	29
30		- return $instance;
31		- }
	30	+ return $instance;
	31	+ }
32	32
33		- /**
34		- * Loading configs from CAPTCHA class
35		- * @param array $config
36		- */
37		- public function loadConfig($config = [])
38		- {
39		- // Loading default preferences
40		- $this->config = $config;
41		- }
	33	+ /**
	34	+ * Loading configs from CAPTCHA class
	35	+ * @param array $config
	36	+ */
	37	+ public function loadConfig($config = [])
	38	+ {
	39	+ // Loading default preferences
	40	+ $this->config = $config;
	41	+ }
42	42
43		- public function setCode()
44		- {
45		- $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
46		- }
	43	+ public function setCode()
	44	+ {
	45	+ $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
	46	+ }
47	47
48		- /**
49		- * @return string
50		- */
51		- public function render()
52		- {
53		- $form = $this->loadText() . "   <input type='text' name='" . $this->config['name'] . "' id='" . $this->config['name'] . "' size='" . $this->config['num_chars'] . "' maxlength='" . $this->config['num_chars'] . "' value=''>";
54		- $rule = constant('XOOPS_CAPTCHA_RULE_TEXT');
55		- if (!empty($rule)) {
56		- $form .= "  <small>{$rule}</small>";
57		- }
	48	+ /**
	49	+ * @return string
	50	+ */
	51	+ public function render()
	52	+ {
	53	+ $form = $this->loadText() . "   <input type='text' name='" . $this->config['name'] . "' id='" . $this->config['name'] . "' size='" . $this->config['num_chars'] . "' maxlength='" . $this->config['num_chars'] . "' value=''>";
	54	+ $rule = constant('XOOPS_CAPTCHA_RULE_TEXT');
	55	+ if (!empty($rule)) {
	56	+ $form .= "  <small>{$rule}</small>";
	57	+ }
58	58
59		- $this->setCode();
	59	+ $this->setCode();
60	60
61		- return $form;
62		- }
	61	+ return $form;
	62	+ }
63	63
64		- /**
65		- * @return string
66		- */
67		- public function loadText()
68		- {
69		- $val_a = mt_rand(0, 9);
70		- $val_b = mt_rand(0, 9);
71		- if ($val_a > $val_b) {
72		- $expression = "{$val_a} - {$val_b} = ?";
73		- $this->code = $val_a - $val_b;
74		- } else {
75		- $expression = "{$val_a} + {$val_b} = ?";
76		- $this->code = $val_a + $val_b;
77		- }
	64	+ /**
	65	+ * @return string
	66	+ */
	67	+ public function loadText()
	68	+ {
	69	+ $val_a = mt_rand(0, 9);
	70	+ $val_b = mt_rand(0, 9);
	71	+ if ($val_a > $val_b) {
	72	+ $expression = "{$val_a} - {$val_b} = ?";
	73	+ $this->code = $val_a - $val_b;
	74	+ } else {
	75	+ $expression = "{$val_a} + {$val_b} = ?";
	76	+ $this->code = $val_a + $val_b;
	77	+ }
78	78
79		- return "<span style='font-style: normal; font-weight: bold; font-size: 100%; font-color: #333; border: 1px solid #333; padding: 1px 5px;'>{$expression}</span>";
80		- }
	79	+ return "<span style='font-style: normal; font-weight: bold; font-size: 100%; font-color: #333; border: 1px solid #333; padding: 1px 5px;'>{$expression}</span>";
	80	+ }
81	81	}

mambax7 / smartobject

Push — master ( bf34f3...88111b )

Status

Category

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Indentation +71 added lines, -71 removed lines patch added patch discarded remove patch

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

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Indentation +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Indentation +61 added lines, -61 removed lines patch added patch discarded remove patch