View GitHub Repository XoopsCore

Schedule Inspection
Subscribe
Completed
Push — master ( 0c98dc...038288 )
by Richard
15s queued 11s
created
Status
Category
Toggle Patches
htdocs/include/findusers.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch 
@@ -147,9 +147,9 @@  discard block
 
 block discarded – undo
147 147 
         $form->addElement($rank_select);
148 148 
     } else {
149 149 
         foreach (array(
150 
-                     "uname",
151 
-                     "email"
152 
-                 ) as $var) {
150 
+                        "uname",
151 
+                        "email"
152 
+                    ) as $var) {
153 153 
             $title = $items_match[$var];
154 154 
             $text = new Xoops\Form\Text("", $var, 30, 100, @$_POST[$var]);
155 155 
             $match = new Xoops\Form\SelectMatchOption("", "{$var}_match", @$_POST["{$var}_match"]);
 
@@ -237,9 +237,9 @@  discard block
 
 block discarded – undo
237 237 
             $criteria->add(new Criteria('user_occ', '%' . trim($_POST['user_occ']) . '%', 'LIKE'));
238 238 
         }
239 239 
         foreach (array(
240 
-                     "last_login",
241 
-                     "user_regdate"
242 
-                 ) as $var) {
240 
+                        "last_login",
241 
+                        "user_regdate"
242 
+                    ) as $var) {
243 243 
             if (!empty($_POST["{$var}_more"]) && is_numeric($_POST["{$var}_more"])) {
244 244 
                 $time = time() - (60 * 60 * 24 * (int)(trim($_POST["{$var}_more"])));
245 245 
                 if ($time > 0) {
Please login to merge, or discard this patch.
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch 
@@ -21,7 +21,7 @@  discard block
 
 block discarded – undo
21 21 
  * @author          Taiwen Jiang <[email protected]>
22 22 
  * @version         $Id$
23 23 
  */
24 
-include_once dirname(__DIR__) . '/mainfile.php';
24 
+include_once dirname(__DIR__).'/mainfile.php';
25 25
26 26 
 $xoops = Xoops::getInstance();
27 27 
 
@@ -47,8 +47,8 @@  discard block
 
 block discarded – undo
47 47
48 48 
 $token = isset($_REQUEST['token']) ? $_REQUEST['token'] : '';
49 49 
 $name_form = 'memberslist';
50 
-$name_userid = 'uid' . (!empty($_REQUEST['multiple']) ? '[]' : '');
51 
-$name_username = 'uname' . (!empty($_REQUEST['multiple']) ? '[]' : '');
50 
+$name_userid = 'uid'.(!empty($_REQUEST['multiple']) ? '[]' : '');
51 
+$name_username = 'uname'.(!empty($_REQUEST['multiple']) ? '[]' : '');
52 52
53 53 
 $user_handler = $xoops->getHandlerUser();
54 54 
 
@@ -187,16 +187,16 @@  discard block
 
 block discarded – undo
187 187 
     $acttotal = $user_handler->getCount(new Criteria('level', 0, '>'));
188 188 
     $inacttotal = $user_handler->getCount(new Criteria('level', 0, '<='));
189 189 
     echo "</html><body>";
190 
-    echo "<h2 style='text-align:left;'>" . XoopsLocale::FIND_USERS . " - " . $modes[$mode] . "</h2>";
190 
+    echo "<h2 style='text-align:left;'>".XoopsLocale::FIND_USERS." - ".$modes[$mode]."</h2>";
191 191 
     $modes_switch = array();
192 192 
     foreach ($modes as $_mode => $title) {
193 193 
         if ($mode == $_mode) {
194 194 
             continue;
195 195 
         }
196 
-        $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>";
196 
+        $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>";
197 197 
     }
198 
-    echo "<h4>" . implode(" | ", $modes_switch) . "</h4>";
199 
-    echo "(" . sprintf(XoopsLocale::F_ACTIVE_USERS, "<span style='color:#ff0000;'>$acttotal</span>") . " " . sprintf(XoopsLocale::F_INACTIVE_USERS, "<span style='color:#ff0000;'>$inacttotal</span>") . ")";
198 
+    echo "<h4>".implode(" | ", $modes_switch)."</h4>";
199 
+    echo "(".sprintf(XoopsLocale::F_ACTIVE_USERS, "<span style='color:#ff0000;'>$acttotal</span>")." ".sprintf(XoopsLocale::F_INACTIVE_USERS, "<span style='color:#ff0000;'>$inacttotal</span>").")";
200 200 
     $form->display();
201 201 
 } else {
202 202 
     $limit = empty($_POST['limit']) ? 50 : (int)($_POST['limit']);
 
@@ -209,32 +209,32 @@  discard block
 
 block discarded – undo
209 209 
                 $value = str_replace("_", "\\\_", trim($_POST[$var]));
210 210 
                 switch ($match) {
211 211 
                     case XOOPS_MATCH_START:
212 
-                        $criteria->add(new Criteria($var, $value . '%', 'LIKE'));
212 
+                        $criteria->add(new Criteria($var, $value.'%', 'LIKE'));
213 213 
                         break;
214 214 
                     case XOOPS_MATCH_END:
215 
-                        $criteria->add(new Criteria($var, '%' . $value, 'LIKE'));
215 
+                        $criteria->add(new Criteria($var, '%'.$value, 'LIKE'));
216 216 
                         break;
217 217 
                     case XOOPS_MATCH_EQUAL:
218 218 
                         $criteria->add(new Criteria($var, $value));
219 219 
                         break;
220 220 
                     case XOOPS_MATCH_CONTAIN:
221 
-                        $criteria->add(new Criteria($var, '%' . $value . '%', 'LIKE'));
221 
+                        $criteria->add(new Criteria($var, '%'.$value.'%', 'LIKE'));
222 222 
                         break;
223 223 
                 }
224 224 
             }
225 225 
         }
226 226 
         if (!empty($_POST['url'])) {
227 227 
             $url = $xoops->formatURL(trim($_POST['url']));
228 
-            $criteria->add(new Criteria('url', $url . '%', 'LIKE'));
228 
+            $criteria->add(new Criteria('url', $url.'%', 'LIKE'));
229 229 
         }
230 230 
         if (!empty($_POST['user_from'])) {
231 
-            $criteria->add(new Criteria('user_from', '%' . trim($_POST['user_from']) . '%', 'LIKE'));
231 
+            $criteria->add(new Criteria('user_from', '%'.trim($_POST['user_from']).'%', 'LIKE'));
232 232 
         }
233 233 
         if (!empty($_POST['user_intrest'])) {
234 
-            $criteria->add(new Criteria('user_intrest', '%' . trim($_POST['user_intrest']) . '%', 'LIKE'));
234 
+            $criteria->add(new Criteria('user_intrest', '%'.trim($_POST['user_intrest']).'%', 'LIKE'));
235 235 
         }
236 236 
         if (!empty($_POST['user_occ'])) {
237 
-            $criteria->add(new Criteria('user_occ', '%' . trim($_POST['user_occ']) . '%', 'LIKE'));
237 
+            $criteria->add(new Criteria('user_occ', '%'.trim($_POST['user_occ']).'%', 'LIKE'));
238 238 
         }
239 239 
         foreach (array(
240 240 
                      "last_login",
 
@@ -315,15 +315,15 @@  discard block
 
 block discarded – undo
315 315
316 316 
     echo $js_adduser = '
317 317 
         <script type="text/javascript">
318 
-        var multiple=' . (int)($_REQUEST['multiple']) . ';
318 
+        var multiple=' . (int)($_REQUEST['multiple']).';
319 319 
         function addusers()
320 320 
         {
321 321 
             var sel_str = "";
322 322 
             var num = 0;
323 
-            var mForm = document.forms["' . $name_form . '"];
323 
+            var mForm = document.forms["' . $name_form.'"];
324 324 
             for (var i=0;i!=mForm.elements.length;i++) {
325 325 
                 var id=mForm.elements[i];
326 
-                if ( ( (multiple > 0 && id.type == "checkbox") || (multiple == 0 && id.type == "radio") ) && (id.checked == true) && ( id.name == "' . $name_userid . '" ) ) {
326 
+                if ( ( (multiple > 0 && id.type == "checkbox") || (multiple == 0 && id.type == "radio") ) && (id.checked == true) && ( id.name == "' . $name_userid.'" ) ) {
327 327 
                     var name = mForm.elements[++i];
328 328 
                     var len = id.value.length + name.value.length;
329 329 
                     sel_str += len + ":" + id.value + ":" + name.value;
 
@@ -331,12 +331,12 @@  discard block
 
 block discarded – undo
331 331 
                 }
332 332 
             }
333 333 
             if (num == 0) {
334 
-                alert("' . XoopsLocale::E_NO_USER_SELECTED . '");
334 
+                alert("' . XoopsLocale::E_NO_USER_SELECTED.'");
335 335 
                 return false;
336 336 
             }
337 337 
             sel_str = num + ":" + sel_str;
338 338 
             window.opener.addusers(sel_str);
339 
-            alert("' . XoopsLocale::S_USERS_ADDED . '");
339 
+            alert("' . XoopsLocale::S_USERS_ADDED.'");
340 340 
             if (multiple == 0) {
341 341 
                 window.close();
342 342 
                 window.opener.focus();
 
@@ -347,16 +347,16 @@  discard block
 
 block discarded – undo
347 347 
     ';
348 348
349 349 
     echo "</html><body>";
350 
-    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 />";
350 
+    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 />";
351 351 
     if (empty($start) && empty($foundusers)) {
352 
-        echo "<h4>" . XoopsLocale::E_USERS_NOT_FOUND, "</h4>";
352 
+        echo "<h4>".XoopsLocale::E_USERS_NOT_FOUND, "</h4>";
353 353 
         $hiddenform = "<form name='findnext' action='findusers.php' method='post'>";
354 354 
         foreach ($_POST as $k => $v) {
355 355 
             if ($k === 'XOOPS_TOKEN_REQUEST') {
356 356 
                 // regenerate token value
357 
-                $hiddenform .= $xoops->security()->getTokenHTML() . "\n";
357 
+                $hiddenform .= $xoops->security()->getTokenHTML()."\n";
358 358 
             } else {
359 
-                $hiddenform .= "<input type='hidden' name='" . $myts->htmlSpecialChars($k) . "' value='" . $myts->htmlSpecialChars($v) . "' />\n";
359 
+                $hiddenform .= "<input type='hidden' name='".$myts->htmlSpecialChars($k)."' value='".$myts->htmlSpecialChars($v)."' />\n";
360 360 
             }
361 361 
         }
362 362 
         if (!isset($_POST['limit'])) {
 
@@ -365,16 +365,16 @@  discard block
 
 block discarded – undo
365 365 
         if (!isset($_POST['start'])) {
366 366 
             $hiddenform .= "<input type='hidden' name='start' value='{$start}' />\n";
367 367 
         }
368 
-        $hiddenform .= "<input type='hidden' name='token' value='" . $myts->htmlSpecialChars($token) . "' />\n";
368 
+        $hiddenform .= "<input type='hidden' name='token' value='".$myts->htmlSpecialChars($token)."' />\n";
369 369 
         $hiddenform .= "</form>";
370 370
371 
-        echo "<div>" . $hiddenform;
372 
-        echo "<a href='#' onclick='javascript:document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>" . XoopsLocale::SEARCH_AGAIN . "</a>\n";
371 
+        echo "<div>".$hiddenform;
372 
+        echo "<a href='#' onclick='javascript:document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>".XoopsLocale::SEARCH_AGAIN."</a>\n";
373 373 
         echo "</div>";
374 374 
     } else {
375 375 
         if ($start < $total) {
376 376 
             if (!empty($total)) {
377 
-                echo sprintf(XoopsLocale::F_USERS_FOUND, $total) . "<br />";
377 
+                echo sprintf(XoopsLocale::F_USERS_FOUND, $total)."<br />";
378 378 
             }
379 379 
             if (!empty($foundusers)) {
380 380 
                 echo "<form action='findusers.php' method='post' name='{$name_form}' id='{$name_form}'>
 
@@ -385,11 +385,11 @@  discard block
 
 block discarded – undo
385 385 
                     echo "<input type='checkbox' name='memberslist_checkall' id='memberslist_checkall' onclick='xoopsCheckAll(\"{$name_form}\", \"memberslist_checkall\");' />";
386 386 
                 }
387 387 
                 echo "</th>
388 
-            <th align='center'>" . XoopsLocale::USER_NAME . "</th>
389 
-            <th align='center'>" . XoopsLocale::REAL_NAME . "</th>
390 
-            <th align='center'>" . XoopsLocale::USER_REGISTRATION . "</th>
391 
-            <th align='center'>" . XoopsLocale::LAST_LOGIN . "</th>
392 
-            <th align='center'>" . XoopsLocale::POSTS . "</th>
388 
+            <th align='center'>" . XoopsLocale::USER_NAME."</th>
389 
+            <th align='center'>" . XoopsLocale::REAL_NAME."</th>
390 
+            <th align='center'>" . XoopsLocale::USER_REGISTRATION."</th>
391 
+            <th align='center'>" . XoopsLocale::LAST_LOGIN."</th>
392 
+            <th align='center'>" . XoopsLocale::POSTS."</th>
393 393 
             </tr>";
394 394 
                 $ucount = 0;
395 395 
                 foreach (array_keys($foundusers) as $j) {
 
@@ -403,32 +403,32 @@  discard block
 
 block discarded – undo
403 403 
                     echo "<tr class='$class'>
404 404 
                     <td align='center'>";
405 405 
                     if (!empty($_POST["multiple"])) {
406 
-                        echo "<input type='checkbox' name='{$name_userid}' id='{$name_userid}' value='" . $foundusers[$j]->getVar("uid") . "' />";
407 
-                        echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='" . $foundusers[$j]->getVar("uname") . "' />";
406 
+                        echo "<input type='checkbox' name='{$name_userid}' id='{$name_userid}' value='".$foundusers[$j]->getVar("uid")."' />";
407 
+                        echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='".$foundusers[$j]->getVar("uname")."' />";
408 408 
                     } else {
409 
-                        echo "<input type='radio' name='{$name_userid}' id='{$name_userid}' value='" . $foundusers[$j]->getVar("uid") . "' />";
410 
-                        echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='" . $foundusers[$j]->getVar("uname") . "' />";
409 
+                        echo "<input type='radio' name='{$name_userid}' id='{$name_userid}' value='".$foundusers[$j]->getVar("uid")."' />";
410 
+                        echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='".$foundusers[$j]->getVar("uname")."' />";
411 411 
                     }
412 412 
                     echo "</td>
413 
-                    <td><a href='" . \XoopsBaseConfig::get('url') . "/userinfo.php?uid=" . $foundusers[$j]->getVar("uid") . "' target='_blank'>" . $foundusers[$j]->getVar("uname") . "</a></td>
414 
-                    <td>" . $fuser_name . "</td>
415 
-                    <td align='center'>" . ($foundusers[$j]->getVar("user_regdate") ? date("Y-m-d", $foundusers[$j]->getVar("user_regdate")) : "") . "</td>
416 
-                    <td align='center'>" . ($foundusers[$j]->getVar("last_login") ? date("Y-m-d H:i", $foundusers[$j]->getVar("last_login")) : "") . "</td>
417 
-                    <td align='center'>" . $foundusers[$j]->getVar("posts") . "</td>";
413 
+                    <td><a href='" . \XoopsBaseConfig::get('url')."/userinfo.php?uid=".$foundusers[$j]->getVar("uid")."' target='_blank'>".$foundusers[$j]->getVar("uname")."</a></td>
414 
+                    <td>" . $fuser_name."</td>
415 
+                    <td align='center'>" . ($foundusers[$j]->getVar("user_regdate") ? date("Y-m-d", $foundusers[$j]->getVar("user_regdate")) : "")."</td>
416 
+                    <td align='center'>" . ($foundusers[$j]->getVar("last_login") ? date("Y-m-d H:i", $foundusers[$j]->getVar("last_login")) : "")."</td>
417 
+                    <td align='center'>" . $foundusers[$j]->getVar("posts")."</td>";
418 418 
                     echo "</tr>\n";
419 419 
                 }
420 420 
                 echo "<tr class='foot'><td colspan='6'>";
421 421
422 422 
                 // placeholder for external applications
423 423 
                 if (empty($_POST["target"])) {
424 
-                    echo "<select name='fct'><option value='users'>" . XoopsLocale::A_DELETE . "</option><option value='mailusers'>" . XoopsLocale::SEND_EMAIL . "</option>";
424 
+                    echo "<select name='fct'><option value='users'>".XoopsLocale::A_DELETE."</option><option value='mailusers'>".XoopsLocale::SEND_EMAIL."</option>";
425 425 
                     echo "</select>&nbsp;";
426 
-                    echo $xoops->security()->getTokenHTML() . "<input type='submit' value='" . XoopsLocale::A_SUBMIT . "' />";
426 
+                    echo $xoops->security()->getTokenHTML()."<input type='submit' value='".XoopsLocale::A_SUBMIT."' />";
427 427 
                     // Add selected users
428 428 
                 } else {
429 
-                    echo "<input type='button' value='" . XoopsLocale::ADD_SELECTED_USERS . "' onclick='addusers();' />";
429 
+                    echo "<input type='button' value='".XoopsLocale::ADD_SELECTED_USERS."' onclick='addusers();' />";
430 430 
                 }
431 
-                echo "<input type='hidden' name='token' value='" . $myts->htmlSpecialChars($token) . "' />\n";
431 
+                echo "<input type='hidden' name='token' value='".$myts->htmlSpecialChars($token)."' />\n";
432 432 
                 echo "</td></tr></table></form>\n";
433 433 
             }
434 434 
 
@@ -436,32 +436,32 @@  discard block
 
 block discarded – undo
436 436 
             foreach ($_POST as $k => $v) {
437 437 
                 if ($k === 'XOOPS_TOKEN_REQUEST') {
438 438 
                     // regenerate token value
439 
-                    $hiddenform .= $xoops->security()->getTokenHTML() . "\n";
439 
+                    $hiddenform .= $xoops->security()->getTokenHTML()."\n";
440 440 
                 } else {
441 
-                    $hiddenform .= "<input type='hidden' name='" . $myts->htmlSpecialChars($k) . "' value='" . $myts->htmlSpecialChars($v) . "' />\n";
441 
+                    $hiddenform .= "<input type='hidden' name='".$myts->htmlSpecialChars($k)."' value='".$myts->htmlSpecialChars($v)."' />\n";
442 442 
                 }
443 443 
             }
444 444 
             if (!isset($_POST['limit'])) {
445 
-                $hiddenform .= "<input type='hidden' name='limit' value='" . $limit . "' />\n";
445 
+                $hiddenform .= "<input type='hidden' name='limit' value='".$limit."' />\n";
446 446 
             }
447 447 
             if (!isset($_POST['start'])) {
448 
-                $hiddenform .= "<input type='hidden' name='start' value='" . $start . "' />\n";
448 
+                $hiddenform .= "<input type='hidden' name='start' value='".$start."' />\n";
449 449 
             }
450 
-            $hiddenform .= "<input type='hidden' name='token' value='" . $myts->htmlSpecialChars($token) . "' />\n";
450 
+            $hiddenform .= "<input type='hidden' name='token' value='".$myts->htmlSpecialChars($token)."' />\n";
451 451 
             if (!isset($total) || ($totalpages = ceil($total / $limit)) > 1) {
452 452 
                 $prev = $start - $limit;
453 453 
                 if ($start - $limit >= 0) {
454 
-                    $hiddenform .= "<a href='#0' onclick='javascript:document.findnext.start.value=" . $prev . ";document.findnext.submit();'>" . XoopsLocale::PREVIOUS . "</a>&nbsp;\n";
454 
+                    $hiddenform .= "<a href='#0' onclick='javascript:document.findnext.start.value=".$prev.";document.findnext.submit();'>".XoopsLocale::PREVIOUS."</a>&nbsp;\n";
455 455 
                 }
456 456 
                 $counter = 1;
457 457 
                 $currentpage = ($start + $limit) / $limit;
458 458 
                 if (!isset($total)) {
459 459 
                     while ($counter <= $currentpage) {
460 460 
                         if ($counter == $currentpage) {
461 
-                            $hiddenform .= "<strong>" . $counter . "</strong> ";
461 
+                            $hiddenform .= "<strong>".$counter."</strong> ";
462 462 
                         } else {
463 463 
                             if (($counter > $currentpage - 4 && $counter < $currentpage + 4) || $counter == 1) {
464 
-                                $hiddenform .= "<a href='#" . $counter . "' onclick='javascript:document.findnext.start.value=" . ($counter - 1) * $limit . ";document.findnext.submit();'>" . $counter . "</a> ";
464 
+                                $hiddenform .= "<a href='#".$counter."' onclick='javascript:document.findnext.start.value=".($counter - 1) * $limit.";document.findnext.submit();'>".$counter."</a> ";
465 465 
                                 if ($counter == 1 && $currentpage > 5) {
466 466 
                                     $hiddenform .= "... ";
467 467 
                                 }
 
@@ -472,13 +472,13 @@  discard block
 
 block discarded – undo
472 472 
                 } else {
473 473 
                     while ($counter <= $totalpages) {
474 474 
                         if ($counter == $currentpage) {
475 
-                            $hiddenform .= "<strong>" . $counter . "</strong> ";
475 
+                            $hiddenform .= "<strong>".$counter."</strong> ";
476 476 
                         } else {
477 477 
                             if (($counter > $currentpage - 4 && $counter < $currentpage + 4) || $counter == 1 || $counter == $totalpages) {
478 478 
                                 if ($counter == $totalpages && $currentpage < $totalpages - 4) {
479 479 
                                     $hiddenform .= "... ";
480 480 
                                 }
481 
-                                $hiddenform .= "<a href='#" . $counter . "' onclick='javascript:document.findnext.start.value=" . ($counter - 1) * $limit . ";document.findnext.submit();'>" . $counter . "</a> ";
481 
+                                $hiddenform .= "<a href='#".$counter."' onclick='javascript:document.findnext.start.value=".($counter - 1) * $limit.";document.findnext.submit();'>".$counter."</a> ";
482 482 
                                 if ($counter == 1 && $currentpage > 5) {
483 483 
                                     $hiddenform .= "... ";
484 484 
                                 }
 
@@ -490,16 +490,16 @@  discard block
 
 block discarded – undo
490 490
491 491 
                 $next = $start + $limit;
492 492 
                 if ((isset($total) && $total > $next) || (!isset($total) && count($foundusers) >= $limit)) {
493 
-                    $hiddenform .= "&nbsp;<a href='#" . $total . "' onclick='javascript:document.findnext.start.value=" . $next . ";document.findnext.submit();'>" . XoopsLocale::NEXT . "</a>\n";
493 
+                    $hiddenform .= "&nbsp;<a href='#".$total."' onclick='javascript:document.findnext.start.value=".$next.";document.findnext.submit();'>".XoopsLocale::NEXT."</a>\n";
494 494 
                 }
495 495 
             }
496 496 
             $hiddenform .= "</form>";
497 497
498 
-            echo "<div>" . $hiddenform;
498 
+            echo "<div>".$hiddenform;
499 499 
             if (isset($total)) {
500 
-                echo "<br />" . sprintf(XoopsLocale::F_USERS_FOUND, $total) . "&nbsp;";
500 
+                echo "<br />".sprintf(XoopsLocale::F_USERS_FOUND, $total)."&nbsp;";
501 501 
             }
502 
-            echo "<a href='#' onclick='javascript:document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>" . XoopsLocale::SEARCH_AGAIN . "</a>\n";
502 
+            echo "<a href='#' onclick='javascript:document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>".XoopsLocale::SEARCH_AGAIN."</a>\n";
503 503 
             echo "</div>";
504 504 
         }
505 505 
     }
Please login to merge, or discard this patch.
htdocs/include/version.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -19,5 +19,5 @@
 
 block discarded – undo
19 19 
  * Define XOOPS version
20 20 
  * @todo This should be eliminated in favor of \Xoops::VERSION, but it is still required in installer
21 21 
  */
22 
-$XoopsIncludeVersionString  = class_exists('\Xoops', false) ? \Xoops::VERSION : 'XOOPS 2.6.0';
22 
+$XoopsIncludeVersionString = class_exists('\Xoops', false) ? \Xoops::VERSION : 'XOOPS 2.6.0';
23 23 
 define('XOOPS_VERSION', $XoopsIncludeVersionString);
Please login to merge, or discard this patch.
htdocs/include/calendarjs.php 1 patch
Spacing   +37 added lines, -37 removed lines patch added patch discarded remove patch 
@@ -1,8 +1,8 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2 
 $xoops_url = \XoopsBaseConfig::get('url');
3 3 
 ?>
4 
-<link rel="stylesheet" type="text/css" media="all" href="<?php echo $xoops_url;?>/include/calendar-blue.css"/>
5 
-<script type="text/javascript" src="<?php echo $xoops_url . '/include/calendar.js';?>"></script>
4 
+<link rel="stylesheet" type="text/css" media="all" href="<?php echo $xoops_url; ?>/include/calendar-blue.css"/>
5 
+<script type="text/javascript" src="<?php echo $xoops_url.'/include/calendar.js'; ?>"></script>
6 6 
 <script type="text/javascript">
7 7 
     <!--
8 8 
     var calendar = null;
 
@@ -54,47 +54,47 @@  discard block
 
 block discarded – undo
54 54 
     }
55 55
56 56 
     Calendar._DN = new Array
57 
-        ("<?php echo XoopsLocale::L_DAY_SUNDAY;?>",
58 
-            "<?php echo XoopsLocale::L_DAY_MONDAY;?>",
59 
-            "<?php echo XoopsLocale::L_DAY_TUESDAY;?>",
60 
-            "<?php echo XoopsLocale::L_DAY_WEDNESDAY;?>",
61 
-            "<?php echo XoopsLocale::L_DAY_THURSDAY;?>",
62 
-            "<?php echo XoopsLocale::L_DAY_FRIDAY;?>",
63 
-            "<?php echo XoopsLocale::L_DAY_SATURDAY;?>",
64 
-            "<?php echo XoopsLocale::L_DAY_SUNDAY;?>");
57 
+        ("<?php echo XoopsLocale::L_DAY_SUNDAY; ?>",
58 
+            "<?php echo XoopsLocale::L_DAY_MONDAY; ?>",
59 
+            "<?php echo XoopsLocale::L_DAY_TUESDAY; ?>",
60 
+            "<?php echo XoopsLocale::L_DAY_WEDNESDAY; ?>",
61 
+            "<?php echo XoopsLocale::L_DAY_THURSDAY; ?>",
62 
+            "<?php echo XoopsLocale::L_DAY_FRIDAY; ?>",
63 
+            "<?php echo XoopsLocale::L_DAY_SATURDAY; ?>",
64 
+            "<?php echo XoopsLocale::L_DAY_SUNDAY; ?>");
65 65 
     Calendar._MN = new Array
66 
-        ("<?php echo XoopsLocale::L_MONTH_JANUARY;?>",
67 
-            "<?php echo XoopsLocale::L_MONTH_FEBRUARY;?>",
68 
-            "<?php echo XoopsLocale::L_MONTH_MARCH;?>",
69 
-            "<?php echo XoopsLocale::L_MONTH_APRIL;?>",
70 
-            "<?php echo XoopsLocale::L_MONTH_MAY;?>",
71 
-            "<?php echo XoopsLocale::L_MONTH_JUNE;?>",
72 
-            "<?php echo XoopsLocale::L_MONTH_JULY;?>",
73 
-            "<?php echo XoopsLocale::L_MONTH_AUGUST;?>",
74 
-            "<?php echo XoopsLocale::L_MONTH_SEPTEMBER;?>",
75 
-            "<?php echo XoopsLocale::L_MONTH_OCTOBER;?>",
76 
-            "<?php echo XoopsLocale::L_MONTH_NOVEMBER;?>",
77 
-            "<?php echo XoopsLocale::L_MONTH_DECEMBER;?>");
66 
+        ("<?php echo XoopsLocale::L_MONTH_JANUARY; ?>",
67 
+            "<?php echo XoopsLocale::L_MONTH_FEBRUARY; ?>",
68 
+            "<?php echo XoopsLocale::L_MONTH_MARCH; ?>",
69 
+            "<?php echo XoopsLocale::L_MONTH_APRIL; ?>",
70 
+            "<?php echo XoopsLocale::L_MONTH_MAY; ?>",
71 
+            "<?php echo XoopsLocale::L_MONTH_JUNE; ?>",
72 
+            "<?php echo XoopsLocale::L_MONTH_JULY; ?>",
73 
+            "<?php echo XoopsLocale::L_MONTH_AUGUST; ?>",
74 
+            "<?php echo XoopsLocale::L_MONTH_SEPTEMBER; ?>",
75 
+            "<?php echo XoopsLocale::L_MONTH_OCTOBER; ?>",
76 
+            "<?php echo XoopsLocale::L_MONTH_NOVEMBER; ?>",
77 
+            "<?php echo XoopsLocale::L_MONTH_DECEMBER; ?>");
78 78
79 79 
     Calendar._TT = {};
80 
-    Calendar._TT["TOGGLE"] = "<?php echo XoopsLocale::TOGGLE_FIRST_DAY_OF_WEEK;?>";
81 
-    Calendar._TT["PREV_YEAR"] = "<?php echo XoopsLocale::PREVIOUS_YEAR;?>";
82 
-    Calendar._TT["PREV_MONTH"] = "<?php echo XoopsLocale::PREVIOUS_MONTH;?>";
83 
-    Calendar._TT["GO_TODAY"] = "<?php echo XoopsLocale::GO_TODAY;?>";
84 
-    Calendar._TT["NEXT_MONTH"] = "<?php echo XoopsLocale::NEXT_MONTH;?>";
85 
-    Calendar._TT["NEXT_YEAR"] = "<?php echo XoopsLocale::NEXT_YEAR;?>";
86 
-    Calendar._TT["SEL_DATE"] = "<?php echo XoopsLocale::SELECT_DATE;?>";
87 
-    Calendar._TT["DRAG_TO_MOVE"] = "<?php echo XoopsLocale::DRAG_TO_MOVE;?>";
88 
-    Calendar._TT["PART_TODAY"] = "(<?php echo XoopsLocale::TODAY;?>)";
89 
-    Calendar._TT["MON_FIRST"] = "<?php echo XoopsLocale::DISPLAY_MONDAY_FIRST;?>";
90 
-    Calendar._TT["SUN_FIRST"] = "<?php echo XoopsLocale::DISPLAY_SUNDAY_FIRST;?>";
91 
-    Calendar._TT["CLOSE"] = "<?php echo XoopsLocale::A_CLOSE;?>";
92 
-    Calendar._TT["TODAY"] = "<?php echo XoopsLocale::TODAY;?>";
80 
+    Calendar._TT["TOGGLE"] = "<?php echo XoopsLocale::TOGGLE_FIRST_DAY_OF_WEEK; ?>";
81 
+    Calendar._TT["PREV_YEAR"] = "<?php echo XoopsLocale::PREVIOUS_YEAR; ?>";
82 
+    Calendar._TT["PREV_MONTH"] = "<?php echo XoopsLocale::PREVIOUS_MONTH; ?>";
83 
+    Calendar._TT["GO_TODAY"] = "<?php echo XoopsLocale::GO_TODAY; ?>";
84 
+    Calendar._TT["NEXT_MONTH"] = "<?php echo XoopsLocale::NEXT_MONTH; ?>";
85 
+    Calendar._TT["NEXT_YEAR"] = "<?php echo XoopsLocale::NEXT_YEAR; ?>";
86 
+    Calendar._TT["SEL_DATE"] = "<?php echo XoopsLocale::SELECT_DATE; ?>";
87 
+    Calendar._TT["DRAG_TO_MOVE"] = "<?php echo XoopsLocale::DRAG_TO_MOVE; ?>";
88 
+    Calendar._TT["PART_TODAY"] = "(<?php echo XoopsLocale::TODAY; ?>)";
89 
+    Calendar._TT["MON_FIRST"] = "<?php echo XoopsLocale::DISPLAY_MONDAY_FIRST; ?>";
90 
+    Calendar._TT["SUN_FIRST"] = "<?php echo XoopsLocale::DISPLAY_SUNDAY_FIRST; ?>";
91 
+    Calendar._TT["CLOSE"] = "<?php echo XoopsLocale::A_CLOSE; ?>";
92 
+    Calendar._TT["TODAY"] = "<?php echo XoopsLocale::TODAY; ?>";
93 93
94 94 
     // date formats
95 95 
     // todo, strings not defined bellow?
96 
-    Calendar._TT["DEF_DATE_FORMAT"] = "<?php echo _CAL_DEF_DATE_FORMAT;?>";
97 
-    Calendar._TT["TT_DATE_FORMAT"] = "<?php echo _CAL_TT_DATE_FORMAT;?>";
96 
+    Calendar._TT["DEF_DATE_FORMAT"] = "<?php echo _CAL_DEF_DATE_FORMAT; ?>";
97 
+    Calendar._TT["TT_DATE_FORMAT"] = "<?php echo _CAL_TT_DATE_FORMAT; ?>";
98 98
99 99 
     Calendar._TT["WK"] = "";
100 100 
     //-->
Please login to merge, or discard this patch.
htdocs/language/english/xmf.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch 
@@ -1,8 +1,8 @@
 
 block discarded – undo
1 1 
 <?php
2 2
3 
-define('_AM_XMF_MODULE_NOTFOUND','Please install or reactivate %1$s module. Minimum version required: %2$s');
4 
-define('_AM_XMF_MODULE_VERSION','Minimum %1$s module version required: %2$s (your version is %3$s)');
3 
+define('_AM_XMF_MODULE_NOTFOUND', 'Please install or reactivate %1$s module. Minimum version required: %2$s');
4 
+define('_AM_XMF_MODULE_VERSION', 'Minimum %1$s module version required: %2$s (your version is %3$s)');
5 5 
 define('_AM_XMF_MODULE_INSTALLED', 'The module \'%s\' is installed!');
6 6 
 define('_AM_XMF_MODULE_NOT_INSTALLED', 'The module \'%s\' is not installed!');
7 7
8 
-define('_DB_XMF_TABLE_IS_NOT_DEFINED','Table is not defined');
8 
+define('_DB_XMF_TABLE_IS_NOT_DEFINED', 'Table is not defined');
Please login to merge, or discard this patch.
htdocs/language/english/locale.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -30,7 +30,7 @@
 
 block discarded – undo
30 30 
 define("_MONTHDAY", "n/j G:i");
31 31 
 define("_YEARMONTHDAY", "Y/n/j G:i");
32 32 
 define("_ELAPSE", "%s ago");
33 
-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>.");
33 
+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>.");
34 34 
 define("_TIMEZONE_SET", "Europe/London");
35 35
36 36 
 /**
Please login to merge, or discard this patch.
htdocs/backend.php 2 patches
Indentation   +10 added lines, -10 removed lines patch added patch discarded remove patch 
@@ -68,11 +68,11 @@  discard block
 
 block discarded – undo
68 68 
             foreach ($res as $item) {
69 69 
                 $date[] = array('date' => $item['date']);
70 70 
                 $items[] = array('date' => XoopsLocale::formatTimestamp($item['date'], 'rss'),
71 
-                                 'title' => $myts->htmlSpecialChars($item['title']),
72 
-                                 'content' => $myts->htmlSpecialChars($item['content']),
73 
-                                 'link' => $item['link'],
74 
-                                 'guid' => $item['link'],
75 
-                                 );
71 
+                                    'title' => $myts->htmlSpecialChars($item['title']),
72 
+                                    'content' => $myts->htmlSpecialChars($item['content']),
73 
+                                    'link' => $item['link'],
74 
+                                    'guid' => $item['link'],
75 
+                                    );
76 76 
             }
77 77 
         }
78 78 
     } else {
 
@@ -84,11 +84,11 @@  discard block
 
 block discarded – undo
84 84 
                 foreach ($res as $item) {
85 85 
                     $date[] = array('date' => $item['date']);
86 86 
                     $items[] = array('date' => XoopsLocale::formatTimestamp($item['date'], 'rss'),
87 
-                                     'title' => $myts->htmlSpecialChars($item['title']),
88 
-                                     'content' => $myts->htmlSpecialChars($item['content']),
89 
-                                     'link' => $item['link'],
90 
-                                     'guid' => $item['link'],
91 
-                                     );
87 
+                                        'title' => $myts->htmlSpecialChars($item['title']),
88 
+                                        'content' => $myts->htmlSpecialChars($item['content']),
89 
+                                        'link' => $item['link'],
90 
+                                        'guid' => $item['link'],
91 
+                                        );
92 92 
                 }
93 93 
             }
94 94 
         }
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -23,7 +23,7 @@  discard block
 
 block discarded – undo
23 23 
  */
24 24
25 25
26 
-require __DIR__ . '/mainfile.php';
26 
+require __DIR__.'/mainfile.php';
27 27
28 28 
 $xoops = Xoops::getInstance();
29 29 
 $xoops->disableErrorReporting();
 
@@ -36,13 +36,13 @@  discard block
 
 block discarded – undo
36 36 
     mb_http_output('pass');
37 37 
 }
38 38 
 header('Content-Type:text/xml; charset=utf-8');
39 
-$dirname = $xoops->isModule() ? $xoops->module->getVar('dirname'): 'system';
39 
+$dirname = $xoops->isModule() ? $xoops->module->getVar('dirname') : 'system';
40 40 
 $tpl = new XoopsTpl();
41 41 
 $tpl->caching = 2;
42 42 
 $tpl->cache_lifetime = 3600;
43 
-if (!$tpl->isCached('module:' . $dirname . '/system_rss.tpl')) {
43 
+if (!$tpl->isCached('module:'.$dirname.'/system_rss.tpl')) {
44 44 
     $tpl->assign('channel_title', $myts->htmlSpecialChars($xoops->getConfig('sitename')));
45 
-    $tpl->assign('channel_link', $xoops_url . '/');
45 
+    $tpl->assign('channel_link', $xoops_url.'/');
46 46 
     $tpl->assign('channel_desc', $myts->htmlSpecialChars($xoops->getConfig('slogan')));
47 47 
     $tpl->assign('channel_lastbuild', XoopsLocale::formatTimestamp(time(), 'rss'));
48 48 
     $tpl->assign('channel_webmaster', $xoops->checkEmail($xoops->getConfig('adminmail'), true));
 
@@ -64,7 +64,7 @@  discard block
 
 block discarded – undo
64 64 
         /* @var $plugin SystemPluginInterface */
65 65 
         $plugin = Xoops\Module\Plugin::getPlugin($dirname, 'system');
66 66 
         $res = $plugin->backend(10);
67 
-        if (is_array($res) && count($res)>0) {
67 
+        if (is_array($res) && count($res) > 0) {
68 68 
             foreach ($res as $item) {
69 69 
                 $date[] = array('date' => $item['date']);
70 70 
                 $items[] = array('date' => XoopsLocale::formatTimestamp($item['date'], 'rss'),
 
@@ -80,7 +80,7 @@  discard block
 
 block discarded – undo
80 80 
         /* @var $plugin SystemPluginInterface */
81 81 
         foreach ($plugins as $plugin) {
82 82 
             $res = $plugin->backend(10);
83 
-            if (is_array($res) && count($res)>0) {
83 
+            if (is_array($res) && count($res) > 0) {
84 84 
                 foreach ($res as $item) {
85 85 
                     $date[] = array('date' => $item['date']);
86 86 
                     $items[] = array('date' => XoopsLocale::formatTimestamp($item['date'], 'rss'),
 
@@ -97,4 +97,4 @@  discard block
 
 block discarded – undo
97 97 
     $tpl->assign('items', $items);
98 98
99 99 
 }
100 
-$tpl->display('module:' . $dirname . '/system_rss.tpl');
100 
+$tpl->display('module:'.$dirname.'/system_rss.tpl');
Please login to merge, or discard this patch.
htdocs/kernel/object.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch 
@@ -61,7 +61,7 @@
 
 block discarded – undo
61 61 
         $keyName = '',
62 62 
         $identifierName = ''
63 63 
     ) {
64 
-        if ($db===null) {
64 
+        if ($db === null) {
65 65 
             $this->db2 = \Xoops\Core\Database\Factory::getConnection();
66 66 
             $db = $this->db2;
67 67 
         }
Please login to merge, or discard this patch.
htdocs/pmlite.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch 
@@ -22,7 +22,7 @@  discard block
 
 block discarded – undo
22 22 
  * @version         $Id$
23 23 
  */
24 24
25 
-include __DIR__ . '/mainfile.php';
25 
+include __DIR__.'/mainfile.php';
26 26 
 $xoops = Xoops::getInstance();
27 27 
 $xoops_url = \XoopsBaseConfig::get('url');
28 28 
 $xoops->events()->triggerEvent('core.pmlite.start');
 
@@ -35,7 +35,7 @@  discard block
 
 block discarded – undo
35 35 
 $msg_id = isset($_GET['msg_id']) ? (int)($_GET['msg_id']) : 0;
36 36
37 37 
 if (empty($_GET['refresh']) && isset($_POST['op']) && $_POST['op'] !== "submit") {
38 
-    $jump = "pmlite.php?refresh=" . time();
38 
+    $jump = "pmlite.php?refresh=".time();
39 39 
     if ($send == 1) {
40 40 
         $jump .= "&amp;send={$send}";
41 41 
     } else {
 
@@ -48,7 +48,7 @@  discard block
 
 block discarded – undo
48 48 
             }
49 49 
         }
50 50 
     }
51 
-    header('location: ' . $jump);
51 
+    header('location: '.$jump);
52 52 
     exit();
53 53 
 }
54 54 
 
@@ -64,8 +64,8 @@  discard block
 
 block discarded – undo
64 64 
     $tpl = new XoopsTpl();
65 65 
     if ($count != 1) {
66 66 
         $error_message = XoopsLocale::E_SELECTED_USER_DOES_NOT_EXIST;
67 
-        $error_message .= "<br />" . XoopsLocale::E_GO_BACK_AND_TRY_AGAIN;
68 
-        $error_message .= "<br />[ <a href='javascript:history.go(-1)'>" . XoopsLocale::GO_BACK . "</a> ]";
67 
+        $error_message .= "<br />".XoopsLocale::E_GO_BACK_AND_TRY_AGAIN;
68 
+        $error_message .= "<br />[ <a href='javascript:history.go(-1)'>".XoopsLocale::GO_BACK."</a> ]";
69 69 
         $tpl->assign('error_message', $error_message);
70 70 
     } else {
71 71 
         if ($xoops->security()->check()) {
 
@@ -81,19 +81,19 @@  discard block
 
 block discarded – undo
81 81 
             $pm->setVar("from_userid", $xoops->user->getVar("uid"));
82 82 
             if (!$pm_handler->insert($pm)) {
83 83 
                 $error_message = $pm->getHtmlErrors();
84 
-                $error_message .= "<br /><a href='javascript:history.go(-1)'>" . XoopsLocale::GO_BACK . "</a>";
84 
+                $error_message .= "<br /><a href='javascript:history.go(-1)'>".XoopsLocale::GO_BACK."</a>";
85 85 
                 $tpl->assign('error_message', $error_message);
86 86 
             } else {
87 87 
                 // @todo: Send notification email if user has selected this in the profile
88 88 
                 $info_message = XoopsLocale::S_MESSAGED_HAS_BEEN_POSTED;
89 89 
                 $info_message .= "<br />";
90 
-                $info_message .= "<br /><a href=\"javascript:window.opener.location='" . $xoops_url . "/viewpmsg.php';window.close();\">" . XoopsLocale::CLICK_HERE_TO_VIEW_YOU_PRIVATE_MESSAGES . "</a>";
91 
-                $info_message .= "<br /><br /><a href=\"javascript:window.close();\">" . XoopsLocale::OR_CLICK_HERE_TO_CLOSE_WINDOW . "</a>";
90 
+                $info_message .= "<br /><a href=\"javascript:window.opener.location='".$xoops_url."/viewpmsg.php';window.close();\">".XoopsLocale::CLICK_HERE_TO_VIEW_YOU_PRIVATE_MESSAGES."</a>";
91 
+                $info_message .= "<br /><br /><a href=\"javascript:window.close();\">".XoopsLocale::OR_CLICK_HERE_TO_CLOSE_WINDOW."</a>";
92 92 
                 $tpl->assign('info_message', $info_message);
93 93 
             }
94 94 
         } else {
95 95 
             $error_message = implode('<br />', $xoops->security()->getErrors());
96 
-            $error_message .= "<br /><a href=\"javascript:window.close();\">" . XoopsLocale::OR_CLICK_HERE_TO_CLOSE_WINDOW . "</a>";
96 
+            $error_message .= "<br /><a href=\"javascript:window.close();\">".XoopsLocale::OR_CLICK_HERE_TO_CLOSE_WINDOW."</a>";
97 97 
             $tpl->assign('error_message', $error_message);
98 98 
         }
99 99 
     }
 
@@ -110,7 +110,7 @@  discard block
 
 block discarded – undo
110 110 
                 $pm_uname = XoopsUser::getUnameFromId($pm->getVar("from_userid"));
111 111 
                 $message = "[quote]\n";
112 112 
                 $message .= sprintf(XoopsLocale::CF_WROTE, $pm_uname);
113 
-                $message .= "\n" . $pm->getVar("msg_text", "E") . "\n[/quote]";
113 
+                $message .= "\n".$pm->getVar("msg_text", "E")."\n[/quote]";
114 114 
             } else {
115 115 
                 unset($pm);
116 116 
                 $reply = 0;
 
@@ -123,8 +123,8 @@  discard block
 
 block discarded – undo
123 123
124 124 
         if ($reply == 1) {
125 125 
             $subject = $pm->getVar('subject', 'E');
126 
-            if (!preg_match("/^" . XoopsLocale::C_RE . "/i", $subject)) {
127 
-                $subject = XoopsLocale::C_RE . ' ' . $subject;
126 
+            if (!preg_match("/^".XoopsLocale::C_RE."/i", $subject)) {
127 
+                $subject = XoopsLocale::C_RE.' '.$subject;
128 128 
             }
129 129 
             $form->addElement(new Xoops\Form\Label(XoopsLocale::C_TO, $pm_uname));
130 130 
             $form->addElement(new Xoops\Form\Hidden('to_userid', $pm->getVar("from_userid")));
Please login to merge, or discard this patch.
htdocs/lostpass.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch 
@@ -21,7 +21,7 @@  discard block
 
 block discarded – undo
21 21 
  * @version         $Id$
22 22 
  */
23 23
24 
-include __DIR__ . '/mainfile.php';
24 
+include __DIR__.'/mainfile.php';
25 25 
 $xoops = Xoops::getInstance();
26 26 
 $xoops->events()->triggerEvent('core.lostpass.start');
27 27 
 
@@ -54,7 +54,7 @@  discard block
 
 block discarded – undo
54 54 
         $xoopsMailer->setTemplate("lostpass2.tpl");
55 55 
         $xoopsMailer->assign("SITENAME", $xoops->getConfig('sitename'));
56 56 
         $xoopsMailer->assign("ADMINMAIL", $xoops->getConfig('adminmail'));
57 
-        $xoopsMailer->assign("SITEURL", $xoops_url . "/");
57 
+        $xoopsMailer->assign("SITEURL", $xoops_url."/");
58 58 
         $xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
59 59 
         $xoopsMailer->assign("NEWPWD", $newpass);
60 60 
         $xoopsMailer->setToUsers($userObject);
 
@@ -79,9 +79,9 @@  discard block
 
 block discarded – undo
79 79 
         $xoopsMailer->setTemplate("lostpass1.tpl");
80 80 
         $xoopsMailer->assign("SITENAME", $xoops->getConfig('sitename'));
81 81 
         $xoopsMailer->assign("ADMINMAIL", $xoops->getConfig('adminmail'));
82 
-        $xoopsMailer->assign("SITEURL", $xoops_url . "/");
82 
+        $xoopsMailer->assign("SITEURL", $xoops_url."/");
83 83 
         $xoopsMailer->assign("IP", $_SERVER['REMOTE_ADDR']);
84 
-        $xoopsMailer->assign("NEWPWD_LINK", $xoops_url . "/lostpass.php?email=" . $email . "&code=" . $areyou);
84 
+        $xoopsMailer->assign("NEWPWD_LINK", $xoops_url."/lostpass.php?email=".$email."&code=".$areyou);
85 85 
         $xoopsMailer->setToUsers($userObject);
86 86 
         $xoopsMailer->setFromEmail($xoops->getConfig('adminmail'));
87 87 
         $xoopsMailer->setFromName($xoops->getConfig('sitename'));
Please login to merge, or discard this patch.