mambax7 / xoopsfaq

include/sitemap.plugin.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
         $retVal['parent'][] = [
             'id'    => $id,
             'title' => $myts->htmlSpecialChars($title),
-            'url'   => $helper->url('index.php?cat_id=' . $id),
+            'url'   => $helper->url('index.php?cat_id='.$id),
         ];
     }
     return $retVal;

include/onuninstall.php

Spacing +1 added lines, -1 removed lines

@@ -53,7 +53,7 @@
         if ($dirInfo->isDir()) {
             // The directory exists so delete it
             if (false === $utility::rrmdir($old_dir)) {
-                $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir));
+                $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH'), $old_dir));
                 $success = false;
             }
         }

include/common.php

Spacing +26 added lines, -26 removed lines

@@ -19,7 +19,7 @@ 
 
 use XoopsModules\Xoopsfaq;
 
-require dirname(__DIR__) . '/preloads/autoloader.php';
+require dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName      = basename(dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
@@ -44,33 +44,33 @@ 
 //$pathModIcon16 = $helper->getModule()->getInfo('modicons16');
 //$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
+if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) {
+    define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__)));
+    define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_IMAGE_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/');
+    define($moduleDirNameUpper.'_IMAGE_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images');
+    define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php');
     //    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', $pathIcon32 . '/xoopsmicrobutton.gif');
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+    define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', $pathIcon32.'/xoopsmicrobutton.gif');
+    define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1);
 }
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+    'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
+    'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
+    'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
+    'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
+    'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
+    'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
+    'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
+    '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
+    '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
 ];
 
 $debug = false;
@@ -83,12 +83,12 @@ 
     $GLOBALS['xoopsTpl'] = new \XoopsTpl();
 }
 
-$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName);
+$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL.'/modules/'.$moduleDirName);
 // Local icons path
 if (is_object($helper->getModule())) {
     $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16);
     $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }

include/search.inc.php

Spacing +8 added lines, -8 removed lines

@@ -64,10 +64,10 @@ 
 
     $queryarrayHold = $queryarray;
     if ((is_array($queryarray)) && !empty($queryarray)) {
-        $criteria->add(new \Criteria('category_title', '%' . $queryarray[0] . '%', 'LIKE'));
+        $criteria->add(new \Criteria('category_title', '%'.$queryarray[0].'%', 'LIKE'));
         array_shift($queryarray); //get rid of first element
         foreach ($queryarray as $query) {
-            $criteria->add(new \Criteria('category_title', '%' . $query . '%', 'LIKE'), $andor);
+            $criteria->add(new \Criteria('category_title', '%'.$query.'%', 'LIKE'), $andor);
         }
     }
     $catArray   = $contentsHandler->getAll($criteria, $contentFields, false);
@@ -76,7 +76,7 @@ 
     foreach ($catArray as $cId => $cat) {
         $ret[] = [
             'image' => 'assets/images/folder.png',
-            'link'  => $helper->url('index.php?cat_id=' . $cId),
+            'link'  => $helper->url('index.php?cat_id='.$cId),
             'title' => $cat['category_title'],
         ];
     }
@@ -94,20 +94,20 @@ 
     $criteria->setStart((int)$offset);
 
     if ((is_array($queryarray)) && !empty($queryarray)) {
-        $criteria->add(new \Criteria('contents_title', '%' . $queryarray[0] . '%', 'LIKE'));
-        $criteria->add(new \Criteria('contents_contents', '%' . $queryarray[0] . '%', 'LIKE'), 'OR');
+        $criteria->add(new \Criteria('contents_title', '%'.$queryarray[0].'%', 'LIKE'));
+        $criteria->add(new \Criteria('contents_contents', '%'.$queryarray[0].'%', 'LIKE'), 'OR');
         array_shift($queryarray); //get rid of first element
 
         foreach ($queryarray as $query) {
-            $criteria->add(new \Criteria('contents_title', '%' . $query . '%', 'LIKE'), $andor);
-            $criteria->add(new \Criteria('contents_contents', '%' . $query . '%', 'LIKE'), 'OR');
+            $criteria->add(new \Criteria('contents_title', '%'.$query.'%', 'LIKE'), $andor);
+            $criteria->add(new \Criteria('contents_contents', '%'.$query.'%', 'LIKE'), 'OR');
         }
     }
     $contentArray = $contentsHandler->getAll($criteria, $contentFields, false);
     foreach ($contentArray as $content) {
         $ret[] = [
             'image' => 'assets/images/question2.gif',
-            'link'  => $helper->url('index.php?cat_id=' . $content['contents_cid'] . '#q' . $content['contents_id']),
+            'link'  => $helper->url('index.php?cat_id='.$content['contents_cid'].'#q'.$content['contents_id']),
             'title' => $content['contents_title'],
             'time'  => $content['contents_publish'],
         ];

include/onupdate.php

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
 if ((!defined('XOOPS_ROOT_PATH'))
     || !($GLOBALS['xoopsUser'] instanceof XoopsUser)
     || !($GLOBALS['xoopsUser']->isAdmin())) {
-    exit('Restricted access' . PHP_EOL);
+    exit('Restricted access'.PHP_EOL);
 }
 
 /**

include/oninstall.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 if ((!defined('XOOPS_ROOT_PATH'))
     || !($GLOBALS['xoopsUser'] instanceof XoopsUser)
     || !($GLOBALS['xoopsUser']->isAdmin())) {
-    exit('Restricted access' . PHP_EOL);
+    exit('Restricted access'.PHP_EOL);
 }
 
 /**

include/search.php

Spacing +8 added lines, -8 removed lines

@@ -64,10 +64,10 @@ 
 
     $queryarrayHold = $queryarray;
     if ((is_array($queryarray)) && !empty($queryarray)) {
-        $criteria->add(new \Criteria('category_title', '%' . $queryarray[0] . '%', 'LIKE'));
+        $criteria->add(new \Criteria('category_title', '%'.$queryarray[0].'%', 'LIKE'));
         array_shift($queryarray); //get rid of first element
         foreach ($queryarray as $query) {
-            $criteria->add(new \Criteria('category_title', '%' . $query . '%', 'LIKE'), $andor);
+            $criteria->add(new \Criteria('category_title', '%'.$query.'%', 'LIKE'), $andor);
         }
     }
     $catArray   = $contentsHandler->getAll($criteria, $contentFields, false);
@@ -76,7 +76,7 @@ 
     foreach ($catArray as $cId => $cat) {
         $ret[] = [
             'image' => 'assets/images/folder.png',
-            'link'  => $helper->url('index.php?cat_id=' . $cId),
+            'link'  => $helper->url('index.php?cat_id='.$cId),
             'title' => $cat['category_title'],
         ];
     }
@@ -94,20 +94,20 @@ 
     $criteria->setStart((int)$offset);
 
     if ((is_array($queryarray)) && !empty($queryarray)) {
-        $criteria->add(new \Criteria('contents_title', '%' . $queryarray[0] . '%', 'LIKE'));
-        $criteria->add(new \Criteria('contents_contents', '%' . $queryarray[0] . '%', 'LIKE'), 'OR');
+        $criteria->add(new \Criteria('contents_title', '%'.$queryarray[0].'%', 'LIKE'));
+        $criteria->add(new \Criteria('contents_contents', '%'.$queryarray[0].'%', 'LIKE'), 'OR');
         array_shift($queryarray); //get rid of first element
 
         foreach ($queryarray as $query) {
-            $criteria->add(new \Criteria('contents_title', '%' . $query . '%', 'LIKE'), $andor);
-            $criteria->add(new \Criteria('contents_contents', '%' . $query . '%', 'LIKE'), 'OR');
+            $criteria->add(new \Criteria('contents_title', '%'.$query.'%', 'LIKE'), $andor);
+            $criteria->add(new \Criteria('contents_contents', '%'.$query.'%', 'LIKE'), 'OR');
         }
     }
     $contentArray = $contentsHandler->getAll($criteria, $contentFields, false);
     foreach ($contentArray as $content) {
         $ret[] = [
             'image' => 'assets/images/question2.gif',
-            'link'  => $helper->url('index.php?cat_id=' . $content['contents_cid'] . '#q' . $content['contents_id']),
+            'link'  => $helper->url('index.php?cat_id='.$content['contents_cid'].'#q'.$content['contents_id']),
             'title' => $content['contents_title'],
             'time'  => $content['contents_publish'],
         ];

blocks/xoopsfaq_recent.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
         }
     }
     if (!empty($catsToUse)) {
-        $criteria->add(new \Criteria('contents_cid', '(' . implode(',', $catsToUse) . ')', 'IN'));
+        $criteria->add(new \Criteria('contents_cid', '('.implode(',', $catsToUse).')', 'IN'));
     } else {
         return $block;
     }

blocks/xoopsfaq_rand.php

Spacing +4 added lines, -4 removed lines

@@ -65,7 +65,7 @@ 
         }
     }
     if (!empty($catsToUse)) {
-        $criteria->add(new \Criteria('contents_cid', '(' . implode(',', $catsToUse) . ')', 'IN'));
+        $criteria->add(new \Criteria('contents_cid', '('.implode(',', $catsToUse).')', 'IN'));
     } else {
         return $block;
     }
@@ -86,9 +86,9 @@ 
             'title'    => _MB_XOOPSFAQ_RANDOM_TITLE,
             'faq'      => $faq,
             'faqans'   => $faqAns,
-            'morelink' => $helper->url('index.php?cat_id=' . $cid . '#q' . $xpFaqObj->getVar('contents_id')),
+            'morelink' => $helper->url('index.php?cat_id='.$cid.'#q'.$xpFaqObj->getVar('contents_id')),
             'linktxt'  => _MB_XOOPSFAQ_SEE_MORE,
-            'catlink'  => $helper->url('index.php?cat_id=' . $cid),
+            'catlink'  => $helper->url('index.php?cat_id='.$cid),
             'cattxt'   => $catObj->getVar('category_title'),
         ];
         unset($xpFaqObj, $catObj);
@@ -122,6 +122,6 @@ 
     $formSelect->setValue($selOptions);
     $selectCat = $formSelect->render();
 
-    $form = '<div class="line140">' . _MB_XOOPSFAQ_CHARS . '&nbsp;' . '<input type="number" name="options[0]" value="' . $options[0] . '" style="width: 5em;" min="0" class="right">&nbsp;' . _MB_XOOPSFAQ_LENGTH . '<br><br>' . _MB_XOOPSFAQ_ALL_CATS_INTRO . '&nbsp;&nbsp;' . $selectCat . '</div>';
+    $form = '<div class="line140">'._MB_XOOPSFAQ_CHARS.'&nbsp;'.'<input type="number" name="options[0]" value="'.$options[0].'" style="width: 5em;" min="0" class="right">&nbsp;'._MB_XOOPSFAQ_LENGTH.'<br><br>'._MB_XOOPSFAQ_ALL_CATS_INTRO.'&nbsp;&nbsp;'.$selectCat.'</div>';
     return $form;
 }