Test Failed
Push — master ( 398493...d4ef72 )
by Michael
11:04
created
extras/mainfile.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -14,6 +14,6 @@
 block discarded – undo
14 14
  * Typical writable permission would be 665 (user read/write, group read/write, other read)
15 15
  * If problems persist, escalate permission to 777 (world read/write/execute) as a last resort.
16 16
  */
17
-if (! defined('XOOPS_INSTALL')) {
17
+if (!defined('XOOPS_INSTALL')) {
18 18
     header('Location: install/index.php');
19 19
 }
Please login to merge, or discard this patch.
extras/altsys_functions.php 1 patch
Spacing   +16 added lines, -16 removed lines patch added patch discarded remove patch
@@ -23,15 +23,15 @@  discard block
 block discarded – undo
23 23
     global $xoopsModule, $xoopsConfig, $mydirname, $mydirpath, $mytrustdirname, $mytrustdirpath, $mymenu_fake_uri;
24 24
 
25 25
     $mymenu_find_paths = array(
26
-        $mydirpath . '/admin/mymenu.php',
27
-        $mydirpath . '/mymenu.php',
28
-        $mytrustdirpath . '/admin/mymenu.php',
29
-        $mytrustdirpath . '/mymenu.php');
26
+        $mydirpath.'/admin/mymenu.php',
27
+        $mydirpath.'/mymenu.php',
28
+        $mytrustdirpath.'/admin/mymenu.php',
29
+        $mytrustdirpath.'/mymenu.php');
30 30
 
31 31
     foreach ($mymenu_find_paths as $mymenu_find_path) {
32 32
         if (file_exists($mymenu_find_path)) {
33 33
             include $mymenu_find_path;
34
-            include_once __DIR__ . '/adminmenu_functions.php';
34
+            include_once __DIR__.'/adminmenu_functions.php';
35 35
             altsys_adminmenu_insert_mymenu($xoopsModule);
36 36
             altsys_adminmenu_hack_ft();
37 37
             break;
@@ -46,14 +46,14 @@  discard block
 block discarded – undo
46 46
 {
47 47
     $mylang = $GLOBALS['xoopsConfig']['language'];
48 48
 
49
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/altsys/language/' . $mylang . '/' . $type . '.php')) {
50
-        include_once XOOPS_ROOT_PATH . '/modules/altsys/language/' . $mylang . '/' . $type . '.php';
51
-    } elseif (file_exists(XOOPS_TRUST_PATH . '/libs/altsys/language/' . $mylang . '/' . $type . '.php')) {
52
-        include_once XOOPS_TRUST_PATH . '/libs/altsys/language/' . $mylang . '/' . $type . '.php';
53
-    } elseif (file_exists(XOOPS_ROOT_PATH . '/modules/altsys/language/english/' . $type . '.php')) {
54
-        include_once XOOPS_ROOT_PATH . '/modules/altsys/language/english/' . $type . '.php';
55
-    } elseif (file_exists(XOOPS_TRUST_PATH . '/libs/altsys/language/english/' . $type . '.php')) {
56
-        include_once XOOPS_TRUST_PATH . '/libs/altsys/language/english/' . $type . '.php';
49
+    if (file_exists(XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php')) {
50
+        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/'.$mylang.'/'.$type.'.php';
51
+    } elseif (file_exists(XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php')) {
52
+        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/'.$mylang.'/'.$type.'.php';
53
+    } elseif (file_exists(XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php')) {
54
+        include_once XOOPS_ROOT_PATH.'/modules/altsys/language/english/'.$type.'.php';
55
+    } elseif (file_exists(XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php')) {
56
+        include_once XOOPS_TRUST_PATH.'/libs/altsys/language/english/'.$type.'.php';
57 57
     }
58 58
 }
59 59
 
@@ -98,9 +98,9 @@  discard block
 block discarded – undo
98 98
         case ALTSYS_CORE_TYPE_X20S:
99 99
         case ALTSYS_CORE_TYPE_ORE:
100 100
         case ALTSYS_CORE_TYPE_X22:
101
-            return XOOPS_URL . '/modules/system/admin.php?fct=preferences&op=showmod&mod=' . $mid;
101
+            return XOOPS_URL.'/modules/system/admin.php?fct=preferences&op=showmod&mod='.$mid;
102 102
         case ALTSYS_CORE_TYPE_XC21L:
103
-            return XOOPS_URL . '/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id=' . $mid;
103
+            return XOOPS_URL.'/modules/legacy/admin/index.php?action=PreferenceEdit&confmod_id='.$mid;
104 104
     }
105 105
 
106 106
     return null;
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
         if (substr($file, -4) !== '.php') {
131 131
             continue;
132 132
         }
133
-        @unlink(XOOPS_COMPILE_PATH . '/' . $file);
133
+        @unlink(XOOPS_COMPILE_PATH.'/'.$file);
134 134
     }
135 135
     closedir($dh);
136 136
 }
Please login to merge, or discard this patch.
extras/login.php 1 patch
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -4,11 +4,11 @@  discard block
 block discarded – undo
4 4
 // path to your xoops main directory
5 5
 $path = '/path/to/xoops/directory';
6 6
 
7
-include $path . '/mainfile.php';
7
+include $path.'/mainfile.php';
8 8
 if (!defined('XOOPS_ROOT_PATH')) {
9 9
     exit();
10 10
 }
11
-include_once XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/user.php';
11
+include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/user.php';
12 12
 $op = (isset($_POST['op']) && $_POST['op'] === 'dologin') ? 'dologin' : 'login';
13 13
 
14 14
 $username = isset($_POST['username']) ? trim($_POST['username']) : '';
@@ -20,17 +20,17 @@  discard block
 block discarded – undo
20 20
 echo '
21 21
 <html>
22 22
   <head>
23
-    <meta http-equiv="content-type" content="text/html; charset=' . _CHARSET . '" />
24
-    <meta http-equiv="content-language" content="' . _LANGCODE . '" />
25
-    <title>' . $xoopsConfig['sitename'] . '</title>
26
-    <link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL . '/xoops.css" />
23
+    <meta http-equiv="content-type" content="text/html; charset=' . _CHARSET.'" />
24
+    <meta http-equiv="content-language" content="' . _LANGCODE.'" />
25
+    <title>' . $xoopsConfig['sitename'].'</title>
26
+    <link rel="stylesheet" type="text/css" media="all" href="' . XOOPS_URL.'/xoops.css" />
27 27
 ';
28 28
 $style = xoops_getcss($xoopsConfig['theme_set']);
29 29
 if ($style == '') {
30 30
     $style = xoops_getcss($xoopsConfig['theme_set']);
31 31
 }
32 32
 if ($style != '') {
33
-    echo '<link rel="stylesheet" type="text/css" media="all" href="' . $style . '" />';
33
+    echo '<link rel="stylesheet" type="text/css" media="all" href="'.$style.'" />';
34 34
 }
35 35
 echo '
36 36
   </head>
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
     $user           = $member_handler->loginUser(addslashes($myts->stripSlashesGPC($username)), addslashes($myts->stripSlashesGPC($password)));
44 44
     if (is_object($user)) {
45 45
         if (0 == $user->getVar('level')) {
46
-            redirect_header(XOOPS_URL . '/index.php', 5, _US_NOACTTPADM);
46
+            redirect_header(XOOPS_URL.'/index.php', 5, _US_NOACTTPADM);
47 47
             exit();
48 48
         }
49 49
         if ($xoopsConfig['closesite'] == 1) {
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
                 }
56 56
             }
57 57
             if (!$allowed) {
58
-                redirect_header(XOOPS_URL . '/index.php', 1, _NOPERM);
58
+                redirect_header(XOOPS_URL.'/index.php', 1, _NOPERM);
59 59
                 exit();
60 60
             }
61 61
         }
@@ -66,13 +66,13 @@  discard block
 block discarded – undo
66 66
         $_SESSION['xoopsUserId']     = $user->getVar('uid');
67 67
         $_SESSION['xoopsUserGroups'] = $user->getGroups();
68 68
         if (!empty($xoopsConfig['use_ssl'])) {
69
-            xoops_confirm(array($xoopsConfig['sslpost_name'] => session_id()), XOOPS_URL . '/misc.php?action=showpopups&amp;type=ssllogin', _US_PRESSLOGIN, _LOGIN);
69
+            xoops_confirm(array($xoopsConfig['sslpost_name'] => session_id()), XOOPS_URL.'/misc.php?action=showpopups&amp;type=ssllogin', _US_PRESSLOGIN, _LOGIN);
70 70
         } else {
71 71
             echo sprintf(_US_LOGGINGU, $user->getVar('uname'));
72
-            echo '<div style="text-align:center;"><input value="' . _CLOSE . '" type="button" onclick="document.window.opener.location.reload();document.window.close();" /></div>';
72
+            echo '<div style="text-align:center;"><input value="'._CLOSE.'" type="button" onclick="document.window.opener.location.reload();document.window.close();" /></div>';
73 73
         }
74 74
     } else {
75
-        xoops_error(_US_INCORRECTLOGIN . '<br><a href="login.php">' . _BACK . '</a>');
75
+        xoops_error(_US_INCORRECTLOGIN.'<br><a href="login.php">'._BACK.'</a>');
76 76
     }
77 77
 }
78 78
 
@@ -82,16 +82,16 @@  discard block
 block discarded – undo
82 82
     <form action="login.php" method="post">
83 83
       <table class="outer" width="95%">
84 84
         <tr>
85
-          <td class="head">' . _USERNAME . '</td>
85
+          <td class="head">' . _USERNAME.'</td>
86 86
           <td class="even"><input type="text" name="username" value="" /></td>
87 87
         </tr>
88 88
         <tr>
89
-          <td class="head">' . _PASSWORD . '</td>
89
+          <td class="head">' . _PASSWORD.'</td>
90 90
           <td class="even"><input type="password" name="userpass" value="" /></td>
91 91
         </tr>
92 92
         <tr>
93 93
           <td class="head">&nbsp;</td>
94
-          <td class="even"><input type="hidden" name="op" value="dologin" /><input type="submit" name="submit" value="' . _LOGIN . '" /></td>
94
+          <td class="even"><input type="hidden" name="op" value="dologin" /><input type="submit" name="submit" value="' . _LOGIN.'" /></td>
95 95
         </tr>
96 96
       </table>
97 97
     </form>
Please login to merge, or discard this patch.
htdocs/register.php 2 patches
Switch Indentation   +189 added lines, -189 removed lines patch added patch discarded remove patch
@@ -120,33 +120,33 @@  discard block
 block discarded – undo
120 120
 }
121 121
 
122 122
 switch ($op) {
123
-    case 'newuser':
124
-        $xoopsOption['xoops_pagetitle'] = _US_USERREG;
125
-        include $GLOBALS['xoops']->path('header.php');
126
-        $stop = '';
127
-        if (!$GLOBALS['xoopsSecurity']->check()) {
128
-            $stop .= implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()) . '<br>';
129
-        }
130
-        if ($xoopsConfigUser['reg_dispdsclmr'] != 0 && $xoopsConfigUser['reg_disclaimer'] != '') {
131
-            if (empty($agree_disc)) {
132
-                $stop .= _US_UNEEDAGREE . '<br>';
123
+        case 'newuser':
124
+            $xoopsOption['xoops_pagetitle'] = _US_USERREG;
125
+            include $GLOBALS['xoops']->path('header.php');
126
+            $stop = '';
127
+            if (!$GLOBALS['xoopsSecurity']->check()) {
128
+                $stop .= implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()) . '<br>';
133 129
             }
134
-        }
135
-        $stop .= XoopsUserUtility::validate($uname, $email, $pass, $vpass);
136
-        if (empty($stop)) {
137
-            echo _US_USERNAME . ': ' . $myts->htmlSpecialChars($uname) . '<br>';
138
-            echo _US_EMAIL . ': ' . $myts->htmlSpecialChars($email) . '<br>';
139
-            if ($url != '') {
140
-                $url = formatURL($url);
141
-                echo _US_WEBSITE . ': ' . $myts->htmlSpecialChars($url) . '<br>';
130
+            if ($xoopsConfigUser['reg_dispdsclmr'] != 0 && $xoopsConfigUser['reg_disclaimer'] != '') {
131
+                if (empty($agree_disc)) {
132
+                    $stop .= _US_UNEEDAGREE . '<br>';
133
+                }
142 134
             }
143
-            $f_timezone = ($timezone_offset < 0) ? 'GMT ' . $timezone_offset : 'GMT +' . $timezone_offset;
144
-            echo _US_TIMEZONE . ": $f_timezone<br>";
145
-            echo "<form action='register.php' method='post'>";
146
-            xoops_load('XoopsFormCaptcha');
147
-            $cpatcha = new XoopsFormCaptcha();
148
-            echo '<br>' . $cpatcha->getCaption() . ': ' . $cpatcha->render();
149
-            echo "<input type='hidden' name='uname' value='" . $myts->htmlSpecialChars($uname) . "' />
135
+            $stop .= XoopsUserUtility::validate($uname, $email, $pass, $vpass);
136
+            if (empty($stop)) {
137
+                echo _US_USERNAME . ': ' . $myts->htmlSpecialChars($uname) . '<br>';
138
+                echo _US_EMAIL . ': ' . $myts->htmlSpecialChars($email) . '<br>';
139
+                if ($url != '') {
140
+                    $url = formatURL($url);
141
+                    echo _US_WEBSITE . ': ' . $myts->htmlSpecialChars($url) . '<br>';
142
+                }
143
+                $f_timezone = ($timezone_offset < 0) ? 'GMT ' . $timezone_offset : 'GMT +' . $timezone_offset;
144
+                echo _US_TIMEZONE . ": $f_timezone<br>";
145
+                echo "<form action='register.php' method='post'>";
146
+                xoops_load('XoopsFormCaptcha');
147
+                $cpatcha = new XoopsFormCaptcha();
148
+                echo '<br>' . $cpatcha->getCaption() . ': ' . $cpatcha->render();
149
+                echo "<input type='hidden' name='uname' value='" . $myts->htmlSpecialChars($uname) . "' />
150 150
                   <input type='hidden' name='email' value='" . $myts->htmlSpecialChars($email) . "' />
151 151
                   <input type='hidden' name='user_viewemail' value='" . $user_viewemail . "' />
152 152
                   <input type='hidden' name='timezone_offset' value='" . (float)$timezone_offset . "' />
@@ -155,186 +155,186 @@  discard block
 block discarded – undo
155 155
                   <input type='hidden' name='vpass' value='" . $myts->htmlSpecialChars($vpass) . "' />
156 156
                   <input type='hidden' name='user_mailok' value='" . $user_mailok . "' />
157 157
                   <br><br><input type='hidden' name='op' value='finish' />" . $GLOBALS['xoopsSecurity']->getTokenHTML() . "<input type='submit' value='" . _US_FINISH . "' /></form>";
158
-        } else {
159
-            echo "<span class='red'>$stop</span>";
160
-            include $GLOBALS['xoops']->path('include/registerform.php');
161
-            $reg_form->display();
162
-        }
163
-        include $GLOBALS['xoops']->path('footer.php');
164
-        break;
165
-
166
-    case 'finish':
167
-        include $GLOBALS['xoops']->path('header.php');
168
-        $stop = XoopsUserUtility::validate($uname, $email, $pass, $vpass);
169
-        if (!$GLOBALS['xoopsSecurity']->check()) {
170
-            $stop .= implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()) . '<br>';
171
-        }
172
-        xoops_load('XoopsCaptcha');
173
-        $xoopsCaptcha = XoopsCaptcha::getInstance();
174
-        if (!$xoopsCaptcha->verify()) {
175
-            $stop .= $xoopsCaptcha->getMessage() . '<br>';
176
-        }
177
-        if (empty($stop)) {
178
-            /* @var $member_handler XoopsMemberHandler */
179
-            $member_handler = xoops_getHandler('member');
180
-            $newuser        = $member_handler->createUser();
181
-            $newuser->setVar('user_viewemail', $user_viewemail, true);
182
-            $newuser->setVar('uname', $uname, true);
183
-            $newuser->setVar('email', $email, true);
184
-            if ($url != '') {
185
-                $newuser->setVar('url', formatURL($url), true);
186
-            }
187
-            $newuser->setVar('user_avatar', 'avatars/blank.gif', true);
188
-            $actkey = substr(md5(uniqid(mt_rand(), 1)), 0, 8);
189
-            $newuser->setVar('actkey', $actkey, true);
190
-            $newuser->setVar('pass', password_hash($pass, PASSWORD_DEFAULT), true);
191
-            $newuser->setVar('timezone_offset', $timezone_offset, true);
192
-            $newuser->setVar('user_regdate', time(), true);
193
-            $newuser->setVar('uorder', $GLOBALS['xoopsConfig']['com_order'], true);
194
-            $newuser->setVar('umode', $GLOBALS['xoopsConfig']['com_mode'], true);
195
-            $newuser->setVar('theme', $GLOBALS['xoopsConfig']['theme_set'], true);
196
-            $newuser->setVar('user_mailok', $user_mailok, true);
197
-            if ($xoopsConfigUser['activation_type'] == 1) {
198
-                $newuser->setVar('level', 1, true);
199 158
             } else {
200
-                $newuser->setVar('level', 0, true);
159
+                echo "<span class='red'>$stop</span>";
160
+                include $GLOBALS['xoops']->path('include/registerform.php');
161
+                $reg_form->display();
201 162
             }
202
-            if (!$member_handler->insertUser($newuser)) {
203
-                echo _US_REGISTERNG;
204
-                include $GLOBALS['xoops']->path('footer.php');
205
-                exit();
206
-            }
207
-            $newid = $newuser->getVar('uid');
208
-            if (!$member_handler->addUserToGroup(XOOPS_GROUP_USERS, $newid)) {
209
-                echo _US_REGISTERNG;
210
-                include $GLOBALS['xoops']->path('footer.php');
211
-                exit();
163
+            include $GLOBALS['xoops']->path('footer.php');
164
+            break;
165
+
166
+        case 'finish':
167
+            include $GLOBALS['xoops']->path('header.php');
168
+            $stop = XoopsUserUtility::validate($uname, $email, $pass, $vpass);
169
+            if (!$GLOBALS['xoopsSecurity']->check()) {
170
+                $stop .= implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()) . '<br>';
212 171
             }
213
-            if ($xoopsConfigUser['activation_type'] == 1) {
214
-                XoopsUserUtility::sendWelcome($newuser);
215
-                redirect_header('index.php', 4, _US_ACTLOGIN);
172
+            xoops_load('XoopsCaptcha');
173
+            $xoopsCaptcha = XoopsCaptcha::getInstance();
174
+            if (!$xoopsCaptcha->verify()) {
175
+                $stop .= $xoopsCaptcha->getMessage() . '<br>';
216 176
             }
217
-            // Sending notification email to user for self activation
218
-            if ($xoopsConfigUser['activation_type'] == 0) {
219
-                $xoopsMailer = xoops_getMailer();
220
-                $xoopsMailer->useMail();
221
-                $xoopsMailer->setTemplate('register.tpl');
222
-                $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
223
-                $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
224
-                $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
225
-                $xoopsMailer->setToUsers(new XoopsUser($newid));
226
-                $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
227
-                $xoopsMailer->setFromName($xoopsConfig['sitename']);
228
-                $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $uname));
229
-                if (!$xoopsMailer->send()) {
230
-                    echo _US_YOURREGMAILNG;
231
-                } else {
232
-                    echo _US_YOURREGISTERED;
233
-                }
234
-                // Sending notification email to administrator for activation
235
-            } elseif ($xoopsConfigUser['activation_type'] == 2) {
236
-                $xoopsMailer = xoops_getMailer();
237
-                $xoopsMailer->useMail();
238
-                $xoopsMailer->setTemplate('adminactivate.tpl');
239
-                $xoopsMailer->assign('USERNAME', $uname);
240
-                $xoopsMailer->assign('USEREMAIL', $email);
241
-                $xoopsMailer->assign('USERACTLINK', XOOPS_URL . '/register.php?op=actv&id=' . $newid . '&actkey=' . $actkey);
242
-                $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
243
-                $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
244
-                $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
177
+            if (empty($stop)) {
245 178
                 /* @var $member_handler XoopsMemberHandler */
246 179
                 $member_handler = xoops_getHandler('member');
247
-                $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group']));
248
-                $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
249
-                $xoopsMailer->setFromName($xoopsConfig['sitename']);
250
-                $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $uname));
251
-                if (!$xoopsMailer->send()) {
252
-                    echo _US_YOURREGMAILNG;
180
+                $newuser        = $member_handler->createUser();
181
+                $newuser->setVar('user_viewemail', $user_viewemail, true);
182
+                $newuser->setVar('uname', $uname, true);
183
+                $newuser->setVar('email', $email, true);
184
+                if ($url != '') {
185
+                    $newuser->setVar('url', formatURL($url), true);
186
+                }
187
+                $newuser->setVar('user_avatar', 'avatars/blank.gif', true);
188
+                $actkey = substr(md5(uniqid(mt_rand(), 1)), 0, 8);
189
+                $newuser->setVar('actkey', $actkey, true);
190
+                $newuser->setVar('pass', password_hash($pass, PASSWORD_DEFAULT), true);
191
+                $newuser->setVar('timezone_offset', $timezone_offset, true);
192
+                $newuser->setVar('user_regdate', time(), true);
193
+                $newuser->setVar('uorder', $GLOBALS['xoopsConfig']['com_order'], true);
194
+                $newuser->setVar('umode', $GLOBALS['xoopsConfig']['com_mode'], true);
195
+                $newuser->setVar('theme', $GLOBALS['xoopsConfig']['theme_set'], true);
196
+                $newuser->setVar('user_mailok', $user_mailok, true);
197
+                if ($xoopsConfigUser['activation_type'] == 1) {
198
+                    $newuser->setVar('level', 1, true);
253 199
                 } else {
254
-                    echo _US_YOURREGISTERED2;
200
+                    $newuser->setVar('level', 0, true);
255 201
                 }
202
+                if (!$member_handler->insertUser($newuser)) {
203
+                    echo _US_REGISTERNG;
204
+                    include $GLOBALS['xoops']->path('footer.php');
205
+                    exit();
206
+                }
207
+                $newid = $newuser->getVar('uid');
208
+                if (!$member_handler->addUserToGroup(XOOPS_GROUP_USERS, $newid)) {
209
+                    echo _US_REGISTERNG;
210
+                    include $GLOBALS['xoops']->path('footer.php');
211
+                    exit();
212
+                }
213
+                if ($xoopsConfigUser['activation_type'] == 1) {
214
+                    XoopsUserUtility::sendWelcome($newuser);
215
+                    redirect_header('index.php', 4, _US_ACTLOGIN);
216
+                }
217
+                // Sending notification email to user for self activation
218
+                if ($xoopsConfigUser['activation_type'] == 0) {
219
+                    $xoopsMailer = xoops_getMailer();
220
+                    $xoopsMailer->useMail();
221
+                    $xoopsMailer->setTemplate('register.tpl');
222
+                    $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
223
+                    $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
224
+                    $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
225
+                    $xoopsMailer->setToUsers(new XoopsUser($newid));
226
+                    $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
227
+                    $xoopsMailer->setFromName($xoopsConfig['sitename']);
228
+                    $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $uname));
229
+                    if (!$xoopsMailer->send()) {
230
+                        echo _US_YOURREGMAILNG;
231
+                    } else {
232
+                        echo _US_YOURREGISTERED;
233
+                    }
234
+                    // Sending notification email to administrator for activation
235
+                } elseif ($xoopsConfigUser['activation_type'] == 2) {
236
+                    $xoopsMailer = xoops_getMailer();
237
+                    $xoopsMailer->useMail();
238
+                    $xoopsMailer->setTemplate('adminactivate.tpl');
239
+                    $xoopsMailer->assign('USERNAME', $uname);
240
+                    $xoopsMailer->assign('USEREMAIL', $email);
241
+                    $xoopsMailer->assign('USERACTLINK', XOOPS_URL . '/register.php?op=actv&id=' . $newid . '&actkey=' . $actkey);
242
+                    $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
243
+                    $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
244
+                    $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
245
+                    /* @var $member_handler XoopsMemberHandler */
246
+                    $member_handler = xoops_getHandler('member');
247
+                    $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group']));
248
+                    $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
249
+                    $xoopsMailer->setFromName($xoopsConfig['sitename']);
250
+                    $xoopsMailer->setSubject(sprintf(_US_USERKEYFOR, $uname));
251
+                    if (!$xoopsMailer->send()) {
252
+                        echo _US_YOURREGMAILNG;
253
+                    } else {
254
+                        echo _US_YOURREGISTERED2;
255
+                    }
256
+                }
257
+                if ($xoopsConfigUser['new_user_notify'] == 1 && !empty($xoopsConfigUser['new_user_notify_group'])) {
258
+                    $xoopsMailer = xoops_getMailer();
259
+                    $xoopsMailer->reset();
260
+                    $xoopsMailer->useMail();
261
+                    /* @var $member_handler XoopsMemberHandler */
262
+                    $member_handler = xoops_getHandler('member');
263
+                    $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['new_user_notify_group']));
264
+                    $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
265
+                    $xoopsMailer->setFromName($xoopsConfig['sitename']);
266
+                    $xoopsMailer->setSubject(sprintf(_US_NEWUSERREGAT, $xoopsConfig['sitename']));
267
+                    $xoopsMailer->setBody(sprintf(_US_HASJUSTREG, $uname));
268
+                    $xoopsMailer->send();
269
+                }
270
+            } else {
271
+                echo "<span class='red bold'>{$stop}</span>";
272
+                include $GLOBALS['xoops']->path('include/registerform.php');
273
+                $reg_form->display();
256 274
             }
257
-            if ($xoopsConfigUser['new_user_notify'] == 1 && !empty($xoopsConfigUser['new_user_notify_group'])) {
258
-                $xoopsMailer = xoops_getMailer();
259
-                $xoopsMailer->reset();
260
-                $xoopsMailer->useMail();
261
-                /* @var $member_handler XoopsMemberHandler */
262
-                $member_handler = xoops_getHandler('member');
263
-                $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['new_user_notify_group']));
264
-                $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
265
-                $xoopsMailer->setFromName($xoopsConfig['sitename']);
266
-                $xoopsMailer->setSubject(sprintf(_US_NEWUSERREGAT, $xoopsConfig['sitename']));
267
-                $xoopsMailer->setBody(sprintf(_US_HASJUSTREG, $uname));
268
-                $xoopsMailer->send();
269
-            }
270
-        } else {
271
-            echo "<span class='red bold'>{$stop}</span>";
272
-            include $GLOBALS['xoops']->path('include/registerform.php');
273
-            $reg_form->display();
274
-        }
275
-        include $GLOBALS['xoops']->path('footer.php');
276
-        break;
275
+            include $GLOBALS['xoops']->path('footer.php');
276
+            break;
277 277
 
278
-    case 'actv':
279
-    case 'activate':
280
-        $id     = $clean_id;
281
-        $actkey = $clean_actkey;
282
-        if (empty($id)) {
283
-            redirect_header('index.php', 1, '');
284
-        }
285
-    /* @var $member_handler XoopsMemberHandler */
286
-        $member_handler = xoops_getHandler('member');
287
-        $thisuser       = $member_handler->getUser($id);
288
-        if (!is_object($thisuser)) {
289
-            exit();
290
-        }
291
-        if ($thisuser->getVar('actkey') != $actkey) {
292
-            redirect_header('index.php', 5, _US_ACTKEYNOT);
293
-        } else {
294
-            if ($thisuser->getVar('level') > 0) {
295
-                redirect_header('user.php', 5, _US_ACONTACT, false);
278
+        case 'actv':
279
+        case 'activate':
280
+            $id     = $clean_id;
281
+            $actkey = $clean_actkey;
282
+            if (empty($id)) {
283
+                redirect_header('index.php', 1, '');
284
+            }
285
+        /* @var $member_handler XoopsMemberHandler */
286
+            $member_handler = xoops_getHandler('member');
287
+            $thisuser       = $member_handler->getUser($id);
288
+            if (!is_object($thisuser)) {
289
+                exit();
290
+            }
291
+            if ($thisuser->getVar('actkey') != $actkey) {
292
+                redirect_header('index.php', 5, _US_ACTKEYNOT);
296 293
             } else {
297
-                if (false !== $member_handler->activateUser($thisuser)) {
298
-                    $xoopsPreload->triggerEvent('core.behavior.user.activate', $thisuser);
299
-                    $config_handler  = xoops_getHandler('config');
300
-                    $xoopsConfigUser = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
301
-                    if ($xoopsConfigUser['activation_type'] == 2) {
302
-                        $myts        = MyTextSanitizer::getInstance();
303
-                        $xoopsMailer = xoops_getMailer();
304
-                        $xoopsMailer->useMail();
305
-                        $xoopsMailer->setTemplate('activated.tpl');
306
-                        $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
307
-                        $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
308
-                        $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
309
-                        $xoopsMailer->setToUsers($thisuser);
310
-                        $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
311
-                        $xoopsMailer->setFromName($xoopsConfig['sitename']);
312
-                        $xoopsMailer->setSubject(sprintf(_US_YOURACCOUNT, $xoopsConfig['sitename']));
313
-                        include $GLOBALS['xoops']->path('header.php');
314
-                        if (!$xoopsMailer->send()) {
315
-                            printf(_US_ACTVMAILNG, $thisuser->getVar('uname'));
294
+                if ($thisuser->getVar('level') > 0) {
295
+                    redirect_header('user.php', 5, _US_ACONTACT, false);
296
+                } else {
297
+                    if (false !== $member_handler->activateUser($thisuser)) {
298
+                        $xoopsPreload->triggerEvent('core.behavior.user.activate', $thisuser);
299
+                        $config_handler  = xoops_getHandler('config');
300
+                        $xoopsConfigUser = $config_handler->getConfigsByCat(XOOPS_CONF_USER);
301
+                        if ($xoopsConfigUser['activation_type'] == 2) {
302
+                            $myts        = MyTextSanitizer::getInstance();
303
+                            $xoopsMailer = xoops_getMailer();
304
+                            $xoopsMailer->useMail();
305
+                            $xoopsMailer->setTemplate('activated.tpl');
306
+                            $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
307
+                            $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
308
+                            $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
309
+                            $xoopsMailer->setToUsers($thisuser);
310
+                            $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
311
+                            $xoopsMailer->setFromName($xoopsConfig['sitename']);
312
+                            $xoopsMailer->setSubject(sprintf(_US_YOURACCOUNT, $xoopsConfig['sitename']));
313
+                            include $GLOBALS['xoops']->path('header.php');
314
+                            if (!$xoopsMailer->send()) {
315
+                                printf(_US_ACTVMAILNG, $thisuser->getVar('uname'));
316
+                            } else {
317
+                                printf(_US_ACTVMAILOK, $thisuser->getVar('uname'));
318
+                            }
319
+                            include $GLOBALS['xoops']->path('footer.php');
316 320
                         } else {
317
-                            printf(_US_ACTVMAILOK, $thisuser->getVar('uname'));
321
+                            redirect_header('user.php', 5, _US_ACTLOGIN, false);
318 322
                         }
319
-                        include $GLOBALS['xoops']->path('footer.php');
320 323
                     } else {
321
-                        redirect_header('user.php', 5, _US_ACTLOGIN, false);
324
+                        redirect_header('index.php', 5, _US_ACTFAILD);
322 325
                     }
323
-                } else {
324
-                    redirect_header('index.php', 5, _US_ACTFAILD);
325 326
                 }
326 327
             }
327
-        }
328
-        break;
328
+            break;
329 329
 
330
-    case 'register':
331
-    default:
332
-        $xoopsOption['xoops_pagetitle'] = _US_USERREG;
333
-        include $GLOBALS['xoops']->path('header.php');
334
-        $xoTheme->addMeta('meta', 'keywords', _US_USERREG . ', ' . _US_NICKNAME); // FIXME!
335
-        $xoTheme->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer']));
336
-        include $GLOBALS['xoops']->path('include/registerform.php');
337
-        $reg_form->display();
338
-        include $GLOBALS['xoops']->path('footer.php');
339
-        break;
330
+        case 'register':
331
+        default:
332
+            $xoopsOption['xoops_pagetitle'] = _US_USERREG;
333
+            include $GLOBALS['xoops']->path('header.php');
334
+            $xoTheme->addMeta('meta', 'keywords', _US_USERREG . ', ' . _US_NICKNAME); // FIXME!
335
+            $xoTheme->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer']));
336
+            include $GLOBALS['xoops']->path('include/registerform.php');
337
+            $reg_form->display();
338
+            include $GLOBALS['xoops']->path('footer.php');
339
+            break;
340 340
 }
Please login to merge, or discard this patch.
Spacing   +26 added lines, -26 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
  * @since               2.0.0
22 22
  * @author              Kazumi Ono <[email protected]>
23 23
  */
24
-include __DIR__ . '/mainfile.php';
24
+include __DIR__.'/mainfile.php';
25 25
 $xoopsPreload = XoopsPreload::getInstance();
26 26
 $xoopsPreload->triggerEvent('core.register.start');
27 27
 
@@ -47,7 +47,7 @@  discard block
 block discarded – undo
47 47
  */
48 48
 function userCheck($uname, $email, $pass, $vpass)
49 49
 {
50
-    $GLOBALS['xoopsLogger']->addDeprecated('Function ' . __FUNCTION__ . ' is deprecated, use XoopsUserUtility::validate() instead');
50
+    $GLOBALS['xoopsLogger']->addDeprecated('Function '.__FUNCTION__.' is deprecated, use XoopsUserUtility::validate() instead');
51 51
 
52 52
     return XoopsUserUtility::validate($uname, $email, $pass, $vpass);
53 53
 }
@@ -125,36 +125,36 @@  discard block
 block discarded – undo
125 125
         include $GLOBALS['xoops']->path('header.php');
126 126
         $stop = '';
127 127
         if (!$GLOBALS['xoopsSecurity']->check()) {
128
-            $stop .= implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()) . '<br>';
128
+            $stop .= implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()).'<br>';
129 129
         }
130 130
         if ($xoopsConfigUser['reg_dispdsclmr'] != 0 && $xoopsConfigUser['reg_disclaimer'] != '') {
131 131
             if (empty($agree_disc)) {
132
-                $stop .= _US_UNEEDAGREE . '<br>';
132
+                $stop .= _US_UNEEDAGREE.'<br>';
133 133
             }
134 134
         }
135 135
         $stop .= XoopsUserUtility::validate($uname, $email, $pass, $vpass);
136 136
         if (empty($stop)) {
137
-            echo _US_USERNAME . ': ' . $myts->htmlSpecialChars($uname) . '<br>';
138
-            echo _US_EMAIL . ': ' . $myts->htmlSpecialChars($email) . '<br>';
137
+            echo _US_USERNAME.': '.$myts->htmlSpecialChars($uname).'<br>';
138
+            echo _US_EMAIL.': '.$myts->htmlSpecialChars($email).'<br>';
139 139
             if ($url != '') {
140 140
                 $url = formatURL($url);
141
-                echo _US_WEBSITE . ': ' . $myts->htmlSpecialChars($url) . '<br>';
141
+                echo _US_WEBSITE.': '.$myts->htmlSpecialChars($url).'<br>';
142 142
             }
143
-            $f_timezone = ($timezone_offset < 0) ? 'GMT ' . $timezone_offset : 'GMT +' . $timezone_offset;
144
-            echo _US_TIMEZONE . ": $f_timezone<br>";
143
+            $f_timezone = ($timezone_offset < 0) ? 'GMT '.$timezone_offset : 'GMT +'.$timezone_offset;
144
+            echo _US_TIMEZONE.": $f_timezone<br>";
145 145
             echo "<form action='register.php' method='post'>";
146 146
             xoops_load('XoopsFormCaptcha');
147 147
             $cpatcha = new XoopsFormCaptcha();
148
-            echo '<br>' . $cpatcha->getCaption() . ': ' . $cpatcha->render();
149
-            echo "<input type='hidden' name='uname' value='" . $myts->htmlSpecialChars($uname) . "' />
150
-                  <input type='hidden' name='email' value='" . $myts->htmlSpecialChars($email) . "' />
151
-                  <input type='hidden' name='user_viewemail' value='" . $user_viewemail . "' />
152
-                  <input type='hidden' name='timezone_offset' value='" . (float)$timezone_offset . "' />
153
-                  <input type='hidden' name='url' value='" . $myts->htmlSpecialChars($url) . "' />
154
-                  <input type='hidden' name='pass' value='" . $myts->htmlSpecialChars($pass) . "' />
155
-                  <input type='hidden' name='vpass' value='" . $myts->htmlSpecialChars($vpass) . "' />
156
-                  <input type='hidden' name='user_mailok' value='" . $user_mailok . "' />
157
-                  <br><br><input type='hidden' name='op' value='finish' />" . $GLOBALS['xoopsSecurity']->getTokenHTML() . "<input type='submit' value='" . _US_FINISH . "' /></form>";
148
+            echo '<br>'.$cpatcha->getCaption().': '.$cpatcha->render();
149
+            echo "<input type='hidden' name='uname' value='".$myts->htmlSpecialChars($uname)."' />
150
+                  <input type='hidden' name='email' value='" . $myts->htmlSpecialChars($email)."' />
151
+                  <input type='hidden' name='user_viewemail' value='" . $user_viewemail."' />
152
+                  <input type='hidden' name='timezone_offset' value='" . (float)$timezone_offset."' />
153
+                  <input type='hidden' name='url' value='" . $myts->htmlSpecialChars($url)."' />
154
+                  <input type='hidden' name='pass' value='" . $myts->htmlSpecialChars($pass)."' />
155
+                  <input type='hidden' name='vpass' value='" . $myts->htmlSpecialChars($vpass)."' />
156
+                  <input type='hidden' name='user_mailok' value='" . $user_mailok."' />
157
+                  <br><br><input type='hidden' name='op' value='finish' />" . $GLOBALS['xoopsSecurity']->getTokenHTML()."<input type='submit' value='"._US_FINISH."' /></form>";
158 158
         } else {
159 159
             echo "<span class='red'>$stop</span>";
160 160
             include $GLOBALS['xoops']->path('include/registerform.php');
@@ -167,12 +167,12 @@  discard block
 block discarded – undo
167 167
         include $GLOBALS['xoops']->path('header.php');
168 168
         $stop = XoopsUserUtility::validate($uname, $email, $pass, $vpass);
169 169
         if (!$GLOBALS['xoopsSecurity']->check()) {
170
-            $stop .= implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()) . '<br>';
170
+            $stop .= implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()).'<br>';
171 171
         }
172 172
         xoops_load('XoopsCaptcha');
173 173
         $xoopsCaptcha = XoopsCaptcha::getInstance();
174 174
         if (!$xoopsCaptcha->verify()) {
175
-            $stop .= $xoopsCaptcha->getMessage() . '<br>';
175
+            $stop .= $xoopsCaptcha->getMessage().'<br>';
176 176
         }
177 177
         if (empty($stop)) {
178 178
             /* @var $member_handler XoopsMemberHandler */
@@ -221,7 +221,7 @@  discard block
 block discarded – undo
221 221
                 $xoopsMailer->setTemplate('register.tpl');
222 222
                 $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
223 223
                 $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
224
-                $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
224
+                $xoopsMailer->assign('SITEURL', XOOPS_URL.'/');
225 225
                 $xoopsMailer->setToUsers(new XoopsUser($newid));
226 226
                 $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
227 227
                 $xoopsMailer->setFromName($xoopsConfig['sitename']);
@@ -238,10 +238,10 @@  discard block
 block discarded – undo
238 238
                 $xoopsMailer->setTemplate('adminactivate.tpl');
239 239
                 $xoopsMailer->assign('USERNAME', $uname);
240 240
                 $xoopsMailer->assign('USEREMAIL', $email);
241
-                $xoopsMailer->assign('USERACTLINK', XOOPS_URL . '/register.php?op=actv&id=' . $newid . '&actkey=' . $actkey);
241
+                $xoopsMailer->assign('USERACTLINK', XOOPS_URL.'/register.php?op=actv&id='.$newid.'&actkey='.$actkey);
242 242
                 $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
243 243
                 $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
244
-                $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
244
+                $xoopsMailer->assign('SITEURL', XOOPS_URL.'/');
245 245
                 /* @var $member_handler XoopsMemberHandler */
246 246
                 $member_handler = xoops_getHandler('member');
247 247
                 $xoopsMailer->setToGroups($member_handler->getGroup($xoopsConfigUser['activation_group']));
@@ -305,7 +305,7 @@  discard block
 block discarded – undo
305 305
                         $xoopsMailer->setTemplate('activated.tpl');
306 306
                         $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
307 307
                         $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
308
-                        $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
308
+                        $xoopsMailer->assign('SITEURL', XOOPS_URL.'/');
309 309
                         $xoopsMailer->setToUsers($thisuser);
310 310
                         $xoopsMailer->setFromEmail($xoopsConfig['adminmail']);
311 311
                         $xoopsMailer->setFromName($xoopsConfig['sitename']);
@@ -331,7 +331,7 @@  discard block
 block discarded – undo
331 331
     default:
332 332
         $xoopsOption['xoops_pagetitle'] = _US_USERREG;
333 333
         include $GLOBALS['xoops']->path('header.php');
334
-        $xoTheme->addMeta('meta', 'keywords', _US_USERREG . ', ' . _US_NICKNAME); // FIXME!
334
+        $xoTheme->addMeta('meta', 'keywords', _US_USERREG.', '._US_NICKNAME); // FIXME!
335 335
         $xoTheme->addMeta('meta', 'description', strip_tags($xoopsConfigUser['reg_disclaimer']));
336 336
         include $GLOBALS['xoops']->path('include/registerform.php');
337 337
         $reg_form->display();
Please login to merge, or discard this patch.
htdocs/viewpmsg.php 2 patches
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -33,9 +33,9 @@
 block discarded – undo
33 33
         } elseif (empty($_REQUEST['ok'])) {
34 34
             include $GLOBALS['xoops']->path('header.php');
35 35
             xoops_confirm(array(
36
-                              'ok'              => 1,
37
-                              'delete_messages' => 1,
38
-                              'msg_ids'         => json_encode(array_map('intval', $_POST['msg_id']))), $_SERVER['REQUEST_URI'], _PM_SURE_TO_DELETE);
36
+                                'ok'              => 1,
37
+                                'delete_messages' => 1,
38
+                                'msg_ids'         => json_encode(array_map('intval', $_POST['msg_id']))), $_SERVER['REQUEST_URI'], _PM_SURE_TO_DELETE);
39 39
             include $GLOBALS['xoops']->path('footer.php');
40 40
             exit();
41 41
         }
Please login to merge, or discard this patch.
Spacing   +15 added lines, -15 removed lines patch added patch discarded remove patch
@@ -15,14 +15,14 @@  discard block
 block discarded – undo
15 15
  * @since               2.0.0
16 16
  */
17 17
 
18
-include __DIR__ . '/mainfile.php';
18
+include __DIR__.'/mainfile.php';
19 19
 $xoopsPreload = XoopsPreload::getInstance();
20 20
 $xoopsPreload->triggerEvent('core.viewpmsg.start');
21 21
 
22 22
 xoops_loadLanguage('pmsg');
23 23
 
24 24
 if (!is_object($xoopsUser)) {
25
-    $errormessage = _PM_SORRY . '<br>' . _PM_PLZREG . '';
25
+    $errormessage = _PM_SORRY.'<br>'._PM_PLZREG.'';
26 26
     redirect_header('user.php', 2, $errormessage);
27 27
 } else {
28 28
     $pm_handler = xoops_getHandler('privmessage');
@@ -44,7 +44,7 @@  discard block
 block discarded – undo
44 44
             $clean_msg_id = array_map('intval', $clean_msg_id);
45 45
         }
46 46
         $size = count($clean_msg_id);
47
-        $msg  =& $clean_msg_id;
47
+        $msg  = & $clean_msg_id;
48 48
         for ($i = 0; $i < $size; ++$i) {
49 49
             $pm = $pm_handler->get((int)$msg[$i]);
50 50
             if ($pm->getVar('to_userid') == $xoopsUser->getVar('uid')) {
@@ -58,28 +58,28 @@  discard block
 block discarded – undo
58 58
     $criteria = new Criteria('to_userid', $xoopsUser->getVar('uid'));
59 59
     $criteria->setOrder('DESC');
60 60
     $pm_arr = $pm_handler->getObjects($criteria);
61
-    echo "<h4 class='txtcenter'>" . _PM_PRIVATEMESSAGE . "</h4><br><a href='userinfo.php?uid=" . $xoopsUser->getVar('uid') . "'>" . _PM_PROFILE . "</a>&nbsp;<span style='font-weight:bold;'>&raquo;</span>&nbsp;" . _PM_INBOX . '<br><br>';
61
+    echo "<h4 class='txtcenter'>"._PM_PRIVATEMESSAGE."</h4><br><a href='userinfo.php?uid=".$xoopsUser->getVar('uid')."'>"._PM_PROFILE."</a>&nbsp;<span style='font-weight:bold;'>&raquo;</span>&nbsp;"._PM_INBOX.'<br><br>';
62 62
     echo "<form name='prvmsg' method='post' action='viewpmsg.php'>";
63 63
     echo "<table cellspacing='1' cellpadding='4' class='outer width100 bnone'>\n";
64
-    echo "<tr align='center' valign='middle'><th><input name='allbox' id='allbox' onclick='xoopsCheckAll(\"prvmsg\", \"allbox\");' type='checkbox' value='Check All' /></th><th><img class'bnone' src='images/download.gif' alt=''/></th><th>&nbsp;</th><th>" . _PM_FROM . '</th><th>' . _PM_SUBJECT . "</th><th class='txtcenter'>" . _PM_DATE . "</th></tr>\n";
64
+    echo "<tr align='center' valign='middle'><th><input name='allbox' id='allbox' onclick='xoopsCheckAll(\"prvmsg\", \"allbox\");' type='checkbox' value='Check All' /></th><th><img class'bnone' src='images/download.gif' alt=''/></th><th>&nbsp;</th><th>"._PM_FROM.'</th><th>'._PM_SUBJECT."</th><th class='txtcenter'>"._PM_DATE."</th></tr>\n";
65 65
     $total_messages = count($pm_arr);
66 66
     if ($total_messages == 0) {
67
-        echo "<tr><td class='even txcenter' colspan='6'>" . _PM_YOUDONTHAVE . '</td></tr> ';
67
+        echo "<tr><td class='even txcenter' colspan='6'>"._PM_YOUDONTHAVE.'</td></tr> ';
68 68
         $display = 0;
69 69
     } else {
70 70
         $display = 1;
71 71
     }
72 72
     for ($i = 0; $i < $total_messages; ++$i) {
73 73
         $class = ($i % 2 == 0) ? 'even' : 'odd';
74
-        echo "<tr class='$class txtleft'><td class='aligntop width2 txtcenter'><input type='checkbox' id='msg_id[]' name='msg_id[]' value='" . $pm_arr[$i]->getVar('msg_id') . "' /></td>\n";
74
+        echo "<tr class='$class txtleft'><td class='aligntop width2 txtcenter'><input type='checkbox' id='msg_id[]' name='msg_id[]' value='".$pm_arr[$i]->getVar('msg_id')."' /></td>\n";
75 75
         if ($pm_arr[$i]->getVar('read_msg') == 1) {
76
-            echo "<td class='aligntop width5 txtcenter'><img src='images/email_read.png' alt='" . _PM_READ . "' title='" . _PM_READ . "' /></td>\n";
76
+            echo "<td class='aligntop width5 txtcenter'><img src='images/email_read.png' alt='"._PM_READ."' title='"._PM_READ."' /></td>\n";
77 77
         } else {
78
-            echo "<td class='aligntop width5 txtcenter'><img src='images/email_notread.png' alt='" . _PM_NOTREAD . "' title='" . _PM_NOTREAD . "' /></td>\n";
78
+            echo "<td class='aligntop width5 txtcenter'><img src='images/email_notread.png' alt='"._PM_NOTREAD."' title='"._PM_NOTREAD."' /></td>\n";
79 79
         }
80 80
         $iconName = htmlspecialchars($pm_arr[$i]->getVar('msg_image', 'E'), ENT_QUOTES);
81 81
         if ($iconName != '') {
82
-            echo "<td class='aligntop width5 txtcenter'><img src='images/subject/" . $iconName . "' alt='' /></td>\n";
82
+            echo "<td class='aligntop width5 txtcenter'><img src='images/subject/".$iconName."' alt='' /></td>\n";
83 83
         } else {
84 84
             echo "<td class='aligntop width5 txtcenter'></td>\n";
85 85
         }
@@ -87,18 +87,18 @@  discard block
 block discarded – undo
87 87
         echo "<td class='alignmiddle width10'>";
88 88
         // no need to show deleted users
89 89
         if ($postername) {
90
-            echo "<a href='userinfo.php?uid=" . $pm_arr[$i]->getVar('from_userid') . "' title=''>" . $postername . '</a>';
90
+            echo "<a href='userinfo.php?uid=".$pm_arr[$i]->getVar('from_userid')."' title=''>".$postername.'</a>';
91 91
         } else {
92 92
             echo $xoopsConfig['anonymous'];
93 93
         }
94 94
         echo "</td>\n";
95
-        echo "<td class='alignmiddle'><a href='readpmsg.php?start=" . ($total_messages - $i - 1), "&amp;total_messages=$total_messages'>" . $pm_arr[$i]->getVar('subject') . '</a></td>';
96
-        echo "<td class='alignmiddle txtcenter width20'>" . formatTimestamp($pm_arr[$i]->getVar('msg_time')) . '</td></tr>';
95
+        echo "<td class='alignmiddle'><a href='readpmsg.php?start=".($total_messages - $i - 1), "&amp;total_messages=$total_messages'>".$pm_arr[$i]->getVar('subject').'</a></td>';
96
+        echo "<td class='alignmiddle txtcenter width20'>".formatTimestamp($pm_arr[$i]->getVar('msg_time')).'</td></tr>';
97 97
     }
98 98
     if ($display == 1) {
99
-        echo "<tr class='foot txtleft'><td colspan='6' align='left'><input type='button' class='formButton' onclick='openWithSelfMain(\"" . XOOPS_URL . "/pmlite.php?send=1\",\"pmlite\",565,500);' value='" . _PM_SEND . "' />&nbsp;<input type='submit' class='formButton' name='delete_messages' value='" . _PM_DELETE . "' />" . $GLOBALS['xoopsSecurity']->getTokenHTML() . '</td></tr></table></form>';
99
+        echo "<tr class='foot txtleft'><td colspan='6' align='left'><input type='button' class='formButton' onclick='openWithSelfMain(\"".XOOPS_URL."/pmlite.php?send=1\",\"pmlite\",565,500);' value='"._PM_SEND."' />&nbsp;<input type='submit' class='formButton' name='delete_messages' value='"._PM_DELETE."' />".$GLOBALS['xoopsSecurity']->getTokenHTML().'</td></tr></table></form>';
100 100
     } else {
101
-        echo "<tr class='bg2 txtleft'><td class='txtleft' colspan='6'><input type='button' class='formButton' onclick='openWithSelfMain(\"" . XOOPS_URL . "/pmlite.php?send=1\",\"pmlite\",565,500);' value='" . _PM_SEND . "' /></td></tr></table></form>";
101
+        echo "<tr class='bg2 txtleft'><td class='txtleft' colspan='6'><input type='button' class='formButton' onclick='openWithSelfMain(\"".XOOPS_URL."/pmlite.php?send=1\",\"pmlite\",565,500);' value='"._PM_SEND."' /></td></tr></table></form>";
102 102
     }
103 103
     include $GLOBALS['xoops']->path('footer.php');
104 104
 }
Please login to merge, or discard this patch.
htdocs/Frameworks/moduleclasses/moduleadmin/moduleadmin.php 2 patches
Indentation   +54 added lines, -54 removed lines patch added patch discarded remove patch
@@ -507,16 +507,16 @@  discard block
 block discarded – undo
507 507
         $release_date = formatTimestamp(mktime(0, 0, 0, $date[1], $date[2], $date[0]), 's');
508 508
         $module_dir   = $this->_obj->getVar('dirname');
509 509
         $module_info  = "<div id=\"about\"><label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_DESCRIPTION . "</label>\n"
510
-                      . "<text>" . $this->_obj->getInfo('description') . "</text><br>\n"
511
-                      . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_UPDATEDATE . "</label>\n"
512
-                      . "<text class=\"bold\">" . formatTimestamp($this->_obj->getVar('last_update'), 'm') . "</text><br>\n"
513
-                      . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_MODULESTATUS . "</label>\n"
514
-                      . "<text>" . $this->_obj->getInfo('module_status') . "</text><br>\n"
515
-                      . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_WEBSITE . "</label>\n"
516
-                      . "<text><a class=\"tooltip\" href=\"http://" . $this->_obj->getInfo('module_website_url') . "\" rel=\"external\" title=\""
517
-                      . $this->_obj->getInfo('module_website_name') . " - " . $this->_obj->getInfo('module_website_url') . "\">"
518
-                      . $this->_obj->getInfo('module_website_name') . "</a></text>\n"
519
-                      . "</div>\n";
510
+                        . "<text>" . $this->_obj->getInfo('description') . "</text><br>\n"
511
+                        . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_UPDATEDATE . "</label>\n"
512
+                        . "<text class=\"bold\">" . formatTimestamp($this->_obj->getVar('last_update'), 'm') . "</text><br>\n"
513
+                        . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_MODULESTATUS . "</label>\n"
514
+                        . "<text>" . $this->_obj->getInfo('module_status') . "</text><br>\n"
515
+                        . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_WEBSITE . "</label>\n"
516
+                        . "<text><a class=\"tooltip\" href=\"http://" . $this->_obj->getInfo('module_website_url') . "\" rel=\"external\" title=\""
517
+                        . $this->_obj->getInfo('module_website_name') . " - " . $this->_obj->getInfo('module_website_url') . "\">"
518
+                        . $this->_obj->getInfo('module_website_name') . "</a></text>\n"
519
+                        . "</div>\n";
520 520
         $authorArray  = array();
521 521
         foreach ( $author as $k => $aName ) {
522 522
             $authorArray[$k] = ( isset( $nickname[$k] ) && ( '' != $nickname[$k] ) ) ? "{$aName} ({$nickname[$k]})" : "{$aName}";
@@ -527,51 +527,51 @@  discard block
 block discarded – undo
527 527
         $website = preg_match('%^(https?:)?//%', $website) ? $website : 'http://' . $website;
528 528
 
529 529
         $ret = "<table>\n<tr>\n"
530
-             . "<td width=\"50%\">\n"
531
-             . "<table>\n<tr>\n<td style=\"width: 100px;\">\n"
532
-             . "<img src=\"" . XOOPS_URL . '/modules/' . $module_dir . '/' . $this->_obj->getInfo('image') . "\" alt=\"" . $module_dir . "\" style=\"float: left; margin-right: 10px;\">\n"
533
-             . "</td><td>\n"
534
-             . "<div style=\"margin-top: 1px; margin-bottom: 4px; font-size: 18px; line-height: 18px; color: #2F5376; font-weight: bold;\">\n"
535
-             . $this->_obj->getInfo('name') . ' ' . $this->_obj->getInfo('version') . ' ' . $this->_obj->getInfo('module_status') . " ({$release_date})\n"
536
-             . "<br>\n"
537
-             . "</div>\n"
538
-             . "<div style=\"line-height: 16px; font-weight: bold;\">\n"
539
-             . _AM_MODULEADMIN_ABOUT_BY . implode(', ', $authorArray) . "\n"
540
-             . "</div>\n"
541
-             . "<div style=\"line-height: 16px;\">\n"
542
-             . "<a href=\"$license_url\" target=\"_blank\" rel=\"external\">" . $this->_obj->getInfo('license') . "</a>\n"
543
-             . "<br>\n"
544
-             . "<a href=\"$website\" target=\"_blank\">" . $this->_obj->getInfo('website') . "</a>\n"
545
-             . "<br>\n"
546
-             . "<br>\n"
547
-             . "</div>\n"
548
-             . "</td></tr>\n";
530
+                . "<td width=\"50%\">\n"
531
+                . "<table>\n<tr>\n<td style=\"width: 100px;\">\n"
532
+                . "<img src=\"" . XOOPS_URL . '/modules/' . $module_dir . '/' . $this->_obj->getInfo('image') . "\" alt=\"" . $module_dir . "\" style=\"float: left; margin-right: 10px;\">\n"
533
+                . "</td><td>\n"
534
+                . "<div style=\"margin-top: 1px; margin-bottom: 4px; font-size: 18px; line-height: 18px; color: #2F5376; font-weight: bold;\">\n"
535
+                . $this->_obj->getInfo('name') . ' ' . $this->_obj->getInfo('version') . ' ' . $this->_obj->getInfo('module_status') . " ({$release_date})\n"
536
+                . "<br>\n"
537
+                . "</div>\n"
538
+                . "<div style=\"line-height: 16px; font-weight: bold;\">\n"
539
+                . _AM_MODULEADMIN_ABOUT_BY . implode(', ', $authorArray) . "\n"
540
+                . "</div>\n"
541
+                . "<div style=\"line-height: 16px;\">\n"
542
+                . "<a href=\"$license_url\" target=\"_blank\" rel=\"external\">" . $this->_obj->getInfo('license') . "</a>\n"
543
+                . "<br>\n"
544
+                . "<a href=\"$website\" target=\"_blank\">" . $this->_obj->getInfo('website') . "</a>\n"
545
+                . "<br>\n"
546
+                . "<br>\n"
547
+                . "</div>\n"
548
+                . "</td></tr>\n";
549 549
         if ((1 !== preg_match('/[^a-zA-Z0-9]/', $business)) || (false !== checkEmail($business))) {
550 550
             $ret .= "<td colspan=\"2\">"
551
-                  . "<div id=\"about_donate\"><fieldset><legend class=\"label\">Donation</legend><br>\n"
552
-                  . "<div style=\"clear: both; height: 1em;\"></div>\n"
553
-                  . "<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target=\"_blank\" rel=\external\">\n"
554
-                  . "<input name=\"cmd\" type=\"hidden\" value=\"_donations\">\n"
555
-                  . "<input name=\"business\" type=\"hidden\" value=\"{$business}\">\n"
556
-                  . "<input name=\"currency_code\" type=\"hidden\" value=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_CURRENCY . "\">\n"
557
-                  . "<label class=\"label_after\" for=\"amount\">" . _AM_MODULEADMIN_ABOUT_AMOUNT . "</label><text><input class=\"donate_amount\" type=\"text\" name=\"amount\" value=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_SUGGESTED . "\" title=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_TTL . "\" pattern=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_PATTERN . "\"></text>\n"
558
-                  . "<br>\n"
559
-                  . "<text><input type=\"image\" name=\"submit\" class=\"donate_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif\" alt=\"" . _AM_MODULEADMIN_ABOUT_DONATE_IMG_ALT . "\"></text>\n"
560
-                  . "<img alt=\"\" height=\"1\" src=\"https://www.paypalobjects.com/en_US/i/scr/pixel.gif\" style=\"border-width: 0px;\" width=\"1\">\n"
561
-                  . "</form>\n"
562
-                  . "<br>\n"
563
-                  . "</fieldset>\n"
564
-                  . "</div>\n"
565
-                  . "</td>\n</tr>\n";
551
+                    . "<div id=\"about_donate\"><fieldset><legend class=\"label\">Donation</legend><br>\n"
552
+                    . "<div style=\"clear: both; height: 1em;\"></div>\n"
553
+                    . "<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target=\"_blank\" rel=\external\">\n"
554
+                    . "<input name=\"cmd\" type=\"hidden\" value=\"_donations\">\n"
555
+                    . "<input name=\"business\" type=\"hidden\" value=\"{$business}\">\n"
556
+                    . "<input name=\"currency_code\" type=\"hidden\" value=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_CURRENCY . "\">\n"
557
+                    . "<label class=\"label_after\" for=\"amount\">" . _AM_MODULEADMIN_ABOUT_AMOUNT . "</label><text><input class=\"donate_amount\" type=\"text\" name=\"amount\" value=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_SUGGESTED . "\" title=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_TTL . "\" pattern=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_PATTERN . "\"></text>\n"
558
+                    . "<br>\n"
559
+                    . "<text><input type=\"image\" name=\"submit\" class=\"donate_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif\" alt=\"" . _AM_MODULEADMIN_ABOUT_DONATE_IMG_ALT . "\"></text>\n"
560
+                    . "<img alt=\"\" height=\"1\" src=\"https://www.paypalobjects.com/en_US/i/scr/pixel.gif\" style=\"border-width: 0px;\" width=\"1\">\n"
561
+                    . "</form>\n"
562
+                    . "<br>\n"
563
+                    . "</fieldset>\n"
564
+                    . "</div>\n"
565
+                    . "</td>\n</tr>\n";
566 566
         }
567 567
         $ret .= "</table>\n";
568 568
         $this->addInfoBox( _AM_MODULEADMIN_ABOUT_MODULEINFO );
569 569
         $this->addInfoBoxLine( _AM_MODULEADMIN_ABOUT_MODULEINFO, $module_info, '', '', 'information' );
570 570
         $ret .= $this->renderInfoBox()
571
-              . "</td>\n"
572
-              . "<td width=\"50%\">\n"
573
-              . "<fieldset><legend class=\"label\">" . _AM_MODULEADMIN_ABOUT_CHANGELOG . "</legend><br>\n"
574
-              . "<div class=\"txtchangelog\">\n";
571
+                . "</td>\n"
572
+                . "<td width=\"50%\">\n"
573
+                . "<fieldset><legend class=\"label\">" . _AM_MODULEADMIN_ABOUT_CHANGELOG . "</legend><br>\n"
574
+                . "<div class=\"txtchangelog\">\n";
575 575
         $language = empty( $GLOBALS['xoopsConfig']['language'] ) ? 'english' : $GLOBALS['xoopsConfig']['language'];
576 576
         $file     = XOOPS_ROOT_PATH . "/modules/{$module_dir}/language/{$language}/changelog.txt";
577 577
         if ( !is_file( $file ) && ( 'english' !== $language ) ) {
@@ -586,14 +586,14 @@  discard block
 block discarded – undo
586 586
             }
587 587
         }
588 588
         $ret .= "</div>\n"
589
-              . "</fieldset>\n"
590
-              . "</td>\n"
591
-              . "</tr>\n"
592
-              . "</table>\n";
589
+                . "</fieldset>\n"
590
+                . "</td>\n"
591
+                . "</tr>\n"
592
+                . "</table>\n";
593 593
         if ( true === $logo_xoops ) {
594 594
             $ret .= "<div class=\"center\">"
595
-                  . "<a href=\"http://www.xoops.org\" target=\"_blank\"><img src=\"{$path}xoopsmicrobutton.gif\" alt=\"XOOPS\" title=\"XOOPS\"></a>"
596
-                  . "</div>";
595
+                    . "<a href=\"http://www.xoops.org\" target=\"_blank\"><img src=\"{$path}xoopsmicrobutton.gif\" alt=\"XOOPS\" title=\"XOOPS\"></a>"
596
+                    . "</div>";
597 597
         }
598 598
         return $ret;
599 599
     }
Please login to merge, or discard this patch.
Spacing   +77 added lines, -77 removed lines patch added patch discarded remove patch
@@ -33,7 +33,7 @@  discard block
 block discarded – undo
33 33
     public function __construct()
34 34
     {
35 35
         global $xoopsModule;
36
-        $this->_obj =& $xoopsModule;
36
+        $this->_obj = & $xoopsModule;
37 37
         $this->loadLanguage();
38 38
     }
39 39
 
@@ -121,8 +121,8 @@  discard block
 block discarded – undo
121 121
     public function loadLanguage()
122 122
     {
123 123
         $language = $GLOBALS['xoopsConfig']['language'];
124
-        if (!file_exists($fileinc = XOOPS_ROOT_PATH . "/Frameworks/moduleclasses/moduleadmin/language/{$language}/main.php")) {
125
-            if (!file_exists($fileinc = XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/moduleadmin/language/english/main.php')) {
124
+        if (!file_exists($fileinc = XOOPS_ROOT_PATH."/Frameworks/moduleclasses/moduleadmin/language/{$language}/main.php")) {
125
+            if (!file_exists($fileinc = XOOPS_ROOT_PATH.'/Frameworks/moduleclasses/moduleadmin/language/english/main.php')) {
126 126
                 return false;
127 127
             }
128 128
         }
@@ -141,26 +141,26 @@  discard block
 block discarded – undo
141 141
     public function renderMenuIndex()
142 142
     {
143 143
         $this->addAssets();
144
-        $path       = XOOPS_URL . '/modules/' . $this->_obj->getVar('dirname') . '/';
145
-        $pathsystem = XOOPS_URL . '/modules/system/';
144
+        $path       = XOOPS_URL.'/modules/'.$this->_obj->getVar('dirname').'/';
145
+        $pathsystem = XOOPS_URL.'/modules/system/';
146 146
         $this->_obj->loadAdminMenu();
147 147
         $ret = "<div class=\"rmmenuicon\">\n";
148 148
         foreach (array_keys($this->_obj->adminmenu) as $i) {
149 149
             if ($this->_obj->adminmenu[$i]['link'] !== 'admin/index.php') {
150
-                $ret .= "<a href=\"../" . $this->_obj->adminmenu[$i]['link'] . "\" title=\"" . (isset($this->_obj->adminmenu[$i]['desc']) ? $this->_obj->adminmenu[$i]['desc'] : '') . "\">";
150
+                $ret .= "<a href=\"../".$this->_obj->adminmenu[$i]['link']."\" title=\"".(isset($this->_obj->adminmenu[$i]['desc']) ? $this->_obj->adminmenu[$i]['desc'] : '')."\">";
151 151
                 //$ret .= "<img src=\"" . $path . $this->_obj->adminmenu[$i]['icon']. "\" alt=\"" . $this->_obj->adminmenu[$i]['title'] . "\" />";
152 152
                 //mb for direct URL access to icons in modules Admin
153
-                $ret .= "<img src=\"" . (filter_var($this->_obj->adminmenu[$i]['icon'], FILTER_VALIDATE_URL) ? $this->_obj->adminmenu[$i]['icon'] : $path . $this->_obj->adminmenu[$i]['icon']) . "\" alt=\"" . $this->_obj->adminmenu[$i]['title'] . "\" />";
153
+                $ret .= "<img src=\"".(filter_var($this->_obj->adminmenu[$i]['icon'], FILTER_VALIDATE_URL) ? $this->_obj->adminmenu[$i]['icon'] : $path.$this->_obj->adminmenu[$i]['icon'])."\" alt=\"".$this->_obj->adminmenu[$i]['title']."\" />";
154 154
 
155
-                $ret .= '<span>' . $this->_obj->adminmenu[$i]['title'] . '</span>';
155
+                $ret .= '<span>'.$this->_obj->adminmenu[$i]['title'].'</span>';
156 156
                 $ret .= '</a>';
157 157
             }
158 158
         }
159 159
         if ($this->_obj->getInfo('help')) {
160 160
             if (substr(XOOPS_VERSION, 0, 9) >= 'XOOPS 2.5') {
161
-                $ret .= "<a href=\"" . $pathsystem . 'help.php?mid=' . $this->_obj->getVar('mid', 's') . '&amp;' . $this->_obj->getInfo('help') . "\" title=\"" . _AM_SYSTEM_HELP . "\">";
162
-                $ret .= "<img width=\"32px\" src=\"" . XOOPS_URL . "/Frameworks/moduleclasses/icons/32/help.png\" alt=\"" . _AM_SYSTEM_HELP . "\" /> ";
163
-                $ret .= '<span>' . _AM_SYSTEM_HELP . '</span>';
161
+                $ret .= "<a href=\"".$pathsystem.'help.php?mid='.$this->_obj->getVar('mid', 's').'&amp;'.$this->_obj->getInfo('help')."\" title=\""._AM_SYSTEM_HELP."\">";
162
+                $ret .= "<img width=\"32px\" src=\"".XOOPS_URL."/Frameworks/moduleclasses/icons/32/help.png\" alt=\""._AM_SYSTEM_HELP."\" /> ";
163
+                $ret .= '<span>'._AM_SYSTEM_HELP.'</span>';
164 164
                 $ret .= '</a>';
165 165
             }
166 166
         }
@@ -182,7 +182,7 @@  discard block
 block discarded – undo
182 182
     public function renderButton($position = 'right', $delimeter = '&nbsp;')
183 183
     {
184 184
         $this->addAssets();
185
-        $path = XOOPS_URL . '/Frameworks/moduleclasses/icons/32/';
185
+        $path = XOOPS_URL.'/Frameworks/moduleclasses/icons/32/';
186 186
         switch ($position) {
187 187
             default:
188 188
             case 'right':
@@ -198,11 +198,11 @@  discard block
 block discarded – undo
198 198
         }
199 199
         $ret .= "<div class=\"xo-buttons\">\n";
200 200
         foreach (array_keys($this->_itemButton) as $i) {
201
-            $ret .= "<a class='ui-corner-all tooltip' href='" . $this->_itemButton[$i]['link'] . "' title='" . $this->_itemButton[$i]['title'] . "' " . $this->_itemButton[$i]['extra'] . '>';
201
+            $ret .= "<a class='ui-corner-all tooltip' href='".$this->_itemButton[$i]['link']."' title='".$this->_itemButton[$i]['title']."' ".$this->_itemButton[$i]['extra'].'>';
202 202
             $ret .= "<img src='"
203 203
                     //. $path . $this -> _itemButton[$i]['icon']
204 204
                     //mb for direct URL access to icons in modules Admin
205
-                    . (filter_var($this->_itemButton[$i]['icon'], FILTER_VALIDATE_URL) ? $this->_itemButton[$i]['icon'] : $path . $this->_itemButton[$i]['icon']) . "' title='" . $this->_itemButton[$i]['title'] . "' alt='" . $this->_itemButton[$i]['title'] . "' />" . $this->_itemButton[$i]['title'];
205
+                    . (filter_var($this->_itemButton[$i]['icon'], FILTER_VALIDATE_URL) ? $this->_itemButton[$i]['icon'] : $path.$this->_itemButton[$i]['icon'])."' title='".$this->_itemButton[$i]['title']."' alt='".$this->_itemButton[$i]['title']."' />".$this->_itemButton[$i]['title'];
206 206
             $ret .= "</a>\n";
207 207
             $ret .= $delimeter;
208 208
         }
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
         $ret = array();
226 226
         $ret['title']        = $title;
227 227
         $ret['link']         = $link;
228
-        $ret['icon']         = $icon . '.png';
228
+        $ret['icon']         = $icon.'.png';
229 229
         $ret['extra']        = $extra;
230 230
         $this->_itemButton[] = $ret;
231 231
 
@@ -249,22 +249,22 @@  discard block
 block discarded – undo
249 249
     public function addConfigBoxLine($value = '', $type = 'default')
250 250
     {
251 251
         $line = '';
252
-        $path = XOOPS_URL . '/Frameworks/moduleclasses/icons/16/';
252
+        $path = XOOPS_URL.'/Frameworks/moduleclasses/icons/16/';
253 253
         switch ($type) {
254 254
             default:
255 255
             case 'default':
256
-                $line .= '<span>' . $value . '</span>';
256
+                $line .= '<span>'.$value.'</span>';
257 257
                 break;
258 258
 
259 259
             case 'folder':
260 260
                 if (!is_dir($value)) {
261 261
                     $line .= "<span style='color : red; font-weight : bold;'>";
262
-                    $line .= "<img src='" . $path . "0.png' >";
262
+                    $line .= "<img src='".$path."0.png' >";
263 263
                     $line .= sprintf(_AM_MODULEADMIN_CONFIG_FOLDERKO, $value);
264 264
                     $line .= "</span>\n";
265 265
                 } else {
266 266
                     $line .= "<span style='color : green;'>";
267
-                    $line .= "<img src='" . $path . "1.png' >";
267
+                    $line .= "<img src='".$path."1.png' >";
268 268
                     $line .= sprintf(_AM_MODULEADMIN_CONFIG_FOLDEROK, $value);
269 269
                     $line .= "</span>\n";
270 270
                 }
@@ -274,12 +274,12 @@  discard block
 block discarded – undo
274 274
                 if (is_dir($value[0])) {
275 275
                     if (substr(decoct(fileperms($value[0])), 2) != $value[1]) {
276 276
                         $line .= "<span style='color : red; font-weight : bold;'>";
277
-                        $line .= "<img src='" . $path . "0.png' >";
277
+                        $line .= "<img src='".$path."0.png' >";
278 278
                         $line .= sprintf(_AM_MODULEADMIN_CONFIG_CHMOD, $value[0], $value[1], substr(decoct(fileperms($value[0])), 2));
279 279
                         $line .= "</span>\n";
280 280
                     } else {
281 281
                         $line .= "<span style='color : green;'>";
282
-                        $line .= "<img src='" . $path . "1.png' >";
282
+                        $line .= "<img src='".$path."1.png' >";
283 283
                         $line .= sprintf(_AM_MODULEADMIN_CONFIG_CHMOD, $value[0], $value[1], substr(decoct(fileperms($value[0])), 2));
284 284
                         $line .= "</span>\n";
285 285
                     }
@@ -318,18 +318,18 @@  discard block
 block discarded – undo
318 318
             $ret .= "</legend>\n";
319 319
 
320 320
             // php version
321
-            $path = XOOPS_URL . '/Frameworks/moduleclasses/icons/16/';
321
+            $path = XOOPS_URL.'/Frameworks/moduleclasses/icons/16/';
322 322
             if ($this->_obj->getInfo('min_php')) {
323 323
                 if (version_compare(phpversion(), $this->_obj->getInfo('min_php'), '<')) {
324
-                    $ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "0.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion()) . "</span>\n";
324
+                    $ret .= "<span style='color : red; font-weight : bold;'><img src='".$path."0.png' >".sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion())."</span>\n";
325 325
                 } else {
326
-                    $ret .= "<span style='color : green;'><img src='" . $path . "1.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion()) . "</span>\n";
326
+                    $ret .= "<span style='color : green;'><img src='".$path."1.png' >".sprintf(_AM_MODULEADMIN_CONFIG_PHP, $this->_obj->getInfo('min_php'), phpversion())."</span>\n";
327 327
                 }
328 328
                 $ret .= '<br>';
329 329
             }
330 330
 
331 331
             // Database version
332
-            $path    = XOOPS_URL . '/Frameworks/moduleclasses/icons/16/';
332
+            $path    = XOOPS_URL.'/Frameworks/moduleclasses/icons/16/';
333 333
             $dbarray = $this->_obj->getInfo('min_db');
334 334
 
335 335
             if ($dbarray[XOOPS_DB_TYPE]) {
@@ -366,9 +366,9 @@  discard block
 block discarded – undo
366 366
                     }
367 367
                 }
368 368
                 if ($reqVer > $curVer) {
369
-                    $ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "0.png' >" . sprintf(XOOPS_DB_TYPE . ' ' . _AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion) . "</span><br>\n";
369
+                    $ret .= "<span style='color : red; font-weight : bold;'><img src='".$path."0.png' >".sprintf(XOOPS_DB_TYPE.' '._AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion)."</span><br>\n";
370 370
                 } else {
371
-                    $ret .= "<span style='color : green;'><img src='" . $path . "1.png' >" . sprintf(strtoupper(XOOPS_DB_TYPE) . ' ' . _AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion) . "</span><br>\n";
371
+                    $ret .= "<span style='color : green;'><img src='".$path."1.png' >".sprintf(strtoupper(XOOPS_DB_TYPE).' '._AM_MODULEADMIN_CONFIG_DB, $dbRequiredVersion, $dbCurrentVersion)."</span><br>\n";
372 372
                 }
373 373
             }
374 374
 
@@ -376,9 +376,9 @@  discard block
 block discarded – undo
376 376
             if ($this->_obj->getInfo('min_xoops')) {
377 377
                 $currentXoopsVersion = strtolower(str_replace('XOOPS ', '', XOOPS_VERSION));
378 378
                 if (version_compare($currentXoopsVersion, $this->_obj->getInfo('min_xoops'), '<')) {
379
-                    $ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "0.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION) - 6)) . "</span>\n";
379
+                    $ret .= "<span style='color : red; font-weight : bold;'><img src='".$path."0.png' >".sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6, strlen(XOOPS_VERSION) - 6))."</span>\n";
380 380
                 } else {
381
-                    $ret .= "<span style='color : green;'><img src='" . $path . "1.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6)) . "</span>\n";
381
+                    $ret .= "<span style='color : green;'><img src='".$path."1.png' >".sprintf(_AM_MODULEADMIN_CONFIG_XOOPS, $this->_obj->getInfo('min_xoops'), substr(XOOPS_VERSION, 6))."</span>\n";
382 382
                 }
383 383
                 $ret .= '<br>';
384 384
             }
@@ -386,9 +386,9 @@  discard block
 block discarded – undo
386 386
             // ModuleAdmin version
387 387
             if ($this->_obj->getInfo('min_admin')) {
388 388
                 if ($this->getVersion() < $this->_obj->getInfo('min_admin')) {
389
-                    $ret .= "<span style='color : red; font-weight : bold;'><img src='" . $path . "0.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion()) . "</span>\n";
389
+                    $ret .= "<span style='color : red; font-weight : bold;'><img src='".$path."0.png' >".sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion())."</span>\n";
390 390
                 } else {
391
-                    $ret .= "<span style='color : green;'><img src='" . $path . "1.png' >" . sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion()) . "</span>\n";
391
+                    $ret .= "<span style='color : green;'><img src='".$path."1.png' >".sprintf(_AM_MODULEADMIN_CONFIG_ADMIN, $this->_obj->getInfo('min_admin'), $this->getVersion())."</span>\n";
392 392
                 }
393 393
                 $ret .= '<br>';
394 394
             }
@@ -451,7 +451,7 @@  discard block
 block discarded – undo
451 451
         switch ($type) {
452 452
             default:
453 453
             case 'default':
454
-                $line .= sprintf($text, "<span style='color : " . $color . "; font-weight : bold;'>" . $value . '</span>');
454
+                $line .= sprintf($text, "<span style='color : ".$color."; font-weight : bold;'>".$value.'</span>');
455 455
                 break;
456 456
 
457 457
             case 'information':
@@ -499,49 +499,49 @@  discard block
 block discarded – undo
499 499
     public function renderAbout($business = '', $logo_xoops = true)
500 500
     {
501 501
         $this->addAssets();
502
-        $path         = XOOPS_URL . '/Frameworks/moduleclasses/icons/32/';
502
+        $path         = XOOPS_URL.'/Frameworks/moduleclasses/icons/32/';
503 503
         $date         = preg_replace('/-\\\/', '/', $this->_obj->getInfo('release_date')); // make format a little more forgiving
504 504
         $date         = explode('/', $date);
505 505
         $author       = explode(',', $this->_obj->getInfo('author'));
506 506
         $nickname     = explode(',', $this->_obj->getInfo('nickname'));
507 507
         $release_date = formatTimestamp(mktime(0, 0, 0, $date[1], $date[2], $date[0]), 's');
508 508
         $module_dir   = $this->_obj->getVar('dirname');
509
-        $module_info  = "<div id=\"about\"><label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_DESCRIPTION . "</label>\n"
510
-                      . "<text>" . $this->_obj->getInfo('description') . "</text><br>\n"
511
-                      . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_UPDATEDATE . "</label>\n"
512
-                      . "<text class=\"bold\">" . formatTimestamp($this->_obj->getVar('last_update'), 'm') . "</text><br>\n"
513
-                      . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_MODULESTATUS . "</label>\n"
514
-                      . "<text>" . $this->_obj->getInfo('module_status') . "</text><br>\n"
515
-                      . "<label class=\"label_after\">" . _AM_MODULEADMIN_ABOUT_WEBSITE . "</label>\n"
516
-                      . "<text><a class=\"tooltip\" href=\"http://" . $this->_obj->getInfo('module_website_url') . "\" rel=\"external\" title=\""
517
-                      . $this->_obj->getInfo('module_website_name') . " - " . $this->_obj->getInfo('module_website_url') . "\">"
518
-                      . $this->_obj->getInfo('module_website_name') . "</a></text>\n"
509
+        $module_info  = "<div id=\"about\"><label class=\"label_after\">"._AM_MODULEADMIN_ABOUT_DESCRIPTION."</label>\n"
510
+                      . "<text>".$this->_obj->getInfo('description')."</text><br>\n"
511
+                      . "<label class=\"label_after\">"._AM_MODULEADMIN_ABOUT_UPDATEDATE."</label>\n"
512
+                      . "<text class=\"bold\">".formatTimestamp($this->_obj->getVar('last_update'), 'm')."</text><br>\n"
513
+                      . "<label class=\"label_after\">"._AM_MODULEADMIN_ABOUT_MODULESTATUS."</label>\n"
514
+                      . "<text>".$this->_obj->getInfo('module_status')."</text><br>\n"
515
+                      . "<label class=\"label_after\">"._AM_MODULEADMIN_ABOUT_WEBSITE."</label>\n"
516
+                      . "<text><a class=\"tooltip\" href=\"http://".$this->_obj->getInfo('module_website_url')."\" rel=\"external\" title=\""
517
+                      . $this->_obj->getInfo('module_website_name')." - ".$this->_obj->getInfo('module_website_url')."\">"
518
+                      . $this->_obj->getInfo('module_website_name')."</a></text>\n"
519 519
                       . "</div>\n";
520
-        $authorArray  = array();
521
-        foreach ( $author as $k => $aName ) {
522
-            $authorArray[$k] = ( isset( $nickname[$k] ) && ( '' != $nickname[$k] ) ) ? "{$aName} ({$nickname[$k]})" : "{$aName}";
520
+        $authorArray = array();
521
+        foreach ($author as $k => $aName) {
522
+            $authorArray[$k] = (isset($nickname[$k]) && ('' != $nickname[$k])) ? "{$aName} ({$nickname[$k]})" : "{$aName}";
523 523
         }
524 524
         $license_url = $this->_obj->getInfo('license_url');
525
-        $license_url = preg_match('%^(https?:)?//%', $license_url) ? $license_url : 'http://' . $license_url;
525
+        $license_url = preg_match('%^(https?:)?//%', $license_url) ? $license_url : 'http://'.$license_url;
526 526
         $website = $this->_obj->getInfo('website');
527
-        $website = preg_match('%^(https?:)?//%', $website) ? $website : 'http://' . $website;
527
+        $website = preg_match('%^(https?:)?//%', $website) ? $website : 'http://'.$website;
528 528
 
529 529
         $ret = "<table>\n<tr>\n"
530 530
              . "<td width=\"50%\">\n"
531 531
              . "<table>\n<tr>\n<td style=\"width: 100px;\">\n"
532
-             . "<img src=\"" . XOOPS_URL . '/modules/' . $module_dir . '/' . $this->_obj->getInfo('image') . "\" alt=\"" . $module_dir . "\" style=\"float: left; margin-right: 10px;\">\n"
532
+             . "<img src=\"".XOOPS_URL.'/modules/'.$module_dir.'/'.$this->_obj->getInfo('image')."\" alt=\"".$module_dir."\" style=\"float: left; margin-right: 10px;\">\n"
533 533
              . "</td><td>\n"
534 534
              . "<div style=\"margin-top: 1px; margin-bottom: 4px; font-size: 18px; line-height: 18px; color: #2F5376; font-weight: bold;\">\n"
535
-             . $this->_obj->getInfo('name') . ' ' . $this->_obj->getInfo('version') . ' ' . $this->_obj->getInfo('module_status') . " ({$release_date})\n"
535
+             . $this->_obj->getInfo('name').' '.$this->_obj->getInfo('version').' '.$this->_obj->getInfo('module_status')." ({$release_date})\n"
536 536
              . "<br>\n"
537 537
              . "</div>\n"
538 538
              . "<div style=\"line-height: 16px; font-weight: bold;\">\n"
539
-             . _AM_MODULEADMIN_ABOUT_BY . implode(', ', $authorArray) . "\n"
539
+             . _AM_MODULEADMIN_ABOUT_BY.implode(', ', $authorArray)."\n"
540 540
              . "</div>\n"
541 541
              . "<div style=\"line-height: 16px;\">\n"
542
-             . "<a href=\"$license_url\" target=\"_blank\" rel=\"external\">" . $this->_obj->getInfo('license') . "</a>\n"
542
+             . "<a href=\"$license_url\" target=\"_blank\" rel=\"external\">".$this->_obj->getInfo('license')."</a>\n"
543 543
              . "<br>\n"
544
-             . "<a href=\"$website\" target=\"_blank\">" . $this->_obj->getInfo('website') . "</a>\n"
544
+             . "<a href=\"$website\" target=\"_blank\">".$this->_obj->getInfo('website')."</a>\n"
545 545
              . "<br>\n"
546 546
              . "<br>\n"
547 547
              . "</div>\n"
@@ -553,10 +553,10 @@  discard block
 block discarded – undo
553 553
                   . "<form action=\"https://www.paypal.com/cgi-bin/webscr\" method=\"post\" target=\"_blank\" rel=\external\">\n"
554 554
                   . "<input name=\"cmd\" type=\"hidden\" value=\"_donations\">\n"
555 555
                   . "<input name=\"business\" type=\"hidden\" value=\"{$business}\">\n"
556
-                  . "<input name=\"currency_code\" type=\"hidden\" value=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_CURRENCY . "\">\n"
557
-                  . "<label class=\"label_after\" for=\"amount\">" . _AM_MODULEADMIN_ABOUT_AMOUNT . "</label><text><input class=\"donate_amount\" type=\"text\" name=\"amount\" value=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_SUGGESTED . "\" title=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_TTL . "\" pattern=\"" . _AM_MODULEADMIN_ABOUT_AMOUNT_PATTERN . "\"></text>\n"
556
+                  . "<input name=\"currency_code\" type=\"hidden\" value=\""._AM_MODULEADMIN_ABOUT_AMOUNT_CURRENCY."\">\n"
557
+                  . "<label class=\"label_after\" for=\"amount\">"._AM_MODULEADMIN_ABOUT_AMOUNT."</label><text><input class=\"donate_amount\" type=\"text\" name=\"amount\" value=\""._AM_MODULEADMIN_ABOUT_AMOUNT_SUGGESTED."\" title=\""._AM_MODULEADMIN_ABOUT_AMOUNT_TTL."\" pattern=\""._AM_MODULEADMIN_ABOUT_AMOUNT_PATTERN."\"></text>\n"
558 558
                   . "<br>\n"
559
-                  . "<text><input type=\"image\" name=\"submit\" class=\"donate_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif\" alt=\"" . _AM_MODULEADMIN_ABOUT_DONATE_IMG_ALT . "\"></text>\n"
559
+                  . "<text><input type=\"image\" name=\"submit\" class=\"donate_button\" src=\"https://www.paypal.com/en_US/i/btn/btn_donate_LG.gif\" alt=\""._AM_MODULEADMIN_ABOUT_DONATE_IMG_ALT."\"></text>\n"
560 560
                   . "<img alt=\"\" height=\"1\" src=\"https://www.paypalobjects.com/en_US/i/scr/pixel.gif\" style=\"border-width: 0px;\" width=\"1\">\n"
561 561
                   . "</form>\n"
562 562
                   . "<br>\n"
@@ -565,24 +565,24 @@  discard block
 block discarded – undo
565 565
                   . "</td>\n</tr>\n";
566 566
         }
567 567
         $ret .= "</table>\n";
568
-        $this->addInfoBox( _AM_MODULEADMIN_ABOUT_MODULEINFO );
569
-        $this->addInfoBoxLine( _AM_MODULEADMIN_ABOUT_MODULEINFO, $module_info, '', '', 'information' );
568
+        $this->addInfoBox(_AM_MODULEADMIN_ABOUT_MODULEINFO);
569
+        $this->addInfoBoxLine(_AM_MODULEADMIN_ABOUT_MODULEINFO, $module_info, '', '', 'information');
570 570
         $ret .= $this->renderInfoBox()
571 571
               . "</td>\n"
572 572
               . "<td width=\"50%\">\n"
573
-              . "<fieldset><legend class=\"label\">" . _AM_MODULEADMIN_ABOUT_CHANGELOG . "</legend><br>\n"
573
+              . "<fieldset><legend class=\"label\">"._AM_MODULEADMIN_ABOUT_CHANGELOG."</legend><br>\n"
574 574
               . "<div class=\"txtchangelog\">\n";
575
-        $language = empty( $GLOBALS['xoopsConfig']['language'] ) ? 'english' : $GLOBALS['xoopsConfig']['language'];
576
-        $file     = XOOPS_ROOT_PATH . "/modules/{$module_dir}/language/{$language}/changelog.txt";
577
-        if ( !is_file( $file ) && ( 'english' !== $language ) ) {
578
-            $file = XOOPS_ROOT_PATH . "/modules/{$module_dir}/language/english/changelog.txt";
575
+        $language = empty($GLOBALS['xoopsConfig']['language']) ? 'english' : $GLOBALS['xoopsConfig']['language'];
576
+        $file     = XOOPS_ROOT_PATH."/modules/{$module_dir}/language/{$language}/changelog.txt";
577
+        if (!is_file($file) && ('english' !== $language)) {
578
+            $file = XOOPS_ROOT_PATH."/modules/{$module_dir}/language/english/changelog.txt";
579 579
         }
580
-        if ( is_readable( $file ) ) {
581
-            $ret .= ( implode( '<br>', file( $file ) ) ) . "\n";
580
+        if (is_readable($file)) {
581
+            $ret .= (implode('<br>', file($file)))."\n";
582 582
         } else {
583
-            $file = XOOPS_ROOT_PATH . "/modules/{$module_dir}/docs/changelog.txt";
584
-            if ( is_readable( $file ) ) {
585
-                $ret .= implode( '<br>', file( $file ) ) . "\n";
583
+            $file = XOOPS_ROOT_PATH."/modules/{$module_dir}/docs/changelog.txt";
584
+            if (is_readable($file)) {
585
+                $ret .= implode('<br>', file($file))."\n";
586 586
             }
587 587
         }
588 588
         $ret .= "</div>\n"
@@ -590,7 +590,7 @@  discard block
 block discarded – undo
590 590
               . "</td>\n"
591 591
               . "</tr>\n"
592 592
               . "</table>\n";
593
-        if ( true === $logo_xoops ) {
593
+        if (true === $logo_xoops) {
594 594
             $ret .= "<div class=\"center\">"
595 595
                   . "<a href=\"http://www.xoops.org\" target=\"_blank\"><img src=\"{$path}xoopsmicrobutton.gif\" alt=\"XOOPS\" title=\"XOOPS\"></a>"
596 596
                   . "</div>";
@@ -608,20 +608,20 @@  discard block
 block discarded – undo
608 608
         $this->addAssets();
609 609
         $ret        = '';
610 610
         $navigation = '';
611
-        $path       = XOOPS_URL . '/modules/' . $this->_obj->getVar('dirname') . '/';
611
+        $path       = XOOPS_URL.'/modules/'.$this->_obj->getVar('dirname').'/';
612 612
         $this->_obj->loadAdminMenu();
613 613
         foreach (array_keys($this->_obj->adminmenu) as $i) {
614
-            if ($this->_obj->adminmenu[$i]['link'] == 'admin/' . $menu) {
615
-                $navigation .= $this->_obj->adminmenu[$i]['title'] . ' | ';
616
-                $ret = "<div class=\"CPbigTitle\" style=\"background-image: url(" . $path . $this->_obj->adminmenu[$i]['icon'] . "); background-repeat: no-repeat; background-position: left; padding-left: 50px;\">
617
-        <strong>" . $this->_obj->adminmenu[$i]['title'] . '</strong></div><br>';
614
+            if ($this->_obj->adminmenu[$i]['link'] == 'admin/'.$menu) {
615
+                $navigation .= $this->_obj->adminmenu[$i]['title'].' | ';
616
+                $ret = "<div class=\"CPbigTitle\" style=\"background-image: url(".$path.$this->_obj->adminmenu[$i]['icon']."); background-repeat: no-repeat; background-position: left; padding-left: 50px;\">
617
+        <strong>" . $this->_obj->adminmenu[$i]['title'].'</strong></div><br>';
618 618
             } else {
619
-                $navigation .= "<a href = '../" . $this->_obj->adminmenu[$i]['link'] . "'>" . $this->_obj->adminmenu[$i]['title'] . '</a> | ';
619
+                $navigation .= "<a href = '../".$this->_obj->adminmenu[$i]['link']."'>".$this->_obj->adminmenu[$i]['title'].'</a> | ';
620 620
             }
621 621
         }
622 622
         if (substr(XOOPS_VERSION, 0, 9) < 'XOOPS 2.5') {
623
-            $navigation .= "<a href = '../../system/admin.php?fct=preferences&op=showmod&mod=" . $this->_obj->getVar('mid') . "'>" . _MI_SYSTEM_ADMENU6 . '</a>';
624
-            $ret = $navigation . '<br><br>' . $ret;
623
+            $navigation .= "<a href = '../../system/admin.php?fct=preferences&op=showmod&mod=".$this->_obj->getVar('mid')."'>"._MI_SYSTEM_ADMENU6.'</a>';
624
+            $ret = $navigation.'<br><br>'.$ret;
625 625
         }
626 626
 
627 627
         return $ret;
Please login to merge, or discard this patch.
htdocs/Frameworks/art/functions.user.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
      */
22 22
     function mod_getIP($asString = false)
23 23
     {
24
-        $GLOBALS['xoopsLogger']->addDeprecated("Deprecated function '" . __FUNCTION__ . "', use XoopsUserUtility directly.");
24
+        $GLOBALS['xoopsLogger']->addDeprecated("Deprecated function '".__FUNCTION__."', use XoopsUserUtility directly.");
25 25
 
26 26
         return XoopsUserUtility::getIP($asString);
27 27
     }
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
      */
36 36
     function &mod_getUnameFromIds($uid, $usereal = false, $linked = false)
37 37
     {
38
-        $GLOBALS['xoopsLogger']->addDeprecated("Deprecated function '" . __FUNCTION__ . "', use XoopsUserUtility directly.");
38
+        $GLOBALS['xoopsLogger']->addDeprecated("Deprecated function '".__FUNCTION__."', use XoopsUserUtility directly.");
39 39
         $ids = XoopsUserUtility::getUnameFromIds($uid, $usereal, $linked);
40 40
 
41 41
         return $ids;
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
      */
51 51
     function mod_getUnameFromId($uid, $usereal = 0, $linked = false)
52 52
     {
53
-        $GLOBALS['xoopsLogger']->addDeprecated("Deprecated function '" . __FUNCTION__ . "', user XoopsUserUtility directly.");
53
+        $GLOBALS['xoopsLogger']->addDeprecated("Deprecated function '".__FUNCTION__."', user XoopsUserUtility directly.");
54 54
 
55 55
         return XoopsUserUtility::getUnameFromId($uid, $usereal, $linked);
56 56
     }
Please login to merge, or discard this patch.
htdocs/Frameworks/art/functions.ini.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
 if (!defined('FRAMEWORKS_ART_FUNCTIONS_INI')):
18 18
     define('FRAMEWORKS_ART_FUNCTIONS_INI', true);
19 19
 
20
-    define('FRAMEWORKS_ROOT_PATH', XOOPS_ROOT_PATH . '/Frameworks');
20
+    define('FRAMEWORKS_ROOT_PATH', XOOPS_ROOT_PATH.'/Frameworks');
21 21
 
22 22
     /**
23 23
      * Load declaration of an object handler
@@ -34,11 +34,11 @@  discard block
 block discarded – undo
34 34
             $handlerClass = 'ArtObject';
35 35
             $fileName     = 'object.php';
36 36
         } else {
37
-            $handlerClass = 'ArtObject' . ucfirst($handler) . 'Handler';
37
+            $handlerClass = 'ArtObject'.ucfirst($handler).'Handler';
38 38
             $fileName     = "object.{$handler}.php";
39 39
         }
40 40
 
41
-        class_exists($handlerClass) || require_once FRAMEWORKS_ROOT_PATH . "/{$dirname}/{$fileName}";
41
+        class_exists($handlerClass) || require_once FRAMEWORKS_ROOT_PATH."/{$dirname}/{$fileName}";
42 42
 
43 43
         return class_exists($handlerClass);
44 44
     }
@@ -61,12 +61,12 @@  discard block
 block discarded – undo
61 61
     function load_functions($group = '', $dirname = 'art')
62 62
     {
63 63
         $dirname  = ('' == $dirname) ? 'art' : $dirname;
64
-        $constant = strtoupper("frameworks_{$dirname}_functions" . ($group ? "_{$group}" : ''));
64
+        $constant = strtoupper("frameworks_{$dirname}_functions".($group ? "_{$group}" : ''));
65 65
         if (defined($constant)) {
66 66
             return true;
67 67
         }
68 68
 
69
-        return include_once FRAMEWORKS_ROOT_PATH . "/{$dirname}/functions.{$group}" . (empty($group) ? '' : '.') . 'php';
69
+        return include_once FRAMEWORKS_ROOT_PATH."/{$dirname}/functions.{$group}".(empty($group) ? '' : '.').'php';
70 70
     }
71 71
 
72 72
     /**
@@ -84,11 +84,11 @@  discard block
 block discarded – undo
84 84
     function mod_loadFunctions($group = '', $dirname = '')
85 85
     {
86 86
         $dirname  = !empty($dirname) ? $dirname : $GLOBALS['xoopsModule']->getVar('dirname', 'n');
87
-        $constant = strtoupper("{$dirname}_functions" . ($group ? "_{$group}" : '') . '_loaded');
87
+        $constant = strtoupper("{$dirname}_functions".($group ? "_{$group}" : '').'_loaded');
88 88
         if (defined($constant)) {
89 89
             return true;
90 90
         }
91
-        $filename = XOOPS_ROOT_PATH . "/modules/{$dirname}/include/functions.{$group}" . (empty($group) ? '' : '.') . 'php';
91
+        $filename = XOOPS_ROOT_PATH."/modules/{$dirname}/include/functions.{$group}".(empty($group) ? '' : '.').'php';
92 92
 
93 93
         return include_once $filename;
94 94
     }
@@ -106,9 +106,9 @@  discard block
 block discarded – undo
106 106
     function mod_loadRenderer($class, $dirname = '')
107 107
     {
108 108
         $dirname  = !empty($dirname) ? $dirname : $GLOBALS['xoopsModule']->getVar('dirname', 'n');
109
-        $renderer = ucfirst($dirname) . ucfirst($class) . 'Renderer';
109
+        $renderer = ucfirst($dirname).ucfirst($class).'Renderer';
110 110
         if (!class_exists($renderer)) {
111
-            require_once XOOPS_ROOT_PATH . "/modules/{$dirname}/class/{$class}.renderer.php";
111
+            require_once XOOPS_ROOT_PATH."/modules/{$dirname}/class/{$class}.renderer.php";
112 112
         }
113 113
         $instance = eval("{$renderer}::instance()");
114 114
 
@@ -128,10 +128,10 @@  discard block
 block discarded – undo
128 128
          */
129 129
         function mod_constant($name)
130 130
         {
131
-            if (!empty($GLOBALS['VAR_PREFIXU']) && @defined($GLOBALS['VAR_PREFIXU'] . '_' . strtoupper($name))) {
132
-                return constant($GLOBALS['VAR_PREFIXU'] . '_' . strtoupper($name));
133
-            } elseif (!empty($GLOBALS['xoopsModule']) && @defined(strtoupper($GLOBALS['xoopsModule']->getVar('dirname', 'n') . '_' . $name))) {
134
-                return constant(strtoupper($GLOBALS['xoopsModule']->getVar('dirname', 'n') . '_' . $name));
131
+            if (!empty($GLOBALS['VAR_PREFIXU']) && @defined($GLOBALS['VAR_PREFIXU'].'_'.strtoupper($name))) {
132
+                return constant($GLOBALS['VAR_PREFIXU'].'_'.strtoupper($name));
133
+            } elseif (!empty($GLOBALS['xoopsModule']) && @defined(strtoupper($GLOBALS['xoopsModule']->getVar('dirname', 'n').'_'.$name))) {
134
+                return constant(strtoupper($GLOBALS['xoopsModule']->getVar('dirname', 'n').'_'.$name));
135 135
             } elseif (defined(strtoupper($name))) {
136 136
                 return constant(strtoupper($name));
137 137
             } else {
@@ -155,7 +155,7 @@  discard block
 block discarded – undo
155 155
          */
156 156
         function mod_DB_prefix($name, $isRel = false)
157 157
         {
158
-            $relative_name = $GLOBALS['MOD_DB_PREFIX'] . '_' . $name;
158
+            $relative_name = $GLOBALS['MOD_DB_PREFIX'].'_'.$name;
159 159
             if ($isRel) {
160 160
                 return $relative_name;
161 161
             }
Please login to merge, or discard this patch.
htdocs/Frameworks/art/xoopsart.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -26,6 +26,6 @@
 block discarded – undo
26 26
      */
27 27
     public function loadFunctions($group = '')
28 28
     {
29
-        return include_once FRAMEWORKS_ROOT_PATH . "/art/functions.{$group}" . (empty($group) ? '' : '.') . 'php';
29
+        return include_once FRAMEWORKS_ROOT_PATH."/art/functions.{$group}".(empty($group) ? '' : '.').'php';
30 30
     }
31 31
 }
Please login to merge, or discard this patch.