geekwright / XoopsCore

htdocs/include/checklogin.php

Spacing +9 added lines, -9 removed lines

@@ -28,7 +28,7 @@ 
 $uname = Request::getString('uname', '', 'POST');
 $pass = Request::getString('pass', '', 'POST');
 if ($uname == '' || $pass == '') {
-    $xoops->redirect($xoops_url . '/user.php', 1, XoopsLocale::E_INCORRECT_LOGIN);
+    $xoops->redirect($xoops_url.'/user.php', 1, XoopsLocale::E_INCORRECT_LOGIN);
     exit();
 }
 $rememberme = Request::getBool('rememberme', false, 'POST');
@@ -42,11 +42,11 @@ 
 if (false != $user) {
     /* @var $user XoopsUser */
     if (0 == $user->getVar('level')) {
-        $xoops->redirect($xoops_url . '/index.php', 5, XoopsLocale::E_SELECTED_USER_DEACTIVATED_OR_NOT_ACTIVE);
+        $xoops->redirect($xoops_url.'/index.php', 5, XoopsLocale::E_SELECTED_USER_DEACTIVATED_OR_NOT_ACTIVE);
         exit();
     }
     if (in_array(FixedGroups::REMOVED, $user->getGroups())) {
-        $xoops->redirect($xoops_url . '/index.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
+        $xoops->redirect($xoops_url.'/index.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
         exit();
     }
     if ($xoops->getConfig('closesite') == 1) {
@@ -58,7 +58,7 @@ 
             }
         }
         if (!$allowed) {
-            $xoops->redirect($xoops_url . '/index.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
+            $xoops->redirect($xoops_url.'/index.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
             exit();
         }
     }
@@ -77,11 +77,11 @@ 
     if (!empty($xoops_redirect) && !strpos($xoops_redirect, 'register')) {
         $xoops_redirect = rawurldecode($xoops_redirect);
         $parsed = parse_url($xoops_url);
-        $url = isset($parsed['scheme']) ? $parsed['scheme'] . '://' : 'http://';
+        $url = isset($parsed['scheme']) ? $parsed['scheme'].'://' : 'http://';
         if (isset($parsed['host'])) {
             $url .= $parsed['host'];
             if (isset($parsed['port'])) {
-                $url .= ':' . $parsed['port'];
+                $url .= ':'.$parsed['port'];
             }
         } else {
             $url .= $_SERVER['HTTP_HOST'];
@@ -93,17 +93,17 @@ 
         }
         $url .= $xoops_redirect;
     } else {
-        $url = $xoops_url . '/index.php';
+        $url = $xoops_url.'/index.php';
     }
 
     $xoops->redirect($url, 1, sprintf(XoopsLocale::SF_THANK_YOU_FOR_LOGGING_IN, $user->getVar('uname')), false);
 } else {
     $xoops->events()->triggerEvent('core.include.checklogin.failed');
     if (empty($xoops_redirect)) {
-        $xoops->redirect($xoops_url . '/user.php', 5, $xoopsAuth->getHtmlErrors());
+        $xoops->redirect($xoops_url.'/user.php', 5, $xoopsAuth->getHtmlErrors());
     } else {
         $xoops->redirect(
-            $xoops_url . '/user.php?xoops_redirect=' . urlencode($xoops_redirect),
+            $xoops_url.'/user.php?xoops_redirect='.urlencode($xoops_redirect),
             5,
             $xoopsAuth->getHtmlErrors(),
             false

htdocs/include/formdhtmltextarea_preview.php

Spacing +3 added lines, -3 removed lines

@@ -18,7 +18,7 @@ 
  * @version         $Id$
  */
 use Xmf\Request;
-include_once dirname(__DIR__) . '/mainfile.php';
+include_once dirname(__DIR__).'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $xoops->logger()->quiet();
@@ -39,10 +39,10 @@ 
 //    $content = urldecode($content);
 //}
 
-if (! headers_sent()) {
+if (!headers_sent()) {
     header('Content-Type:text/html; charset=UTF-8');
     header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
     header('Cache-Control: private, no-cache');
     header('Pragma: no-cache');
 }
-echo "<div>" . $content . "</div>";
+echo "<div>".$content."</div>";

htdocs/include/findusers.php

Indentation +6 added lines, -6 removed lines

@@ -147,9 +147,9 @@ 
         $form->addElement($rank_select);
     } else {
         foreach (array(
-                     "uname",
-                     "email"
-                 ) as $var) {
+                        "uname",
+                        "email"
+                    ) as $var) {
             $title = $items_match[$var];
             $text = new Xoops\Form\Text("", $var, 30, 100, @$_POST[$var]);
             $match = new Xoops\Form\SelectMatchOption("", "{$var}_match", @$_POST["{$var}_match"]);
@@ -237,9 +237,9 @@ 
             $criteria->add(new Criteria('user_occ', '%' . trim($_POST['user_occ']) . '%', 'LIKE'));
         }
         foreach (array(
-                     "last_login",
-                     "user_regdate"
-                 ) as $var) {
+                        "last_login",
+                        "user_regdate"
+                    ) as $var) {
             if (!empty($_POST["{$var}_more"]) && is_numeric($_POST["{$var}_more"])) {
                 $time = time() - (60 * 60 * 24 * (int)(trim($_POST["{$var}_more"])));
                 if ($time > 0) {

Spacing +59 added lines, -59 removed lines

@@ -21,7 +21,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  * @version         $Id$
  */
-include_once dirname(__DIR__) . '/mainfile.php';
+include_once dirname(__DIR__).'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 
@@ -47,8 +47,8 @@ 
 
 $token = isset($_REQUEST['token']) ? $_REQUEST['token'] : '';
 $name_form = 'memberslist';
-$name_userid = 'uid' . (!empty($_REQUEST['multiple']) ? '[]' : '');
-$name_username = 'uname' . (!empty($_REQUEST['multiple']) ? '[]' : '');
+$name_userid = 'uid'.(!empty($_REQUEST['multiple']) ? '[]' : '');
+$name_username = 'uname'.(!empty($_REQUEST['multiple']) ? '[]' : '');
 
 $user_handler = $xoops->getHandlerUser();
 
@@ -187,16 +187,16 @@ 
     $acttotal = $user_handler->getCount(new Criteria('level', 0, '>'));
     $inacttotal = $user_handler->getCount(new Criteria('level', 0, '<='));
     echo "</html><body>";
-    echo "<h2 style='text-align:left;'>" . XoopsLocale::FIND_USERS . " - " . $modes[$mode] . "</h2>";
+    echo "<h2 style='text-align:left;'>".XoopsLocale::FIND_USERS." - ".$modes[$mode]."</h2>";
     $modes_switch = array();
     foreach ($modes as $_mode => $title) {
         if ($mode == $_mode) {
             continue;
         }
-        $modes_switch[] = "<a href='findusers.php?target=" . $myts->htmlSpecialChars(@$_REQUEST["target"]) . "&amp;multiple=" . $myts->htmlSpecialChars(@$_REQUEST["multiple"]) . "&amp;token=" . $myts->htmlSpecialChars($token, ENT_QUOTES) . "&amp;mode={$_mode}'>{$title}</a>";
+        $modes_switch[] = "<a href='findusers.php?target=".$myts->htmlSpecialChars(@$_REQUEST["target"])."&amp;multiple=".$myts->htmlSpecialChars(@$_REQUEST["multiple"])."&amp;token=".$myts->htmlSpecialChars($token, ENT_QUOTES)."&amp;mode={$_mode}'>{$title}</a>";
     }
-    echo "<h4>" . implode(" | ", $modes_switch) . "</h4>";
-    echo "(" . sprintf(XoopsLocale::F_ACTIVE_USERS, "<span style='color:#ff0000;'>$acttotal</span>") . " " . sprintf(XoopsLocale::F_INACTIVE_USERS, "<span style='color:#ff0000;'>$inacttotal</span>") . ")";
+    echo "<h4>".implode(" | ", $modes_switch)."</h4>";
+    echo "(".sprintf(XoopsLocale::F_ACTIVE_USERS, "<span style='color:#ff0000;'>$acttotal</span>")." ".sprintf(XoopsLocale::F_INACTIVE_USERS, "<span style='color:#ff0000;'>$inacttotal</span>").")";
     $form->display();
 } else {
     $limit = empty($_POST['limit']) ? 50 : (int)($_POST['limit']);
@@ -209,32 +209,32 @@ 
                 $value = str_replace("_", "\\\_", trim($_POST[$var]));
                 switch ($match) {
                     case XOOPS_MATCH_START:
-                        $criteria->add(new Criteria($var, $value . '%', 'LIKE'));
+                        $criteria->add(new Criteria($var, $value.'%', 'LIKE'));
                         break;
                     case XOOPS_MATCH_END:
-                        $criteria->add(new Criteria($var, '%' . $value, 'LIKE'));
+                        $criteria->add(new Criteria($var, '%'.$value, 'LIKE'));
                         break;
                     case XOOPS_MATCH_EQUAL:
                         $criteria->add(new Criteria($var, $value));
                         break;
                     case XOOPS_MATCH_CONTAIN:
-                        $criteria->add(new Criteria($var, '%' . $value . '%', 'LIKE'));
+                        $criteria->add(new Criteria($var, '%'.$value.'%', 'LIKE'));
                         break;
                 }
             }
         }
         if (!empty($_POST['url'])) {
             $url = $xoops->formatURL(trim($_POST['url']));
-            $criteria->add(new Criteria('url', $url . '%', 'LIKE'));
+            $criteria->add(new Criteria('url', $url.'%', 'LIKE'));
         }
         if (!empty($_POST['user_from'])) {
-            $criteria->add(new Criteria('user_from', '%' . trim($_POST['user_from']) . '%', 'LIKE'));
+            $criteria->add(new Criteria('user_from', '%'.trim($_POST['user_from']).'%', 'LIKE'));
         }
         if (!empty($_POST['user_intrest'])) {
-            $criteria->add(new Criteria('user_intrest', '%' . trim($_POST['user_intrest']) . '%', 'LIKE'));
+            $criteria->add(new Criteria('user_intrest', '%'.trim($_POST['user_intrest']).'%', 'LIKE'));
         }
         if (!empty($_POST['user_occ'])) {
-            $criteria->add(new Criteria('user_occ', '%' . trim($_POST['user_occ']) . '%', 'LIKE'));
+            $criteria->add(new Criteria('user_occ', '%'.trim($_POST['user_occ']).'%', 'LIKE'));
         }
         foreach (array(
                      "last_login",
@@ -315,15 +315,15 @@ 
 
     echo $js_adduser = '
         <script type="text/javascript">
-        var multiple=' . (int)($_REQUEST['multiple']) . ';
+        var multiple=' . (int)($_REQUEST['multiple']).';
         function addusers()
         {
             var sel_str = "";
             var num = 0;
-            var mForm = document.forms["' . $name_form . '"];
+            var mForm = document.forms["' . $name_form.'"];
             for (var i=0;i!=mForm.elements.length;i++) {
                 var id=mForm.elements[i];
-                if ( ( (multiple > 0 && id.type == "checkbox") || (multiple == 0 && id.type == "radio") ) && (id.checked == true) && ( id.name == "' . $name_userid . '" ) ) {
+                if ( ( (multiple > 0 && id.type == "checkbox") || (multiple == 0 && id.type == "radio") ) && (id.checked == true) && ( id.name == "' . $name_userid.'" ) ) {
                     var name = mForm.elements[++i];
                     var len = id.value.length + name.value.length;
                     sel_str += len + ":" + id.value + ":" + name.value;
@@ -331,12 +331,12 @@ 
                 }
             }
             if (num == 0) {
-                alert("' . XoopsLocale::E_NO_USER_SELECTED . '");
+                alert("' . XoopsLocale::E_NO_USER_SELECTED.'");
                 return false;
             }
             sel_str = num + ":" + sel_str;
             window.opener.addusers(sel_str);
-            alert("' . XoopsLocale::S_USERS_ADDED . '");
+            alert("' . XoopsLocale::S_USERS_ADDED.'");
             if (multiple == 0) {
                 window.close();
                 window.opener.focus();
@@ -347,16 +347,16 @@ 
     ';
 
     echo "</html><body>";
-    echo "<a href='findusers.php?target=" . $myts->htmlSpecialChars(@$_POST["target"]) . "&amp;multiple=" . (int)(@$_POST["multiple"]) . "&amp;token=" . $myts->htmlSpecialChars($token) . "'>" . XoopsLocale::FIND_USERS . "</a>&nbsp;<span style='font-weight:bold;'>&raquo;&raquo;</span>&nbsp;" . XoopsLocale::SEARCH_RESULTS . "<br /><br />";
+    echo "<a href='findusers.php?target=".$myts->htmlSpecialChars(@$_POST["target"])."&amp;multiple=".(int)(@$_POST["multiple"])."&amp;token=".$myts->htmlSpecialChars($token)."'>".XoopsLocale::FIND_USERS."</a>&nbsp;<span style='font-weight:bold;'>&raquo;&raquo;</span>&nbsp;".XoopsLocale::SEARCH_RESULTS."<br /><br />";
     if (empty($start) && empty($foundusers)) {
-        echo "<h4>" . XoopsLocale::E_USERS_NOT_FOUND, "</h4>";
+        echo "<h4>".XoopsLocale::E_USERS_NOT_FOUND, "</h4>";
         $hiddenform = "<form name='findnext' action='findusers.php' method='post'>";
         foreach ($_POST as $k => $v) {
             if ($k === 'XOOPS_TOKEN_REQUEST') {
                 // regenerate token value
-                $hiddenform .= $xoops->security()->getTokenHTML() . "\n";
+                $hiddenform .= $xoops->security()->getTokenHTML()."\n";
             } else {
-                $hiddenform .= "<input type='hidden' name='" . $myts->htmlSpecialChars($k) . "' value='" . $myts->htmlSpecialChars($v) . "' />\n";
+                $hiddenform .= "<input type='hidden' name='".$myts->htmlSpecialChars($k)."' value='".$myts->htmlSpecialChars($v)."' />\n";
             }
         }
         if (!isset($_POST['limit'])) {
@@ -365,16 +365,16 @@ 
         if (!isset($_POST['start'])) {
             $hiddenform .= "<input type='hidden' name='start' value='{$start}' />\n";
         }
-        $hiddenform .= "<input type='hidden' name='token' value='" . $myts->htmlSpecialChars($token) . "' />\n";
+        $hiddenform .= "<input type='hidden' name='token' value='".$myts->htmlSpecialChars($token)."' />\n";
         $hiddenform .= "</form>";
 
-        echo "<div>" . $hiddenform;
-        echo "<a href='#' onclick='javascript:document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>" . XoopsLocale::SEARCH_AGAIN . "</a>\n";
+        echo "<div>".$hiddenform;
+        echo "<a href='#' onclick='javascript:document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>".XoopsLocale::SEARCH_AGAIN."</a>\n";
         echo "</div>";
     } else {
         if ($start < $total) {
             if (!empty($total)) {
-                echo sprintf(XoopsLocale::F_USERS_FOUND, $total) . "<br />";
+                echo sprintf(XoopsLocale::F_USERS_FOUND, $total)."<br />";
             }
             if (!empty($foundusers)) {
                 echo "<form action='findusers.php' method='post' name='{$name_form}' id='{$name_form}'>
@@ -385,11 +385,11 @@ 
                     echo "<input type='checkbox' name='memberslist_checkall' id='memberslist_checkall' onclick='xoopsCheckAll(\"{$name_form}\", \"memberslist_checkall\");' />";
                 }
                 echo "</th>
-            <th align='center'>" . XoopsLocale::USER_NAME . "</th>
-            <th align='center'>" . XoopsLocale::REAL_NAME . "</th>
-            <th align='center'>" . XoopsLocale::USER_REGISTRATION . "</th>
-            <th align='center'>" . XoopsLocale::LAST_LOGIN . "</th>
-            <th align='center'>" . XoopsLocale::POSTS . "</th>
+            <th align='center'>" . XoopsLocale::USER_NAME."</th>
+            <th align='center'>" . XoopsLocale::REAL_NAME."</th>
+            <th align='center'>" . XoopsLocale::USER_REGISTRATION."</th>
+            <th align='center'>" . XoopsLocale::LAST_LOGIN."</th>
+            <th align='center'>" . XoopsLocale::POSTS."</th>
             </tr>";
                 $ucount = 0;
                 foreach (array_keys($foundusers) as $j) {
@@ -403,32 +403,32 @@ 
                     echo "<tr class='$class'>
                     <td align='center'>";
                     if (!empty($_POST["multiple"])) {
-                        echo "<input type='checkbox' name='{$name_userid}' id='{$name_userid}' value='" . $foundusers[$j]->getVar("uid") . "' />";
-                        echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='" . $foundusers[$j]->getVar("uname") . "' />";
+                        echo "<input type='checkbox' name='{$name_userid}' id='{$name_userid}' value='".$foundusers[$j]->getVar("uid")."' />";
+                        echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='".$foundusers[$j]->getVar("uname")."' />";
                     } else {
-                        echo "<input type='radio' name='{$name_userid}' id='{$name_userid}' value='" . $foundusers[$j]->getVar("uid") . "' />";
-                        echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='" . $foundusers[$j]->getVar("uname") . "' />";
+                        echo "<input type='radio' name='{$name_userid}' id='{$name_userid}' value='".$foundusers[$j]->getVar("uid")."' />";
+                        echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='".$foundusers[$j]->getVar("uname")."' />";
                     }
                     echo "</td>
-                    <td><a href='" . \XoopsBaseConfig::get('url') . "/userinfo.php?uid=" . $foundusers[$j]->getVar("uid") . "' target='_blank'>" . $foundusers[$j]->getVar("uname") . "</a></td>
-                    <td>" . $fuser_name . "</td>
-                    <td align='center'>" . ($foundusers[$j]->getVar("user_regdate") ? date("Y-m-d", $foundusers[$j]->getVar("user_regdate")) : "") . "</td>
-                    <td align='center'>" . ($foundusers[$j]->getVar("last_login") ? date("Y-m-d H:i", $foundusers[$j]->getVar("last_login")) : "") . "</td>
-                    <td align='center'>" . $foundusers[$j]->getVar("posts") . "</td>";
+                    <td><a href='" . \XoopsBaseConfig::get('url')."/userinfo.php?uid=".$foundusers[$j]->getVar("uid")."' target='_blank'>".$foundusers[$j]->getVar("uname")."</a></td>
+                    <td>" . $fuser_name."</td>
+                    <td align='center'>" . ($foundusers[$j]->getVar("user_regdate") ? date("Y-m-d", $foundusers[$j]->getVar("user_regdate")) : "")."</td>
+                    <td align='center'>" . ($foundusers[$j]->getVar("last_login") ? date("Y-m-d H:i", $foundusers[$j]->getVar("last_login")) : "")."</td>
+                    <td align='center'>" . $foundusers[$j]->getVar("posts")."</td>";
                     echo "</tr>\n";
                 }
                 echo "<tr class='foot'><td colspan='6'>";
 
                 // placeholder for external applications
                 if (empty($_POST["target"])) {
-                    echo "<select name='fct'><option value='users'>" . XoopsLocale::A_DELETE . "</option><option value='mailusers'>" . XoopsLocale::SEND_EMAIL . "</option>";
+                    echo "<select name='fct'><option value='users'>".XoopsLocale::A_DELETE."</option><option value='mailusers'>".XoopsLocale::SEND_EMAIL."</option>";
                     echo "</select>&nbsp;";
-                    echo $xoops->security()->getTokenHTML() . "<input type='submit' value='" . XoopsLocale::A_SUBMIT . "' />";
+                    echo $xoops->security()->getTokenHTML()."<input type='submit' value='".XoopsLocale::A_SUBMIT."' />";
                     // Add selected users
                 } else {
-                    echo "<input type='button' value='" . XoopsLocale::ADD_SELECTED_USERS . "' onclick='addusers();' />";
+                    echo "<input type='button' value='".XoopsLocale::ADD_SELECTED_USERS."' onclick='addusers();' />";
                 }
-                echo "<input type='hidden' name='token' value='" . $myts->htmlSpecialChars($token) . "' />\n";
+                echo "<input type='hidden' name='token' value='".$myts->htmlSpecialChars($token)."' />\n";
                 echo "</td></tr></table></form>\n";
             }
 
@@ -436,32 +436,32 @@ 
             foreach ($_POST as $k => $v) {
                 if ($k === 'XOOPS_TOKEN_REQUEST') {
                     // regenerate token value
-                    $hiddenform .= $xoops->security()->getTokenHTML() . "\n";
+                    $hiddenform .= $xoops->security()->getTokenHTML()."\n";
                 } else {
-                    $hiddenform .= "<input type='hidden' name='" . $myts->htmlSpecialChars($k) . "' value='" . $myts->htmlSpecialChars($v) . "' />\n";
+                    $hiddenform .= "<input type='hidden' name='".$myts->htmlSpecialChars($k)."' value='".$myts->htmlSpecialChars($v)."' />\n";
                 }
             }
             if (!isset($_POST['limit'])) {
-                $hiddenform .= "<input type='hidden' name='limit' value='" . $limit . "' />\n";
+                $hiddenform .= "<input type='hidden' name='limit' value='".$limit."' />\n";
             }
             if (!isset($_POST['start'])) {
-                $hiddenform .= "<input type='hidden' name='start' value='" . $start . "' />\n";
+                $hiddenform .= "<input type='hidden' name='start' value='".$start."' />\n";
             }
-            $hiddenform .= "<input type='hidden' name='token' value='" . $myts->htmlSpecialChars($token) . "' />\n";
+            $hiddenform .= "<input type='hidden' name='token' value='".$myts->htmlSpecialChars($token)."' />\n";
             if (!isset($total) || ($totalpages = ceil($total / $limit)) > 1) {
                 $prev = $start - $limit;
                 if ($start - $limit >= 0) {
-                    $hiddenform .= "<a href='#0' onclick='javascript:document.findnext.start.value=" . $prev . ";document.findnext.submit();'>" . XoopsLocale::PREVIOUS . "</a>&nbsp;\n";
+                    $hiddenform .= "<a href='#0' onclick='javascript:document.findnext.start.value=".$prev.";document.findnext.submit();'>".XoopsLocale::PREVIOUS."</a>&nbsp;\n";
                 }
                 $counter = 1;
                 $currentpage = ($start + $limit) / $limit;
                 if (!isset($total)) {
                     while ($counter <= $currentpage) {
                         if ($counter == $currentpage) {
-                            $hiddenform .= "<strong>" . $counter . "</strong> ";
+                            $hiddenform .= "<strong>".$counter."</strong> ";
                         } else {
                             if (($counter > $currentpage - 4 && $counter < $currentpage + 4) || $counter == 1) {
-                                $hiddenform .= "<a href='#" . $counter . "' onclick='javascript:document.findnext.start.value=" . ($counter - 1) * $limit . ";document.findnext.submit();'>" . $counter . "</a> ";
+                                $hiddenform .= "<a href='#".$counter."' onclick='javascript:document.findnext.start.value=".($counter - 1) * $limit.";document.findnext.submit();'>".$counter."</a> ";
                                 if ($counter == 1 && $currentpage > 5) {
                                     $hiddenform .= "... ";
                                 }
@@ -472,13 +472,13 @@ 
                 } else {
                     while ($counter <= $totalpages) {
                         if ($counter == $currentpage) {
-                            $hiddenform .= "<strong>" . $counter . "</strong> ";
+                            $hiddenform .= "<strong>".$counter."</strong> ";
                         } else {
                             if (($counter > $currentpage - 4 && $counter < $currentpage + 4) || $counter == 1 || $counter == $totalpages) {
                                 if ($counter == $totalpages && $currentpage < $totalpages - 4) {
                                     $hiddenform .= "... ";
                                 }
-                                $hiddenform .= "<a href='#" . $counter . "' onclick='javascript:document.findnext.start.value=" . ($counter - 1) * $limit . ";document.findnext.submit();'>" . $counter . "</a> ";
+                                $hiddenform .= "<a href='#".$counter."' onclick='javascript:document.findnext.start.value=".($counter - 1) * $limit.";document.findnext.submit();'>".$counter."</a> ";
                                 if ($counter == 1 && $currentpage > 5) {
                                     $hiddenform .= "... ";
                                 }
@@ -490,16 +490,16 @@ 
 
                 $next = $start + $limit;
                 if ((isset($total) && $total > $next) || (!isset($total) && count($foundusers) >= $limit)) {
-                    $hiddenform .= "&nbsp;<a href='#" . $total . "' onclick='javascript:document.findnext.start.value=" . $next . ";document.findnext.submit();'>" . XoopsLocale::NEXT . "</a>\n";
+                    $hiddenform .= "&nbsp;<a href='#".$total."' onclick='javascript:document.findnext.start.value=".$next.";document.findnext.submit();'>".XoopsLocale::NEXT."</a>\n";
                 }
             }
             $hiddenform .= "</form>";
 
-            echo "<div>" . $hiddenform;
+            echo "<div>".$hiddenform;
             if (isset($total)) {
-                echo "<br />" . sprintf(XoopsLocale::F_USERS_FOUND, $total) . "&nbsp;";
+                echo "<br />".sprintf(XoopsLocale::F_USERS_FOUND, $total)."&nbsp;";
             }
-            echo "<a href='#' onclick='javascript:document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>" . XoopsLocale::SEARCH_AGAIN . "</a>\n";
+            echo "<a href='#' onclick='javascript:document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>".XoopsLocale::SEARCH_AGAIN."</a>\n";
             echo "</div>";
         }
     }

htdocs/include/version.php

Spacing +1 added lines, -1 removed lines

@@ -19,5 +19,5 @@
  * Define XOOPS version
  * @todo This should be eliminated in favor of \Xoops::VERSION, but it is still required in installer
  */
-$XoopsIncludeVersionString  = class_exists('\Xoops', false) ? \Xoops::VERSION : 'XOOPS 2.6.0';
+$XoopsIncludeVersionString = class_exists('\Xoops', false) ? \Xoops::VERSION : 'XOOPS 2.6.0';
 define('XOOPS_VERSION', $XoopsIncludeVersionString);

htdocs/include/calendarjs.php

Spacing +37 added lines, -37 removed lines

@@ -1,8 +1,8 @@ 
 <?php
 $xoops_url = \XoopsBaseConfig::get('url');
 ?>
-<link rel="stylesheet" type="text/css" media="all" href="<?php echo $xoops_url;?>/include/calendar-blue.css"/>
-<script type="text/javascript" src="<?php echo $xoops_url . '/include/calendar.js';?>"></script>
+<link rel="stylesheet" type="text/css" media="all" href="<?php echo $xoops_url; ?>/include/calendar-blue.css"/>
+<script type="text/javascript" src="<?php echo $xoops_url.'/include/calendar.js'; ?>"></script>
 <script type="text/javascript">
     <!--
     var calendar = null;
@@ -54,47 +54,47 @@ 
     }
 
     Calendar._DN = new Array
-        ("<?php echo XoopsLocale::L_DAY_SUNDAY;?>",
-            "<?php echo XoopsLocale::L_DAY_MONDAY;?>",
-            "<?php echo XoopsLocale::L_DAY_TUESDAY;?>",
-            "<?php echo XoopsLocale::L_DAY_WEDNESDAY;?>",
-            "<?php echo XoopsLocale::L_DAY_THURSDAY;?>",
-            "<?php echo XoopsLocale::L_DAY_FRIDAY;?>",
-            "<?php echo XoopsLocale::L_DAY_SATURDAY;?>",
-            "<?php echo XoopsLocale::L_DAY_SUNDAY;?>");
+        ("<?php echo XoopsLocale::L_DAY_SUNDAY; ?>",
+            "<?php echo XoopsLocale::L_DAY_MONDAY; ?>",
+            "<?php echo XoopsLocale::L_DAY_TUESDAY; ?>",
+            "<?php echo XoopsLocale::L_DAY_WEDNESDAY; ?>",
+            "<?php echo XoopsLocale::L_DAY_THURSDAY; ?>",
+            "<?php echo XoopsLocale::L_DAY_FRIDAY; ?>",
+            "<?php echo XoopsLocale::L_DAY_SATURDAY; ?>",
+            "<?php echo XoopsLocale::L_DAY_SUNDAY; ?>");
     Calendar._MN = new Array
-        ("<?php echo XoopsLocale::L_MONTH_JANUARY;?>",
-            "<?php echo XoopsLocale::L_MONTH_FEBRUARY;?>",
-            "<?php echo XoopsLocale::L_MONTH_MARCH;?>",
-            "<?php echo XoopsLocale::L_MONTH_APRIL;?>",
-            "<?php echo XoopsLocale::L_MONTH_MAY;?>",
-            "<?php echo XoopsLocale::L_MONTH_JUNE;?>",
-            "<?php echo XoopsLocale::L_MONTH_JULY;?>",
-            "<?php echo XoopsLocale::L_MONTH_AUGUST;?>",
-            "<?php echo XoopsLocale::L_MONTH_SEPTEMBER;?>",
-            "<?php echo XoopsLocale::L_MONTH_OCTOBER;?>",
-            "<?php echo XoopsLocale::L_MONTH_NOVEMBER;?>",
-            "<?php echo XoopsLocale::L_MONTH_DECEMBER;?>");
+        ("<?php echo XoopsLocale::L_MONTH_JANUARY; ?>",
+            "<?php echo XoopsLocale::L_MONTH_FEBRUARY; ?>",
+            "<?php echo XoopsLocale::L_MONTH_MARCH; ?>",
+            "<?php echo XoopsLocale::L_MONTH_APRIL; ?>",
+            "<?php echo XoopsLocale::L_MONTH_MAY; ?>",
+            "<?php echo XoopsLocale::L_MONTH_JUNE; ?>",
+            "<?php echo XoopsLocale::L_MONTH_JULY; ?>",
+            "<?php echo XoopsLocale::L_MONTH_AUGUST; ?>",
+            "<?php echo XoopsLocale::L_MONTH_SEPTEMBER; ?>",
+            "<?php echo XoopsLocale::L_MONTH_OCTOBER; ?>",
+            "<?php echo XoopsLocale::L_MONTH_NOVEMBER; ?>",
+            "<?php echo XoopsLocale::L_MONTH_DECEMBER; ?>");
 
     Calendar._TT = {};
-    Calendar._TT["TOGGLE"] = "<?php echo XoopsLocale::TOGGLE_FIRST_DAY_OF_WEEK;?>";
-    Calendar._TT["PREV_YEAR"] = "<?php echo XoopsLocale::PREVIOUS_YEAR;?>";
-    Calendar._TT["PREV_MONTH"] = "<?php echo XoopsLocale::PREVIOUS_MONTH;?>";
-    Calendar._TT["GO_TODAY"] = "<?php echo XoopsLocale::GO_TODAY;?>";
-    Calendar._TT["NEXT_MONTH"] = "<?php echo XoopsLocale::NEXT_MONTH;?>";
-    Calendar._TT["NEXT_YEAR"] = "<?php echo XoopsLocale::NEXT_YEAR;?>";
-    Calendar._TT["SEL_DATE"] = "<?php echo XoopsLocale::SELECT_DATE;?>";
-    Calendar._TT["DRAG_TO_MOVE"] = "<?php echo XoopsLocale::DRAG_TO_MOVE;?>";
-    Calendar._TT["PART_TODAY"] = "(<?php echo XoopsLocale::TODAY;?>)";
-    Calendar._TT["MON_FIRST"] = "<?php echo XoopsLocale::DISPLAY_MONDAY_FIRST;?>";
-    Calendar._TT["SUN_FIRST"] = "<?php echo XoopsLocale::DISPLAY_SUNDAY_FIRST;?>";
-    Calendar._TT["CLOSE"] = "<?php echo XoopsLocale::A_CLOSE;?>";
-    Calendar._TT["TODAY"] = "<?php echo XoopsLocale::TODAY;?>";
+    Calendar._TT["TOGGLE"] = "<?php echo XoopsLocale::TOGGLE_FIRST_DAY_OF_WEEK; ?>";
+    Calendar._TT["PREV_YEAR"] = "<?php echo XoopsLocale::PREVIOUS_YEAR; ?>";
+    Calendar._TT["PREV_MONTH"] = "<?php echo XoopsLocale::PREVIOUS_MONTH; ?>";
+    Calendar._TT["GO_TODAY"] = "<?php echo XoopsLocale::GO_TODAY; ?>";
+    Calendar._TT["NEXT_MONTH"] = "<?php echo XoopsLocale::NEXT_MONTH; ?>";
+    Calendar._TT["NEXT_YEAR"] = "<?php echo XoopsLocale::NEXT_YEAR; ?>";
+    Calendar._TT["SEL_DATE"] = "<?php echo XoopsLocale::SELECT_DATE; ?>";
+    Calendar._TT["DRAG_TO_MOVE"] = "<?php echo XoopsLocale::DRAG_TO_MOVE; ?>";
+    Calendar._TT["PART_TODAY"] = "(<?php echo XoopsLocale::TODAY; ?>)";
+    Calendar._TT["MON_FIRST"] = "<?php echo XoopsLocale::DISPLAY_MONDAY_FIRST; ?>";
+    Calendar._TT["SUN_FIRST"] = "<?php echo XoopsLocale::DISPLAY_SUNDAY_FIRST; ?>";
+    Calendar._TT["CLOSE"] = "<?php echo XoopsLocale::A_CLOSE; ?>";
+    Calendar._TT["TODAY"] = "<?php echo XoopsLocale::TODAY; ?>";
 
     // date formats
     // todo, strings not defined bellow?
-    Calendar._TT["DEF_DATE_FORMAT"] = "<?php echo _CAL_DEF_DATE_FORMAT;?>";
-    Calendar._TT["TT_DATE_FORMAT"] = "<?php echo _CAL_TT_DATE_FORMAT;?>";
+    Calendar._TT["DEF_DATE_FORMAT"] = "<?php echo _CAL_DEF_DATE_FORMAT; ?>";
+    Calendar._TT["TT_DATE_FORMAT"] = "<?php echo _CAL_TT_DATE_FORMAT; ?>";
 
     Calendar._TT["WK"] = "";
     //-->

htdocs/language/english/xmf.php

Spacing +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php
 
-define('_AM_XMF_MODULE_NOTFOUND','Please install or reactivate %1$s module. Minimum version required: %2$s');
-define('_AM_XMF_MODULE_VERSION','Minimum %1$s module version required: %2$s (your version is %3$s)');
+define('_AM_XMF_MODULE_NOTFOUND', 'Please install or reactivate %1$s module. Minimum version required: %2$s');
+define('_AM_XMF_MODULE_VERSION', 'Minimum %1$s module version required: %2$s (your version is %3$s)');
 define('_AM_XMF_MODULE_INSTALLED', 'The module \'%s\' is installed!');
 define('_AM_XMF_MODULE_NOT_INSTALLED', 'The module \'%s\' is not installed!');
 
-define('_DB_XMF_TABLE_IS_NOT_DEFINED','Table is not defined');
+define('_DB_XMF_TABLE_IS_NOT_DEFINED', 'Table is not defined');

htdocs/language/english/locale.php

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 define("_MONTHDAY", "n/j G:i");
 define("_YEARMONTHDAY", "Y/n/j G:i");
 define("_ELAPSE", "%s ago");
-define("_TIMEFORMAT_DESC", "Valid formats: \"s\" - " . _SHORTDATESTRING . "; \"m\" - " . _MEDIUMDATESTRING . "; \"l\" - " . _DATESTRING . ";<br />" . "\"c\" or \"custom\" - format determined according to interval to present; \"e\" - Elapsed; \"mysql\" - Y-m-d H:i:s;<br />" . "specified string - Refer to <a href=\"http://php.net/manual/en/function.date.php\" rel=\"external\">PHP manual</a>.");
+define("_TIMEFORMAT_DESC", "Valid formats: \"s\" - "._SHORTDATESTRING."; \"m\" - "._MEDIUMDATESTRING."; \"l\" - "._DATESTRING.";<br />"."\"c\" or \"custom\" - format determined according to interval to present; \"e\" - Elapsed; \"mysql\" - Y-m-d H:i:s;<br />"."specified string - Refer to <a href=\"http://php.net/manual/en/function.date.php\" rel=\"external\">PHP manual</a>.");
 define("_TIMEZONE_SET", "Europe/London");
 
 /**

htdocs/backend.php

Indentation +10 added lines, -10 removed lines

@@ -68,11 +68,11 @@ 
             foreach ($res as $item) {
                 $date[] = array('date' => $item['date']);
                 $items[] = array('date' => XoopsLocale::formatTimestamp($item['date'], 'rss'),
-                                 'title' => $myts->htmlSpecialChars($item['title']),
-                                 'content' => $myts->htmlSpecialChars($item['content']),
-                                 'link' => $item['link'],
-                                 'guid' => $item['link'],
-                                 );
+                                    'title' => $myts->htmlSpecialChars($item['title']),
+                                    'content' => $myts->htmlSpecialChars($item['content']),
+                                    'link' => $item['link'],
+                                    'guid' => $item['link'],
+                                    );
             }
         }
     } else {
@@ -84,11 +84,11 @@ 
                 foreach ($res as $item) {
                     $date[] = array('date' => $item['date']);
                     $items[] = array('date' => XoopsLocale::formatTimestamp($item['date'], 'rss'),
-                                     'title' => $myts->htmlSpecialChars($item['title']),
-                                     'content' => $myts->htmlSpecialChars($item['content']),
-                                     'link' => $item['link'],
-                                     'guid' => $item['link'],
-                                     );
+                                        'title' => $myts->htmlSpecialChars($item['title']),
+                                        'content' => $myts->htmlSpecialChars($item['content']),
+                                        'link' => $item['link'],
+                                        'guid' => $item['link'],
+                                        );
                 }
             }
         }

Spacing +7 added lines, -7 removed lines

@@ -23,7 +23,7 @@ 
  */
 
 
-require __DIR__ . '/mainfile.php';
+require __DIR__.'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $xoops->disableErrorReporting();
@@ -36,13 +36,13 @@ 
     mb_http_output('pass');
 }
 header('Content-Type:text/xml; charset=utf-8');
-$dirname = $xoops->isModule() ? $xoops->module->getVar('dirname'): 'system';
+$dirname = $xoops->isModule() ? $xoops->module->getVar('dirname') : 'system';
 $tpl = new XoopsTpl();
 $tpl->caching = 2;
 $tpl->cache_lifetime = 3600;
-if (!$tpl->isCached('module:' . $dirname . '/system_rss.tpl')) {
+if (!$tpl->isCached('module:'.$dirname.'/system_rss.tpl')) {
     $tpl->assign('channel_title', $myts->htmlSpecialChars($xoops->getConfig('sitename')));
-    $tpl->assign('channel_link', $xoops_url . '/');
+    $tpl->assign('channel_link', $xoops_url.'/');
     $tpl->assign('channel_desc', $myts->htmlSpecialChars($xoops->getConfig('slogan')));
     $tpl->assign('channel_lastbuild', XoopsLocale::formatTimestamp(time(), 'rss'));
     $tpl->assign('channel_webmaster', $xoops->checkEmail($xoops->getConfig('adminmail'), true));
@@ -64,7 +64,7 @@ 
         /* @var $plugin SystemPluginInterface */
         $plugin = Xoops\Module\Plugin::getPlugin($dirname, 'system');
         $res = $plugin->backend(10);
-        if (is_array($res) && count($res)>0) {
+        if (is_array($res) && count($res) > 0) {
             foreach ($res as $item) {
                 $date[] = array('date' => $item['date']);
                 $items[] = array('date' => XoopsLocale::formatTimestamp($item['date'], 'rss'),
@@ -80,7 +80,7 @@ 
         /* @var $plugin SystemPluginInterface */
         foreach ($plugins as $plugin) {
             $res = $plugin->backend(10);
-            if (is_array($res) && count($res)>0) {
+            if (is_array($res) && count($res) > 0) {
                 foreach ($res as $item) {
                     $date[] = array('date' => $item['date']);
                     $items[] = array('date' => XoopsLocale::formatTimestamp($item['date'], 'rss'),
@@ -97,4 +97,4 @@ 
     $tpl->assign('items', $items);
 
 }
-$tpl->display('module:' . $dirname . '/system_rss.tpl');
+$tpl->display('module:'.$dirname.'/system_rss.tpl');

htdocs/kernel/object.php

Spacing +1 added lines, -1 removed lines

@@ -61,7 +61,7 @@
         $keyName = '',
         $identifierName = ''
     ) {
-        if ($db===null) {
+        if ($db === null) {
             $this->db2 = \Xoops\Core\Database\Factory::getConnection();
             $db = $this->db2;
         }