mambax7 / smartfaq

class/Common/ServerStats.php

Spacing +12 added lines, -12 removed lines

@@ -34,19 +34,19 @@ 
         //        $sql   .= " WHERE metakey='version' LIMIT 1";
         //        $query = $GLOBALS['xoopsDB']->query($sql);
         //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
-        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . "</legend>\n";
+        $html .= "<fieldset><legend style='font-weight: bold; color: #900;'>".constant('CO_'.$moduleDirNameUpper.'_IMAGEINFO')."</legend>\n";
         $html .= "<div style='padding: 8px;'>\n";
         //        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>\n";
         //        $html .= "<br>\n";
         //        $html .= "<br>\n";
-        $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . "</div>\n";
+        $html .= '<div>'.constant('CO_'.$moduleDirNameUpper.'_SPHPINI')."</div>\n";
         $html .= "<ul>\n";
         //
-        $gdlib = function_exists('gd_info') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
-        $html  .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
+        $gdlib = function_exists('gd_info') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_GDON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_GDOFF').'</span>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS').$gdlib;
         if (function_exists('gd_info')) {
             if (true === ($gdlib = gd_info())) {
-                $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
+                $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBVERSION').'<b>'.$gdlib['GD Version'].'</b>';
             }
         }
         //
@@ -56,18 +56,18 @@ 
         //    $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: green;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: red;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
         //    $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
         //
-        $downloads = ini_get('file_uploads') ? '<span style="color: green;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: red;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
-        $html      .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
+        $downloads = ini_get('file_uploads') ? '<span style="color: green;">'.constant('CO_'.$moduleDirNameUpper.'_ON').'</span>' : '<span style="color: red;">'.constant('CO_'.$moduleDirNameUpper.'_OFF').'</span>';
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS').$downloads;
         //
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: blue;">' . ini_get('upload_max_filesize') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: blue;">' . ini_get('post_max_size') . "</span></b>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: blue;">' . ini_get('memory_limit') . "</span></b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE').' <b><span style="color: blue;">'.ini_get('upload_max_filesize')."</span></b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE').' <b><span style="color: blue;">'.ini_get('post_max_size')."</span></b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT').' <b><span style="color: blue;">'.ini_get('memory_limit')."</span></b>\n";
         $html .= "</ul>\n";
         $html .= "<ul>\n";
-        $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . "</b>\n";
+        $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERPATH').' <b>'.XOOPS_ROOT_PATH."</b>\n";
         $html .= "</ul>\n";
         $html .= "<br>\n";
-        $html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . "\n";
+        $html .= constant('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC')."\n";
         $html .= '</div>';
         $html .= '</fieldset><br>';
 

class/Common/FilesManagement.php

Spacing +10 added lines, -10 removed lines

@@ -33,7 +33,7 @@ 
                     throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
                 }
 
-                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+                file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
             }
         } catch (\Exception $e) {
             echo 'Caught exception: ', $e->getMessage(), "\n", '<br>';
@@ -61,10 +61,10 @@ 
         if (!mkdir($dst) && !is_dir($dst)) {
             while (false !== ($file = readdir($dir))) {
                 if (('.' !== $file) && ('..' !== $file)) {
-                    if (is_dir($src . '/' . $file)) {
-                        self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
+                    if (is_dir($src.'/'.$file)) {
+                        self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
                     } else {
-                        copy($src . '/' . $file, $dst . '/' . $file);
+                        copy($src.'/'.$file, $dst.'/'.$file);
                     }
                 }
             }
@@ -159,7 +159,7 @@ 
                 self::rrmdir($fObj->getPathname());
             }
         }
-        $iterator = null;   // clear iterator Obj to close file/directory
+        $iterator = null; // clear iterator Obj to close file/directory
         return rmdir($src); // remove the directory & return results
     }
 
@@ -192,14 +192,14 @@ 
         $iterator = new \DirectoryIterator($src);
         foreach ($iterator as $fObj) {
             if ($fObj->isFile()) {
-                rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                rename($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             } elseif (!$fObj->isDot() && $fObj->isDir()) {
                 // Try recursively on directory
-                self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                self::rmove($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
                 //                rmdir($fObj->getPath()); // now delete the directory
             }
         }
-        $iterator = null;   // clear iterator Obj to close file/directory
+        $iterator = null; // clear iterator Obj to close file/directory
         return rmdir($src); // remove the directory & return results
     }
 
@@ -235,9 +235,9 @@ 
         $iterator = new \DirectoryIterator($src);
         foreach ($iterator as $fObj) {
             if ($fObj->isFile()) {
-                copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                copy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             } elseif (!$fObj->isDot() && $fObj->isDir()) {
-                self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
+                self::rcopy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
             }
         }
         return true;

class/Tree.php

Spacing +27 added lines, -27 removed lines

@@ -67,9 +67,9 @@ 
      */
     public function getFirstChild($selectId, $order = '')
     {
-        $selectId = (int)$selectId;
+        $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";
         }
@@ -94,9 +94,9 @@ 
      */
     public function getFirstChildId($selectId)
     {
-        $selectId = (int)$selectId;
+        $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;
@@ -119,8 +119,8 @@ 
      */
     public function getAllChildId($selectId, $order = '', array $idarray = [])
     {
-        $selectId = (int)$selectId;
-        $sql      = 'SELECT ' . $this->id . ' FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . '';
+        $selectId = (int) $selectId;
+        $sql      = 'SELECT '.$this->id.' FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.'';
         if ('' !== $order) {
             $sql .= " ORDER BY $order";
         }
@@ -148,8 +148,8 @@ 
      */
     public function getAllParentId($selectId, $order = '', array $idarray = [])
     {
-        $selectId = (int)$selectId;
-        $sql      = 'SELECT ' . $this->pid . ' FROM ' . $this->table . ' WHERE ' . $this->id . '=' . $selectId . '';
+        $selectId = (int) $selectId;
+        $sql      = 'SELECT '.$this->pid.' FROM '.$this->table.' WHERE '.$this->id.'='.$selectId.'';
         if ('' !== $order) {
             $sql .= " ORDER BY $order";
         }
@@ -175,15 +175,15 @@ 
      */
     public function getPathFromId($selectId, $title, $path = '')
     {
-        $selectId = (int)$selectId;
-        $result   = $this->db->query('SELECT ' . $this->pid . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$selectId");
+        $selectId = (int) $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 = '';
             }
         }
@@ -256,8 +256,8 @@ 
     public function getNicePathFromId($selectId, $title, $funcURL, $path = '')
     {
         $path     = !empty($path) ? $path : $path;
-        $selectId = (int)$selectId;
-        $sql      = 'SELECT ' . $this->pid . ', ' . $title . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$selectId";
+        $selectId = (int) $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;
         }
@@ -284,13 +284,13 @@ 
      */
     public function getIdPathFromId($selectId, $path = '')
     {
-        $selectId = (int)$selectId;
-        $result   = $this->db->query('SELECT ' . $this->pid . ' FROM ' . $this->table . ' WHERE ' . $this->id . "=$selectId");
+        $selectId = (int) $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;
         }
@@ -310,8 +310,8 @@ 
      */
     public function getAllChild($selectId = 0, $order = '', array $parray = [])
     {
-        $selectId = (int)$selectId;
-        $sql      = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . '';
+        $selectId = (int) $selectId;
+        $sql      = 'SELECT * FROM '.$this->table.' WHERE '.$this->pid.'='.$selectId.'';
         if ('' !== $order) {
             $sql .= " ORDER BY $order";
         }
@@ -340,8 +340,8 @@ 
      */
     public function getChildTreeArray($selectId = 0, $order = '', array $parray = [], $r_prefix = '')
     {
-        $selectId = (int)$selectId;
-        $sql      = 'SELECT * FROM ' . $this->table . ' WHERE ' . $this->pid . '=' . $selectId . '';
+        $selectId = (int) $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']);
         }

submit.php

Switch Indentation +134 added lines, -134 removed lines

@@ -52,153 +52,153 @@ 
 }
 
 switch ($op) {
-    case 'preview':
+        case 'preview':
 
-        global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
+            global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
 
-        $faqObj      = $faqHandler->create();
-        $answerObj   = $answerHandler->create();
-        $categoryObj = $categoryHandler->get($_POST['categoryid']);
+            $faqObj      = $faqHandler->create();
+            $answerObj   = $answerHandler->create();
+            $categoryObj = $categoryHandler->get($_POST['categoryid']);
 
-        if (!$xoopsUser) {
-            if (1 == $xoopsModuleConfig['anonpost']) {
-                $uid = 0;
+            if (!$xoopsUser) {
+                if (1 == $xoopsModuleConfig['anonpost']) {
+                    $uid = 0;
+                } else {
+                    redirect_header('index.php', 3, _NOPERM);
+                }
             } else {
-                redirect_header('index.php', 3, _NOPERM);
+                $uid = $xoopsUser->uid();
             }
-        } else {
-            $uid = $xoopsUser->uid();
-        }
 
-        $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
+            $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
 
-        // Putting the values about the FAQ in the FAQ object
-        $faqObj->setVar('categoryid', $_POST['categoryid']);
-        $faqObj->setVar('uid', $uid);
-        $faqObj->setVar('question', $_POST['question']);
-        $faqObj->setVar('howdoi', $_POST['howdoi']);
-        $faqObj->setVar('diduno', $_POST['diduno']);
-        $faqObj->setVar('datesub', time());
+            // Putting the values about the FAQ in the FAQ object
+            $faqObj->setVar('categoryid', $_POST['categoryid']);
+            $faqObj->setVar('uid', $uid);
+            $faqObj->setVar('question', $_POST['question']);
+            $faqObj->setVar('howdoi', $_POST['howdoi']);
+            $faqObj->setVar('diduno', $_POST['diduno']);
+            $faqObj->setVar('datesub', time());
 
-        // Putting the values in the answer object
-        $answerObj->setVar('status', Constants::SF_AN_STATUS_APPROVED);
-        $answerObj->setVar('faqid', $faqObj->faqid());
-        $answerObj->setVar('answer', $_POST['answer']);
-        $answerObj->setVar('uid', $uid);
+            // Putting the values in the answer object
+            $answerObj->setVar('status', Constants::SF_AN_STATUS_APPROVED);
+            $answerObj->setVar('faqid', $faqObj->faqid());
+            $answerObj->setVar('answer', $_POST['answer']);
+            $answerObj->setVar('uid', $uid);
 
-        global $xoopsUser, $myts;
+            global $xoopsUser, $myts;
 
-        $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
-        require_once XOOPS_ROOT_PATH . '/header.php';
-        require_once __DIR__ . '/footer.php';
+            $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
+            require_once XOOPS_ROOT_PATH . '/header.php';
+            require_once __DIR__ . '/footer.php';
 
-        $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
+            $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
 
-        $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
-        $faq                 = $faqObj->toArray(null, $categoryObj, false);
-        $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
-        $faq['answer']       = $answerObj->answer();
-        $faq['who_when']     = $faqObj->getWhoAndWhen();
+            $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
+            $faq                 = $faqObj->toArray(null, $categoryObj, false);
+            $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
+            $faq['answer']       = $answerObj->answer();
+            $faq['who_when']     = $faqObj->getWhoAndWhen();
 
-        $faq['comments'] = -1;
-        $xoopsTpl->assign('faq', $faq);
-        $xoopsTpl->assign('op', 'preview');
-        $xoopsTpl->assign('whereInSection', $moduleName);
-        $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
+            $faq['comments'] = -1;
+            $xoopsTpl->assign('faq', $faq);
+            $xoopsTpl->assign('op', 'preview');
+            $xoopsTpl->assign('whereInSection', $moduleName);
+            $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
 
-        $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
+            $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
+            $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
 
-        require_once __DIR__ . '/include/submit.inc.php';
+            require_once __DIR__ . '/include/submit.inc.php';
 
-        require_once XOOPS_ROOT_PATH . '/footer.php';
+            require_once XOOPS_ROOT_PATH . '/footer.php';
 
-        exit();
-        break;
+            exit();
+            break;
 
-    case 'post':
+        case 'post':
 
-        global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
+            global $xoopsUser, $xoopsConfig, $xoopsModule, $xoopsModuleConfig, $xoopsDB;
 
-        $newFaqObj    = $faqHandler->create();
-        $newAnswerObj = $answerHandler->create();
+            $newFaqObj    = $faqHandler->create();
+            $newAnswerObj = $answerHandler->create();
 
-        if (!$xoopsUser) {
-            if (1 == $xoopsModuleConfig['anonpost']) {
-                $uid = 0;
+            if (!$xoopsUser) {
+                if (1 == $xoopsModuleConfig['anonpost']) {
+                    $uid = 0;
+                } else {
+                    redirect_header('index.php', 3, _NOPERM);
+                }
             } else {
-                redirect_header('index.php', 3, _NOPERM);
+                $uid = $xoopsUser->uid();
             }
-        } else {
-            $uid = $xoopsUser->uid();
-        }
-
-        $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
-
-        // Putting the values about the FAQ in the FAQ object
-        $newFaqObj->setVar('categoryid', $_POST['categoryid']);
-        $newFaqObj->setVar('uid', $uid);
-        $newFaqObj->setVar('question', $_POST['question']);
-        $newFaqObj->setVar('howdoi', $_POST['howdoi']);
-        $newFaqObj->setVar('diduno', $_POST['diduno']);
-        $newFaqObj->setVar('notifypub', $notifypub);
-        //$newFaqObj->setVar('modulelink', $_POST['modulelink']);
-        //$newFaqObj->setVar('contextpage', $_POST['contextpage']);
 
-        // Setting the status of the FAQ
-
-        // if user is admin, FAQ are automatically published
-        $isAdmin = Smartfaq\Utility::userIsAdmin();
-        if ($isAdmin) {
-            $newFaqObj->setVar('status', Constants::SF_STATUS_PUBLISHED);
-        } elseif (1 == $xoopsModuleConfig['autoapprove_submitted_faq']) {
-            $newFaqObj->setVar('status', Constants::SF_STATUS_PUBLISHED);
-        } else {
-            $newFaqObj->setVar('status', Constants::SF_STATUS_SUBMITTED);
-        }
+            $notifypub = isset($_POST['notifypub']) ? $_POST['notifypub'] : 0;
+
+            // Putting the values about the FAQ in the FAQ object
+            $newFaqObj->setVar('categoryid', $_POST['categoryid']);
+            $newFaqObj->setVar('uid', $uid);
+            $newFaqObj->setVar('question', $_POST['question']);
+            $newFaqObj->setVar('howdoi', $_POST['howdoi']);
+            $newFaqObj->setVar('diduno', $_POST['diduno']);
+            $newFaqObj->setVar('notifypub', $notifypub);
+            //$newFaqObj->setVar('modulelink', $_POST['modulelink']);
+            //$newFaqObj->setVar('contextpage', $_POST['contextpage']);
+
+            // Setting the status of the FAQ
+
+            // if user is admin, FAQ are automatically published
+            $isAdmin = Smartfaq\Utility::userIsAdmin();
+            if ($isAdmin) {
+                $newFaqObj->setVar('status', Constants::SF_STATUS_PUBLISHED);
+            } elseif (1 == $xoopsModuleConfig['autoapprove_submitted_faq']) {
+                $newFaqObj->setVar('status', Constants::SF_STATUS_PUBLISHED);
+            } else {
+                $newFaqObj->setVar('status', Constants::SF_STATUS_SUBMITTED);
+            }
 
-        // Storing the FAQ object in the database
-        if (!$newFaqObj->store()) {
-            redirect_header('javascript:history.go(-1)', 2, _MD_SF_SUBMIT_ERROR);
-        }
+            // Storing the FAQ object in the database
+            if (!$newFaqObj->store()) {
+                redirect_header('javascript:history.go(-1)', 2, _MD_SF_SUBMIT_ERROR);
+            }
 
-        // Putting the values in the answer object
-        $newAnswerObj->setVar('status', Constants::SF_AN_STATUS_APPROVED);
-        $newAnswerObj->setVar('faqid', $newFaqObj->faqid());
-        $newAnswerObj->setVar('answer', $_POST['answer']);
-        $newAnswerObj->setVar('uid', $uid);
-
-        //====================================================================================
-        //TODO post Attachment
-        $attachments_tmp = [];
-        if (!empty($_POST['attachments_tmp'])) {
-            $attachments_tmp = unserialize(base64_decode($_POST['attachments_tmp']));
-            if (isset($_POST['delete_tmp']) && count($_POST['delete_tmp'])) {
-                foreach ($_POST['delete_tmp'] as $key) {
-                    unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0]);
-                    unset($attachments_tmp[$key]);
+            // Putting the values in the answer object
+            $newAnswerObj->setVar('status', Constants::SF_AN_STATUS_APPROVED);
+            $newAnswerObj->setVar('faqid', $newFaqObj->faqid());
+            $newAnswerObj->setVar('answer', $_POST['answer']);
+            $newAnswerObj->setVar('uid', $uid);
+
+            //====================================================================================
+            //TODO post Attachment
+            $attachments_tmp = [];
+            if (!empty($_POST['attachments_tmp'])) {
+                $attachments_tmp = unserialize(base64_decode($_POST['attachments_tmp']));
+                if (isset($_POST['delete_tmp']) && count($_POST['delete_tmp'])) {
+                    foreach ($_POST['delete_tmp'] as $key) {
+                        unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0]);
+                        unset($attachments_tmp[$key]);
+                    }
                 }
             }
-        }
-        if (count($attachments_tmp)) {
-            foreach ($attachments_tmp as $key => $attach) {
-                if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0])) {
-                    $post_obj->setAttachment($attach[0], $attach[1], $attach[2]);
+            if (count($attachments_tmp)) {
+                foreach ($attachments_tmp as $key => $attach) {
+                    if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0])) {
+                        $post_obj->setAttachment($attach[0], $attach[1], $attach[2]);
+                    }
                 }
             }
-        }
-        $error_upload = '';
+            $error_upload = '';
 
-        if (isset($_FILES['userfile']['name']) && '' != $_FILES['userfile']['name']
-            && $topicHandler->getPermission($forum_obj, $topic_status, 'attach')) {
-            require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php';
-            $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
-            $uploaddir   = XOOPS_CACHE_PATH;
+            if (isset($_FILES['userfile']['name']) && '' != $_FILES['userfile']['name']
+                && $topicHandler->getPermission($forum_obj, $topic_status, 'attach')) {
+                require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php';
+                $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
+                $uploaddir   = XOOPS_CACHE_PATH;
 
-            $uploader = new Smartfaq\Uploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
+                $uploader = new Smartfaq\Uploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
 
-            if ($_FILES['userfile']['error'] > 0) {
-                switch ($_FILES['userfile']['error']) {
+                if ($_FILES['userfile']['error'] > 0) {
+                    switch ($_FILES['userfile']['error']) {
                     case 1:
                         $error_message[] = _MD_NEWBB_MAXUPLOADFILEINI;
                         break;
@@ -208,7 +208,7 @@ 
                     default:
                         $error_message[] = _MD_NEWBB_UPLOAD_ERRNODEF;
                         break;
-                }
+                    }
             } else {
                 $uploader->setCheckMediaTypeByExt();
 
@@ -271,30 +271,30 @@ 
         redirect_header('index.php', 2, $redirect_msg);
         break;
 
-    case 'form':
-    default:
+        case 'form':
+        default:
 
-        global $xoopsUser, $myts;
+            global $xoopsUser, $myts;
 
-        $faqObj      = $faqHandler->create();
-        $answerObj   = $answerHandler->create();
-        $categoryObj = $categoryHandler->create();
+            $faqObj      = $faqHandler->create();
+            $answerObj   = $answerHandler->create();
+            $categoryObj = $categoryHandler->create();
 
-        $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.html';
-        require_once XOOPS_ROOT_PATH . '/header.php';
-        require_once __DIR__ . '/footer.php';
+            $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.html';
+            require_once XOOPS_ROOT_PATH . '/header.php';
+            require_once __DIR__ . '/footer.php';
 
-        $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
-        $notifypub  = 1;
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
-        $xoopsTpl->assign('whereInSection', $moduleName);
-        $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
+            $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
+            $notifypub  = 1;
+            $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
+            $xoopsTpl->assign('whereInSection', $moduleName);
+            $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
 
-        $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
+            $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
+            $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
 
-        require_once __DIR__ . '/include/submit.inc.php';
+            require_once __DIR__ . '/include/submit.inc.php';
 
-        require_once XOOPS_ROOT_PATH . '/footer.php';
-        break;
+            require_once XOOPS_ROOT_PATH . '/footer.php';
+            break;
 }

Spacing +22 added lines, -22 removed lines

@@ -9,7 +9,7 @@ 
 use XoopsModules\Smartfaq;
 use XoopsModules\Smartfaq\Constants;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
 
@@ -89,12 +89,12 @@ 
         global $xoopsUser, $myts;
 
         $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.tpl';
-        require_once XOOPS_ROOT_PATH . '/header.php';
-        require_once __DIR__ . '/footer.php';
+        require_once XOOPS_ROOT_PATH.'/header.php';
+        require_once __DIR__.'/footer.php';
 
         $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
 
-        $moduleName          =& $myts->displayTarea($xoopsModule->getVar('name'));
+        $moduleName          = & $myts->displayTarea($xoopsModule->getVar('name'));
         $faq                 = $faqObj->toArray(null, $categoryObj, false);
         $faq['categoryPath'] = $categoryObj->getCategoryPath(true);
         $faq['answer']       = $answerObj->answer();
@@ -107,11 +107,11 @@ 
         $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
 
         $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, "._MD_SF_SUB_INTRO);
 
-        require_once __DIR__ . '/include/submit.inc.php';
+        require_once __DIR__.'/include/submit.inc.php';
 
-        require_once XOOPS_ROOT_PATH . '/footer.php';
+        require_once XOOPS_ROOT_PATH.'/footer.php';
 
         exit();
         break;
@@ -175,14 +175,14 @@ 
             $attachments_tmp = unserialize(base64_decode($_POST['attachments_tmp']));
             if (isset($_POST['delete_tmp']) && count($_POST['delete_tmp'])) {
                 foreach ($_POST['delete_tmp'] as $key) {
-                    unlink(XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0]);
+                    unlink(XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$attachments_tmp[$key][0]);
                     unset($attachments_tmp[$key]);
                 }
             }
         }
         if (count($attachments_tmp)) {
             foreach ($attachments_tmp as $key => $attach) {
-                if (rename(XOOPS_CACHE_PATH . '/' . $attachments_tmp[$key][0], XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachments_tmp[$key][0])) {
+                if (rename(XOOPS_CACHE_PATH.'/'.$attachments_tmp[$key][0], XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$attachments_tmp[$key][0])) {
                     $post_obj->setAttachment($attach[0], $attach[1], $attach[2]);
                 }
             }
@@ -191,11 +191,11 @@ 
 
         if (isset($_FILES['userfile']['name']) && '' != $_FILES['userfile']['name']
             && $topicHandler->getPermission($forum_obj, $topic_status, 'attach')) {
-            require_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname', 'n') . '/class/uploader.php';
+            require_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname', 'n').'/class/uploader.php';
             $maxfilesize = $forum_obj->getVar('attach_maxkb') * 1024;
             $uploaddir   = XOOPS_CACHE_PATH;
 
-            $uploader = new Smartfaq\Uploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int)$maxfilesize, (int)$xoopsModuleConfig['max_img_width'], (int)$xoopsModuleConfig['max_img_height']);
+            $uploader = new Smartfaq\Uploader($uploaddir, $newAnswerObj->getVar('attach_ext'), (int) $maxfilesize, (int) $xoopsModuleConfig['max_img_width'], (int) $xoopsModuleConfig['max_img_height']);
 
             if ($_FILES['userfile']['error'] > 0) {
                 switch ($_FILES['userfile']['error']) {
@@ -213,19 +213,19 @@ 
                 $uploader->setCheckMediaTypeByExt();
 
                 if ($uploader->fetchMedia($_POST['xoops_upload_file'][0])) {
-                    $prefix = is_object($xoopsUser) ? (string)$xoopsUser->uid() . '_' : 'newbb_';
+                    $prefix = is_object($xoopsUser) ? (string) $xoopsUser->uid().'_' : 'newbb_';
                     $uploader->setPrefix($prefix);
                     if (!$uploader->upload()) {
-                        $error_message[] = $error_upload =& $uploader->getErrors();
+                        $error_message[] = $error_upload = & $uploader->getErrors();
                     } else {
                         if (is_file($uploader->getSavedDestination())) {
-                            if (rename(XOOPS_CACHE_PATH . '/' . $uploader->getSavedFileName(), XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $uploader->getSavedFileName())) {
+                            if (rename(XOOPS_CACHE_PATH.'/'.$uploader->getSavedFileName(), XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$uploader->getSavedFileName())) {
                                 $post_obj->setAttachment($uploader->getSavedFileName(), $uploader->getMediaName(), $uploader->getMediaType());
                             }
                         }
                     }
                 } else {
-                    $error_message[] = $error_upload =& $uploader->getErrors();
+                    $error_message[] = $error_upload = & $uploader->getErrors();
                 }
             }
         }
@@ -258,7 +258,7 @@ 
         } else {
             // Subscribe the user to On Published notification, if requested
             if (1 == $notifypub) {
-                require_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+                require_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
                 $notificationHandler = xoops_getHandler('notification');
                 $notificationHandler->subscribe('faq', $newFaqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
             }
@@ -281,20 +281,20 @@ 
         $categoryObj = $categoryHandler->create();
 
         $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_submit.html';
-        require_once XOOPS_ROOT_PATH . '/header.php';
-        require_once __DIR__ . '/footer.php';
+        require_once XOOPS_ROOT_PATH.'/header.php';
+        require_once __DIR__.'/footer.php';
 
         $name       = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
         $notifypub  = 1;
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
+        $moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
         $xoopsTpl->assign('whereInSection', $moduleName);
         $xoopsTpl->assign('lang_submit', _MD_SF_SUB_SNEWNAME);
 
         $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUB_SNEWNAME, ucwords($xoopsModule->name())));
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUB_INTRO);
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, "._MD_SF_SUB_INTRO);
 
-        require_once __DIR__ . '/include/submit.inc.php';
+        require_once __DIR__.'/include/submit.inc.php';
 
-        require_once XOOPS_ROOT_PATH . '/footer.php';
+        require_once XOOPS_ROOT_PATH.'/footer.php';
         break;
 }

faq.php

Spacing +10 added lines, -10 removed lines

@@ -8,9 +8,9 @@ 
 
 use XoopsModules\Smartfaq;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
-$faqid = isset($_GET['faqid']) ? (int)$_GET['faqid'] : 0;
+$faqid = isset($_GET['faqid']) ? (int) $_GET['faqid'] : 0;
 
 if (0 == $faqid) {
     redirect_header('javascript:history.go(-1)', 1, _MD_SF_NOFAQSELECTED);
@@ -47,8 +47,8 @@ 
     $faqObj->updateCounter();
 }
 $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_faq.tpl';
-require_once XOOPS_ROOT_PATH . '/header.php';
-require_once __DIR__ . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/header.php';
+require_once __DIR__.'/footer.php';
 
 $faq = $faqObj->toArray(null, $categoryObj, false);
 
@@ -83,7 +83,7 @@ 
 $xoopsTpl->assign('display_categoryname', false);
 
 $xoopsTpl->assign('xcodes', $faqObj->getVar('xcodes'));
-$xoopsTpl->assign('mail_link', 'mailto:?subject=' . sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']) . '&body=' . sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']) . ':  ' . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/faq.php?faqid=' . $faqObj->getVar('faqid'));
+$xoopsTpl->assign('mail_link', 'mailto:?subject='.sprintf(_MD_SF_INTARTICLE, $xoopsConfig['sitename']).'&body='.sprintf(_MD_SF_INTARTFOUND, $xoopsConfig['sitename']).':  '.XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/faq.php?faqid='.$faqObj->getVar('faqid'));
 $xoopsTpl->assign('lang_printerpage', _MD_SF_PRINTERFRIENDLY);
 $xoopsTpl->assign('lang_sendstory', _MD_SF_SENDSTORY);
 $xoopsTpl->assign('faqid', $faqObj->getVar('faqid'));
@@ -99,19 +99,19 @@ 
 
 // Page Title Hack by marcan
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $categoryObj->name() . ' - ' . $faq['question']);
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$categoryObj->name().' - '.$faq['question']);
 // End Page Title Hack by marcan
 
 // Include the comments if the selected FAQ supports comments
 if (1 == $faqObj->cancomment()) {
-    require_once XOOPS_ROOT_PATH . '/include/comment_view.php';
+    require_once XOOPS_ROOT_PATH.'/include/comment_view.php';
 }
 
 //code to include smartie
-if (file_exists(XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php')) {
-    require_once XOOPS_ROOT_PATH . '/modules/smarttie/smarttie_links.php';
+if (file_exists(XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php')) {
+    require_once XOOPS_ROOT_PATH.'/modules/smarttie/smarttie_links.php';
     $xoopsTpl->assign('smarttie', 1);
 }
 //end code for smarttie
 
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

preloads/autoloader.php

Spacing +4 added lines, -4 removed lines

@@ -3,12 +3,12 @@ 
 /**
  * @see http://www.php-fig.org/psr/psr-4/examples/
  */
-spl_autoload_register(function ($class) {
+spl_autoload_register(function($class) {
     // project-specific namespace prefix
-    $prefix = 'XoopsModules\\' . ucfirst(basename(dirname(__DIR__)));
+    $prefix = 'XoopsModules\\'.ucfirst(basename(dirname(__DIR__)));
 
     // base directory for the namespace prefix
-    $base_dir = __DIR__ . '/../class/';
+    $base_dir = __DIR__.'/../class/';
 
     // does the class use the namespace prefix?
     $len      = strlen($prefix);
@@ -23,7 +23,7 @@ 
     // replace the namespace prefix with the base directory, replace namespace
     // separators with directory separators in the relative class name, append
     // with .php
-    $file           = $base_dir . str_replace('\\', '/', $relative_class) . '.php';
+    $file = $base_dir.str_replace('\\', '/', $relative_class).'.php';
 
     // if the file exists, require it
     if (file_exists($file)) {

preloads/core.php

Spacing +1 added lines, -1 removed lines

@@ -28,6 +28,6 @@
      */
     public static function eventCoreIncludeCommonEnd($args)
     {
-        include __DIR__ . '/autoloader.php';
+        include __DIR__.'/autoloader.php';
     }
 }

footer.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 $uid     = $xoopsUser ? $xoopsUser->getVar('uid') : 0;
 $isAdmin = (Smartfaq\Utility::userIsAdmin() || Smartfaq\Utility::getModerator());
 
-$xoopsTpl->assign('sf_adminpage', "<a href='" . XOOPS_URL . "/modules/smartfaq/admin/index.php'>" . _MD_SF_ADMIN_PAGE . '</a>');
+$xoopsTpl->assign('sf_adminpage', "<a href='".XOOPS_URL."/modules/smartfaq/admin/index.php'>"._MD_SF_ADMIN_PAGE.'</a>');
 $xoopsTpl->assign('isAdmin', $isAdmin);
 
 $xoopsTpl->assign([
@@ -36,4 +36,4 @@ 
 
 $xoopsTpl->assign('ref_smartfaq', 'SmartFAQ is developed by The SmartFactory (http://www.smartfactory.ca), a division of InBox Solutions (http://www.inboxsolutions.net)');
 
-$xoopsTpl->assign('xoops_module_header', "<link rel='stylesheet' type='text/css' href='" . XOOPS_URL . "/modules/smartfaq/assets/css/smartfaq.css'>");
+$xoopsTpl->assign('xoops_module_header', "<link rel='stylesheet' type='text/css' href='".XOOPS_URL."/modules/smartfaq/assets/css/smartfaq.css'>");

language/english/common.php

Spacing +35 added lines, -35 removed lines

@@ -21,51 +21,51 @@
 $moduleDirName      = basename(dirname(dirname(__DIR__)));
 $moduleDirNameUpper = strtoupper($moduleDirName);
 
-define('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS', 'GD library support: ');
-define('CO_' . $moduleDirNameUpper . '_GDLIBVERSION', 'GD Library version: ');
-define('CO_' . $moduleDirNameUpper . '_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
-define('CO_' . $moduleDirNameUpper . '_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
-define('CO_' . $moduleDirNameUpper . '_IMAGEINFO', 'Server status');
-define('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
-define('CO_' . $moduleDirNameUpper . '_OFF', "<span style='font-weight: bold;'>OFF</span>");
-define('CO_' . $moduleDirNameUpper . '_ON', "<span style='font-weight: bold;'>ON</span>");
-define('CO_' . $moduleDirNameUpper . '_SERVERPATH', 'Server path to XOOPS root: ');
-define('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS', 'Server uploads status: ');
-define('CO_' . $moduleDirNameUpper . '_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
-define('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
+define('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS', 'GD library support: ');
+define('CO_'.$moduleDirNameUpper.'_GDLIBVERSION', 'GD Library version: ');
+define('CO_'.$moduleDirNameUpper.'_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
+define('CO_'.$moduleDirNameUpper.'_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
+define('CO_'.$moduleDirNameUpper.'_IMAGEINFO', 'Server status');
+define('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
+define('CO_'.$moduleDirNameUpper.'_OFF', "<span style='font-weight: bold;'>OFF</span>");
+define('CO_'.$moduleDirNameUpper.'_ON', "<span style='font-weight: bold;'>ON</span>");
+define('CO_'.$moduleDirNameUpper.'_SERVERPATH', 'Server path to XOOPS root: ');
+define('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS', 'Server uploads status: ');
+define('CO_'.$moduleDirNameUpper.'_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
+define('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
 
-define('CO_' . $moduleDirNameUpper . '_PRINT', "<span style='font-weight: bold;'>Print</span>");
-define('CO_' . $moduleDirNameUpper . '_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
+define('CO_'.$moduleDirNameUpper.'_PRINT', "<span style='font-weight: bold;'>Print</span>");
+define('CO_'.$moduleDirNameUpper.'_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
 
 
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED1', "Update failed - couldn't add new fields");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
-define('CO_' . $moduleDirNameUpper . '_ERROR_COLUMN', 'Could not create column in database : %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED1', "Update failed - couldn't add new fields");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
+define('CO_'.$moduleDirNameUpper.'_ERROR_COLUMN', 'Could not create column in database : %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
 
-define('CO_' . $moduleDirNameUpper . '_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
+define('CO_'.$moduleDirNameUpper.'_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
 
 // Error Msgs
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_REMOVE', 'Could not delete %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_NO_PLUGIN', 'Could not load plugin');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_REMOVE', 'Could not delete %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_NO_PLUGIN', 'Could not load plugin');
 
 
 //Help
-define('CO_' . $moduleDirNameUpper . '_DIRNAME', basename(dirname(dirname(__DIR__))));
-define('CO_' . $moduleDirNameUpper . '_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
-define('CO_' . $moduleDirNameUpper . '_BACK_2_ADMIN', 'Back to Administration of ');
-define('CO_' . $moduleDirNameUpper . '_OVERVIEW', 'Overview');
+define('CO_'.$moduleDirNameUpper.'_DIRNAME', basename(dirname(dirname(__DIR__))));
+define('CO_'.$moduleDirNameUpper.'_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
+define('CO_'.$moduleDirNameUpper.'_BACK_2_ADMIN', 'Back to Administration of ');
+define('CO_'.$moduleDirNameUpper.'_OVERVIEW', 'Overview');
 
 //define('CO_' . $moduleDirNameUpper . '_HELP_DIR', __DIR__);
 
 //help multi-page
-define('CO_' . $moduleDirNameUpper . '_DISCLAIMER', 'Disclaimer');
-define('CO_' . $moduleDirNameUpper . '_LICENSE', 'License');
-define('CO_' . $moduleDirNameUpper . '_SUPPORT', 'Support');
+define('CO_'.$moduleDirNameUpper.'_DISCLAIMER', 'Disclaimer');
+define('CO_'.$moduleDirNameUpper.'_LICENSE', 'License');
+define('CO_'.$moduleDirNameUpper.'_SUPPORT', 'Support');