mambax7 / smartfaq

include/functions.render.php

Spacing +7 added lines, -7 removed lines

@@ -11,7 +11,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-defined('NEWBB_FUNCTIONS_INI') || include __DIR__ . '/functions.ini.php';
+defined('NEWBB_FUNCTIONS_INI') || include __DIR__.'/functions.ini.php';
 define('NEWBB_FUNCTIONS_RENDER_LOADED', true);
 
 if (!defined('NEWBB_FUNCTIONS_RENDER')):
@@ -56,16 +56,16 @@ 
             // decode xcode
             if ($image != 0) {
                 // image allowed
-                $text =& $myts->xoopsCodeDecode($text);
+                $text = & $myts->xoopsCodeDecode($text);
             } else {
                 // image not allowed
-                $text =& $myts->xoopsCodeDecode($text, 0);
+                $text = & $myts->xoopsCodeDecode($text, 0);
             }
         }
         if ($br != 0) {
-            $text =& $myts->nl2Br($text);
+            $text = & $myts->nl2Br($text);
         }
-        $text = $myts->codeConv($text, $xcode, $image);    // Ryuji_edit(2003-11-18)
+        $text = $myts->codeConv($text, $xcode, $image); // Ryuji_edit(2003-11-18)
 
         return $text;
     }
@@ -95,7 +95,7 @@ 
     {
         $button = "<input type='button' name='{$button}' {$extra} value='{$alt}' onclick='window.location.href={$link}' />";
         if (empty($asImage)) {
-            $button = "<a href='{$link}' title='{$alt}' {$extra}>" . sf_displayImage($button, $alt, true) . '</a>';
+            $button = "<a href='{$link}' title='{$alt}' {$extra}>".sf_displayImage($button, $alt, true).'</a>';
         }
 
         return $button;
@@ -147,7 +147,7 @@ 
         }
 
         if (!class_exists('NewbbIconHandler')) {
-            require_once dirname(__DIR__) . '/class/icon.php';
+            require_once dirname(__DIR__).'/class/icon.php';
         }
 
         $iconHandler           = NewbbIconHandler::instance();

include/notification.inc.php

Spacing +4 added lines, -4 removed lines

@@ -34,22 +34,22 @@
 
     if ($category === 'category') {
         // Assume we have a valid category id
-        $sql          = 'SELECT name FROM ' . $xoopsDB->prefix('smartfaq_categories') . ' WHERE categoryid  = ' . $item_id;
+        $sql          = 'SELECT name FROM '.$xoopsDB->prefix('smartfaq_categories').' WHERE categoryid  = '.$item_id;
         $result       = $xoopsDB->query($sql); // TODO: error check
         $result_array = $xoopsDB->fetchArray($result);
         $item['name'] = $result_array['name'];
-        $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/category.php?categoryid=' . $item_id;
+        $item['url']  = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/category.php?categoryid='.$item_id;
 
         return $item;
     }
 
     if ($category === 'faq') {
         // Assume we have a valid story id
-        $sql          = 'SELECT question FROM ' . $xoopsDB->prefix('smartfaq_faq') . ' WHERE faqid = ' . $item_id;
+        $sql          = 'SELECT question FROM '.$xoopsDB->prefix('smartfaq_faq').' WHERE faqid = '.$item_id;
         $result       = $xoopsDB->query($sql); // TODO: error check
         $result_array = $xoopsDB->fetchArray($result);
         $item['name'] = $result_array['question'];
-        $item['url']  = XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/faq.php?faqid=' . $item_id;
+        $item['url']  = XOOPS_URL.'/modules/'.$module->getVar('dirname').'/faq.php?faqid='.$item_id;
 
         return $item;
     }

include/functions.image.php

Spacing +31 added lines, -31 removed lines

@@ -40,23 +40,23 @@ 
     {
         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']);
                 }
             }
@@ -64,26 +64,26 @@ 
             if ($imginfo[0] > $xoopsModuleConfig['max_image_width'] || $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 = '';
         }
@@ -100,10 +100,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)) {
@@ -123,20 +123,20 @@ 
             return false;
         }
 
-        $newWidth  = (int)min($imginfo[0], $thumb_width);
-        $newHeight = (int)($imginfo[1] * $newWidth / $imginfo[0]);
+        $newWidth  = (int) min($imginfo[0], $thumb_width);
+        $newHeight = (int) ($imginfo[1] * $newWidth / $imginfo[0]);
 
         if ($xoopsModuleConfig['image_lib'] == 1 or $xoopsModuleConfig['image_lib'] == 0) {
             if (preg_match("#[A-Z]:|\\\\#Ai", __FILE__)) {
                 $cur_dir     = __DIR__;
-                $src_file_im = '"' . $cur_dir . '\\' . strtr($src_file, '/', '\\') . '"';
-                $new_file_im = '"' . $cur_dir . '\\' . strtr($new_file, '/', '\\') . '"';
+                $src_file_im = '"'.$cur_dir.'\\'.strtr($src_file, '/', '\\').'"';
+                $new_file_im = '"'.$cur_dir.'\\'.strtr($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)) {
@@ -145,13 +145,13 @@ 
         }
 
         if ($xoopsModuleConfig['image_lib'] == 2 or $xoopsModuleConfig['image_lib'] == 0) {
-            $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/blocksadmin.inc.php

Spacing +23 added lines, -23 removed lines

@@ -40,8 +40,8 @@ 
 if (!is_object($xoopsUser) || !is_object($xoopsModule) || !$xoopsUser->isAdmin($xoopsModule->mid())) {
     exit('Access Denied');
 }
-include_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
-include XOOPS_ROOT_PATH . '/modules/system/admin/blocksadmin/blocksadmin.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
+include XOOPS_ROOT_PATH.'/modules/system/admin/blocksadmin/blocksadmin.php';
 
 $op = 'list';
 if (isset($HTTP_POST_VARS)) {
@@ -53,13 +53,13 @@ 
 if (isset($HTTP_GET_VARS['op'])) {
     if ($HTTP_GET_VARS['op'] === 'edit' || $HTTP_GET_VARS['op'] === 'delete' || $HTTP_GET_VARS['op'] === 'delete_ok' || $HTTP_GET_VARS['op'] === 'clone' || $HTTP_GET_VARS['op'] === 'previewpopup') {
         $op  = $HTTP_GET_VARS['op'];
-        $bid = isset($HTTP_GET_VARS['bid']) ? (int)$HTTP_GET_VARS['bid'] : 0;
+        $bid = isset($HTTP_GET_VARS['bid']) ? (int) $HTTP_GET_VARS['bid'] : 0;
     }
 }
 
 if (isset($previewblock)) {
     xoops_cp_header();
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
+    include_once XOOPS_ROOT_PATH.'/class/template.php';
     $xoopsTpl = new XoopsTpl();
     $xoopsTpl->xoops_setCaching(0);
     if (isset($bid)) {
@@ -79,10 +79,10 @@ 
     $myts = MyTextSanitizer::getInstance();
     $myblock->setVar('title', $myts->stripSlashesGPC($btitle));
     $myblock->setVar('content', $myts->stripSlashesGPC($bcontent));
-    $dummyhtml = '<html><head><meta http-equiv="content-type" content="text/html; charset=' . _CHARSET . '" /><meta http-equiv="content-language" content="' . _LANGCODE . '" /><title>' . $xoopsConfig['sitename'] . '</title><link rel="stylesheet" type="text/css" media="all" href="' . getcss($xoopsConfig['theme_set']) . '" /></head><body><table><tr><th>' . $myblock->getVar('title') . '</th></tr><tr><td>' . $myblock->getContent('S', $bctype) . '</td></tr></table></body></html>';
+    $dummyhtml = '<html><head><meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" /><meta http-equiv="content-language" content="'._LANGCODE.'" /><title>'.$xoopsConfig['sitename'].'</title><link rel="stylesheet" type="text/css" media="all" href="'.getcss($xoopsConfig['theme_set']).'" /></head><body><table><tr><th>'.$myblock->getVar('title').'</th></tr><tr><td>'.$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;
@@ -93,24 +93,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';
+    $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';
     $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 ($op === 'previewpopup') {
-    $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);
@@ -148,7 +148,7 @@ 
 }
 
 if ($op === 'update') {
-    $bcachetime = isset($bcachetime) ? (int)$bcachetime : 0;
+    $bcachetime = isset($bcachetime) ? (int) $bcachetime : 0;
     $options    = isset($options) ? $options : array();
     $bcontent   = isset($bcontent) ? $bcontent : '';
     $bctype     = isset($bctype) ? $bctype : '';
@@ -239,27 +239,27 @@ 
         $sql = sprintf('DELETE FROM %s WHERE block_id = %u', $db->prefix('block_module_link'), $bid);
         $db->query($sql);
         foreach ($bmodule as $bmid) {
-            $sql = sprintf('INSERT INTO %s (block_id, module_id) VALUES (%u, %d)', $db->prefix('block_module_link'), $bid, (int)$bmid);
+            $sql = sprintf('INSERT INTO %s (block_id, module_id) VALUES (%u, %d)', $db->prefix('block_module_link'), $bid, (int) $bmid);
             $db->query($sql);
         }
-        include_once XOOPS_ROOT_PATH . '/class/template.php';
+        include_once XOOPS_ROOT_PATH.'/class/template.php';
         $xoopsTpl = new XoopsTpl();
         $xoopsTpl->xoops_setCaching(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.html', 'block' . $bid)) {
-                if (!$xoopsTpl->clear_cache('db:system_dummy.html', 'block' . $bid)) {
-                    $msg = 'Unable to clear cache for block ID' . $bid;
+            if ($xoopsTpl->is_cached('db:system_dummy.html', 'block'.$bid)) {
+                if (!$xoopsTpl->clear_cache('db:system_dummy.html', '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/request.inc.php

Spacing +3 added lines, -3 removed lines

@@ -9,9 +9,9 @@
 
 global $_POST;
 
-include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 $form = new XoopsThemeForm(_MD_SF_REQUEST, 'form', xoops_getenv('PHP_SELF'));
 // CATEGORY

include/submit.inc.php

Spacing +8 added lines, -8 removed lines

@@ -9,9 +9,9 @@ 
 
 global $_POST, $xoopsDB;
 
-include_once XOOPS_ROOT_PATH . '/class/xoopstree.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopstree.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 include_once 'functions.php';
 
@@ -70,18 +70,18 @@ 
 //    $upload_tray->addElement(new XoopsFormFile('', 'userfile', ($forum_obj->getVar('attach_maxkb') * 1024)));
 $upload_tray->addElement(new XoopsFormFile('', 'userfile', $xoopsModuleConfig['max_image_size'] * 1024));
 $upload_tray->addElement(new XoopsFormButton('', 'contents_upload', _MD_SF_UPLOAD, 'submit'));
-$upload_tray->addElement(new XoopsFormLabel('<br /><br />' . _MD_SF_MAX_FILESIZE . ':', $xoopsModuleConfig['max_image_size'] . 'Kb; '));
+$upload_tray->addElement(new XoopsFormLabel('<br /><br />'._MD_SF_MAX_FILESIZE.':', $xoopsModuleConfig['max_image_size'].'Kb; '));
 $extensions = trim(str_replace('|', ' ', $xoopsModuleConfig['attach_ext']));
 $extensions = (empty($extensions) || $extensions === '*') ? _ALL : $extensions;
-$upload_tray->addElement(new XoopsFormLabel(_MD_SF_ALLOWED_EXTENSIONS . ':', $extensions));
-$upload_tray->addElement(new XoopsFormLabel('<br />' . sprintf(_MD_SF_MAXPIC, $xoopsModuleConfig['max_img_height'], $xoopsModuleConfig['max_img_width'])));
+$upload_tray->addElement(new XoopsFormLabel(_MD_SF_ALLOWED_EXTENSIONS.':', $extensions));
+$upload_tray->addElement(new XoopsFormLabel('<br />'.sprintf(_MD_SF_MAXPIC, $xoopsModuleConfig['max_img_height'], $xoopsModuleConfig['max_img_width'])));
 $form->addElement($upload_tray);
 //}
 
 if (!empty($attachments) && is_array($attachments) && count($attachments)) {
     $delete_attach_checkbox = new XoopsFormCheckBox(_MD_SF_ATTACHED_FILES, 'delete_attach[]');
     foreach ($attachments as $key => $attachment) {
-        $attach = ' ' . _DELETE . ' <a href=' . XOOPS_URL . '/' . $xoopsModuleConfig['dir_attachments'] . '/' . $attachment['name_saved'] . ' rel="external">' . $attachment['name_display'] . '</a><br />';
+        $attach = ' '._DELETE.' <a href='.XOOPS_URL.'/'.$xoopsModuleConfig['dir_attachments'].'/'.$attachment['name_saved'].' rel="external">'.$attachment['name_display'].'</a><br />';
         $delete_attach_checkbox->addOption($key, $attach);
     }
     $form->addElement($delete_attach_checkbox);
@@ -92,7 +92,7 @@ 
     $delete_attach_checkbox = new XoopsFormCheckBox(_MD_REMOVE, 'delete_tmp[]');
     $url_prefix             = str_replace(XOOPS_ROOT_PATH, XOOPS_URL, XOOPS_CACHE_PATH);
     foreach ($attachments_tmp as $key => $attachment) {
-        $attach = ' <a href="' . $url_prefix . '/' . $attachment[0] . '" rel="external">' . $attachment[1] . '</a><br />';
+        $attach = ' <a href="'.$url_prefix.'/'.$attachment[0].'" rel="external">'.$attachment[1].'</a><br />';
         $delete_attach_checkbox->addOption($key, $attach);
     }
     $form->addElement($delete_attach_checkbox);

include/displayfaqs.php

Spacing +20 added lines, -20 removed lines

@@ -23,9 +23,9 @@ 
 
 sf_collapsableBar('toptable', 'toptableicon');
 
-echo "<img id='toptableicon' src=" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . "/assets/images/icon/close12.gif alt='' /></a>&nbsp;" . $faqs_title . '</h3>';
+echo "<img id='toptableicon' src=".XOOPS_URL.'/modules/'.$xoopsModule->dirname()."/assets/images/icon/close12.gif alt='' /></a>&nbsp;".$faqs_title.'</h3>';
 echo "<div id='toptable'>";
-echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">" . $faqs_info . '</span>';
+echo "<span style=\"color: #567; margin: 3px 0 12px 0; font-size: small; display: block; \">".$faqs_info.'</span>';
 
 // Get the total number of published FAQs
 $totalfaqs = $faqHandler->getFaqsCount($sel_cat, array(_SF_STATUS_PUBLISHED, _SF_STATUS_NEW_ANSWER));
@@ -36,22 +36,22 @@ 
 $allcats         = $categoryHandler->getObjects(null, true);
 echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
 echo '<tr>';
-echo "<th width='40' class='bg3' align='center'><b>" . _AM_SF_ARTID . '</b></td>';
-echo "<th width='20%' class='bg3' align='left'><b>" . _AM_SF_ARTCOLNAME . '</b></td>';
-echo "<th class='bg3' align='left'><b>" . _AM_SF_QUESTION . '</b></td>';
+echo "<th width='40' class='bg3' align='center'><b>"._AM_SF_ARTID.'</b></td>';
+echo "<th width='20%' class='bg3' align='left'><b>"._AM_SF_ARTCOLNAME.'</b></td>';
+echo "<th class='bg3' align='left'><b>"._AM_SF_QUESTION.'</b></td>';
 
-echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ASKED . '</b></td>';
-echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_ANSWERED . '</b></td>';
+echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ASKED.'</b></td>';
+echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_ANSWERED.'</b></td>';
 
-echo "<th width='90' class='bg3' align='center'><b>" . _AM_SF_CREATED . '</b></td>';
-echo "<th width='60' class='bg3' align='center'><b>" . _AM_SF_ACTION . '</b></td>';
+echo "<th width='90' class='bg3' align='center'><b>"._AM_SF_CREATED.'</b></td>';
+echo "<th width='60' class='bg3' align='center'><b>"._AM_SF_ACTION.'</b></td>';
 echo '</tr>';
 if ($totalfaqs > 0) {
     global $pathIcon16, $smartModuleConfig;
     for ($i = 0; $i < $totalFaqsOnPage; ++$i) {
-        $categoryObj =& $allcats[$faqsObj[$i]->categoryid()];
-        $modify      = "<a href='faq.php?op=mod&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/edit.png' . "' title='" . _AM_SF_EDITART . "' alt='" . _AM_SF_EDITART . "' /></a>";
-        $delete      = "<a href='faq.php?op=del&amp;faqid=" . $faqsObj[$i]->faqid() . "'><img src='" . $pathIcon16 . '/delete.png' . "' title='" . _AM_SF_EDITART . "' alt='" . _AM_SF_DELETEART . "'/></a>";
+        $categoryObj = & $allcats[$faqsObj[$i]->categoryid()];
+        $modify      = "<a href='faq.php?op=mod&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/edit.png'."' title='"._AM_SF_EDITART."' alt='"._AM_SF_EDITART."' /></a>";
+        $delete      = "<a href='faq.php?op=del&amp;faqid=".$faqsObj[$i]->faqid()."'><img src='".$pathIcon16.'/delete.png'."' title='"._AM_SF_EDITART."' alt='"._AM_SF_DELETEART."'/></a>";
 
         //adding name of the Question Submitter
         $requester = sf_getLinkedUnameFromId($faqsObj[$i]->uid(), $smartModuleConfig['userealname']);
@@ -79,26 +79,26 @@ 
         }
 
         echo '<tr>';
-        echo "<td class='head' align='center'>" . $faqsObj[$i]->faqid() . '</td>';
-        echo "<td class='even' align='left'>" . $categoryObj->name() . '</td>';
-        echo "<td class='even' align='left'><a href='" . XOOPS_URL . '/modules/' . $xoopsModule->dirname() . '/faq.php?faqid=' . $faqsObj[$i]->faqid() . "'>" . $faqsObj[$i]->question(100) . '</a></td>';
+        echo "<td class='head' align='center'>".$faqsObj[$i]->faqid().'</td>';
+        echo "<td class='even' align='left'>".$categoryObj->name().'</td>';
+        echo "<td class='even' align='left'><a href='".XOOPS_URL.'/modules/'.$xoopsModule->dirname().'/faq.php?faqid='.$faqsObj[$i]->faqid()."'>".$faqsObj[$i]->question(100).'</a></td>';
 
-        echo "<td class='even' align='center'>" . $requester . '</td>';
-        echo "<td class='even' align='center'>" . $answerSubmitter . '</td>';
+        echo "<td class='even' align='center'>".$requester.'</td>';
+        echo "<td class='even' align='center'>".$answerSubmitter.'</td>';
 
-        echo "<td class='even' align='center'>" . $faqsObj[$i]->datesub('s') . '</td>';
+        echo "<td class='even' align='center'>".$faqsObj[$i]->datesub('s').'</td>';
         echo "<td class='even' align='center'> $modify $delete </td>";
         echo '</tr>';
     }
 } else {
     $faqid = -1;
     echo '<tr>';
-    echo "<td class='head' align='center' colspan= '7'>" . _AM_SF_NOFAQS . '</td>';
+    echo "<td class='head' align='center' colspan= '7'>"._AM_SF_NOFAQS.'</td>';
     echo '</tr>';
 }
 echo "</table>\n";
 echo "<br />\n";
 
 $pagenav = new XoopsPageNav($totalfaqs, $xoopsModuleConfig['perpage'], $startfaq, 'startfaq', $pagenav_extra_args);
-echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
 echo '</div>';

answer.php

Spacing +13 added lines, -13 removed lines

@@ -6,7 +6,7 @@ 
  * Licence: GNU
  */
 
-include_once __DIR__ . '/header.php';
+include_once __DIR__.'/header.php';
 
 global $xoopsUser, $xoopsConfig, $xoopsModuleConfig, $xoopsModule;
 
@@ -26,8 +26,8 @@ 
 }
 
 // Getting the faqid
-$faqid = isset($_GET['faqid']) ? (int)$_GET['faqid'] : 0;
-$faqid = isset($_POST['faqid']) ? (int)$_POST['faqid'] : $faqid;
+$faqid = isset($_GET['faqid']) ? (int) $_GET['faqid'] : 0;
+$faqid = isset($_POST['faqid']) ? (int) $_POST['faqid'] : $faqid;
 
 // If no FAQ is selected, exit
 if ($faqid == 0) {
@@ -127,12 +127,12 @@ 
 
         // Storing the FAQ object in the database
         if (!$faqObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _MD_SF_SUBMIT_ERROR . sf_formatErrors($faqObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, _MD_SF_SUBMIT_ERROR.sf_formatErrors($faqObj->getErrors()));
         }
 
         // Storing the answer object in the database
         if (!$newAnswerObj->store()) {
-            redirect_header('javascript:history.go(-1)', 3, _MD_SF_SUBMIT_ERROR . sf_formatErrors($newAnswerObj->getErrors()));
+            redirect_header('javascript:history.go(-1)', 3, _MD_SF_SUBMIT_ERROR.sf_formatErrors($newAnswerObj->getErrors()));
         }
 
         $notificationHandler = xoops_getHandler('notification');
@@ -148,7 +148,7 @@ 
             case 2:
                 // Answer for an open question submitted, auto-approved; became Q&A, need approbation
                 if (isset($_POST['notifypub']) && $_POST['notifypub'] == 1) {
-                    include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+                    include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
                     $notificationHandler->subscribe('faq', $faqObj->faqid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
                 }
                 // Send notifications
@@ -158,7 +158,7 @@ 
             case 3:
                 // Answer submitted, needs approbation
                 if (isset($_POST['notifypub']) && $_POST['notifypub'] == 1) {
-                    include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+                    include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
                     $notificationHandler->subscribe('question', $newAnswerObj->answerid(), 'approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
                 }
                 // Send notifications
@@ -173,7 +173,7 @@ 
                 // New answer submitted for a published Q&A, need approbation
                 // Send notifications
                 if (isset($_POST['notifypub']) && $_POST['notifypub'] == 1) {
-                    include_once XOOPS_ROOT_PATH . '/include/notification_constants.php';
+                    include_once XOOPS_ROOT_PATH.'/include/notification_constants.php';
                     $notificationHandler->subscribe('faq', $newAnswerObj->answerid(), 'answer_approved', XOOPS_NOTIFICATION_MODE_SENDONCETHENDELETE);
                 }
 
@@ -210,20 +210,20 @@ 
         }
 
         $xoopsOption['template_main'] = 'smartfaq_submit.tpl';
-        include_once(XOOPS_ROOT_PATH . '/header.php');
-        include_once __DIR__ . '/footer.php';
+        include_once(XOOPS_ROOT_PATH.'/header.php');
+        include_once __DIR__.'/footer.php';
 
         $name = $xoopsUser ? ucwords($xoopsUser->getVar('uname')) : 'Anonymous';
 
-        $moduleName =& $myts->displayTarea($xoopsModule->getVar('name'));
+        $moduleName = & $myts->displayTarea($xoopsModule->getVar('name'));
         $xoopsTpl->assign('whereInSection', $moduleName);
         $xoopsTpl->assign('lang_submit', _MD_SF_SUBMITANSWER);
 
         $xoopsTpl->assign('lang_intro_title', sprintf(_MD_SF_SUBMITANSWERTO, ucwords($xoopsModule->name())));
-        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY . "<b>$name</b>, " . _MD_SF_SUBMITANSWER_INTRO);
+        $xoopsTpl->assign('lang_intro_text', _MD_SF_GOODDAY."<b>$name</b>, "._MD_SF_SUBMITANSWER_INTRO);
 
         include_once 'include/answer.inc.php';
 
-        include_once XOOPS_ROOT_PATH . '/footer.php';
+        include_once XOOPS_ROOT_PATH.'/footer.php';
         break;
 }

blocks/faqs_recent_questions.php

Spacing +11 added lines, -11 removed lines

@@ -11,7 +11,7 @@ 
 
 function b_faqs_recent_questions_show($options)
 {
-    include_once(XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php');
+    include_once(XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php');
 
     $block = array();
 
@@ -60,44 +60,44 @@ 
  */
 function b_faqs_recent_questions_edit($options)
 {
-    include_once(XOOPS_ROOT_PATH . '/modules/smartfaq/include/functions.php');
+    include_once(XOOPS_ROOT_PATH.'/modules/smartfaq/include/functions.php');
 
     $form = sf_createCategorySelect($options[0]);
 
-    $form .= '&nbsp;<br>' . _MB_SF_ORDER . "&nbsp;<select name='options[]'>";
+    $form .= '&nbsp;<br>'._MB_SF_ORDER."&nbsp;<select name='options[]'>";
 
     $form .= "<option value='datesub'";
     if ($options[1] === 'datesub') {
         $form .= " selected='selected'";
     }
-    $form .= '>' . _MB_SF_DATE . "</option>\n";
+    $form .= '>'._MB_SF_DATE."</option>\n";
 
     $form .= "<option value='counter'";
     if ($options[1] === 'counter') {
         $form .= " selected='selected'";
     }
-    $form .= '>' . _MB_SF_HITS . "</option>\n";
+    $form .= '>'._MB_SF_HITS."</option>\n";
 
     $form .= "<option value='weight'";
     if ($options[1] === 'weight') {
         $form .= " selected='selected'";
     }
-    $form .= '>' . _MB_SF_WEIGHT . "</option>\n";
+    $form .= '>'._MB_SF_WEIGHT."</option>\n";
 
     $form .= "</select>\n";
 
-    $form .= '&nbsp;' . _MB_SF_DISP . "&nbsp;<input type='text' name='options[]' value='" . $options[2] . "' />&nbsp;" . _MB_SF_QUESTIONS . '';
-    $form .= '&nbsp;<br>' . _MB_SF_CHARS . "&nbsp;<input type='text' name='options[]' value='" . $options[3] . "' />&nbsp;" . _MB_SF_LENGTH . '';
+    $form .= '&nbsp;'._MB_SF_DISP."&nbsp;<input type='text' name='options[]' value='".$options[2]."' />&nbsp;"._MB_SF_QUESTIONS.'';
+    $form .= '&nbsp;<br>'._MB_SF_CHARS."&nbsp;<input type='text' name='options[]' value='".$options[3]."' />&nbsp;"._MB_SF_LENGTH.'';
 
-    $form .= '<br />' . _MB_SF_SHOW_DATE . "&nbsp;<input type='radio' id='options[]' name='options[]' value='1'";
+    $form .= '<br />'._MB_SF_SHOW_DATE."&nbsp;<input type='radio' id='options[]' name='options[]' value='1'";
     if ($options[4] == 1) {
         $form .= " checked='checked'";
     }
-    $form .= ' />&nbsp;' . _YES . "<input type='radio' id='options[]' name='options[]' value='0'";
+    $form .= ' />&nbsp;'._YES."<input type='radio' id='options[]' name='options[]' value='0'";
     if ($options[4] == 0) {
         $form .= " checked='checked'";
     }
-    $form .= ' />&nbsp;' . _NO . '';
+    $form .= ' />&nbsp;'._NO.'';
 
     return $form;
 }