Completed
Push — master ( 46dc99...a217e2 )
by Michael
50:47 queued 35:27
created
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.
htdocs/user.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  * @author          Kazumi Ono <[email protected]>
26 26
  */
27 27
 
28
-include __DIR__ . '/mainfile.php';
28
+include __DIR__.'/mainfile.php';
29 29
 
30 30
 $xoops = Xoops::getInstance();
31 31
 $xoops_url = \XoopsBaseConfig::get('url');
@@ -58,12 +58,12 @@  discard block
 block discarded – undo
58 58
         $xoops->theme()->addMeta(
59 59
             'meta',
60 60
             'keywords',
61
-            XoopsLocale::USERNAME . ", " . XoopsLocale::PASSWORD . ", " . XoopsLocale::Q_LOST_YOUR_PASSWORD
61
+            XoopsLocale::USERNAME.", ".XoopsLocale::PASSWORD.", ".XoopsLocale::Q_LOST_YOUR_PASSWORD
62 62
         );
63 63
         $xoops->theme()->addMeta(
64 64
             'meta',
65 65
             'description',
66
-            XoopsLocale::Q_LOST_YOUR_PASSWORD . " " . XoopsLocale::NO_PROBLEM_ENTER_EMAIL_WE_HAVE_ON_FILE
66
+            XoopsLocale::Q_LOST_YOUR_PASSWORD." ".XoopsLocale::NO_PROBLEM_ENTER_EMAIL_WE_HAVE_ON_FILE
67 67
         );
68 68
         $xoops->tpl()->assign('lang_login', XoopsLocale::A_LOGIN);
69 69
         $xoops->tpl()->assign('lang_username', XoopsLocale::C_USERNAME);
@@ -91,11 +91,11 @@  discard block
 block discarded – undo
91 91
             }
92 92
         }
93 93
         if (!$isExternal) {
94
-            header('Location: ' . $redirect);
94
+            header('Location: '.$redirect);
95 95
             exit();
96 96
         }
97 97
     }
98
-    header('Location: ' . $xoops_url . '/userinfo.php?uid=' . $xoopsUser->getVar('uid'));
98
+    header('Location: '.$xoops_url.'/userinfo.php?uid='.$xoopsUser->getVar('uid'));
99 99
     exit();
100 100
 }
101 101
 
@@ -106,8 +106,8 @@  discard block
 block discarded – undo
106 106
     if ($xoops->isUser()) {
107 107
         $xoops->getHandlerOnline()->destroy($xoops->user->getVar('uid'));
108 108
     }
109
-    $message = XoopsLocale::S_YOU_ARE_NOW_LOGGED_OUT . '<br />' . XoopsLocale::S_THANK_YOU_FOR_VISITING_OUR_SITE;
110
-    $xoops->redirect($xoops_url . '/', 1, $message);
109
+    $message = XoopsLocale::S_YOU_ARE_NOW_LOGGED_OUT.'<br />'.XoopsLocale::S_THANK_YOU_FOR_VISITING_OUR_SITE;
110
+    $xoops->redirect($xoops_url.'/', 1, $message);
111 111
 }
112 112
 
113 113
 if ($op === 'delete') {
@@ -120,12 +120,12 @@  discard block
 block discarded – undo
120 120
             // users in the webmasters group may not be deleted
121 121
             $xoops->redirect('user.php', 5, XoopsLocale::E_USER_IN_WEBMASTER_GROUP_CANNOT_BE_REMOVED);
122 122
         }
123
-        if (!(bool) $ok) {
123
+        if (!(bool)$ok) {
124 124
             $xoops->header();
125 125
             echo $xoops->confirm(
126 126
                 array('op' => 'delete', 'ok' => 1),
127 127
                 'user.php',
128
-                XoopsLocale::Q_ARE_YOU_SURE_TO_DELETE_ACCOUNT . '<br/>' . XoopsLocale::THIS_WILL_REMOVE_ALL_YOUR_INFO
128
+                XoopsLocale::Q_ARE_YOU_SURE_TO_DELETE_ACCOUNT.'<br/>'.XoopsLocale::THIS_WILL_REMOVE_ALL_YOUR_INFO
129 129
             );
130 130
             $xoops->footer();
131 131
         } else {
Please login to merge, or discard this patch.