XOOPS / XoopsCore

htdocs/modules/pm/pmlite.php

Spacing +13 added lines, -13 removed lines

@@ -24,9 +24,9 @@ 
  */
 
 if (!defined('XOOPS_MAINFILE_INCLUDED')) {
-    include_once dirname(dirname(__DIR__)) . '/mainfile.php';
+    include_once dirname(dirname(__DIR__)).'/mainfile.php';
 } else {
-    chdir(\XoopsBaseConfig::get('root-path') . '/modules/pm/');
+    chdir(\XoopsBaseConfig::get('root-path').'/modules/pm/');
 }
 $xoops = Xoops::getInstance();
 $xoops->loadLanguage('main', 'pm');
@@ -39,7 +39,7 @@ 
 $msg_id = isset($_GET['msg_id']) ? (int)($_GET['msg_id']) : 0;
 
 if (empty($_GET['refresh']) && isset($_POST['op']) && $_POST['op'] !== "submit") {
-    $jump = "pmlite.php?refresh=" . time();
+    $jump = "pmlite.php?refresh=".time();
     if ($send == 1) {
         $jump .= "&send={$send}";
     } else {
@@ -52,7 +52,7 @@ 
             }
         }
     }
-    header('location: ' . $jump);
+    header('location: '.$jump);
     exit();
 }
 
@@ -69,8 +69,8 @@ 
     $tpl = new XoopsTpl();
     if ($count != 1) {
         $error_message = _PM_USERNOEXIST;
-        $error_message .= "<br />" . _PM_PLZTRYAGAIN;
-        $error_message .= "<br />[ <a href='javascript:history.go(-1)'>" . _PM_GOBACK . "</a> ]";
+        $error_message .= "<br />"._PM_PLZTRYAGAIN;
+        $error_message .= "<br />[ <a href='javascript:history.go(-1)'>"._PM_GOBACK."</a> ]";
         $tpl->assign('error_message', $error_message);
     } else {
         if ($xoops->security()->check()) {
@@ -90,19 +90,19 @@ 
             }
             if (!$pm_handler->insert($pm)) {
                 $error_message = $pm->getHtmlErrors();
-                $error_message .= "<br /><a href='javascript:history.go(-1)'>" . _PM_GOBACK . "</a>";
+                $error_message .= "<br /><a href='javascript:history.go(-1)'>"._PM_GOBACK."</a>";
                 $tpl->assign('error_message', $error_message);
             } else {
                 // @todo: Send notification email if user has selected this in the profile
                 $info_message = _PM_MESSAGEPOSTED;
                 $info_message .= "<br />";
-                $info_message .= "<br /><a href=\"javascript:window.opener.location='" . \XoopsBaseConfig::get('url') . "/viewpmsg.php';window.close();\">" . _PM_CLICKHERE . "</a>";
-                $info_message .= "<br /><br /><a href=\"javascript:window.close();\">" . _PM_ORCLOSEWINDOW . "</a>";
+                $info_message .= "<br /><a href=\"javascript:window.opener.location='".\XoopsBaseConfig::get('url')."/viewpmsg.php';window.close();\">"._PM_CLICKHERE."</a>";
+                $info_message .= "<br /><br /><a href=\"javascript:window.close();\">"._PM_ORCLOSEWINDOW."</a>";
                 $tpl->assign('info_message', $info_message);
             }
         } else {
             $error_message = implode('<br />', $xoops->security()->getErrors());
-            $error_message .= "<br /><a href=\"javascript:window.close();\">" . _PM_ORCLOSEWINDOW . "</a>";
+            $error_message .= "<br /><a href=\"javascript:window.close();\">"._PM_ORCLOSEWINDOW."</a>";
             $tpl->assign('error_message', $error_message);
         }
     }
@@ -119,7 +119,7 @@ 
                 $pm_uname = XoopsUser::getUnameFromId($pm->getVar("from_userid"));
                 $message = "[quote]\n";
                 $message .= sprintf(_PM_USERWROTE, $pm_uname);
-                $message .= "\n" . $pm->getVar("msg_text", "E") . "\n[/quote]";
+                $message .= "\n".$pm->getVar("msg_text", "E")."\n[/quote]";
             } else {
                 unset($pm);
                 $reply = $send2 = 0;
@@ -131,8 +131,8 @@ 
 
         if ($reply == 1) {
             $subject = $pm->getVar('subject', 'E');
-            if (!preg_match("/^" . XoopsLocale::C_RE . "/i", $subject)) {
-                $subject = XoopsLocale::C_RE . ' ' . $subject;
+            if (!preg_match("/^".XoopsLocale::C_RE."/i", $subject)) {
+                $subject = XoopsLocale::C_RE.' '.$subject;
             }
             $form->addElement(new Xoops\Form\Label(_PM_TO, $pm_uname));
             $form->addElement(new Xoops\Form\Hidden('to_userid', $pm->getVar("from_userid")));

htdocs/modules/pm/viewpmsg.php

Indentation +3 added lines, -3 removed lines

@@ -51,8 +51,8 @@ 
     } else {
         if (empty($_REQUEST['ok'])) {
             echo $xoops->confirm(array(
-                                 'ok' => 1, 'delete_messages' => 1, 'op' => $op,
-                                 'msg_ids' => json_encode(array_map("intval", $_POST['msg_id']))
+                                    'ok' => 1, 'delete_messages' => 1, 'op' => $op,
+                                    'msg_ids' => json_encode(array_map("intval", $_POST['msg_id']))
                             ), $_SERVER['REQUEST_URI'], XoopsLocale::Q_ARE_YOU_SURE_YOU_WANT_TO_DELETE_THIS_MESSAGES);
             $xoops->footer();
         } else {
@@ -129,7 +129,7 @@ 
     } else {
         if (empty($_REQUEST['ok'])) {
             echo $xoops->confirm(array(
-                                 'ok' => 1, 'empty_messages' => 1, 'op' => $op
+                                    'ok' => 1, 'empty_messages' => 1, 'op' => $op
                             ), $_SERVER['REQUEST_URI'], _PM_RUSUREEMPTY);
             $xoops->footer();
         } else {

Spacing +5 added lines, -5 removed lines

@@ -26,7 +26,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include_once dirname(dirname(__DIR__)) . '/mainfile.php';
+include_once dirname(dirname(__DIR__)).'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 
@@ -61,7 +61,7 @@ 
                 $clean_msg_id = array_map("intval", $clean_msg_id);
             }
             $size = count($clean_msg_id);
-            $msg =& $clean_msg_id;
+            $msg = & $clean_msg_id;
             for ($i = 0; $i < $size; ++$i) {
                 $pm = $pm_handler->get($msg[$i]);
                 if ($pm->getVar('to_userid') == $xoops->user->getVar('uid')) {
@@ -218,7 +218,7 @@ 
 $xoops->tpl()->assign('op', $op);
 
 if ($total_messages > $xoops->getModuleConfig('perpage')) {
-    $nav = new XoopsPageNav($total_messages, $xoops->getModuleConfig('perpage'), $start, "start", 'op=' . $op);
+    $nav = new XoopsPageNav($total_messages, $xoops->getModuleConfig('perpage'), $start, "start", 'op='.$op);
     $xoops->tpl()->assign('pagenav', $nav->renderNav(4));
 }
 
@@ -233,7 +233,7 @@ 
         }
     }
     $member_handler = $xoops->getHandlerMember();
-    $senders = $member_handler->getUserList(new Criteria('uid', "(" . implode(", ", array_unique($uids)) . ")", "IN"));
+    $senders = $member_handler->getUserList(new Criteria('uid', "(".implode(", ", array_unique($uids)).")", "IN"));
     foreach (array_keys($pm_arr) as $i) {
         $message = $pm_arr[$i];
         //$message['msg_time'] = XoopsLocale::formatTimestamp($message["msg_time"], 'e');
@@ -252,7 +252,7 @@ 
 $send_button = new Xoops\Form\Button('', 'send', XoopsLocale::A_SEND);
 $send_button->set(
     'onclick',
-    'openWithSelfMain("' . $xoops->url('modules/pm/pmlite.php?send=1') . '" , "pmlite", 740,640);'
+    'openWithSelfMain("'.$xoops->url('modules/pm/pmlite.php?send=1').'" , "pmlite", 740,640);'
 );
 $delete_button = new Xoops\Form\Button('', 'delete_messages', XoopsLocale::A_DELETE, 'submit');
 $move_button = new Xoops\Form\Button('', 'move_messages', ($op === 'save') ? _PM_UNSAVE

htdocs/modules/pm/class/message.php

Indentation +2 added lines, -2 removed lines

@@ -180,8 +180,8 @@
         $msg .= _PM_EMAIL_MESSAGE . ":\n";
         $msg .= "\n" . $pm->getVar("subject") . "\n";
         $msg .= "\n" . strip_tags(str_replace(array(
-                                                   "<p>", "</p>", "<br />", "<br />"
-                                              ), "\n", $pm->getVar("msg_text"))) . "\n\n";
+                                                    "<p>", "</p>", "<br />", "<br />"
+                                                ), "\n", $pm->getVar("msg_text"))) . "\n\n";
         $msg .= "--------------\n";
         $msg .= $xoops->getConfig('sitename') . ": " . \XoopsBaseConfig::get('url') . "\n";
 

Spacing +9 added lines, -9 removed lines

@@ -171,19 +171,19 @@
         $msg .= "\n";
         $from = new XoopsUser($pm->getVar("from_userid"));
         $to = new XoopsUser($pm->getVar("to_userid"));
-        $msg .= sprintf(_PM_EMAIL_FROM, $from->getVar("uname") . " (" . \XoopsBaseConfig::get('url')
-            . "/userinfo.php?uid=" . $pm->getVar("from_userid") . ")");
+        $msg .= sprintf(_PM_EMAIL_FROM, $from->getVar("uname")." (".\XoopsBaseConfig::get('url')
+            . "/userinfo.php?uid=".$pm->getVar("from_userid").")");
         $msg .= "\n";
-        $msg .= sprintf(_PM_EMAIL_TO, $to->getVar("uname") . " (" . \XoopsBaseConfig::get('url')
-            . "/userinfo.php?uid=" . $pm->getVar("to_userid") . ")");
+        $msg .= sprintf(_PM_EMAIL_TO, $to->getVar("uname")." (".\XoopsBaseConfig::get('url')
+            . "/userinfo.php?uid=".$pm->getVar("to_userid").")");
         $msg .= "\n";
-        $msg .= _PM_EMAIL_MESSAGE . ":\n";
-        $msg .= "\n" . $pm->getVar("subject") . "\n";
-        $msg .= "\n" . strip_tags(str_replace(array(
+        $msg .= _PM_EMAIL_MESSAGE.":\n";
+        $msg .= "\n".$pm->getVar("subject")."\n";
+        $msg .= "\n".strip_tags(str_replace(array(
                                                    "<p>", "</p>", "<br />", "<br />"
-                                              ), "\n", $pm->getVar("msg_text"))) . "\n\n";
+                                              ), "\n", $pm->getVar("msg_text")))."\n\n";
         $msg .= "--------------\n";
-        $msg .= $xoops->getConfig('sitename') . ": " . \XoopsBaseConfig::get('url') . "\n";
+        $msg .= $xoops->getConfig('sitename').": ".\XoopsBaseConfig::get('url')."\n";
 
         $xoopsMailer = $xoops->getMailer();
         $xoopsMailer->useMail();

htdocs/modules/pm/class/plugin/usermenu.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 
         $name = XoopsLocale::INBOX;
         if ($pm_count = $pm_handler->getCount($criteria)) {
-            $name = XoopsLocale::INBOX . ' <span class="badge">' . $pm_count . '</span>';
+            $name = XoopsLocale::INBOX.' <span class="badge">'.$pm_count.'</span>';
         }
 
         $ret[] = [

htdocs/modules/search/language/english/modinfo.php

Spacing +1 added lines, -1 removed lines

@@ -24,4 +24,4 @@
 define("_MI_SEARCH_MINSEARCH", "Minimum keyword length");
 define("_MI_SEARCH_MINSEARCHDSC", "Enter the minimum keyword length that users are required to enter to perform search");
 
-define("_MI_SEARCH_BNAME1","Search");
+define("_MI_SEARCH_BNAME1", "Search");

htdocs/modules/search/class/form/search.php

Spacing +4 added lines, -4 removed lines

@@ -53,9 +53,9 @@ 
 
             //todo, would be nice to have the module ids availabe also
             $criteria = new CriteriaCompo();
-            $criteria->add(new Criteria('dirname', "('" . implode("','", array_keys($available_plugins)) . "')", 'IN'));
+            $criteria->add(new Criteria('dirname', "('".implode("','", array_keys($available_plugins))."')", 'IN'));
             if (isset($available_modules) && !empty($available_modules)) {
-                $criteria->add(new Criteria('mid', '(' . implode(',', $available_modules) . ')', 'IN'));
+                $criteria->add(new Criteria('mid', '('.implode(',', $available_modules).')', 'IN'));
             }
             $module_handler = $xoops->getHandlerModule();
             $mods_checkbox->addOptionArray($module_handler->getNameList($criteria));
@@ -90,9 +90,9 @@ 
         $query = '';
         foreach ($queries as $term) {
             if (false === strpos($term, ' ')) {
-                $query .= $term . ' ';
+                $query .= $term.' ';
             } else {
-                $query .= '"' . $term . '" ';
+                $query .= '"'.$term.'" ';
             }
         }
         $query = trim($query);

htdocs/modules/search/index.php

Switch Indentation +125 added lines, -125 removed lines

@@ -110,156 +110,156 @@
 }
 
 switch ($action) {
-    case "results":
-        $module_handler = $xoops->getHandlerModule();
-        $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('dirname', "('" . implode("','", array_keys($available_plugins)) . "')", 'IN'));
-        $modules = $module_handler->getObjectsArray($criteria, true);
-        if (empty($mids) || !is_array($mids)) {
-            unset($mids);
-            $mids = array_keys($modules);
-        }
-        $xoops->header('module:search/search.tpl');
-        $nomatch = true;
-        $xoops->tpl()->assign('search', true);
-        $xoops->tpl()->assign('queries', $queries);
-        $xoops->tpl()->assign('ignored_words', sprintf(_MD_SEARCH_IGNOREDWORDS, $search->getConfig('keyword_min')));
-        $xoops->tpl()->assign('ignored_queries', $ignored_queries);
+        case "results":
+            $module_handler = $xoops->getHandlerModule();
+            $criteria = new CriteriaCompo();
+            $criteria->add(new Criteria('dirname', "('" . implode("','", array_keys($available_plugins)) . "')", 'IN'));
+            $modules = $module_handler->getObjectsArray($criteria, true);
+            if (empty($mids) || !is_array($mids)) {
+                unset($mids);
+                $mids = array_keys($modules);
+            }
+            $xoops->header('module:search/search.tpl');
+            $nomatch = true;
+            $xoops->tpl()->assign('search', true);
+            $xoops->tpl()->assign('queries', $queries);
+            $xoops->tpl()->assign('ignored_words', sprintf(_MD_SEARCH_IGNOREDWORDS, $search->getConfig('keyword_min')));
+            $xoops->tpl()->assign('ignored_queries', $ignored_queries);
+
+            $modules_result = array();
+            foreach ($mids as $mid) {
+                $mid = (int)($mid);
+                /* @var $module XoopsModule */
+                $module = $modules[$mid];
+                /* @var $plugin SearchPluginInterface */
+                $plugin = \Xoops\Module\Plugin::getPlugin($module->getVar('dirname'), 'search');
+                $results = $plugin->search($queries, $andor, 5, 0, null);
+                $count = count($results);
+                $mid = $module->getVar('mid');
+
+                $res = array();
+                if (is_array($results) && $count > 0) {
+                    $nomatch = false;
+                    $modules_result[$mid]['name'] = $module->getVar('name');
+                    if (XoopsLoad::fileExists($image = $xoops->path('modules/' . $module->getVar('dirname') . '/icons/logo_large.png'))) {
+                        $modules_result[$mid]['image'] = $xoops->url($image);
+                    } else {
+                        $modules_result[$mid]['image'] = $xoops->url('images/icons/posticon2.gif');
+                    }
+                    $res = array();
+                    for ($i = 0; $i < $count; ++$i) {
+                        if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
+                            $res[$i]['link'] = $xoops->url('modules/' . $module->getVar('dirname') . '/' . $results[$i]['link']);
+                        } else {
+                            $res[$i]['link'] = $results[$i]['link'];
+                        }
+                        $res[$i]['title'] = $myts->htmlSpecialChars($results[$i]['title']);
+                        $res[$i]['title_highligh'] = preg_replace($queries_pattern, "<span class='searchHighlight'>$1</span>", $myts->htmlSpecialChars($results[$i]['title']));
+                        if (!empty($results[$i]['uid'])) {
+                            $res[$i]['uid'] = (int)($results[$i]['uid']);
+                            $res[$i]['uname'] = XoopsUser::getUnameFromId($results[$i]['uid'], true);
+                        }
+                        $res[$i]['time'] = !empty($results[$i]['time']) ? XoopsLocale::formatTimestamp((int)($results[$i]['time'])) : "";
+                        $res[$i]['content'] = empty($results[$i]['content']) ? "" : preg_replace($queries_pattern, "<span class='searchHighlight'>$1</span>", $results[$i]['content']);
+                    }
+                    if ($count >= 5) {
+                        $search_url = $search->url('index.php?query=' . urlencode(stripslashes(implode(' ', $queries))));
+                        $search_url .= "&mid={$mid}&action=showall&andor={$andor}";
+                        $modules_result[$mid]['search_url'] = htmlspecialchars($search_url);
+                    }
+                }
+                if (count($res) > 0) {
+                    $modules_result[$mid]['result'] = $res;
+                }
+            }
+            unset($results);
+            unset($module);
+
+            $xoops->tpl()->assign('modules', $modules_result);
+
+            /* @var $formHandler SearchSearchForm */
+            $formHandler = $search->getForm(null, 'search');
+            $form = $formHandler->getSearchFrom($andor, $queries, $mids, $mid);
+            $form->display();
+            break;
 
-        $modules_result = array();
-        foreach ($mids as $mid) {
-            $mid = (int)($mid);
-            /* @var $module XoopsModule */
-            $module = $modules[$mid];
+        case "showall":
+        case 'showallbyuser':
+            $xoops->header('module:search/search.tpl');
+            $xoops->tpl()->assign('search', true);
+            $xoops->tpl()->assign('queries', $queries);
+            $xoops->tpl()->assign('ignored_words', sprintf(_MD_SEARCH_IGNOREDWORDS, $search->getConfig('keyword_min')));
+            $xoops->tpl()->assign('ignored_queries', $ignored_queries);
+
+            $module_handler = $xoops->getHandlerModule();
+            $module = $xoops->getModuleById($mid);
             /* @var $plugin SearchPluginInterface */
             $plugin = \Xoops\Module\Plugin::getPlugin($module->getVar('dirname'), 'search');
-            $results = $plugin->search($queries, $andor, 5, 0, null);
-            $count = count($results);
-            $mid = $module->getVar('mid');
+            $results = $plugin->search($queries, $andor, 20, $start, $uid);
+
+            $modules_result[$mid]['name'] = $module->getVar('name');
+            $modules_result[$mid]['image'] = $xoops->url('modules/' . $module->getVar('dirname') . '/icons/logo_large.png');
 
-            $res = array();
+            $count = count($results);
             if (is_array($results) && $count > 0) {
-                $nomatch = false;
-                $modules_result[$mid]['name'] = $module->getVar('name');
-                if (XoopsLoad::fileExists($image = $xoops->path('modules/' . $module->getVar('dirname') . '/icons/logo_large.png'))) {
-                    $modules_result[$mid]['image'] = $xoops->url($image);
-                } else {
-                    $modules_result[$mid]['image'] = $xoops->url('images/icons/posticon2.gif');
+                $next_results = $plugin->search($queries, $andor, 1, $start + 20, $uid);
+                $next_count = count($next_results);
+                $has_next = false;
+                if (is_array($next_results) && $next_count == 1) {
+                    $has_next = true;
                 }
+                $xoops->tpl()->assign('sr_showing', sprintf(_MD_SEARCH_SHOWING, $start + 1, $start + $count));
                 $res = array();
                 for ($i = 0; $i < $count; ++$i) {
+                    if (isset($results[$i]['image']) && $results[$i]['image'] != "") {
+                        $res[$i]['image'] = $xoops->url('modules/' . $module->getVar('dirname') . '/' . $results[$i]['image']);
+                    } else {
+                        $res[$i]['image'] = $xoops->url('images/icons/posticon2.gif');
+                    }
                     if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
                         $res[$i]['link'] = $xoops->url('modules/' . $module->getVar('dirname') . '/' . $results[$i]['link']);
                     } else {
                         $res[$i]['link'] = $results[$i]['link'];
                     }
                     $res[$i]['title'] = $myts->htmlSpecialChars($results[$i]['title']);
-                    $res[$i]['title_highligh'] = preg_replace($queries_pattern, "<span class='searchHighlight'>$1</span>", $myts->htmlSpecialChars($results[$i]['title']));
+                    if (isset($queries_pattern)) {
+                        $res[$i]['title_highligh'] = preg_replace($queries_pattern, "<span class='searchHighlight'>$1</span>", $myts->htmlSpecialChars($results[$i]['title']));
+                    } else {
+                        $res[$i]['title_highligh'] = $myts->htmlSpecialChars($results[$i]['title']);
+                    }
                     if (!empty($results[$i]['uid'])) {
-                        $res[$i]['uid'] = (int)($results[$i]['uid']);
+                        $res[$i]['uid'] = @(int)($results[$i]['uid']);
                         $res[$i]['uname'] = XoopsUser::getUnameFromId($results[$i]['uid'], true);
                     }
-                    $res[$i]['time'] = !empty($results[$i]['time']) ? XoopsLocale::formatTimestamp((int)($results[$i]['time'])) : "";
+                    $res[$i]['time'] = !empty($results[$i]['time']) ? " (" . XoopsLocale::formatTimestamp((int)($results[$i]['time'])) . ")" : "";
                     $res[$i]['content'] = empty($results[$i]['content']) ? "" : preg_replace($queries_pattern, "<span class='searchHighlight'>$1</span>", $results[$i]['content']);
                 }
-                if ($count >= 5) {
-                    $search_url = $search->url('index.php?query=' . urlencode(stripslashes(implode(' ', $queries))));
-                    $search_url .= "&mid={$mid}&action=showall&andor={$andor}";
-                    $modules_result[$mid]['search_url'] = htmlspecialchars($search_url);
+                if (count($res) > 0) {
+                    $modules_result[$mid]['result'] = $res;
                 }
-            }
-            if (count($res) > 0) {
-                $modules_result[$mid]['result'] = $res;
-            }
-        }
-        unset($results);
-        unset($module);
-
-        $xoops->tpl()->assign('modules', $modules_result);
-
-        /* @var $formHandler SearchSearchForm */
-        $formHandler = $search->getForm(null, 'search');
-        $form = $formHandler->getSearchFrom($andor, $queries, $mids, $mid);
-        $form->display();
-        break;
-
-    case "showall":
-    case 'showallbyuser':
-        $xoops->header('module:search/search.tpl');
-        $xoops->tpl()->assign('search', true);
-        $xoops->tpl()->assign('queries', $queries);
-        $xoops->tpl()->assign('ignored_words', sprintf(_MD_SEARCH_IGNOREDWORDS, $search->getConfig('keyword_min')));
-        $xoops->tpl()->assign('ignored_queries', $ignored_queries);
-
-        $module_handler = $xoops->getHandlerModule();
-        $module = $xoops->getModuleById($mid);
-        /* @var $plugin SearchPluginInterface */
-        $plugin = \Xoops\Module\Plugin::getPlugin($module->getVar('dirname'), 'search');
-        $results = $plugin->search($queries, $andor, 20, $start, $uid);
 
-        $modules_result[$mid]['name'] = $module->getVar('name');
-        $modules_result[$mid]['image'] = $xoops->url('modules/' . $module->getVar('dirname') . '/icons/logo_large.png');
-
-        $count = count($results);
-        if (is_array($results) && $count > 0) {
-            $next_results = $plugin->search($queries, $andor, 1, $start + 20, $uid);
-            $next_count = count($next_results);
-            $has_next = false;
-            if (is_array($next_results) && $next_count == 1) {
-                $has_next = true;
-            }
-            $xoops->tpl()->assign('sr_showing', sprintf(_MD_SEARCH_SHOWING, $start + 1, $start + $count));
-            $res = array();
-            for ($i = 0; $i < $count; ++$i) {
-                if (isset($results[$i]['image']) && $results[$i]['image'] != "") {
-                    $res[$i]['image'] = $xoops->url('modules/' . $module->getVar('dirname') . '/' . $results[$i]['image']);
-                } else {
-                    $res[$i]['image'] = $xoops->url('images/icons/posticon2.gif');
-                }
-                if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
-                    $res[$i]['link'] = $xoops->url('modules/' . $module->getVar('dirname') . '/' . $results[$i]['link']);
-                } else {
-                    $res[$i]['link'] = $results[$i]['link'];
+                $search_url = $search->url('index.php?query=' . urlencode(stripslashes(implode(' ', $queries))));
+                $search_url .= "&mid={$mid}&action={$action}&andor={$andor}";
+                if ($action === 'showallbyuser') {
+                    $search_url .= "&uid={$uid}";
                 }
-                $res[$i]['title'] = $myts->htmlSpecialChars($results[$i]['title']);
-                if (isset($queries_pattern)) {
-                    $res[$i]['title_highligh'] = preg_replace($queries_pattern, "<span class='searchHighlight'>$1</span>", $myts->htmlSpecialChars($results[$i]['title']));
-                } else {
-                    $res[$i]['title_highligh'] = $myts->htmlSpecialChars($results[$i]['title']);
+                if ($start > 0) {
+                    $prev = $start - 20;
+                    $search_url_prev = $search_url . "&start={$prev}";
+                    $modules_result[$mid]['prev'] = htmlspecialchars($search_url_prev);
                 }
-                if (!empty($results[$i]['uid'])) {
-                    $res[$i]['uid'] = @(int)($results[$i]['uid']);
-                    $res[$i]['uname'] = XoopsUser::getUnameFromId($results[$i]['uid'], true);
+                if (false != $has_next) {
+                    $next = $start + 20;
+                    $search_url_next = $search_url . "&start={$next}";
+                    $modules_result[$mid]['next'] = htmlspecialchars($search_url_next);
                 }
-                $res[$i]['time'] = !empty($results[$i]['time']) ? " (" . XoopsLocale::formatTimestamp((int)($results[$i]['time'])) . ")" : "";
-                $res[$i]['content'] = empty($results[$i]['content']) ? "" : preg_replace($queries_pattern, "<span class='searchHighlight'>$1</span>", $results[$i]['content']);
-            }
-            if (count($res) > 0) {
-                $modules_result[$mid]['result'] = $res;
-            }
-
-            $search_url = $search->url('index.php?query=' . urlencode(stripslashes(implode(' ', $queries))));
-            $search_url .= "&mid={$mid}&action={$action}&andor={$andor}";
-            if ($action === 'showallbyuser') {
-                $search_url .= "&uid={$uid}";
-            }
-            if ($start > 0) {
-                $prev = $start - 20;
-                $search_url_prev = $search_url . "&start={$prev}";
-                $modules_result[$mid]['prev'] = htmlspecialchars($search_url_prev);
-            }
-            if (false != $has_next) {
-                $next = $start + 20;
-                $search_url_next = $search_url . "&start={$next}";
-                $modules_result[$mid]['next'] = htmlspecialchars($search_url_next);
+                $xoops->tpl()->assign('modules', $modules_result);
             }
-            $xoops->tpl()->assign('modules', $modules_result);
-        }
 
-        /* @var $formHandler SearchSearchForm */
-        $formHandler = $search->getForm(null, 'search');
-        $form = $formHandler->getSearchFrom($andor, $queries, $mids, $mid);
-        $form->display();
-        break;
+            /* @var $formHandler SearchSearchForm */
+            $formHandler = $search->getForm(null, 'search');
+            $form = $formHandler->getSearchFrom($andor, $queries, $mids, $mid);
+            $form->display();
+            break;
 }
 $xoops->footer();

Spacing +15 added lines, -15 removed lines

@@ -24,12 +24,12 @@ 
  * @version         $Id$
  */
 
-include dirname(dirname(__DIR__)) . '/mainfile.php';
+include dirname(dirname(__DIR__)).'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $search = $xoops->getModuleHelper('search');
 if (!$search->getConfig('enable_search')) {
-    header('Location: ' . XOOPS_URL . '/index.php');
+    header('Location: '.XOOPS_URL.'/index.php');
     exit();
 }
 
@@ -91,7 +91,7 @@ 
             $q = trim($q);
             if (mb_strlen($q) >= $search->getConfig('keyword_min')) {
                 $queries[] = $q;
-                $queries_pattern[] = '~(' . $q . ')~sUi';
+                $queries_pattern[] = '~('.$q.')~sUi';
             } else {
                 $ignored_queries[] = $q;
             }
@@ -105,7 +105,7 @@ 
             $xoops->redirect('index.php', 2, sprintf(_MD_SEARCH_KEYTOOSHORT, $search->getConfig('keyword_min')));
         }
         $queries = array($query);
-        $queries_pattern[] = '~(' . $query . ')~sUi';
+        $queries_pattern[] = '~('.$query.')~sUi';
     }
 }
 
@@ -113,7 +113,7 @@ 
     case "results":
         $module_handler = $xoops->getHandlerModule();
         $criteria = new CriteriaCompo();
-        $criteria->add(new Criteria('dirname', "('" . implode("','", array_keys($available_plugins)) . "')", 'IN'));
+        $criteria->add(new Criteria('dirname', "('".implode("','", array_keys($available_plugins))."')", 'IN'));
         $modules = $module_handler->getObjectsArray($criteria, true);
         if (empty($mids) || !is_array($mids)) {
             unset($mids);
@@ -141,7 +141,7 @@ 
             if (is_array($results) && $count > 0) {
                 $nomatch = false;
                 $modules_result[$mid]['name'] = $module->getVar('name');
-                if (XoopsLoad::fileExists($image = $xoops->path('modules/' . $module->getVar('dirname') . '/icons/logo_large.png'))) {
+                if (XoopsLoad::fileExists($image = $xoops->path('modules/'.$module->getVar('dirname').'/icons/logo_large.png'))) {
                     $modules_result[$mid]['image'] = $xoops->url($image);
                 } else {
                     $modules_result[$mid]['image'] = $xoops->url('images/icons/posticon2.gif');
@@ -149,7 +149,7 @@ 
                 $res = array();
                 for ($i = 0; $i < $count; ++$i) {
                     if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
-                        $res[$i]['link'] = $xoops->url('modules/' . $module->getVar('dirname') . '/' . $results[$i]['link']);
+                        $res[$i]['link'] = $xoops->url('modules/'.$module->getVar('dirname').'/'.$results[$i]['link']);
                     } else {
                         $res[$i]['link'] = $results[$i]['link'];
                     }
@@ -163,7 +163,7 @@ 
                     $res[$i]['content'] = empty($results[$i]['content']) ? "" : preg_replace($queries_pattern, "<span class='searchHighlight'>$1</span>", $results[$i]['content']);
                 }
                 if ($count >= 5) {
-                    $search_url = $search->url('index.php?query=' . urlencode(stripslashes(implode(' ', $queries))));
+                    $search_url = $search->url('index.php?query='.urlencode(stripslashes(implode(' ', $queries))));
                     $search_url .= "&mid={$mid}&action=showall&andor={$andor}";
                     $modules_result[$mid]['search_url'] = htmlspecialchars($search_url);
                 }
@@ -198,7 +198,7 @@ 
         $results = $plugin->search($queries, $andor, 20, $start, $uid);
 
         $modules_result[$mid]['name'] = $module->getVar('name');
-        $modules_result[$mid]['image'] = $xoops->url('modules/' . $module->getVar('dirname') . '/icons/logo_large.png');
+        $modules_result[$mid]['image'] = $xoops->url('modules/'.$module->getVar('dirname').'/icons/logo_large.png');
 
         $count = count($results);
         if (is_array($results) && $count > 0) {
@@ -212,12 +212,12 @@ 
             $res = array();
             for ($i = 0; $i < $count; ++$i) {
                 if (isset($results[$i]['image']) && $results[$i]['image'] != "") {
-                    $res[$i]['image'] = $xoops->url('modules/' . $module->getVar('dirname') . '/' . $results[$i]['image']);
+                    $res[$i]['image'] = $xoops->url('modules/'.$module->getVar('dirname').'/'.$results[$i]['image']);
                 } else {
                     $res[$i]['image'] = $xoops->url('images/icons/posticon2.gif');
                 }
                 if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
-                    $res[$i]['link'] = $xoops->url('modules/' . $module->getVar('dirname') . '/' . $results[$i]['link']);
+                    $res[$i]['link'] = $xoops->url('modules/'.$module->getVar('dirname').'/'.$results[$i]['link']);
                 } else {
                     $res[$i]['link'] = $results[$i]['link'];
                 }
@@ -231,26 +231,26 @@ 
                     $res[$i]['uid'] = @(int)($results[$i]['uid']);
                     $res[$i]['uname'] = XoopsUser::getUnameFromId($results[$i]['uid'], true);
                 }
-                $res[$i]['time'] = !empty($results[$i]['time']) ? " (" . XoopsLocale::formatTimestamp((int)($results[$i]['time'])) . ")" : "";
+                $res[$i]['time'] = !empty($results[$i]['time']) ? " (".XoopsLocale::formatTimestamp((int)($results[$i]['time'])).")" : "";
                 $res[$i]['content'] = empty($results[$i]['content']) ? "" : preg_replace($queries_pattern, "<span class='searchHighlight'>$1</span>", $results[$i]['content']);
             }
             if (count($res) > 0) {
                 $modules_result[$mid]['result'] = $res;
             }
 
-            $search_url = $search->url('index.php?query=' . urlencode(stripslashes(implode(' ', $queries))));
+            $search_url = $search->url('index.php?query='.urlencode(stripslashes(implode(' ', $queries))));
             $search_url .= "&mid={$mid}&action={$action}&andor={$andor}";
             if ($action === 'showallbyuser') {
                 $search_url .= "&uid={$uid}";
             }
             if ($start > 0) {
                 $prev = $start - 20;
-                $search_url_prev = $search_url . "&start={$prev}";
+                $search_url_prev = $search_url."&start={$prev}";
                 $modules_result[$mid]['prev'] = htmlspecialchars($search_url_prev);
             }
             if (false != $has_next) {
                 $next = $start + 20;
-                $search_url_next = $search_url . "&start={$next}";
+                $search_url_next = $search_url."&start={$next}";
                 $modules_result[$mid]['next'] = htmlspecialchars($search_url_next);
             }
             $xoops->tpl()->assign('modules', $modules_result);

htdocs/modules/schematool/admin/about.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
  * @author          Richard Griffith <richard@geekwright.com>
  */
 
-require __DIR__ . '/admin_header.php';
+require __DIR__.'/admin_header.php';
 
 $aboutAdmin = new \Xoops\Module\Admin();
 

htdocs/modules/schematool/admin/menu.php

Spacing +7 added lines, -7 removed lines

@@ -15,22 +15,22 @@
  * @author          Richard Griffith <richard@geekwright.com>
  */
 
-$adminmenu=array();
+$adminmenu = array();
 // Index
 $adminmenu[] = array(
-    'title' => _MI_SCHEMATOOL_ADMIN_INDEX ,
-    'link'  => 'admin/index.php' ,
+    'title' => _MI_SCHEMATOOL_ADMIN_INDEX,
+    'link'  => 'admin/index.php',
     'icon'  => 'home.png'
 );
 // About
 $adminmenu[] = array(
-    'title' => _MI_SCHEMATOOL_ADMIN_ABOUT ,
-    'link'  => 'admin/about.php' ,
+    'title' => _MI_SCHEMATOOL_ADMIN_ABOUT,
+    'link'  => 'admin/about.php',
     'icon'  => 'about.png'
 );
 // SchemaTool
 $adminmenu[] = array(
-    'title' => _MI_SCHEMATOOL_ADMIN_TOOL ,
-    'link'  => 'admin/schematool.php' ,
+    'title' => _MI_SCHEMATOOL_ADMIN_TOOL,
+    'link'  => 'admin/schematool.php',
     'icon'  => 'schematool.png'
 );