mambax7 / smartfaq

include/blocksadmin.inc.php

Spacing +20 added lines, -20 removed lines

@@ -28,8 +28,8 @@ 
 if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) {
     exit('Access Denied');
 }
-require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
-include XOOPS_ROOT_PATH . '/modules/system/admin/blocksadmin/blocksadmin.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
+include XOOPS_ROOT_PATH.'/modules/system/admin/blocksadmin/blocksadmin.php';
 
 $op = 'list';
 if (isset($HTTP_POST_VARS)) {
@@ -49,9 +49,9 @@ 
 
 if (isset($previewblock)) {
     xoops_cp_header();
-    require_once XOOPS_ROOT_PATH . '/class/template.php';
+    require_once XOOPS_ROOT_PATH.'/class/template.php';
     $xoopsTpl = new \XoopsTpl();
-    $xoopsTpl->caching= 0;
+    $xoopsTpl->caching = 0;
     if (isset($bid)) {
         $block['bid']        = $bid;
         $block['form_title'] = _AM_EDITBLOCK;
@@ -83,8 +83,8 @@ 
                  . $myblock->getContent('S', $bctype)
                  . '</td></tr></table></body></html>';
 
-    $dummyfile = '_dummyfile_' . time() . '.html';
-    $fp        = fopen(XOOPS_CACHE_PATH . '/' . $dummyfile, 'w');
+    $dummyfile = '_dummyfile_'.time().'.html';
+    $fp        = fopen(XOOPS_CACHE_PATH.'/'.$dummyfile, 'w');
     fwrite($fp, $dummyhtml);
     fclose($fp);
     $block['edit_form'] = false;
@@ -95,24 +95,24 @@ 
     $block['visible']   = $bvisible;
     $block['title']     = $myblock->getVar('title', 'E');
     $block['content']   = $myblock->getVar('content', 'E');
-    $block['modules']   =& $bmodule;
+    $block['modules']   = & $bmodule;
     $block['ctype']     = isset($bctype) ? $bctype : $myblock->getVar('c_type');
     $block['is_custom'] = true;
     $block['cachetime'] = (int)$bcachetime;
-    echo '<a href="admin.php?fct=blocksadmin">' . _AM_BADMIN . '</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;' . $block['form_title'] . '<br><br>';
-    include XOOPS_ROOT_PATH . '/modules/system/admin/blocksadmin/blockform.php';
+    echo '<a href="admin.php?fct=blocksadmin">'._AM_BADMIN.'</a>&nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;'.$block['form_title'].'<br><br>';
+    include XOOPS_ROOT_PATH.'/modules/system/admin/blocksadmin/blockform.php';
     $form->display();
     xoops_cp_footer();
     echo '<script type="text/javascript">
     <!--//
-    preview_window = openWithSelfMain("' . XOOPS_URL . '/modules/system/admin.php?fct=blocksadmin&op=previewpopup&file=' . $dummyfile . '", "popup", 250, 200);
+    preview_window = openWithSelfMain("' . XOOPS_URL.'/modules/system/admin.php?fct=blocksadmin&op=previewpopup&file='.$dummyfile.'", "popup", 250, 200);
     //-->
     </script>';
     exit();
 }
 
 if ('previewpopup' === $op) {
-    $file = str_replace('..', '', XOOPS_CACHE_PATH . '/' . trim($HTTP_GET_VARS['file']));
+    $file = str_replace('..', '', XOOPS_CACHE_PATH.'/'.trim($HTTP_GET_VARS['file']));
     if (file_exists($file)) {
         include $file;
         @unlink($file);
@@ -254,24 +254,24 @@ 
             $sql = sprintf('INSERT INTO %s (block_id, module_id) VALUES (%u, %d)', $db->prefix('block_module_link'), $bid, (int)$bmid);
             $db->query($sql);
         }
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
         $xoopsTpl = new \XoopsTpl();
-        $xoopsTpl->caching= 2;
+        $xoopsTpl->caching = 2;
         if ('' != $myblock->getVar('template')) {
-            if ($xoopsTpl->is_cached('db:' . $myblock->getVar('template'))) {
-                if (!$xoopsTpl->clear_cache('db:' . $myblock->getVar('template'))) {
-                    $msg = 'Unable to clear cache for block ID' . $bid;
+            if ($xoopsTpl->is_cached('db:'.$myblock->getVar('template'))) {
+                if (!$xoopsTpl->clear_cache('db:'.$myblock->getVar('template'))) {
+                    $msg = 'Unable to clear cache for block ID'.$bid;
                 }
             }
         } else {
-            if ($xoopsTpl->is_cached('db:system_dummy.tpl', 'block' . $bid)) {
-                if (!$xoopsTpl->clear_cache('db:system_dummy.tpl', 'block' . $bid)) {
-                    $msg = 'Unable to clear cache for block ID' . $bid;
+            if ($xoopsTpl->is_cached('db:system_dummy.tpl', 'block'.$bid)) {
+                if (!$xoopsTpl->clear_cache('db:system_dummy.tpl', 'block'.$bid)) {
+                    $msg = 'Unable to clear cache for block ID'.$bid;
                 }
             }
         }
     } else {
-        $msg = 'Failed update of block. ID:' . $bid;
+        $msg = 'Failed update of block. ID:'.$bid;
     }
 
     return $msg; // GIJ +

include/functions.image.php

Spacing +29 added lines, -29 removed lines

@@ -28,24 +28,24 @@ 
     {
         global $xoopsModuleConfig;
 
-        $img_path   = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'];
-        $img_url    = XOOPS_URL . '/' . $xoopsModuleConfig['dir_attachments'];
-        $thumb_path = $img_path . '/thumbs';
-        $thumb_url  = $img_url . '/thumbs';
+        $img_path   = XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'];
+        $img_url    = XOOPS_URL.'/'.$xoopsModuleConfig['dir_attachments'];
+        $thumb_path = $img_path.'/thumbs';
+        $thumb_url  = $img_url.'/thumbs';
 
-        $thumb     = $thumb_path . '/' . $source;
-        $image     = $img_path . '/' . $source;
-        $thumb_url = $thumb_url . '/' . $source;
-        $image_url = $img_url . '/' . $source;
+        $thumb     = $thumb_path.'/'.$source;
+        $image     = $img_path.'/'.$source;
+        $thumb_url = $thumb_url.'/'.$source;
+        $image_url = $img_url.'/'.$source;
 
         $imginfo  = @getimagesize($image);
-        $img_info = (count($imginfo) > 0) ? $imginfo[0] . 'X' . $imginfo[1] . ' px' : '';
+        $img_info = (count($imginfo) > 0) ? $imginfo[0].'X'.$imginfo[1].' px' : '';
 
         if ($xoopsModuleConfig['max_image_width'] > 0 && $xoopsModuleConfig['max_image_height'] > 0) {
             if ($imginfo[0] > $xoopsModuleConfig['max_image_width']
                 || $imginfo[1] > $xoopsModuleConfig['max_image_height']) {
                 //if (!file_exists($thumb_path.'/'.$source) && $imginfo[0] > $xoopsModuleConfig['max_img_width']) {
-                if (!file_exists($thumb_path . '/' . $source)) {
+                if (!file_exists($thumb_path.'/'.$source)) {
                     sf_createThumbnail($source, $xoopsModuleConfig['max_image_width']);
                 }
             }
@@ -54,27 +54,27 @@ 
                 || $imginfo[1] > $xoopsModuleConfig['max_image_height']) {
                 $pseudo_width  = $xoopsModuleConfig['max_image_width'];
                 $pseudo_height = $xoopsModuleConfig['max_image_width'] * ($imginfo[1] / $imginfo[0]);
-                $pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
+                $pseudo_size   = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
             }
             // irmtfan to fix Undefined variable: pseudo_height
             if (!empty($pseudo_height) && $xoopsModuleConfig['max_image_height'] > 0
                 && $pseudo_height > $xoopsModuleConfig['max_image_height']) {
                 $pseudo_height = $xoopsModuleConfig['max_image_height'];
                 $pseudo_width  = $xoopsModuleConfig['max_image_height'] * ($imginfo[0] / $imginfo[1]);
-                $pseudo_size   = "width='" . $pseudo_width . "px' height='" . $pseudo_height . "px'";
+                $pseudo_size   = "width='".$pseudo_width."px' height='".$pseudo_height."px'";
             }
         }
 
         if (file_exists($thumb)) {
-            $attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
-            $attachmentImage .= '<img src="' . $thumb_url . '" alt="' . $source . ' ' . $img_info . '">';
+            $attachmentImage = '<a href="'.$image_url.'" title="'.$source.' '.$img_info.'" target="_blank">';
+            $attachmentImage .= '<img src="'.$thumb_url.'" alt="'.$source.' '.$img_info.'">';
             $attachmentImage .= '</a>';
         } elseif (!empty($pseudo_size)) {
-            $attachmentImage = '<a href="' . $image_url . '" title="' . $source . ' ' . $img_info . '" target="_blank">';
-            $attachmentImage .= '<img src="' . $image_url . '" ' . $pseudo_size . ' alt="' . $source . ' ' . $img_info . '">';
+            $attachmentImage = '<a href="'.$image_url.'" title="'.$source.' '.$img_info.'" target="_blank">';
+            $attachmentImage .= '<img src="'.$image_url.'" '.$pseudo_size.' alt="'.$source.' '.$img_info.'">';
             $attachmentImage .= '</a>';
         } elseif (file_exists($image)) {
-            $attachmentImage = '<img src="' . $image_url . '" alt="' . $source . ' ' . $img_info . '">';
+            $attachmentImage = '<img src="'.$image_url.'" alt="'.$source.' '.$img_info.'">';
         } else {
             $attachmentImage = '';
         }
@@ -91,10 +91,10 @@ 
     {
         global $xoopsModuleConfig;
 
-        $img_path   = XOOPS_ROOT_PATH . '/' . $xoopsModuleConfig['dir_attachments'];
-        $thumb_path = $img_path . '/thumbs';
-        $src_file   = $img_path . '/' . $source;
-        $new_file   = $thumb_path . '/' . $source;
+        $img_path   = XOOPS_ROOT_PATH.'/'.$xoopsModuleConfig['dir_attachments'];
+        $thumb_path = $img_path.'/thumbs';
+        $src_file   = $img_path.'/'.$source;
+        $new_file   = $thumb_path.'/'.$source;
         //$imageLibs = sf_getImageLibs();
 
         if (!filesize($src_file) || !is_readable($src_file)) {
@@ -120,14 +120,14 @@ 
         if (1 == $xoopsModuleConfig['image_lib'] or 0 == $xoopsModuleConfig['image_lib']) {
             if (preg_match("#[A-Z]:|\\\\#Ai", __FILE__)) {
                 $cur_dir     = __DIR__;
-                $src_file_im = '"' . $cur_dir . '\\' . str_replace('/', '\\', $src_file) . '"';
-                $new_file_im = '"' . $cur_dir . '\\' . str_replace('/', '\\', $new_file) . '"';
+                $src_file_im = '"'.$cur_dir.'\\'.str_replace('/', '\\', $src_file).'"';
+                $new_file_im = '"'.$cur_dir.'\\'.str_replace('/', '\\', $new_file).'"';
             } else {
                 $src_file_im = @escapeshellarg($src_file);
                 $new_file_im = @escapeshellarg($new_file);
             }
-            $path           = empty($xoopsModuleConfig['path_magick']) ? '' : $xoopsModuleConfig['path_magick'] . '/';
-            $magick_command = $path . 'convert -quality 85 -antialias -sample ' . $newWidth . 'x' . $newHeight . ' ' . $src_file_im . ' +profile "*" ' . str_replace('\\', '/', $new_file_im) . '';
+            $path           = empty($xoopsModuleConfig['path_magick']) ? '' : $xoopsModuleConfig['path_magick'].'/';
+            $magick_command = $path.'convert -quality 85 -antialias -sample '.$newWidth.'x'.$newHeight.' '.$src_file_im.' +profile "*" '.str_replace('\\', '/', $new_file_im).'';
 
             @passthru($magick_command);
             if (file_exists($new_file)) {
@@ -136,13 +136,13 @@ 
         }
 
         if (2 == $xoopsModuleConfig['image_lib'] or 0 == $xoopsModuleConfig['image_lib']) {
-            $path = empty($xoopsModuleConfig['path_netpbm']) ? '' : $xoopsModuleConfig['path_netpbm'] . '/';
+            $path = empty($xoopsModuleConfig['path_netpbm']) ? '' : $xoopsModuleConfig['path_netpbm'].'/';
             if (preg_match("/\.png/i", $source)) {
-                $cmd = $path . "pngtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "pnmtopng > $new_file";
+                $cmd = $path."pngtopnm $src_file | ".$path."pnmscale -xysize $newWidth $newHeight | ".$path."pnmtopng > $new_file";
             } elseif (preg_match("/\.(jpg|jpeg)/i", $source)) {
-                $cmd = $path . "jpegtopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | " . $path . "ppmtojpeg -quality=90 > $new_file";
+                $cmd = $path."jpegtopnm $src_file | ".$path."pnmscale -xysize $newWidth $newHeight | ".$path."ppmtojpeg -quality=90 > $new_file";
             } elseif (preg_match("/\.gif/i", $source)) {
-                $cmd = $path . "giftopnm $src_file | " . $path . "pnmscale -xysize $newWidth $newHeight | ppmquant 256 | " . $path . "ppmtogif > $new_file";
+                $cmd = $path."giftopnm $src_file | ".$path."pnmscale -xysize $newWidth $newHeight | ppmquant 256 | ".$path."ppmtogif > $new_file";
             }
 
             @exec($cmd, $output, $retval);

include/searchform.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
     $searchcat = new \XoopsFormSelect(_MD_WB_CATEGORY, 'categoryID', $categoryID);
     $searchcat->addOption('0', _MD_WB_ALLOFTHEM);
 
-    $resultcat = $xoopsDB->queryF('SELECT categoryID, name FROM ' . $xoopsDB->prefix('wbcategories') . ' ORDER BY categoryID');
+    $resultcat = $xoopsDB->queryF('SELECT categoryID, name FROM '.$xoopsDB->prefix('wbcategories').' ORDER BY categoryID');
 
     while (list($categoryID, $name) = $xoopsDB->fetchRow($resultcat)) {
         $searchcat->addOption('categoryID', "$categoryID : $name");

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>',
     ];
 }

category.php

Spacing +16 added lines, -16 removed lines

@@ -8,7 +8,7 @@ 
 
 use XoopsModules\Smartfaq;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $categoryid = isset($_GET['categoryid']) ? (int)$_GET['categoryid'] : 0;
 
@@ -35,8 +35,8 @@ 
 }
 $GLOBALS['xoopsOption']['template_main'] = 'smartfaq_category.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';
 
 // At which record shall we start
 $start = isset($_GET['start']) ? (int)$_GET['start'] : 0;
@@ -76,7 +76,7 @@ 
 }
 $lastfaqsize = (int)$xoopsModuleConfig['lastfaqsize'];
 // Creating the sub-categories objects that belong to the selected category
-$subcatsObj    =& $categoryHandler->getCategories(0, 0, $categoryid);
+$subcatsObj    = & $categoryHandler->getCategories(0, 0, $categoryid);
 $total_subcats = count($subcatsObj);
 $total_faqs    = 0;
 if (0 != $total_subcats) {
@@ -86,12 +86,12 @@ 
         if (isset($totalQnas[$subcat_id]) && $totalQnas[$subcat_id] > 0) {
             if (isset($last_qnaObj[$subcat_id])) {
                 $subcatsObj[$i]->setVar('last_faqid', $last_qnaObj[$subcat_id]->getVar('faqid'));
-                $subcatsObj[$i]->setVar('last_question_link', "<a href='faq.php?faqid=" . $last_qnaObj[$subcat_id]->getVar('faqid') . "'>" . $last_qnaObj[$subcat_id]->question($lastfaqsize) . '</a>');
+                $subcatsObj[$i]->setVar('last_question_link', "<a href='faq.php?faqid=".$last_qnaObj[$subcat_id]->getVar('faqid')."'>".$last_qnaObj[$subcat_id]->question($lastfaqsize).'</a>');
             }
         }
         $subcatsObj[$i]->setVar('faqcount', $totalQnas[$subcat_id]);
         $subcats[$subcat_id] = $subcatsObj[$i]->toArray();
-        $total_faqs          += $totalQnas[$subcat_id];
+        $total_faqs += $totalQnas[$subcat_id];
         //}replacé ligne 92
     }
     $xoopsTpl->assign('subcats', $subcats);
@@ -114,7 +114,7 @@ 
     }
 
     $memberHandler = xoops_getHandler('member');
-    $users         = $memberHandler->getUsers(new \Criteria('uid', '(' . implode(',', array_keys($userids)) . ')', 'IN'), true);
+    $users         = $memberHandler->getUsers(new \Criteria('uid', '('.implode(',', array_keys($userids)).')', 'IN'), true);
     // Adding the Q&As of the selected category
     foreach ($faqsObj as $iValue) {
         $faq = $iValue->toArray(null, $categoryObj);
@@ -140,7 +140,7 @@ 
 
     if (isset($last_qnaObj) && $last_qnaObj) {
         $category['last_faqid']         = $last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid');
-        $category['last_question_link'] = "<a href='faq.php?faqid=" . $last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid') . "'>" . $last_qnaObj[$categoryObj->getVar('categoryid')]->question($lastfaqsize) . '</a>';
+        $category['last_question_link'] = "<a href='faq.php?faqid=".$last_qnaObj[$categoryObj->getVar('categoryid')]->getVar('faqid')."'>".$last_qnaObj[$categoryObj->getVar('categoryid')]->question($lastfaqsize).'</a>';
     }
 }
 
@@ -165,26 +165,26 @@ 
 $xoopsTpl->assign('lang_comments', _MD_SF_COMMENTS);
 
 // The Navigation Bar
-require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-$pagenav = new \XoopsPageNav($thiscategory_faqcount, $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid=' . $categoryObj->getVar('categoryid'));
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+$pagenav = new \XoopsPageNav($thiscategory_faqcount, $xoopsModuleConfig['indexperpage'], $start, 'start', 'categoryid='.$categoryObj->getVar('categoryid'));
 if (1 == $xoopsModuleConfig['useimagenavpage']) {
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderImageNav() . '</div>');
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderImageNav().'</div>');
 } else {
-    $xoopsTpl->assign('navbar', '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>');
+    $xoopsTpl->assign('navbar', '<div style="text-align:right;">'.$pagenav->renderNav().'</div>');
 }
 
 $xoopsTpl->assign('category', $category);
 
 // Page Title Hack by marcan
 $module_name = $myts->htmlSpecialChars($xoopsModule->getVar('name'));
-$xoopsTpl->assign('xoops_pagetitle', $module_name . ' - ' . $category['name']);
+$xoopsTpl->assign('xoops_pagetitle', $module_name.' - '.$category['name']);
 // End Page Title Hack by marcan
 
 //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';