XOOPS / XoopsCore25

htdocs/lostpass.php

Spacing +6 added lines, -6 removed lines

@@ -15,7 +15,7 @@ 
  * @since               2.0.0
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 $xoopsPreload = XoopsPreload::getInstance();
 $xoopsPreload->triggerEvent('core.lostpass.start');
@@ -42,12 +42,12 @@ 
     $areyou = substr($getuser[0]->getVar('pass'), 0, 5);
     if ($code != '' && $areyou == $code) {
         $newpass     = xoops_makepass();
-        $xoopsMailer =& xoops_getMailer();
+        $xoopsMailer = & xoops_getMailer();
         $xoopsMailer->useMail();
         $xoopsMailer->setTemplate('lostpass2.tpl');
         $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
         $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
-        $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
+        $xoopsMailer->assign('SITEURL', XOOPS_URL.'/');
         $xoopsMailer->assign('IP', $_SERVER['REMOTE_ADDR']);
         $xoopsMailer->assign('NEWPWD', $newpass);
         $xoopsMailer->setToUsers($getuser[0]);
@@ -73,14 +73,14 @@ 
         redirect_header('user.php', 3, sprintf(_US_PWDMAILED, $getuser[0]->getVar('uname')), false);
         // If no Code, send it
     } else {
-        $xoopsMailer =& xoops_getMailer();
+        $xoopsMailer = & xoops_getMailer();
         $xoopsMailer->useMail();
         $xoopsMailer->setTemplate('lostpass1.tpl');
         $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
         $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
-        $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
+        $xoopsMailer->assign('SITEURL', XOOPS_URL.'/');
         $xoopsMailer->assign('IP', $_SERVER['REMOTE_ADDR']);
-        $xoopsMailer->assign('NEWPWD_LINK', XOOPS_URL . '/lostpass.php?email=' . $email . '&code=' . $areyou);
+        $xoopsMailer->assign('NEWPWD_LINK', XOOPS_URL.'/lostpass.php?email='.$email.'&code='.$areyou);
         $xoopsMailer->setToUsers($getuser[0]);
         $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
         $xoopsMailer->setFromName($xoopsConfig['sitename']);

htdocs/readpmsg.php

Spacing +18 added lines, -18 removed lines

@@ -15,7 +15,7 @@ 
  * @since               2.0.0
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 $xoopsPreload = XoopsPreload::getInstance();
 $xoopsPreload->triggerEvent('core.readpmsg.start');
 
@@ -50,60 +50,60 @@ 
     $criteria->setStart($start);
     $criteria->setSort('msg_time');
     $pm_arr = $pm_handler->getObjects($criteria);
-    echo '<div><h4>' . _PM_PRIVATEMESSAGE . "</h4></div><br><a href='userinfo.php?uid=" . $xoopsUser->getVar('uid') . "' title=''>" . _PM_PROFILE . "</a>&nbsp;<span class='bold'>&raquo;</span>&nbsp;<a href='viewpmsg.php' title=''>" . _PM_INBOX . "</a>&nbsp;<span class='bold'>&raquo;</span>&nbsp;\n";
+    echo '<div><h4>'._PM_PRIVATEMESSAGE."</h4></div><br><a href='userinfo.php?uid=".$xoopsUser->getVar('uid')."' title=''>"._PM_PROFILE."</a>&nbsp;<span class='bold'>&raquo;</span>&nbsp;<a href='viewpmsg.php' title=''>"._PM_INBOX."</a>&nbsp;<span class='bold'>&raquo;</span>&nbsp;\n";
     if (empty($pm_arr)) {
-        echo '<br><br>' . _PM_YOUDONTHAVE;
+        echo '<br><br>'._PM_YOUDONTHAVE;
     } else {
         if (!$pm_handler->setRead($pm_arr[0])) {
             //echo "failed";
         }
-        echo $pm_arr[0]->getVar('subject') . "<br><form action='readpmsg.php' method='post' name='delete" . $pm_arr[0]->getVar('msg_id') . "'><table cellpadding='4' cellspacing='1' class='outer width100 bnone'><tr><th colspan='2'>" . _PM_FROM . "</th></tr><tr class='even'>\n";
+        echo $pm_arr[0]->getVar('subject')."<br><form action='readpmsg.php' method='post' name='delete".$pm_arr[0]->getVar('msg_id')."'><table cellpadding='4' cellspacing='1' class='outer width100 bnone'><tr><th colspan='2'>"._PM_FROM."</th></tr><tr class='even'>\n";
         $poster = new XoopsUser($pm_arr[0]->getVar('from_userid'));
         if (!$poster->isActive()) {
             $poster = false;
         }
         echo "<td valign='top'>";
         if ($poster != false) { // we need to do this for deleted users
-            echo "<a href='userinfo.php?uid=" . $poster->getVar('uid') . "' title=''>" . $poster->getVar('uname') . "</a><br>\n";
+            echo "<a href='userinfo.php?uid=".$poster->getVar('uid')."' title=''>".$poster->getVar('uname')."</a><br>\n";
             if ($poster->getVar('user_avatar') != '') {
-                echo "<img src='uploads/" . $poster->getVar('user_avatar') . "' alt='' /><br>\n";
+                echo "<img src='uploads/".$poster->getVar('user_avatar')."' alt='' /><br>\n";
             }
             if ($poster->getVar('user_from') != '') {
-                echo _PM_FROMC . '' . $poster->getVar('user_from') . "<br><br>\n";
+                echo _PM_FROMC.''.$poster->getVar('user_from')."<br><br>\n";
             }
             if ($poster->isOnline()) {
-                echo "<span class='red bold'>" . _PM_ONLINE . "</span><br><br>\n";
+                echo "<span class='red bold'>"._PM_ONLINE."</span><br><br>\n";
             }
         } else {
             echo $xoopsConfig['anonymous']; // we need to do this for deleted users
         }
         $iconName = htmlspecialchars($pm_arr[0]->getVar('msg_image', 'E'), ENT_QUOTES);
         if ($iconName != '') {
-            echo "</td><td><img src='images/subject/" . $iconName . "' alt='' />&nbsp;" . _PM_SENTC . '' . formatTimestamp($pm_arr[0]->getVar('msg_time'));
+            echo "</td><td><img src='images/subject/".$iconName."' alt='' />&nbsp;"._PM_SENTC.''.formatTimestamp($pm_arr[0]->getVar('msg_time'));
         } else {
-            echo '</td><td>' . _PM_SENTC . '' . formatTimestamp($pm_arr[0]->getVar('msg_time'));
+            echo '</td><td>'._PM_SENTC.''.formatTimestamp($pm_arr[0]->getVar('msg_time'));
         }
 
-        echo '<hr /><br><strong>' . $pm_arr[0]->getVar('subject') . "</strong><br><br>\n";
-        echo $pm_arr[0]->getVar('msg_text') . "<br><br></td></tr><tr class='foot'><td class='width20 txtleft' colspan='2'>";
+        echo '<hr /><br><strong>'.$pm_arr[0]->getVar('subject')."</strong><br><br>\n";
+        echo $pm_arr[0]->getVar('msg_text')."<br><br></td></tr><tr class='foot'><td class='width20 txtleft' colspan='2'>";
         // we don't want to reply to a deleted user!
         if ($poster != false) {
-            echo "<button type='button' class='btn btn-default' onclick='openWithSelfMain(\"" . XOOPS_URL . '/pmlite.php?reply=1&amp;msg_id=' . $pm_arr[0]->getVar('msg_id') . "\",\"pmlite\",565,500);' title='" . _PM_REPLY . "'><span class='fa fa-fw fa-reply'></span></button>\n";
+            echo "<button type='button' class='btn btn-default' onclick='openWithSelfMain(\"".XOOPS_URL.'/pmlite.php?reply=1&amp;msg_id='.$pm_arr[0]->getVar('msg_id')."\",\"pmlite\",565,500);' title='"._PM_REPLY."'><span class='fa fa-fw fa-reply'></span></button>\n";
         }
         echo "<input type='hidden' name='delete' value='1' />";
         echo $GLOBALS['xoopsSecurity']->getTokenHTML();
-        echo "<input type='hidden' name='msg_id' value='" . $pm_arr[0]->getVar('msg_id') . "' />";
-        echo "<button type='button' class='btn btn-default' onclick='document.delete" . $pm_arr[0]->getVar('msg_id') . ".submit();' title='" . _PM_DELETE . "'><span class='fa fa-fw fa-remove'></span></button>";
+        echo "<input type='hidden' name='msg_id' value='".$pm_arr[0]->getVar('msg_id')."' />";
+        echo "<button type='button' class='btn btn-default' onclick='document.delete".$pm_arr[0]->getVar('msg_id').".submit();' title='"._PM_DELETE."'><span class='fa fa-fw fa-remove'></span></button>";
         echo "</td></tr><tr><td class='txtright' colspan='2'>";
         $previous = $start - 1;
         $next     = $start + 1;
         if ($previous >= 0) {
-            echo "<a href='readpmsg.php?start=" . $previous . '&amp;total_messages=' . $total_messages . "' title=''>" . _PM_PREVIOUS . '</a> | ';
+            echo "<a href='readpmsg.php?start=".$previous.'&amp;total_messages='.$total_messages."' title=''>"._PM_PREVIOUS.'</a> | ';
         } else {
-            echo _PM_PREVIOUS . ' | ';
+            echo _PM_PREVIOUS.' | ';
         }
         if ($next < $total_messages) {
-            echo "<a href='readpmsg.php?start=" . $next . '&amp;total_messages=' . $total_messages . "' title=''>" . _PM_NEXT . '</a>';
+            echo "<a href='readpmsg.php?start=".$next.'&amp;total_messages='.$total_messages."' title=''>"._PM_NEXT.'</a>';
         } else {
             echo _PM_NEXT;
         }

htdocs/pda.php

Spacing +6 added lines, -6 removed lines

@@ -15,26 +15,26 @@
  * @since               2.0.0
  */
 
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 header('Content-Type: text/html');
-echo '<html><head><title>' . htmlspecialchars($xoopsConfig['sitename']) . "</title>
+echo '<html><head><title>'.htmlspecialchars($xoopsConfig['sitename'])."</title>
       <meta name='HandheldFriendly' content='True' />
       <meta name='PalmComputingPlatform' content='True' />
       </head>
       <body>";
 
-$sql    = 'SELECT storyid, title FROM ' . $xoopsDB->prefix('stories') . ' WHERE published>0 AND published<' . time() . ' ORDER BY published DESC';
+$sql    = 'SELECT storyid, title FROM '.$xoopsDB->prefix('stories').' WHERE published>0 AND published<'.time().' ORDER BY published DESC';
 $result = $xoopsDB->query($sql, 10, 0);
 //TODO Remove this hardcoded string
 if (!$result) {
     echo 'An error occured';
 } else {
-    echo "<img src='images/logo.gif' alt='" . htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES) . "' border='0' /><br>";
-    echo '<h2>' . htmlspecialchars($xoopsConfig['slogan']) . '</h2>';
+    echo "<img src='images/logo.gif' alt='".htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES)."' border='0' /><br>";
+    echo '<h2>'.htmlspecialchars($xoopsConfig['slogan']).'</h2>';
     echo '<div>';
     while (false !== (list($storyid, $title) = $xoopsDB->fetchRow($result))) {
-        echo "<a href='" . XOOPS_URL . "/modules/news/print.php?storyid=$storyid'>" . htmlspecialchars($title) . '</a><br>';
+        echo "<a href='".XOOPS_URL."/modules/news/print.php?storyid=$storyid'>".htmlspecialchars($title).'</a><br>';
     }
     echo '</div>';
 }

htdocs/search.php

Indentation +56 added lines, -56 removed lines

@@ -92,7 +92,7 @@ 
 if ($action === 'search') {
     include $GLOBALS['xoops']->path('header.php');
     include $GLOBALS['xoops']->path('include/searchform.php');
-	$xoopsTpl->assign('form', $search_form->render());
+    $xoopsTpl->assign('form', $search_form->render());
     include $GLOBALS['xoops']->path('footer.php');
     exit();
 }
@@ -139,28 +139,28 @@ 
         }
         $xoopsOption['xoops_pagetitle'] = _SR_SEARCHRESULTS . ': ' . implode(' ', $queries);
         include $GLOBALS['xoops']->path('header.php');
-		$xoopsTpl->assign('results', true);
+        $xoopsTpl->assign('results', true);
         $nomatch = true;
-		$keywords = '';
-		$error_length = '';
-		$error_keywords = '';
+        $keywords = '';
+        $error_length = '';
+        $error_keywords = '';
         if ($andor !== 'exact') {
             foreach ($queries as $q) {
-				$keywords .= htmlspecialchars(stripslashes($q)) . ' ';
+                $keywords .= htmlspecialchars(stripslashes($q)) . ' ';
             }
             if (!empty($ignored_queries)) {
-				$error_length = sprintf(_SR_IGNOREDWORDS, $xoopsConfigSearch['keyword_min']);
+                $error_length = sprintf(_SR_IGNOREDWORDS, $xoopsConfigSearch['keyword_min']);
                 foreach ($ignored_queries as $q) {
-					$error_keywords .= htmlspecialchars(stripslashes($q)) . ' ';
+                    $error_keywords .= htmlspecialchars(stripslashes($q)) . ' ';
                 }
             }
         } else {
-			$keywords .= '"' . htmlspecialchars(stripslashes($queries[0])) . '"';
+            $keywords .= '"' . htmlspecialchars(stripslashes($queries[0])) . '"';
         }
-		$xoopsTpl->assign('keywords', $keywords);
-		$xoopsTpl->assign('error_length', $error_length);
-		$xoopsTpl->assign('error_keywords', $error_keywords);
-		$results_arr = array();
+        $xoopsTpl->assign('keywords', $keywords);
+        $xoopsTpl->assign('error_length', $error_length);
+        $xoopsTpl->assign('error_keywords', $error_keywords);
+        $results_arr = array();
         foreach ($mids as $mid) {
             $mid = (int)$mid;			
             if (in_array($mid, $available_modules)) {
@@ -169,57 +169,57 @@ 
                 $count   = count($results);
                 if (is_array($results) && $count > 0) {
                     $nomatch = false;
-					$module_name = $module->getVar('name');					
+                    $module_name = $module->getVar('name');					
                     for ($i = 0; $i < $count; ++$i) {
                         if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
-							$results_arr[$i]['image_link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['image'];
+                            $results_arr[$i]['image_link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['image'];
                         } else {
-							$results_arr[$i]['image_link'] = 'images/icons/posticon2.gif';							
+                            $results_arr[$i]['image_link'] = 'images/icons/posticon2.gif';							
                         }
-						$results_arr[$i]['image_title'] = $module->getVar('name');
+                        $results_arr[$i]['image_title'] = $module->getVar('name');
                         if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
                             $results[$i]['link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['link']; 
                         }
-						$results_arr[$i]['link'] = $results[$i]['link'];
-						$results_arr[$i]['link_title'] = $myts->htmlspecialchars($results[$i]['title']);
+                        $results_arr[$i]['link'] = $results[$i]['link'];
+                        $results_arr[$i]['link_title'] = $myts->htmlspecialchars($results[$i]['title']);
 						
                         $results[$i]['uid'] = @(int)$results[$i]['uid'];
                         if (!empty($results[$i]['uid'])) {
                             $uname = XoopsUser::getUnameFromId($results[$i]['uid']);
-							$results_arr[$i]['uname'] = $uname;
-							$results_arr[$i]['uname_link'] = XOOPS_URL . '/userinfo.php?uid=' . $results[$i]['uid'];
+                            $results_arr[$i]['uname'] = $uname;
+                            $results_arr[$i]['uname_link'] = XOOPS_URL . '/userinfo.php?uid=' . $results[$i]['uid'];
+                        }
+                        if (!empty($results[$i]['time'])){
+                            $results_arr[$i]['time'] = formatTimestamp((int)$results[$i]['time']);
                         }
-						if (!empty($results[$i]['time'])){
-							$results_arr[$i]['time'] = formatTimestamp((int)$results[$i]['time']);
-						}
                     }
                     if ($count >= 5) {
                         $search_url = XOOPS_URL . '/search.php?query=' . urlencode(stripslashes(implode(' ', $queries)));
                         $search_url .= "&mid={$mid}&action=showall&andor={$andor}";
-						$search_arr['module_show_all'] = htmlspecialchars($search_url);
+                        $search_arr['module_show_all'] = htmlspecialchars($search_url);
                     }
-					$search_arr['module_name'] = $module_name;
-					$search_arr['module_data'] = $results_arr;
-					$xoopsTpl->append_by_ref('search', $search_arr);
-					unset($results_arr, $search_arr);
+                    $search_arr['module_name'] = $module_name;
+                    $search_arr['module_data'] = $results_arr;
+                    $xoopsTpl->append_by_ref('search', $search_arr);
+                    unset($results_arr, $search_arr);
                 }
             }			
             unset($results, $module, $module_name);
         }
 		
         if ($nomatch) {
-			$xoopsTpl->assign('nomatch', _SR_NOMATCH);
+            $xoopsTpl->assign('nomatch', _SR_NOMATCH);
         }
         include $GLOBALS['xoops']->path('include/searchform.php');
-		$xoopsTpl->assign('form', $search_form->render());
+        $xoopsTpl->assign('form', $search_form->render());
         break;
 
     case 'showall':
     case 'showallbyuser':
         include $GLOBALS['xoops']->path('header.php');
-		$xoopsTpl->assign('showallbyuser', true);
+        $xoopsTpl->assign('showallbyuser', true);
     /* @var $module_handler XoopsModuleHandler  */
-		$module_handler = xoops_getHandler('module');
+        $module_handler = xoops_getHandler('module');
         $module         = $module_handler->get($mid);
         $results        = $module->search($queries, $andor, 20, $start, $uid);
         $count          = count($results);
@@ -231,43 +231,43 @@ 
                 $has_next = true;
             }
             if ($action === 'showall') {
-				$xoopsTpl->assign('showall', true);
-				$keywords = '';
+                $xoopsTpl->assign('showall', true);
+                $keywords = '';
                 if ($andor !== 'exact') {
                     foreach ($queries as $q) {
-						$keywords .= htmlspecialchars(stripslashes($q));
+                        $keywords .= htmlspecialchars(stripslashes($q));
                     }
                 } else {
-					$keywords .= htmlspecialchars(stripslashes($queries[0]));
+                    $keywords .= htmlspecialchars(stripslashes($queries[0]));
                 }
-				$xoopsTpl->assign('keywords', $keywords);
+                $xoopsTpl->assign('keywords', $keywords);
             }
-			$xoopsTpl->assign('showing', sprintf(_SR_SHOWING, $start + 1, $start + $count));
-			$xoopsTpl->assign('module_name', $module->getVar('name'));
-			$results_arr = array();
+            $xoopsTpl->assign('showing', sprintf(_SR_SHOWING, $start + 1, $start + $count));
+            $xoopsTpl->assign('module_name', $module->getVar('name'));
+            $results_arr = array();
             for ($i = 0; $i < $count; ++$i) {
                 if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
-					$results_arr['image_link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['image'];
+                    $results_arr['image_link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['image'];
                 } else {
-					$results_arr['image_link'] = 'images/icons/posticon2.gif';
+                    $results_arr['image_link'] = 'images/icons/posticon2.gif';
                 }
-				$results_arr['image_title'] = $module->getVar('name');
+                $results_arr['image_title'] = $module->getVar('name');
                 if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
                     $results[$i]['link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['link'];
                 }
-				$results_arr['link'] = $results[$i]['link'];
-				$results_arr['link_title'] = $myts->htmlspecialchars($results[$i]['title']);
+                $results_arr['link'] = $results[$i]['link'];
+                $results_arr['link_title'] = $myts->htmlspecialchars($results[$i]['title']);
                 $results['uid'] = @(int)$results[$i]['uid'];
                 if (!empty($results[$i]['uid'])) {
                     $uname = XoopsUser::getUnameFromId($results[$i]['uid']);
-					$results_arr['uname'] = $uname;
-					$results_arr['uname_link'] = XOOPS_URL . '/userinfo.php?uid=' . $results[$i]['uid'];
+                    $results_arr['uname'] = $uname;
+                    $results_arr['uname_link'] = XOOPS_URL . '/userinfo.php?uid=' . $results[$i]['uid'];
+                }
+                if (!empty($results[$i]['time'])){
+                    $results_arr['time'] = formatTimestamp((int)$results[$i]['time']);
                 }
-				if (!empty($results[$i]['time'])){
-					$results_arr['time'] = formatTimestamp((int)$results[$i]['time']);
-				}
-				$xoopsTpl->append_by_ref('results_arr', $results_arr);
-				unset($results_arr);
+                $xoopsTpl->append_by_ref('results_arr', $results_arr);
+                unset($results_arr);
             }
             $search_url = XOOPS_URL . '/search.php?query=' . urlencode(stripslashes(implode(' ', $queries)));
             $search_url .= "&mid={$mid}&action={$action}&andor={$andor}";
@@ -277,15 +277,15 @@ 
             if ($start > 0) {
                 $prev = $start - 20;				
                 $search_url_prev = $search_url . "&start={$prev}";
-				$xoopsTpl->assign('previous', htmlspecialchars($search_url_prev));
+                $xoopsTpl->assign('previous', htmlspecialchars($search_url_prev));
             }
             if (false !== $has_next) {
                 $next            = $start + 20;
                 $search_url_next = $search_url . "&start={$next}";
-				$xoopsTpl->assign('next', htmlspecialchars($search_url_next));
+                $xoopsTpl->assign('next', htmlspecialchars($search_url_next));
             }
         } else {
-			$xoopsTpl->assign('nomatch', true);
+            $xoopsTpl->assign('nomatch', true);
         }
         include $GLOBALS['xoops']->path('include/searchform.php');
         $search_form->display();

Switch Indentation +151 added lines, -151 removed lines

@@ -125,170 +125,170 @@
     }
 }
 switch ($action) {
-    case 'results':
-        /* @var $module_handler XoopsModuleHandler  */
-        $module_handler = xoops_getHandler('module');
-        $criteria       = new CriteriaCompo(new Criteria('hassearch', 1));
-        $criteria->add(new Criteria('isactive', 1));
-        $criteria->add(new Criteria('mid', '(' . implode(',', $available_modules) . ')', 'IN'));
-        $modules = $module_handler->getObjects($criteria, true);
-        $mids    = isset($_REQUEST['mids']) ? $_REQUEST['mids'] : array();
-        if (empty($mids) || !is_array($mids)) {
-            unset($mids);
-            $mids = array_keys($modules);
-        }
-        $xoopsOption['xoops_pagetitle'] = _SR_SEARCHRESULTS . ': ' . implode(' ', $queries);
-        include $GLOBALS['xoops']->path('header.php');
-		$xoopsTpl->assign('results', true);
-        $nomatch = true;
-		$keywords = '';
-		$error_length = '';
-		$error_keywords = '';
-        if ($andor !== 'exact') {
-            foreach ($queries as $q) {
-				$keywords .= htmlspecialchars(stripslashes($q)) . ' ';
+        case 'results':
+            /* @var $module_handler XoopsModuleHandler  */
+            $module_handler = xoops_getHandler('module');
+            $criteria       = new CriteriaCompo(new Criteria('hassearch', 1));
+            $criteria->add(new Criteria('isactive', 1));
+            $criteria->add(new Criteria('mid', '(' . implode(',', $available_modules) . ')', 'IN'));
+            $modules = $module_handler->getObjects($criteria, true);
+            $mids    = isset($_REQUEST['mids']) ? $_REQUEST['mids'] : array();
+            if (empty($mids) || !is_array($mids)) {
+                unset($mids);
+                $mids = array_keys($modules);
             }
-            if (!empty($ignored_queries)) {
-				$error_length = sprintf(_SR_IGNOREDWORDS, $xoopsConfigSearch['keyword_min']);
-                foreach ($ignored_queries as $q) {
-					$error_keywords .= htmlspecialchars(stripslashes($q)) . ' ';
+            $xoopsOption['xoops_pagetitle'] = _SR_SEARCHRESULTS . ': ' . implode(' ', $queries);
+            include $GLOBALS['xoops']->path('header.php');
+		    $xoopsTpl->assign('results', true);
+            $nomatch = true;
+		    $keywords = '';
+		    $error_length = '';
+		    $error_keywords = '';
+            if ($andor !== 'exact') {
+                foreach ($queries as $q) {
+				    $keywords .= htmlspecialchars(stripslashes($q)) . ' ';
+                }
+                if (!empty($ignored_queries)) {
+				    $error_length = sprintf(_SR_IGNOREDWORDS, $xoopsConfigSearch['keyword_min']);
+                    foreach ($ignored_queries as $q) {
+					    $error_keywords .= htmlspecialchars(stripslashes($q)) . ' ';
+                    }
                 }
+            } else {
+			    $keywords .= '"' . htmlspecialchars(stripslashes($queries[0])) . '"';
             }
-        } else {
-			$keywords .= '"' . htmlspecialchars(stripslashes($queries[0])) . '"';
-        }
-		$xoopsTpl->assign('keywords', $keywords);
-		$xoopsTpl->assign('error_length', $error_length);
-		$xoopsTpl->assign('error_keywords', $error_keywords);
-		$results_arr = array();
-        foreach ($mids as $mid) {
-            $mid = (int)$mid;			
-            if (in_array($mid, $available_modules)) {
-                $module  = $modules[$mid];
-                $results = $module->search($queries, $andor, 5, 0);
-                $count   = count($results);
-                if (is_array($results) && $count > 0) {
-                    $nomatch = false;
-					$module_name = $module->getVar('name');					
-                    for ($i = 0; $i < $count; ++$i) {
-                        if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
-							$results_arr[$i]['image_link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['image'];
-                        } else {
-							$results_arr[$i]['image_link'] = 'images/icons/posticon2.gif';							
-                        }
-						$results_arr[$i]['image_title'] = $module->getVar('name');
-                        if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
-                            $results[$i]['link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['link']; 
-                        }
-						$results_arr[$i]['link'] = $results[$i]['link'];
-						$results_arr[$i]['link_title'] = $myts->htmlspecialchars($results[$i]['title']);
+		    $xoopsTpl->assign('keywords', $keywords);
+		    $xoopsTpl->assign('error_length', $error_length);
+		    $xoopsTpl->assign('error_keywords', $error_keywords);
+		    $results_arr = array();
+            foreach ($mids as $mid) {
+                $mid = (int)$mid;			
+                if (in_array($mid, $available_modules)) {
+                    $module  = $modules[$mid];
+                    $results = $module->search($queries, $andor, 5, 0);
+                    $count   = count($results);
+                    if (is_array($results) && $count > 0) {
+                        $nomatch = false;
+					    $module_name = $module->getVar('name');					
+                        for ($i = 0; $i < $count; ++$i) {
+                            if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
+							    $results_arr[$i]['image_link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['image'];
+                            } else {
+							    $results_arr[$i]['image_link'] = 'images/icons/posticon2.gif';							
+                            }
+						    $results_arr[$i]['image_title'] = $module->getVar('name');
+                            if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
+                                $results[$i]['link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['link']; 
+                            }
+						    $results_arr[$i]['link'] = $results[$i]['link'];
+						    $results_arr[$i]['link_title'] = $myts->htmlspecialchars($results[$i]['title']);
 						
-                        $results[$i]['uid'] = @(int)$results[$i]['uid'];
-                        if (!empty($results[$i]['uid'])) {
-                            $uname = XoopsUser::getUnameFromId($results[$i]['uid']);
-							$results_arr[$i]['uname'] = $uname;
-							$results_arr[$i]['uname_link'] = XOOPS_URL . '/userinfo.php?uid=' . $results[$i]['uid'];
+                            $results[$i]['uid'] = @(int)$results[$i]['uid'];
+                            if (!empty($results[$i]['uid'])) {
+                                $uname = XoopsUser::getUnameFromId($results[$i]['uid']);
+							    $results_arr[$i]['uname'] = $uname;
+							    $results_arr[$i]['uname_link'] = XOOPS_URL . '/userinfo.php?uid=' . $results[$i]['uid'];
+                            }
+						    if (!empty($results[$i]['time'])){
+							    $results_arr[$i]['time'] = formatTimestamp((int)$results[$i]['time']);
+						    }
                         }
-						if (!empty($results[$i]['time'])){
-							$results_arr[$i]['time'] = formatTimestamp((int)$results[$i]['time']);
-						}
-                    }
-                    if ($count >= 5) {
-                        $search_url = XOOPS_URL . '/search.php?query=' . urlencode(stripslashes(implode(' ', $queries)));
-                        $search_url .= "&mid={$mid}&action=showall&andor={$andor}";
-						$search_arr['module_show_all'] = htmlspecialchars($search_url);
+                        if ($count >= 5) {
+                            $search_url = XOOPS_URL . '/search.php?query=' . urlencode(stripslashes(implode(' ', $queries)));
+                            $search_url .= "&mid={$mid}&action=showall&andor={$andor}";
+						    $search_arr['module_show_all'] = htmlspecialchars($search_url);
+                        }
+					    $search_arr['module_name'] = $module_name;
+					    $search_arr['module_data'] = $results_arr;
+					    $xoopsTpl->append_by_ref('search', $search_arr);
+					    unset($results_arr, $search_arr);
                     }
-					$search_arr['module_name'] = $module_name;
-					$search_arr['module_data'] = $results_arr;
-					$xoopsTpl->append_by_ref('search', $search_arr);
-					unset($results_arr, $search_arr);
-                }
-            }			
-            unset($results, $module, $module_name);
-        }
+                }			
+                unset($results, $module, $module_name);
+            }
 		
-        if ($nomatch) {
-			$xoopsTpl->assign('nomatch', _SR_NOMATCH);
-        }
-        include $GLOBALS['xoops']->path('include/searchform.php');
-		$xoopsTpl->assign('form', $search_form->render());
-        break;
-
-    case 'showall':
-    case 'showallbyuser':
-        include $GLOBALS['xoops']->path('header.php');
-		$xoopsTpl->assign('showallbyuser', true);
-    /* @var $module_handler XoopsModuleHandler  */
-		$module_handler = xoops_getHandler('module');
-        $module         = $module_handler->get($mid);
-        $results        = $module->search($queries, $andor, 20, $start, $uid);
-        $count          = count($results);
-        if (is_array($results) && $count > 0) {
-            $next_results = $module->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;
+            if ($nomatch) {
+			    $xoopsTpl->assign('nomatch', _SR_NOMATCH);
             }
-            if ($action === 'showall') {
-				$xoopsTpl->assign('showall', true);
-				$keywords = '';
-                if ($andor !== 'exact') {
-                    foreach ($queries as $q) {
-						$keywords .= htmlspecialchars(stripslashes($q));
+            include $GLOBALS['xoops']->path('include/searchform.php');
+		    $xoopsTpl->assign('form', $search_form->render());
+            break;
+
+        case 'showall':
+        case 'showallbyuser':
+            include $GLOBALS['xoops']->path('header.php');
+		    $xoopsTpl->assign('showallbyuser', true);
+        /* @var $module_handler XoopsModuleHandler  */
+		    $module_handler = xoops_getHandler('module');
+            $module         = $module_handler->get($mid);
+            $results        = $module->search($queries, $andor, 20, $start, $uid);
+            $count          = count($results);
+            if (is_array($results) && $count > 0) {
+                $next_results = $module->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;
+                }
+                if ($action === 'showall') {
+				    $xoopsTpl->assign('showall', true);
+				    $keywords = '';
+                    if ($andor !== 'exact') {
+                        foreach ($queries as $q) {
+						    $keywords .= htmlspecialchars(stripslashes($q));
+                        }
+                    } else {
+					    $keywords .= htmlspecialchars(stripslashes($queries[0]));
                     }
-                } else {
-					$keywords .= htmlspecialchars(stripslashes($queries[0]));
+				    $xoopsTpl->assign('keywords', $keywords);
                 }
-				$xoopsTpl->assign('keywords', $keywords);
-            }
-			$xoopsTpl->assign('showing', sprintf(_SR_SHOWING, $start + 1, $start + $count));
-			$xoopsTpl->assign('module_name', $module->getVar('name'));
-			$results_arr = array();
-            for ($i = 0; $i < $count; ++$i) {
-                if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
-					$results_arr['image_link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['image'];
-                } else {
-					$results_arr['image_link'] = 'images/icons/posticon2.gif';
+			    $xoopsTpl->assign('showing', sprintf(_SR_SHOWING, $start + 1, $start + $count));
+			    $xoopsTpl->assign('module_name', $module->getVar('name'));
+			    $results_arr = array();
+                for ($i = 0; $i < $count; ++$i) {
+                    if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
+					    $results_arr['image_link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['image'];
+                    } else {
+					    $results_arr['image_link'] = 'images/icons/posticon2.gif';
+                    }
+				    $results_arr['image_title'] = $module->getVar('name');
+                    if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
+                        $results[$i]['link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['link'];
+                    }
+				    $results_arr['link'] = $results[$i]['link'];
+				    $results_arr['link_title'] = $myts->htmlspecialchars($results[$i]['title']);
+                    $results['uid'] = @(int)$results[$i]['uid'];
+                    if (!empty($results[$i]['uid'])) {
+                        $uname = XoopsUser::getUnameFromId($results[$i]['uid']);
+					    $results_arr['uname'] = $uname;
+					    $results_arr['uname_link'] = XOOPS_URL . '/userinfo.php?uid=' . $results[$i]['uid'];
+                    }
+				    if (!empty($results[$i]['time'])){
+					    $results_arr['time'] = formatTimestamp((int)$results[$i]['time']);
+				    }
+				    $xoopsTpl->append_by_ref('results_arr', $results_arr);
+				    unset($results_arr);
                 }
-				$results_arr['image_title'] = $module->getVar('name');
-                if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
-                    $results[$i]['link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['link'];
+                $search_url = XOOPS_URL . '/search.php?query=' . urlencode(stripslashes(implode(' ', $queries)));
+                $search_url .= "&mid={$mid}&action={$action}&andor={$andor}";
+                if ($action === 'showallbyuser') {
+                    $search_url .= "&uid={$uid}";
                 }
-				$results_arr['link'] = $results[$i]['link'];
-				$results_arr['link_title'] = $myts->htmlspecialchars($results[$i]['title']);
-                $results['uid'] = @(int)$results[$i]['uid'];
-                if (!empty($results[$i]['uid'])) {
-                    $uname = XoopsUser::getUnameFromId($results[$i]['uid']);
-					$results_arr['uname'] = $uname;
-					$results_arr['uname_link'] = XOOPS_URL . '/userinfo.php?uid=' . $results[$i]['uid'];
+                if ($start > 0) {
+                    $prev = $start - 20;				
+                    $search_url_prev = $search_url . "&start={$prev}";
+				    $xoopsTpl->assign('previous', htmlspecialchars($search_url_prev));
                 }
-				if (!empty($results[$i]['time'])){
-					$results_arr['time'] = formatTimestamp((int)$results[$i]['time']);
-				}
-				$xoopsTpl->append_by_ref('results_arr', $results_arr);
-				unset($results_arr);
-            }
-            $search_url = XOOPS_URL . '/search.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}";
-				$xoopsTpl->assign('previous', htmlspecialchars($search_url_prev));
-            }
-            if (false !== $has_next) {
-                $next            = $start + 20;
-                $search_url_next = $search_url . "&start={$next}";
-				$xoopsTpl->assign('next', htmlspecialchars($search_url_next));
+                if (false !== $has_next) {
+                    $next            = $start + 20;
+                    $search_url_next = $search_url . "&start={$next}";
+				    $xoopsTpl->assign('next', htmlspecialchars($search_url_next));
+                }
+            } else {
+			    $xoopsTpl->assign('nomatch', true);
             }
-        } else {
-			$xoopsTpl->assign('nomatch', true);
-        }
-        include $GLOBALS['xoops']->path('include/searchform.php');
-        $search_form->display();
-        break;
+            include $GLOBALS['xoops']->path('include/searchform.php');
+            $search_form->display();
+            break;
 }
 include $GLOBALS['xoops']->path('footer.php');

Spacing +19 added lines, -19 removed lines

@@ -23,7 +23,7 @@ 
  * @author              Taiwen Jiang <phppp@users.sourceforge.net>
  * @todo                Modularize; Both search algorithms and interface will be redesigned
  */
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 
 xoops_loadLanguage('search');
 /* @var $config_handler XoopsConfigHandler  */
@@ -31,7 +31,7 @@ 
 $xoopsConfigSearch = $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH);
 
 if ($xoopsConfigSearch['enable_search'] != 1) {
-    header('Location: ' . XOOPS_URL . '/index.php');
+    header('Location: '.XOOPS_URL.'/index.php');
     exit();
 }
 $action = 'search';
@@ -130,14 +130,14 @@ 
         $module_handler = xoops_getHandler('module');
         $criteria       = new CriteriaCompo(new Criteria('hassearch', 1));
         $criteria->add(new Criteria('isactive', 1));
-        $criteria->add(new Criteria('mid', '(' . implode(',', $available_modules) . ')', 'IN'));
+        $criteria->add(new Criteria('mid', '('.implode(',', $available_modules).')', 'IN'));
         $modules = $module_handler->getObjects($criteria, true);
         $mids    = isset($_REQUEST['mids']) ? $_REQUEST['mids'] : array();
         if (empty($mids) || !is_array($mids)) {
             unset($mids);
             $mids = array_keys($modules);
         }
-        $xoopsOption['xoops_pagetitle'] = _SR_SEARCHRESULTS . ': ' . implode(' ', $queries);
+        $xoopsOption['xoops_pagetitle'] = _SR_SEARCHRESULTS.': '.implode(' ', $queries);
         include $GLOBALS['xoops']->path('header.php');
 		$xoopsTpl->assign('results', true);
         $nomatch = true;
@@ -146,16 +146,16 @@ 
 		$error_keywords = '';
         if ($andor !== 'exact') {
             foreach ($queries as $q) {
-				$keywords .= htmlspecialchars(stripslashes($q)) . ' ';
+				$keywords .= htmlspecialchars(stripslashes($q)).' ';
             }
             if (!empty($ignored_queries)) {
 				$error_length = sprintf(_SR_IGNOREDWORDS, $xoopsConfigSearch['keyword_min']);
                 foreach ($ignored_queries as $q) {
-					$error_keywords .= htmlspecialchars(stripslashes($q)) . ' ';
+					$error_keywords .= htmlspecialchars(stripslashes($q)).' ';
                 }
             }
         } else {
-			$keywords .= '"' . htmlspecialchars(stripslashes($queries[0])) . '"';
+			$keywords .= '"'.htmlspecialchars(stripslashes($queries[0])).'"';
         }
 		$xoopsTpl->assign('keywords', $keywords);
 		$xoopsTpl->assign('error_length', $error_length);
@@ -172,13 +172,13 @@ 
 					$module_name = $module->getVar('name');					
                     for ($i = 0; $i < $count; ++$i) {
                         if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
-							$results_arr[$i]['image_link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['image'];
+							$results_arr[$i]['image_link'] = 'modules/'.$module->getVar('dirname').'/'.$results[$i]['image'];
                         } else {
 							$results_arr[$i]['image_link'] = 'images/icons/posticon2.gif';							
                         }
 						$results_arr[$i]['image_title'] = $module->getVar('name');
                         if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
-                            $results[$i]['link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['link']; 
+                            $results[$i]['link'] = 'modules/'.$module->getVar('dirname').'/'.$results[$i]['link']; 
                         }
 						$results_arr[$i]['link'] = $results[$i]['link'];
 						$results_arr[$i]['link_title'] = $myts->htmlspecialchars($results[$i]['title']);
@@ -187,14 +187,14 @@ 
                         if (!empty($results[$i]['uid'])) {
                             $uname = XoopsUser::getUnameFromId($results[$i]['uid']);
 							$results_arr[$i]['uname'] = $uname;
-							$results_arr[$i]['uname_link'] = XOOPS_URL . '/userinfo.php?uid=' . $results[$i]['uid'];
+							$results_arr[$i]['uname_link'] = XOOPS_URL.'/userinfo.php?uid='.$results[$i]['uid'];
                         }
-						if (!empty($results[$i]['time'])){
+						if (!empty($results[$i]['time'])) {
 							$results_arr[$i]['time'] = formatTimestamp((int)$results[$i]['time']);
 						}
                     }
                     if ($count >= 5) {
-                        $search_url = XOOPS_URL . '/search.php?query=' . urlencode(stripslashes(implode(' ', $queries)));
+                        $search_url = XOOPS_URL.'/search.php?query='.urlencode(stripslashes(implode(' ', $queries)));
                         $search_url .= "&mid={$mid}&action=showall&andor={$andor}";
 						$search_arr['module_show_all'] = htmlspecialchars($search_url);
                     }
@@ -247,13 +247,13 @@ 
 			$results_arr = array();
             for ($i = 0; $i < $count; ++$i) {
                 if (isset($results[$i]['image']) && $results[$i]['image'] != '') {
-					$results_arr['image_link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['image'];
+					$results_arr['image_link'] = 'modules/'.$module->getVar('dirname').'/'.$results[$i]['image'];
                 } else {
 					$results_arr['image_link'] = 'images/icons/posticon2.gif';
                 }
 				$results_arr['image_title'] = $module->getVar('name');
                 if (!preg_match("/^http[s]*:\/\//i", $results[$i]['link'])) {
-                    $results[$i]['link'] = 'modules/' . $module->getVar('dirname') . '/' . $results[$i]['link'];
+                    $results[$i]['link'] = 'modules/'.$module->getVar('dirname').'/'.$results[$i]['link'];
                 }
 				$results_arr['link'] = $results[$i]['link'];
 				$results_arr['link_title'] = $myts->htmlspecialchars($results[$i]['title']);
@@ -261,27 +261,27 @@ 
                 if (!empty($results[$i]['uid'])) {
                     $uname = XoopsUser::getUnameFromId($results[$i]['uid']);
 					$results_arr['uname'] = $uname;
-					$results_arr['uname_link'] = XOOPS_URL . '/userinfo.php?uid=' . $results[$i]['uid'];
+					$results_arr['uname_link'] = XOOPS_URL.'/userinfo.php?uid='.$results[$i]['uid'];
                 }
-				if (!empty($results[$i]['time'])){
+				if (!empty($results[$i]['time'])) {
 					$results_arr['time'] = formatTimestamp((int)$results[$i]['time']);
 				}
 				$xoopsTpl->append_by_ref('results_arr', $results_arr);
 				unset($results_arr);
             }
-            $search_url = XOOPS_URL . '/search.php?query=' . urlencode(stripslashes(implode(' ', $queries)));
+            $search_url = XOOPS_URL.'/search.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}";
 				$xoopsTpl->assign('previous', 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}";
 				$xoopsTpl->assign('next', htmlspecialchars($search_url_next));
             }
         } else {

htdocs/user.php

Spacing +7 added lines, -7 removed lines

@@ -21,7 +21,7 @@ 
  * @since               2.0.0
  * @author              Kazumi Ono <webmaster@myweb.ne.jp>
  */
-include __DIR__ . '/mainfile.php';
+include __DIR__.'/mainfile.php';
 $xoopsPreload = XoopsPreload::getInstance();
 $xoopsPreload->triggerEvent('core.user.start');
 
@@ -61,8 +61,8 @@ 
         $GLOBALS['xoopsOption']['template_main'] = 'system_userform.tpl';
         include $GLOBALS['xoops']->path('header.php');
         $xoopsTpl->assign('xoops_pagetitle', _LOGIN);
-        $xoTheme->addMeta('meta', 'keywords', _USERNAME . ', ' . _US_PASSWORD . ', ' . _US_LOSTPASSWORD);
-        $xoTheme->addMeta('meta', 'description', _US_LOSTPASSWORD . ' ' . _US_NOPROBLEM);
+        $xoTheme->addMeta('meta', 'keywords', _USERNAME.', '._US_PASSWORD.', '._US_LOSTPASSWORD);
+        $xoTheme->addMeta('meta', 'description', _US_LOSTPASSWORD.' '._US_NOPROBLEM);
         $xoopsTpl->assign('lang_login', _LOGIN);
         $xoopsTpl->assign('lang_username', _USERNAME);
         if (!empty($clean_redirect)) {
@@ -91,11 +91,11 @@ 
             }
         }
         if (!$isExternal) {
-            header('Location: ' . $redirect);
+            header('Location: '.$redirect);
             exit();
         }
     }
-    header('Location: ' . XOOPS_URL . '/userinfo.php?uid=' . $xoopsUser->getVar('uid'));
+    header('Location: '.XOOPS_URL.'/userinfo.php?uid='.$xoopsUser->getVar('uid'));
     exit();
 }
 
@@ -113,7 +113,7 @@ 
         $online_handler->destroy($xoopsUser->getVar('uid'));
     }
     $xoopsPreload->triggerEvent('core.behavior.user.logout');
-    $message = _US_LOGGEDOUT . '<br>' . _US_THANKYOUFORVISIT;
+    $message = _US_LOGGEDOUT.'<br>'._US_THANKYOUFORVISIT;
     redirect_header('index.php', 1, $message);
 }
 
@@ -138,7 +138,7 @@ 
         }
         if (!$clean_ok) {
             include $GLOBALS['xoops']->path('header.php');
-            xoops_confirm(array('op' => 'delete', 'ok' => 1), 'user.php', _US_SURETODEL . '<br>' . _US_REMOVEINFO);
+            xoops_confirm(array('op' => 'delete', 'ok' => 1), 'user.php', _US_SURETODEL.'<br>'._US_REMOVEINFO);
             include $GLOBALS['xoops']->path('footer.php');
         } else {
             $del_uid        = $xoopsUser->getVar('uid');

htdocs/modules/pm/readpmsg.php

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
  * @author              Taiwen Jiang <phppp@users.sourceforge.net>
  */
 
-include_once dirname(dirname(__DIR__)) . '/mainfile.php';
+include_once dirname(dirname(__DIR__)).'/mainfile.php';
 
 if (!is_object($GLOBALS['xoopsUser'])) {
     redirect_header(XOOPS_URL, 3, _NOPERM);
@@ -32,7 +32,7 @@ 
 }
 
 if (is_object($pm) && ($pm->getVar('from_userid') != $GLOBALS['xoopsUser']->getVar('uid')) && ($pm->getVar('to_userid') != $GLOBALS['xoopsUser']->getVar('uid'))) {
-    redirect_header(XOOPS_URL . '/modules/' . $GLOBALS['xoopsModule']->getVar('dirname', 'n') . '/index.php', 2, _NOPERM);
+    redirect_header(XOOPS_URL.'/modules/'.$GLOBALS['xoopsModule']->getVar('dirname', 'n').'/index.php', 2, _NOPERM);
 }
 
 if (is_object($pm) && !empty($_POST['action'])) {
@@ -91,7 +91,7 @@ 
         }
     }
     $res_message = isset($res_message) ? $res_message : ($res ? _PM_ACTION_DONE : _PM_ACTION_ERROR);
-    redirect_header('viewpmsg.php?op=' . htmlspecialchars($_REQUEST['op']), 2, $res_message);
+    redirect_header('viewpmsg.php?op='.htmlspecialchars($_REQUEST['op']), 2, $res_message);
 }
 $start                        = !empty($_GET['start']) ? (int)$_GET['start'] : 0;
 $total_messages               = !empty($_GET['total_messages']) ? (int)$_GET['total_messages'] : 0;
@@ -131,7 +131,7 @@ 
 if (is_object($pm) && !empty($pm)) {
     if ($pm->getVar('from_userid') != $GLOBALS['xoopsUser']->getVar('uid')) {
         $reply_button = new XoopsFormButton('', 'send', _PM_REPLY);
-        $reply_button->setExtra("onclick='javascript:openWithSelfMain(\"" . XOOPS_URL . '/modules/pm/pmlite.php?reply=1&msg_id=' . $pm->getVar('msg_id') . "\", \"pmlite\", 565,500);'");
+        $reply_button->setExtra("onclick='javascript:openWithSelfMain(\"".XOOPS_URL.'/modules/pm/pmlite.php?reply=1&msg_id='.$pm->getVar('msg_id')."\", \"pmlite\", 565,500);'");
         $pmform->addElement($reply_button);
     }
     $pmform->addElement(new XoopsFormButton('', 'delete_message', _PM_DELETE, 'submit'));

htdocs/modules/pm/preloads/core.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
      */
     public static function eventCorePmliteStart($args)
     {
-        header('location: ./modules/pm/pmlite.php' . (empty($_SERVER['QUERY_STRING']) ? '' : '?' . $_SERVER['QUERY_STRING']));
+        header('location: ./modules/pm/pmlite.php'.(empty($_SERVER['QUERY_STRING']) ? '' : '?'.$_SERVER['QUERY_STRING']));
         exit();
     }
 
@@ -41,7 +41,7 @@ 
      */
     public static function eventCoreReadpmsgStart($args)
     {
-        header('location: ./modules/pm/readpmsg.php' . (empty($_SERVER['QUERY_STRING']) ? '' : '?' . $_SERVER['QUERY_STRING']));
+        header('location: ./modules/pm/readpmsg.php'.(empty($_SERVER['QUERY_STRING']) ? '' : '?'.$_SERVER['QUERY_STRING']));
         exit();
     }
 
@@ -50,7 +50,7 @@ 
      */
     public static function eventCoreViewpmsgStart($args)
     {
-        header('location: ./modules/pm/viewpmsg.php' . (empty($_SERVER['QUERY_STRING']) ? '' : '?' . $_SERVER['QUERY_STRING']));
+        header('location: ./modules/pm/viewpmsg.php'.(empty($_SERVER['QUERY_STRING']) ? '' : '?'.$_SERVER['QUERY_STRING']));
         exit();
     }
 

htdocs/modules/pm/language/english/main.php

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 define('_PM_MAILNOTIFY', "%s-You've got a new PM from %s");
 define('_PM_MAILMESSAGE', "Hello!\nA New PM has arrived from %s\n\nTitle of PM is\n%s\n\nYou can view the PM here\n%s\n\n-----------\nYou are receiving this message because you selected to be notified when you receive a new PM\n\nYou can change your PM-Config\n%s\n\nPlease do not reply to this message\n\n---------\nBest Regards\n%s\n%s\n%s");
 define('_PM_EMAIL', 'Forward to email');
-define('_PM_EMAIL_DESC', 'Dear %s, this is a message transfered from your account at ' . $GLOBALS['xoopsConfig']['sitename']);
+define('_PM_EMAIL_DESC', 'Dear %s, this is a message transfered from your account at '.$GLOBALS['xoopsConfig']['sitename']);
 define('_PM_EMAIL_FROM', 'From %s');
 define('_PM_EMAIL_TO', 'To %s');
 define('_PM_EMAIL_SUBJECT', '[message]%s');

htdocs/modules/pm/include/install.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
     global $xoopsDB;
 
     // Check pm table version
-    $sql = 'SHOW COLUMNS FROM ' . $xoopsDB->prefix('priv_msgs');
+    $sql = 'SHOW COLUMNS FROM '.$xoopsDB->prefix('priv_msgs');
     if (!$result = $xoopsDB->queryF($sql)) {
         return false;
     }
@@ -32,7 +32,7 @@ 
     if (($rows = $xoopsDB->getRowsNum($result)) == 12) {
         return true;
     } elseif ($rows == 8) {
-        return $xoopsDB->queryFromFile(XOOPS_ROOT_PATH . '/modules/' . $module->getVar('dirname', 'n') . '/sql/mysql.upgrade.sql');
+        return $xoopsDB->queryFromFile(XOOPS_ROOT_PATH.'/modules/'.$module->getVar('dirname', 'n').'/sql/mysql.upgrade.sql');
     } else {
         return false;
     }