mambax7 / smartfaq

admin/admin.php

Spacing +20 added lines, -20 removed lines

@@ -28,42 +28,42 @@ 
 if (empty($fct)) {
     $fct = 'preferences';
 }
-include __DIR__ . '/../../../mainfile.php';
-include XOOPS_ROOT_PATH . '/include/cp_functions.php';
+include __DIR__.'/../../../mainfile.php';
+include XOOPS_ROOT_PATH.'/include/cp_functions.php';
 
-require_once XOOPS_ROOT_PATH . '/kernel/module.php';
+require_once XOOPS_ROOT_PATH.'/kernel/module.php';
 
 $admintest = 0;
 
 if (is_object($xoopsUser)) {
     $xoopsModule = XoopsModule::getByDirname('system');
     if (!$xoopsUser->isAdmin($xoopsModule->mid())) {
-        redirect_header(XOOPS_URL . '/user.php', 3, _NOPERM);
+        redirect_header(XOOPS_URL.'/user.php', 3, _NOPERM);
     }
     $admintest = 1;
 } else {
-    redirect_header(XOOPS_URL . '/user.php', 3, _NOPERM);
+    redirect_header(XOOPS_URL.'/user.php', 3, _NOPERM);
 }
 
 // include system category definitions
-require_once XOOPS_ROOT_PATH . '/modules/system/constants.php';
+require_once XOOPS_ROOT_PATH.'/modules/system/constants.php';
 $error = false;
 if (0 != $admintest) {
     if (isset($fct) && '' != $fct) {
-        if (file_exists(XOOPS_ROOT_PATH . '/modules/system/admin/' . $fct . '/xoops_version.php')) {
+        if (file_exists(XOOPS_ROOT_PATH.'/modules/system/admin/'.$fct.'/xoops_version.php')) {
             xoops_loadLanguage('admin', 'system');
-            xoops_loadLanguage('admin/' . $fct, 'system');
+            xoops_loadLanguage('admin/'.$fct, 'system');
 
-            include XOOPS_ROOT_PATH . '/modules/system/admin/' . $fct . '/xoops_version.php';
+            include XOOPS_ROOT_PATH.'/modules/system/admin/'.$fct.'/xoops_version.php';
             $syspermHandler = xoops_getHandler('groupperm');
             $category       = !empty($modversion['category']) ? (int)$modversion['category'] : 0;
             unset($modversion);
             if ($category > 0) {
-                $groups =& $xoopsUser->getGroups();
+                $groups = & $xoopsUser->getGroups();
                 if (in_array(XOOPS_GROUP_ADMIN, $groups)
                     || false !== $syspermHandler->checkRight('system_admin', $category, $groups, $xoopsModule->getVar('mid'))) {
                     if (file_exists("../include/{$fct}.inc.php")) {
-                        require_once __DIR__ . "/../include/{$fct}.inc.php";
+                        require_once __DIR__."/../include/{$fct}.inc.php";
                     } else {
                         $error = true;
                     }
@@ -71,8 +71,8 @@ 
                     $error = true;
                 }
             } elseif ('version' === $fct) {
-                if (file_exists(XOOPS_ROOT_PATH . '/modules/system/admin/version/main.php')) {
-                    require_once XOOPS_ROOT_PATH . '/modules/system/admin/version/main.php';
+                if (file_exists(XOOPS_ROOT_PATH.'/modules/system/admin/version/main.php')) {
+                    require_once XOOPS_ROOT_PATH.'/modules/system/admin/version/main.php';
                 } else {
                     $error = true;
                 }
@@ -92,26 +92,26 @@ 
     echo '<h4>System Configuration</h4>';
     echo '<table class="outer" cellpadding="4" cellspacing="1">';
     echo '<tr>';
-    $groups =& $xoopsUser->getGroups();
+    $groups = & $xoopsUser->getGroups();
     $all_ok = false;
     if (!in_array(XOOPS_GROUP_ADMIN, $groups)) {
         $syspermHandler = xoops_getHandler('groupperm');
-        $ok_syscats     =& $syspermHandler->getItemIds('system_admin', $groups);
+        $ok_syscats     = & $syspermHandler->getItemIds('system_admin', $groups);
     } else {
         $all_ok = true;
     }
-    $admin_dir = XOOPS_ROOT_PATH . '/modules/system/admin';
+    $admin_dir = XOOPS_ROOT_PATH.'/modules/system/admin';
     $handle    = opendir($admin_dir);
     $counter   = 0;
     $class     = 'even';
     while ($file = readdir($handle)) {
-        if ('cvs' !== strtolower($file) && !preg_match('/[.]/', $file) && is_dir($admin_dir . '/' . $file)) {
-            include $admin_dir . '/' . $file . '/xoops_version.php';
+        if ('cvs' !== strtolower($file) && !preg_match('/[.]/', $file) && is_dir($admin_dir.'/'.$file)) {
+            include $admin_dir.'/'.$file.'/xoops_version.php';
             if ($modversion['hasAdmin']) {
                 $category = isset($modversion['category']) ? (int)$modversion['category'] : 0;
                 if (false !== $all_ok || in_array($modversion['category'], $ok_syscats)) {
                     echo "<td class='$class' align='center' valign='bottom' width='19%'>";
-                    echo "<a href='" . XOOPS_URL . '/modules/system/admin.php?fct=' . $file . "'><b>" . trim($modversion['name']) . "</b></a>\n";
+                    echo "<a href='".XOOPS_URL.'/modules/system/admin.php?fct='.$file."'><b>".trim($modversion['name'])."</b></a>\n";
                     echo '</td>';
                     ++$counter;
                     $class = ('even' === $class) ? 'odd' : 'even';
@@ -126,7 +126,7 @@ 
         }
     }
     while ($counter < 5) {
-        echo '<td class="' . $class . '">&nbsp;</td>';
+        echo '<td class="'.$class.'">&nbsp;</td>';
         $class = ('even' === $class) ? 'odd' : 'even';
         ++$counter;
     }

class/Faq.php

Spacing +13 added lines, -13 removed lines

@@ -187,7 +187,7 @@ 
         if (0 != $maxLength) {
             if (!XOOPS_USE_MULTIBYTES) {
                 if (strlen($ret) >= $maxLength) {
-                    $ret = substr($ret, 0, $maxLength - 1) . '...';
+                    $ret = substr($ret, 0, $maxLength - 1).'...';
                 }
             }
         }
@@ -379,14 +379,14 @@ 
                 $theAnswers = $answerHandler->getAllAnswers($this->faqid(), Constants::SF_AN_STATUS_APPROVED, 1, 0);
                 //echo "test";
                 //exit;
-                $this->answer =& $theAnswers[0];
+                $this->answer = & $theAnswers[0];
                 break;
 
             case Constants::SF_STATUS_ANSWERED:
                 $theAnswers = $answerHandler->getAllAnswers($this->faqid(), Constants::SF_AN_STATUS_PROPOSED, 1, 0);
                 //echo "test";
                 //exit;
-                $this->answer =& $theAnswers[0];
+                $this->answer = & $theAnswers[0];
                 break;
 
             case Constants::SF_STATUS_PUBLISHED:
@@ -472,7 +472,7 @@ 
         $tags['MODULE_NAME']   = $myts->displayTarea($smartModule->getVar('name'));
         $tags['FAQ_NAME']      = $this->question();
         $tags['CATEGORY_NAME'] = $this->getCategoryName();
-        $tags['CATEGORY_URL']  = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/category.php?categoryid=' . $this->categoryid();
+        $tags['CATEGORY_URL']  = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/category.php?categoryid='.$this->categoryid();
         $tags['FAQ_QUESTION']  = $this->question();
         $answerObj             = $this->answer();
         if (is_object($answerObj)) {
@@ -484,7 +484,7 @@ 
         foreach ($notifications as $notification) {
             switch ($notification) {
                 case Constants::SF_NOT_FAQ_PUBLISHED:
-                    $tags['FAQ_URL'] = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/faq.php?faqid=' . $this->faqid();
+                    $tags['FAQ_URL'] = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/faq.php?faqid='.$this->faqid();
 
                     $notificationHandler->triggerEvent('global_faq', 0, 'published', $tags);
                     $notificationHandler->triggerEvent('category_faq', $this->categoryid(), 'published', $tags);
@@ -492,20 +492,20 @@ 
                     break;
 
                 case Constants::SF_NOT_FAQ_SUBMITTED:
-                    $tags['WAITINGFILES_URL'] = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/admin/faq.php?faqid=' . $this->faqid();
+                    $tags['WAITINGFILES_URL'] = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/admin/faq.php?faqid='.$this->faqid();
                     $notificationHandler->triggerEvent('global_faq', 0, 'submitted', $tags);
                     $notificationHandler->triggerEvent('category_faq', $this->categoryid(), 'submitted', $tags);
                     break;
 
                 case Constants::SF_NOT_QUESTION_PUBLISHED:
-                    $tags['FAQ_URL'] = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/answer.php?faqid=' . $this->faqid();
+                    $tags['FAQ_URL'] = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/answer.php?faqid='.$this->faqid();
                     $notificationHandler->triggerEvent('global_question', 0, 'published', $tags);
                     $notificationHandler->triggerEvent('category_question', $this->categoryid(), 'published', $tags);
                     $notificationHandler->triggerEvent('question', $this->faqid(), 'approved', $tags);
                     break;
 
                 case Constants::SF_NOT_QUESTION_SUBMITTED:
-                    $tags['WAITINGFILES_URL'] = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/admin/question.php?op=mod&faqid=' . $this->faqid();
+                    $tags['WAITINGFILES_URL'] = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/admin/question.php?op=mod&faqid='.$this->faqid();
                     $notificationHandler->triggerEvent('global_question', 0, 'submitted', $tags);
                     $notificationHandler->triggerEvent('category_question', $this->categoryid(), 'submitted', $tags);
                     break;
@@ -515,7 +515,7 @@ 
                     break;
 
                 case Constants::SF_NOT_NEW_ANSWER_PROPOSED:
-                    $tags['WAITINGFILES_URL'] = XOOPS_URL . '/modules/' . $smartModule->getVar('dirname') . '/admin/answer.php?op=mod&faqid=' . $this->faqid();
+                    $tags['WAITINGFILES_URL'] = XOOPS_URL.'/modules/'.$smartModule->getVar('dirname').'/admin/answer.php?op=mod&faqid='.$this->faqid();
                     $notificationHandler->triggerEvent('global_faq', 0, 'answer_proposed', $tags);
                     $notificationHandler->triggerEvent('category_faq', $this->categoryid(), 'answer_proposed', $tags);
                     break;
@@ -629,7 +629,7 @@ 
             $text = _MD_SF_FAQCOMEFROM;
         }
 
-        return $text . $xoopsConfig['sitename'] . ' : <a href=' . XOOPS_URL . '/modules/smartfaq/faq.php?faqid=' . $this->faqid() . '>' . XOOPS_URL . '/modules/smartfaq/faq.php?faqid=' . $this->faqid() . '</a>';
+        return $text.$xoopsConfig['sitename'].' : <a href='.XOOPS_URL.'/modules/smartfaq/faq.php?faqid='.$this->faqid().'>'.XOOPS_URL.'/modules/smartfaq/faq.php?faqid='.$this->faqid().'</a>';
     }
 
     /**
@@ -648,9 +648,9 @@ 
         $faq['question']   = $this->question();
         $page              = (Constants::SF_STATUS_OPENED == $this->status()) ? 'answer.php' : 'faq.php';
 
-        $faq['questionlink'] = "<a href='$page?faqid=" . $this->faqid() . "'>" . $this->question($lastfaqsize) . '</a>';
+        $faq['questionlink'] = "<a href='$page?faqid=".$this->faqid()."'>".$this->question($lastfaqsize).'</a>';
         if ($linkInQuestion) {
-            $faq['fullquestionlink'] = "<a href='$page?faqid=" . $this->faqid() . "'>" . $this->question() . '</a>';
+            $faq['fullquestionlink'] = "<a href='$page?faqid=".$this->faqid()."'>".$this->question().'</a>';
         } else {
             $faq['fullquestionlink'] = $this->question();
         }
@@ -666,7 +666,7 @@ 
                 $categoryObj = $category[$this->categoryid()];
             }
             $faq['categoryname'] = $categoryObj->getVar('name');
-            $faq['categorylink'] = "<a href='" . XOOPS_URL . '/modules/smartfaq/category.php?categoryid=' . $this->categoryid() . "'>" . $categoryObj->getVar('name') . '</a>';
+            $faq['categorylink'] = "<a href='".XOOPS_URL.'/modules/smartfaq/category.php?categoryid='.$this->categoryid()."'>".$categoryObj->getVar('name').'</a>';
         }
 
         return $faq;

class/GroupPermForm.php

Spacing +14 added lines, -14 removed lines

@@ -27,12 +27,12 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelement.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formhidden.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formhiddentoken.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formbutton.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelementtray.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/form.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formhidden.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formhiddentoken.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formbutton.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelementtray.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/form.php';
 
 /**
  * Renders a form for setting module specific group permissions
@@ -162,11 +162,11 @@ 
         }
         $gpermHandler  = xoops_getHandler('groupperm');
         $memberHandler = xoops_getHandler('member');
-        $glist         =& $memberHandler->getGroupList();
+        $glist         = & $memberHandler->getGroupList();
         foreach (array_keys($glist) as $i) {
             // get selected item id(s) for each group
             $selected = $gpermHandler->getItemIds($this->_permName, $i, $this->_modid);
-            $ele      = new Smartfaq\GroupFormCheckBox($glist[$i], 'perms[' . $this->_permName . ']', $i, $selected);
+            $ele      = new Smartfaq\GroupFormCheckBox($glist[$i], 'perms['.$this->_permName.']', $i, $selected);
             $ele->setOptionTree($this->_itemTree);
 
             foreach ($this->_appendix as $key => $append) {
@@ -193,18 +193,18 @@ 
         $tray->addElement(new \XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
         $this->addElement($tray);
 
-        $ret      = '<h4>' . $this->getTitle() . '</h4>' . $this->_permDesc . '<br>';
-        $ret      .= "<form name='" . $this->getName() . "' id='" . $this->getName() . "' action='" . $this->getAction() . "' method='" . $this->getMethod() . "'" . $this->getExtra() . ">\n<table width='100%' class='outer' cellspacing='1'>\n";
-        $elements =& $this->getElements();
+        $ret      = '<h4>'.$this->getTitle().'</h4>'.$this->_permDesc.'<br>';
+        $ret .= "<form name='".$this->getName()."' id='".$this->getName()."' action='".$this->getAction()."' method='".$this->getMethod()."'".$this->getExtra().">\n<table width='100%' class='outer' cellspacing='1'>\n";
+        $elements = & $this->getElements();
         foreach (array_keys($elements) as $i) {
             if (!is_object($elements[$i])) {
                 $ret .= $elements[$i];
             } elseif (!$elements[$i]->isHidden()) {
-                $ret .= "<tr valign='top' align='left'><td class='head'>" . $elements[$i]->getCaption();
+                $ret .= "<tr valign='top' align='left'><td class='head'>".$elements[$i]->getCaption();
                 if ('' != $elements[$i]->getDescription()) {
-                    $ret .= '<br><br><span style="font-weight: normal;">' . $elements[$i]->getDescription() . '</span>';
+                    $ret .= '<br><br><span style="font-weight: normal;">'.$elements[$i]->getDescription().'</span>';
                 }
-                $ret .= "</td>\n<td class='even'>\n" . $elements[$i]->render() . "\n</td></tr>\n";
+                $ret .= "</td>\n<td class='even'>\n".$elements[$i]->render()."\n</td></tr>\n";
             } else {
                 $ret .= $elements[$i]->render();
             }

include/config.php

Spacing +13 added lines, -13 removed lines

@@ -22,25 +22,25 @@ 
     $moduleDirName      = basename(dirname(__DIR__));
     $moduleDirNameUpper = strtoupper($moduleDirName);
     return (object)[
-        'name'           => strtoupper($moduleDirName) . ' Module Configurator',
+        'name'           => strtoupper($moduleDirName).' Module Configurator',
         'paths'          => [
             'dirname'    => $moduleDirName,
-            'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-            'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-            'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-            'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-            'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+            'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+            'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+            'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+            'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+            'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
         ],
         'uploadFolders'  => [
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/category',
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/screenshots',
+            constant($moduleDirNameUpper.'_UPLOAD_PATH'),
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/category',
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/screenshots',
             //XOOPS_UPLOAD_PATH . '/flags'
         ],
         'copyBlankFiles' => [
-            constant($moduleDirNameUpper . '_UPLOAD_PATH'),
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/category',
-            constant($moduleDirNameUpper . '_UPLOAD_PATH') . '/screenshots',
+            constant($moduleDirNameUpper.'_UPLOAD_PATH'),
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/category',
+            constant($moduleDirNameUpper.'_UPLOAD_PATH').'/screenshots',
             //XOOPS_UPLOAD_PATH . '/flags'
         ],
 
@@ -75,6 +75,6 @@ 
             '/images',
         ],
         'modCopyright'    => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . constant($moduleDirNameUpper . '_AUTHOR_LOGOIMG') . '\' alt=\'XOOPS Project\' /></a>',
+                     <img src='" . constant($moduleDirNameUpper.'_AUTHOR_LOGOIMG').'\' alt=\'XOOPS Project\' /></a>',
     ];
 }

class/CategoryHandler.php

Indentation +2 added lines, -2 removed lines

@@ -92,7 +92,7 @@ 
             $sql = sprintf(
                 'INSERT INTO `%s` (parentid, name, description, total, weight, created) VALUES (%u, %s, %s, %u, %u, %u)',
                 $this->db->prefix('smartfaq_categories'),
-                           $parentid,
+                            $parentid,
                 $this->db->quoteString($name),
                 $this->db->quoteString($description),
                 $total,
@@ -104,7 +104,7 @@ 
                 'UPDATE `%s` SET parentid = %u, name = %s, description = %s, total = %s, weight = %u, created = %u WHERE categoryid = %u',
                 $this->db->prefix('smartfaq_categories'),
                 $parentid,
-                           $this->db->quoteString($name),
+                            $this->db->quoteString($name),
                 $this->db->quoteString($description),
                 $total,
                 $weight,

Spacing +24 added lines, -24 removed lines

@@ -47,7 +47,7 @@ 
     {
         $false = false;
         if ((int)$id > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('smartfaq_categories') . ' WHERE categoryid=' . $id;
+            $sql = 'SELECT * FROM '.$this->db->prefix('smartfaq_categories').' WHERE categoryid='.$id;
             if (!$result = $this->db->query($sql)) {
                 return $false;
             }
@@ -149,7 +149,7 @@ 
         }
 
         // Deleteing the sub categories
-        $subcats =& $this->getCategories(0, 0, $category->categoryid());
+        $subcats = & $this->getCategories(0, 0, $category->categoryid());
         foreach ($subcats as $subcat) {
             $this->delete($subcat);
         }
@@ -186,11 +186,11 @@ 
     {
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT * FROM ' . $this->db->prefix('smartfaq_categories');
+        $sql   = 'SELECT * FROM '.$this->db->prefix('smartfaq_categories');
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' != $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -247,7 +247,7 @@ 
             $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $criteria->add(new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+            $criteria->add(new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
         }
         $criteria->setStart($start);
         $criteria->setLimit($limit);
@@ -286,7 +286,7 @@ 
             $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $criteria->add(new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+            $criteria->add(new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
         }
 
         $criteria->add(new \Criteria('f.status', Constants::SF_STATUS_OPENED));
@@ -295,11 +295,11 @@ 
 
         $ret   = [];
         $limit = $start = 0;
-        $sql   = 'SELECT DISTINCT c.categoryid, c.parentid, c.name, c.description, c.total, c.weight, c.created FROM ' . $this->db->prefix('smartfaq_categories') . ' AS c INNER JOIN ' . $this->db->prefix('smartfaq_faq') . ' AS f ON c.categoryid = f.categoryid';
+        $sql   = 'SELECT DISTINCT c.categoryid, c.parentid, c.name, c.description, c.total, c.weight, c.created FROM '.$this->db->prefix('smartfaq_categories').' AS c INNER JOIN '.$this->db->prefix('smartfaq_faq').' AS f ON c.categoryid = f.categoryid';
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ('' != $criteria->getSort()) {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -328,9 +328,9 @@ 
      */
     public function getCount($criteria = null)
     {
-        $sql = 'SELECT COUNT(*) FROM ' . $this->db->prefix('smartfaq_categories');
+        $sql = 'SELECT COUNT(*) FROM '.$this->db->prefix('smartfaq_categories');
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         $result = $this->db->query($sql);
         if (!$result) {
@@ -358,7 +358,7 @@ 
                 $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
 
                 $categoriesGranted = $smartPermHandler->getPermissions('category');
-                $criteria->add(new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+                $criteria->add(new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
             }
         }
 
@@ -382,16 +382,16 @@ 
                 $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
 
                 $categoriesGranted = $smartPermHandler->getPermissions('category');
-                $criteria->add(new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+                $criteria->add(new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
             }
         }
 
         $criteria->add(new \Criteria('f.status', Constants::SF_STATUS_OPENED));
 
-        $sql = 'SELECT COUNT(c.categoryid) FROM ' . $this->db->prefix('smartfaq_categories') . ' AS c INNER JOIN ' . $this->db->prefix('smartfaq_faq') . ' AS f ON c.categoryid = f.categoryid';
+        $sql = 'SELECT COUNT(c.categoryid) FROM '.$this->db->prefix('smartfaq_categories').' AS c INNER JOIN '.$this->db->prefix('smartfaq_faq').' AS f ON c.categoryid = f.categoryid';
 
         if (isset($criteria) && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
 
         $result = $this->db->query($sql);
@@ -409,16 +409,16 @@ 
      */
     public function getSubCats($categories)
     {
-        $criteria = new \CriteriaCompo(new \Criteria('parentid', '(' . implode(',', array_keys($categories)) . ')'), 'IN');
+        $criteria = new \CriteriaCompo(new \Criteria('parentid', '('.implode(',', array_keys($categories)).')'), 'IN');
         $ret      = [];
         if (!Smartfaq\Utility::userIsAdmin()) {
             /** @var Smartfaq\PermissionHandler $smartPermHandler */
             $smartPermHandler = Smartfaq\Helper::getInstance()->getHandler('Permission');
 
             $categoriesGranted = $smartPermHandler->getPermissions('category');
-            $criteria->add(new \Criteria('categoryid', '(' . implode(',', $categoriesGranted) . ')', 'IN'));
+            $criteria->add(new \Criteria('categoryid', '('.implode(',', $categoriesGranted).')', 'IN'));
         }
-        $subcats =& $this->getObjects($criteria, true);
+        $subcats = & $this->getObjects($criteria, true);
         foreach ($subcats as $subcat_id => $subcat) {
             $ret[$subcat->getVar('parentid')][$subcat->getVar('categoryid')] = $subcat;
         }
@@ -434,9 +434,9 @@ 
      */
     public function deleteAll($criteria = null)
     {
-        $sql = 'DELETE FROM ' . $this->db->prefix('smartfaq_categories');
+        $sql = 'DELETE FROM '.$this->db->prefix('smartfaq_categories');
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$this->db->query($sql)) {
             return false;
@@ -458,10 +458,10 @@ 
      **/
     public function updateAll($fieldname, $fieldvalue, \CriteriaElement $criteria = null)
     {
-        $set_clause = is_numeric($fieldvalue) ? $fieldname . ' = ' . $fieldvalue : $fieldname . ' = ' . $this->db->quoteString($fieldvalue);
-        $sql        = 'UPDATE ' . $this->db->prefix('smartfaq_categories') . ' SET ' . $set_clause;
+        $set_clause = is_numeric($fieldvalue) ? $fieldname.' = '.$fieldvalue : $fieldname.' = '.$this->db->quoteString($fieldvalue);
+        $sql        = 'UPDATE '.$this->db->prefix('smartfaq_categories').' SET '.$set_clause;
         if (null !== $criteria && is_subclass_of($criteria, 'CriteriaElement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (!$this->db->queryF($sql)) {
             return false;

class/SmartobjectDbupdater.php

Spacing +2 added lines, -2 removed lines

@@ -61,11 +61,11 @@
         $query = sprintf('ALTER TABLE `%s` RENAME %s', $from, $to);
         $ret   = $xoopsDB->queryF($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from).'<br>';
 
             return false;
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE, $from, $to).'<br>';
 
             return true;
         }

admin/myblocksadmin.php

Indentation +22 added lines, -22 removed lines

@@ -174,22 +174,22 @@ 
             </td>
             <td class='$class' align='center' nowrap='nowrap'>
                 <input type='radio' name='side[$bid]' value='"
-             . Constants::XOOPS_SIDEBLOCK_LEFT
-             . "'$ssel0>-<input type='radio' name='side[$bid]' value='"
-             . Constants::XOOPS_CENTERBLOCK_LEFT
-             . "'$ssel2><input type='radio' name='side[$bid]' value='"
-             . Constants::XOOPS_CENTERBLOCK_CENTER
-             . "'$ssel3><input type='radio' name='side[$bid]' value='"
-             . Constants::XOOPS_CENTERBLOCK_RIGHT
-             . "'$ssel4>-<input type='radio' name='side[$bid]' value='"
-             . Constants::XOOPS_SIDEBLOCK_RIGHT
-             . "'$ssel1>
+                . Constants::XOOPS_SIDEBLOCK_LEFT
+                . "'$ssel0>-<input type='radio' name='side[$bid]' value='"
+                . Constants::XOOPS_CENTERBLOCK_LEFT
+                . "'$ssel2><input type='radio' name='side[$bid]' value='"
+                . Constants::XOOPS_CENTERBLOCK_CENTER
+                . "'$ssel3><input type='radio' name='side[$bid]' value='"
+                . Constants::XOOPS_CENTERBLOCK_RIGHT
+                . "'$ssel4>-<input type='radio' name='side[$bid]' value='"
+                . Constants::XOOPS_SIDEBLOCK_RIGHT
+                . "'$ssel1>
                 <br>
                 <br>
                 <input type='radio' name='side[$bid]' value='-1'$sseln>
                 "
-             . _NONE
-             . "
+                . _NONE
+                . "
             </td>
             <td class='$class' align='center'>
                 <input type='text' name=weight[$bid] value='$weight' size='5' maxlength='5' style='text-align:right;'>
@@ -206,8 +206,8 @@ 
             </td>
             <td class='$class' align='center'>
                 <a href='admin.php?fct=blocksadmin&amp;op=edit&amp;bid=$bid'>"
-             . _EDIT
-             . "</a>
+                . _EDIT
+                . "</a>
                 <input type='hidden' name='bid[$bid]' value='$bid'>
             </td>
         </tr>\n";
@@ -240,14 +240,14 @@ 
     }
 
     $form = new GroupPermForm('', 1, 'block_read', "<img id='bottomtableicon' src="
-                                                          . XOOPS_URL
-                                                          . '/modules/'
-                                                          . $xoopsModule->dirname()
-                                                          . "/assets/images/icon/close12.gif alt=''></a>&nbsp;"
-                                                          . _AM_SF_GROUPS
-                                                          . "</h3><div id='bottomtable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">"
-                                                          . _AM_SF_GROUPSINFO
-                                                          . '</span>');
+                                                            . XOOPS_URL
+                                                            . '/modules/'
+                                                            . $xoopsModule->dirname()
+                                                            . "/assets/images/icon/close12.gif alt=''></a>&nbsp;"
+                                                            . _AM_SF_GROUPS
+                                                            . "</h3><div id='bottomtable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">"
+                                                            . _AM_SF_GROUPSINFO
+                                                            . '</span>');
     $form->addAppendix('module_admin', $xoopsModule->mid(), $xoopsModule->name() . ' ' . _AM_ACTIVERIGHTS);
     $form->addAppendix('module_read', $xoopsModule->mid(), $xoopsModule->name() . ' ' . _AM_ACCESSRIGHTS);
     foreach ($item_list as $item_id => $item_name) {

Spacing +26 added lines, -26 removed lines

@@ -15,12 +15,12 @@ 
 use XoopsModules\Smartfaq;
 use XoopsModules\Smartfaq\Constants;
 
-require_once __DIR__ . '/../../../include/cp_header.php';
-require_once __DIR__ . '/mygrouppermform.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
+require_once __DIR__.'/../../../include/cp_header.php';
+require_once __DIR__.'/mygrouppermform.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
 //require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->dirname() . '/include/functions.php';
 
-$xoops_system_path = XOOPS_ROOT_PATH . '/modules/system';
+$xoops_system_path = XOOPS_ROOT_PATH.'/modules/system';
 
 // language files
 $language = $xoopsConfig['language'];
@@ -30,9 +30,9 @@ 
 
 // to prevent from notice that constants already defined
 $error_reporting_level = error_reporting(0);
-require_once __DIR__ . '/../../system/constants.php';
-require_once __DIR__ . "/../../language/$language/admin.php";
-require_once __DIR__ . "/../../language/$language/admin/blocksadmin.php";
+require_once __DIR__.'/../../system/constants.php';
+require_once __DIR__."/../../language/$language/admin.php";
+require_once __DIR__."/../../language/$language/admin/blocksadmin.php";
 //require_once __DIR__ . '/../include/functions.php';
 error_reporting($error_reporting_level);
 
@@ -45,13 +45,13 @@ 
 
 // check $xoopsModule
 if (!is_object($xoopsModule)) {
-    redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 // check access right (needs system_admin of BLOCK)
 $syspermHandler = xoops_getHandler('groupperm');
 if (!$syspermHandler->checkRight('system_admin', XOOPS_SYSTEM_BLOCK, $xoopsUser->getGroups())) {
-    redirect_header(XOOPS_URL . '/user.php', 1, _NOPERM);
+    redirect_header(XOOPS_URL.'/user.php', 1, _NOPERM);
 }
 
 // get blocks owned by the module
@@ -78,20 +78,20 @@ 
 
     // displaying TH
     Smartfaq\Utility::collapsableBar('toptable', 'toptableicon');
-    echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt=''></a>&nbsp;" . _AM_SF_BLOCKS . '</h3>';
+    echo "<img id='toptableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt=''></a>&nbsp;"._AM_SF_BLOCKS.'</h3>';
     echo "<div id='toptable'>";
-    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_SF_BLOCKSTXT . '</span>';
+    echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_SF_BLOCKSTXT.'</span>';
 
     echo "
     <form action='admin.php' name='blockadmin' method='post'>
         <table width='100%' class='outer' cellpadding='4' cellspacing='1'>
         <tr valign='middle'>
-            <th>" . _AM_TITLE . "</th>
-            <th align='center' nowrap='nowrap'>" . _AM_SF_POSITION . "</th>
-            <th align='center'>" . _AM_WEIGHT . "</th>
-            <th align='center'>" . _AM_VISIBLEIN . "</th>
-            <th align='center'>" . _AM_BCACHETIME . "</th>
-            <th align='center'>" . _AM_ACTION . "</th>
+            <th>" . _AM_TITLE."</th>
+            <th align='center' nowrap='nowrap'>" . _AM_SF_POSITION."</th>
+            <th align='center'>" . _AM_WEIGHT."</th>
+            <th align='center'>" . _AM_VISIBLEIN."</th>
+            <th align='center'>" . _AM_BCACHETIME."</th>
+            <th align='center'>" . _AM_ACTION."</th>
         </tr>\n";
 
     // blocks displaying loop
@@ -141,7 +141,7 @@ 
 
         // target modules
         $db            = \XoopsDatabaseFactory::getDatabaseConnection();
-        $result        = $db->query('SELECT module_id FROM ' . $db->prefix('block_module_link') . " WHERE block_id='$bid'");
+        $result        = $db->query('SELECT module_id FROM '.$db->prefix('block_module_link')." WHERE block_id='$bid'");
         $selected_mids = [];
         while (false !== (list($selected_mid) = $db->fetchRow($result))) {
             $selected_mids[] = (int)$selected_mid;
@@ -158,9 +158,9 @@ 
         $myts           = \MyTextSanitizer::getInstance();
         foreach ($module_list as $mid => $mname) {
             if (in_array($mid, $selected_mids)) {
-                $module_options .= "<option value='$mid' selected>" . $myts->displayTarea($mname) . "</option>\n";
+                $module_options .= "<option value='$mid' selected>".$myts->displayTarea($mname)."</option>\n";
             } else {
-                $module_options .= "<option value='$mid'>" . $myts->displayTarea($mname) . "</option>\n";
+                $module_options .= "<option value='$mid'>".$myts->displayTarea($mname)."</option>\n";
             }
         }
 
@@ -220,7 +220,7 @@ 
             <td class='foot' align='center' colspan='6'>
                 <input type='hidden' name='fct' value='blocksadmin'>
                 <input type='hidden' name='op' value='order'>
-                <input type='submit' name='submit' value='" . _SUBMIT . "'>
+                <input type='submit' name='submit' value='" . _SUBMIT."'>
             </td>
         </tr>
         </table>
@@ -248,8 +248,8 @@ 
                                                           . "</h3><div id='bottomtable'><span style=\"color: #567; margin: 3px 0 0 0; font-size: small; display: block; \">"
                                                           . _AM_SF_GROUPSINFO
                                                           . '</span>');
-    $form->addAppendix('module_admin', $xoopsModule->mid(), $xoopsModule->name() . ' ' . _AM_ACTIVERIGHTS);
-    $form->addAppendix('module_read', $xoopsModule->mid(), $xoopsModule->name() . ' ' . _AM_ACCESSRIGHTS);
+    $form->addAppendix('module_admin', $xoopsModule->mid(), $xoopsModule->name().' '._AM_ACTIVERIGHTS);
+    $form->addAppendix('module_read', $xoopsModule->mid(), $xoopsModule->name().' '._AM_ACCESSRIGHTS);
     foreach ($item_list as $item_id => $item_name) {
         $form->addItem($item_id, $myts->displayTarea($item_name));
     }
@@ -258,14 +258,14 @@ 
 }
 
 if (!empty($_POST['submit'])) {
-    include __DIR__ . '/mygroupperm.php';
+    include __DIR__.'/mygroupperm.php';
     require_once "$xoops_system_path/language/$language/admin.php";
-    redirect_header(XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/admin/myblocksadmin.php', 1, _AM_DBUPDATED);
+    redirect_header(XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/admin/myblocksadmin.php', 1, _AM_DBUPDATED);
 }
 
 xoops_cp_header();
 if (file_exists('./mymenu.php')) {
-    include __DIR__ . '/mymenu.php';
+    include __DIR__.'/mymenu.php';
 }
 
 list_blocks();

class/Tree.php

Spacing +18 added lines, -18 removed lines

@@ -69,7 +69,7 @@ 
     {
         $selectId = (int)$selectId;
         $arr      = [];
-        $sql      = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . ' ';
+        $sql      = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.' ';
         if ('' !== $order) {
             $sql .= " ORDER BY $order";
         }
@@ -96,7 +96,7 @@ 
     {
         $selectId = (int)$selectId;
         $idarray  = [];
-        $result   = $this->db->query('SELECT ' . $this->id . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . '');
+        $result   = $this->db->query('SELECT '.$this->id.' FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.'');
         $count    = $this->db->getRowsNum($result);
         if (0 == $count) {
             return $idarray;
@@ -120,7 +120,7 @@ 
     public function getAllChildId($selectId, $order = '', array $idarray = [])
     {
         $selectId = (int)$selectId;
-        $sql      = 'SELECT ' . $this->id . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . '';
+        $sql      = 'SELECT '.$this->id.' FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.'';
         if ('' !== $order) {
             $sql .= " ORDER BY $order";
         }
@@ -149,7 +149,7 @@ 
     public function getAllParentId($selectId, $order = '', array $idarray = [])
     {
         $selectId = (int)$selectId;
-        $sql      = 'SELECT ' . $this->pid . ' FROM ' . $this->table . ' WHERE ' . $this->id . '=' . $selectId . '';
+        $sql      = 'SELECT '.$this->pid.' FROM '.$this->table.' WHERE '.$this->id.'='.$selectId.'';
         if ('' !== $order) {
             $sql .= " ORDER BY $order";
         }
@@ -176,14 +176,14 @@ 
     public function getPathFromId($selectId, $title, $path = '')
     {
         $selectId = (int)$selectId;
-        $result   = $this->db->query('SELECT ' . $this->pid . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$selectId");
+        $result   = $this->db->query('SELECT '.$this->pid.', '.$title.' FROM '.$this->table.' WHERE '.$this->id."=$selectId");
         if (0 == $this->db->getRowsNum($result)) {
             return $path;
         }
         list($parentid, $name) = $this->db->fetchRow($result);
         $myts = \MyTextSanitizer::getInstance();
         $name = $myts->htmlspecialchars($name);
-        $path = '/' . $name . $path . '';
+        $path = '/'.$name.$path.'';
         if (0 == $parentid) {
             return $path;
         }
@@ -209,12 +209,12 @@ 
             $sel_name = $this->id;
         }
         $myts = \MyTextSanitizer::getInstance();
-        echo "<select name='" . $sel_name . "'";
+        echo "<select name='".$sel_name."'";
         if ('' !== $onchange) {
-            echo " onchange='" . $onchange . "'";
+            echo " onchange='".$onchange."'";
         }
         echo ">\n";
-        $sql = 'SELECT ' . $this->id . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=0';
+        $sql = 'SELECT '.$this->id.', '.$title.' FROM '.$this->table.' WHERE '.$this->pid.'=0';
         if ('' !== $order) {
             $sql .= " ORDER BY $order";
         }
@@ -232,11 +232,11 @@ 
             $arr = $this->getChildTreeArray($catid, $order);
             foreach ($arr as $option) {
                 $option['prefix'] = str_replace('.', '--', $option['prefix']);
-                $catpath          = $option['prefix'] . '&nbsp;' . $myts->htmlspecialchars($option[$title]);
+                $catpath          = $option['prefix'].'&nbsp;'.$myts->htmlspecialchars($option[$title]);
                 if ($option[$this->id] == $preset_id) {
                     $sel = " selected='selected'";
                 }
-                echo "<option value='" . $option[$this->id] . "'$sel>$catpath</option>\n";
+                echo "<option value='".$option[$this->id]."'$sel>$catpath</option>\n";
                 $sel = '';
             }
         }
@@ -257,7 +257,7 @@ 
     {
         $path     = !empty($path) ? $path : '';
         $selectId = (int)$selectId;
-        $sql      = 'SELECT ' . $this->pid . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$selectId";
+        $sql      = 'SELECT '.$this->pid.', '.$title.' FROM '.$this->table.' WHERE '.$this->id."=$selectId";
         $result   = $this->db->query($sql);
         if (0 == $this->db->getRowsNum($result)) {
             return $path;
@@ -265,7 +265,7 @@ 
         list($parentid, $name) = $this->db->fetchRow($result);
         $myts = \MyTextSanitizer::getInstance();
         $name = $myts->htmlspecialchars($name);
-        $path = "<li><a href='" . $funcURL . '&amp;' . $this->id . '=' . $selectId . "'>" . $name . '</a></li>' . $path . '';
+        $path = "<li><a href='".$funcURL.'&amp;'.$this->id.'='.$selectId."'>".$name.'</a></li>'.$path.'';
         if (0 == $parentid) {
             return $path;
         }
@@ -285,12 +285,12 @@ 
     public function getIdPathFromId($selectId, $path = '')
     {
         $selectId = (int)$selectId;
-        $result   = $this->db->query('SELECT ' . $this->pid . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$selectId");
+        $result   = $this->db->query('SELECT '.$this->pid.' FROM '.$this->table.' WHERE '.$this->id."=$selectId");
         if (0 == $this->db->getRowsNum($result)) {
             return $path;
         }
         list($parentid) = $this->db->fetchRow($result);
-        $path = '/' . $selectId . $path . '';
+        $path = '/'.$selectId.$path.'';
         if (0 == $parentid) {
             return $path;
         }
@@ -311,7 +311,7 @@ 
     public function getAllChild($selectId = 0, $order = '', array $parray = [])
     {
         $selectId = (int)$selectId;
-        $sql      = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . ' ';
+        $sql      = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.' ';
         if ('' !== $order) {
             $sql .= " ORDER BY $order";
         }
@@ -341,7 +341,7 @@ 
     public function getChildTreeArray($selectId = 0, $order = '', array $parray = [], $r_prefix = '')
     {
         $selectId = (int)$selectId;
-        $sql      = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . ' ';
+        $sql      = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.' ';
         if ('' !== $order) {
             $sql .= " ORDER BY $order";
         }
@@ -351,7 +351,7 @@ 
             return $parray;
         }
         while (false !== ($row = $this->db->fetchArray($result))) {
-            $row['prefix'] = $r_prefix . '.';
+            $row['prefix'] = $r_prefix.'.';
             array_push($parray, $row);
             $parray = $this->getChildTreeArray($row[$this->id], $order, $parray, $row['prefix']);
         }

class/SmartDbTable.php

Spacing +19 added lines, -19 removed lines

@@ -22,7 +22,7 @@ 
     //Verifies that a MySQL table exists
     $xoopsDB  = \XoopsDatabaseFactory::getDatabaseConnection();
     $realname = $xoopsDB->prefix($table);
-    $sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
+    $sql      = 'SHOW TABLES FROM '.XOOPS_DB_NAME;
     $ret      = $xoopsDB->queryF($sql);
     while (false !== (list($m_table) = $xoopsDB->fetchRow($ret))) {
         if ($m_table == $realname) {
@@ -163,14 +163,14 @@ 
     public function getExistingFieldsArray()
     {
         global $xoopsDB;
-        $result = $xoopsDB->queryF('SHOW COLUMNS FROM ' . $this->name());
+        $result = $xoopsDB->queryF('SHOW COLUMNS FROM '.$this->name());
         while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
             $fields[$existing_field['Field']] = $existing_field['Type'];
             if ('YES' !== $existing_field['Null']) {
                 $fields[$existing_field['Field']] .= ' NOT NULL';
             }
             if ($existing_field['Extra']) {
-                $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+                $fields[$existing_field['Field']] .= ' '.$existing_field['Extra'];
             }
         }
 
@@ -246,9 +246,9 @@ 
             $query = sprintf('INSERT INTO `%s` VALUES ("%s")', $this->name(), $data);
             $ret   = $xoopsDB->queryF($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA, $this->name()).'<br>';
             }
         }
 
@@ -413,9 +413,9 @@ 
 
         $ret = $xoopsDB->queryF($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()).'<br>';
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE, $this->name()).'<br>';
         }
 
         return $ret;
@@ -434,11 +434,11 @@ 
         $query = sprintf('DROP TABLE `%s`', $this->name());
         $ret   = $xoopsDB->queryF($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()).'<br>';
 
             return false;
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE, $this->name()).'<br>';
 
             return true;
         }
@@ -462,9 +462,9 @@ 
             $ret = $ret && $xoopsDB->queryF($query);
             if ($alteredField['showerror']) {
                 if (!$ret) {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . '<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()).'<br>';
                 } else {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . '<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()).'<br>';
                 }
             }
         }
@@ -488,9 +488,9 @@ 
             //echo $query;
             $ret = $ret && $xoopsDB->queryF($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()).'<br>';
             }
         }
 
@@ -513,9 +513,9 @@ 
             $query = sprintf('UPDATE `%s` SET %s = %s', $this->name(), $updatedField['name'], $updatedField['value']);
             $ret   = $ret && $xoopsDB->queryF($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
             }
         }
 
@@ -538,9 +538,9 @@ 
             //echo $query."<br>";
             $ret = $ret && $xoopsDB->queryF($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
             }
         }
 
@@ -564,9 +564,9 @@ 
 
             $ret = $ret && $xoopsDB->queryF($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()).'<br>';
             }
         }