Completed
Pull Request — master (#628)
by Richard
19:02 queued 04:58
created
htdocs/modules/codex/usermessage.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
  * @author    Laurent JEN - aka DuGris
22 22
  */
23 23
 
24
-include dirname(dirname(__DIR__)) . '/mainfile.php';
24
+include dirname(dirname(__DIR__)).'/mainfile.php';
25 25
 
26 26
 $xoops = Xoops::getInstance();
27 27
 $xoops->header();
@@ -45,7 +45,7 @@  discard block
 block discarded – undo
45 45
         if ($response->isSuccess()) {
46 46
             echo 'Message sent. Check your inbox.';
47 47
         } else {
48
-            $errors = implode(', ', (array) $response->getErrorMessage());
48
+            $errors = implode(', ', (array)$response->getErrorMessage());
49 49
             echo 'Your message was not sent<br>';
50 50
             echo $errors;
51 51
         }
Please login to merge, or discard this patch.
htdocs/include/site-closed.php 2 patches
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -48,18 +48,18 @@
 block discarded – undo
48 48
     $xoops->theme()->addScript('/include/xoops.js', array('type' => 'text/javascript'));
49 49
     $xoops->setTpl($xoops->theme()->template);
50 50
     $xoops->tpl()->assign(array(
51
-                           'xoops_theme' => $xoops->getConfig('theme_set'),
52
-                           'xoops_imageurl' => \XoopsBaseConfig::get('themes-url') . '/' . $xoops->getConfig('theme_set') . '/',
53
-                           'xoops_themecss' => $xoops->getCss($xoops->getConfig('theme_set')),
54
-                           'xoops_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
55
-                           'xoops_sitename' => htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES),
56
-                           'xoops_slogan' => htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES),
57
-                           'xoops_dirname' => $xoops->isModule() ? $xoops->module->getVar('dirname') : 'system',
58
-                           'xoops_banner' => $xoops->getConfig('banners') ? $xoops->getBanner() : '&nbsp;',
59
-                           'xoops_pagetitle' => $xoops->isModule() ? $xoops->module->getVar('name') : htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES),
60
-                           'lang_login' => XoopsLocale::A_LOGIN, 'lang_username' => XoopsLocale::C_USERNAME, 'lang_password' => XoopsLocale::C_PASSWORD,
61
-                           'lang_siteclosemsg' => $xoops->getConfig('closesite_text')
62
-                      ));
51
+                            'xoops_theme' => $xoops->getConfig('theme_set'),
52
+                            'xoops_imageurl' => \XoopsBaseConfig::get('themes-url') . '/' . $xoops->getConfig('theme_set') . '/',
53
+                            'xoops_themecss' => $xoops->getCss($xoops->getConfig('theme_set')),
54
+                            'xoops_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
55
+                            'xoops_sitename' => htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES),
56
+                            'xoops_slogan' => htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES),
57
+                            'xoops_dirname' => $xoops->isModule() ? $xoops->module->getVar('dirname') : 'system',
58
+                            'xoops_banner' => $xoops->getConfig('banners') ? $xoops->getBanner() : '&nbsp;',
59
+                            'xoops_pagetitle' => $xoops->isModule() ? $xoops->module->getVar('name') : htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES),
60
+                            'lang_login' => XoopsLocale::A_LOGIN, 'lang_username' => XoopsLocale::C_USERNAME, 'lang_password' => XoopsLocale::C_PASSWORD,
61
+                            'lang_siteclosemsg' => $xoops->getConfig('closesite_text')
62
+                        ));
63 63
     //todo check if we can use $xoops->getConfig() instead
64 64
     $config_handler = $xoops->getHandlerConfig();
65 65
     $criteria = new CriteriaCompo(new Criteria('conf_modid', 1));
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -49,7 +49,7 @@
 block discarded – undo
49 49
     $xoops->setTpl($xoops->theme()->template);
50 50
     $xoops->tpl()->assign(array(
51 51
                            'xoops_theme' => $xoops->getConfig('theme_set'),
52
-                           'xoops_imageurl' => \XoopsBaseConfig::get('themes-url') . '/' . $xoops->getConfig('theme_set') . '/',
52
+                           'xoops_imageurl' => \XoopsBaseConfig::get('themes-url').'/'.$xoops->getConfig('theme_set').'/',
53 53
                            'xoops_themecss' => $xoops->getCss($xoops->getConfig('theme_set')),
54 54
                            'xoops_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
55 55
                            'xoops_sitename' => htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES),
Please login to merge, or discard this patch.
htdocs/include/mimetypes.inc.php 1 patch
Spacing   +104 added lines, -104 removed lines patch added patch discarded remove patch
@@ -22,109 +22,109 @@
 block discarded – undo
22 22
  * This should really be replaced with a more accurate way of determining the actually mimetype
23 23
  */
24 24
 return array(
25
-    'hqx' => 'application/mac-binhex40' ,
26
-    'doc' => 'application/msword' ,
27
-    'dot' => 'application/msword' ,
28
-    'bin' => 'application/octet-stream' ,
29
-    'lha' => 'application/octet-stream' ,
30
-    'lzh' => 'application/octet-stream' ,
31
-    'exe' => 'application/octet-stream' ,
32
-    'class' => 'application/octet-stream' ,
33
-    'so' => 'application/octet-stream' ,
34
-    'dll' => 'application/octet-stream' ,
35
-    'pdf' => 'application/pdf' ,
36
-    'ai' => 'application/postscript' ,
37
-    'eps' => 'application/postscript' ,
38
-    'ps' => 'application/postscript' ,
39
-    'smi' => 'application/smil' ,
40
-    'smil' => 'application/smil' ,
41
-    'wbxml' => 'application/vnd.wap.wbxml' ,
42
-    'wmlc' => 'application/vnd.wap.wmlc' ,
43
-    'wmlsc' => 'application/vnd.wap.wmlscriptc' ,
44
-    'xla' => 'application/vnd.ms-excel' ,
45
-    'xls' => 'application/vnd.ms-excel' ,
46
-    'xlt' => 'application/vnd.ms-excel' ,
47
-    'ppt' => 'application/vnd.ms-powerpoint' ,
48
-    'csh' => 'application/x-csh' ,
49
-    'dcr' => 'application/x-director' ,
50
-    'dir' => 'application/x-director' ,
51
-    'dxr' => 'application/x-director' ,
52
-    'spl' => 'application/x-futuresplash' ,
53
-    'gtar' => 'application/x-gtar' ,
54
-    'php' => 'application/x-httpd-php' ,
55
-    'php3' => 'application/x-httpd-php' ,
56
-    'php4' => 'application/x-httpd-php' ,
57
-    'php5' => 'application/x-httpd-php' ,
58
-    'phtml' => 'application/x-httpd-php' ,
59
-    'js' => 'application/x-javascript' ,
60
-    'sh' => 'application/x-sh' ,
61
-    'swf' => 'application/x-shockwave-flash' ,
62
-    'sit' => 'application/x-stuffit' ,
63
-    'tar' => 'application/x-tar' ,
64
-    'tcl' => 'application/x-tcl' ,
65
-    'xhtml' => 'application/xhtml+xml' ,
66
-    'xht' => 'application/xhtml+xml' ,
25
+    'hqx' => 'application/mac-binhex40',
26
+    'doc' => 'application/msword',
27
+    'dot' => 'application/msword',
28
+    'bin' => 'application/octet-stream',
29
+    'lha' => 'application/octet-stream',
30
+    'lzh' => 'application/octet-stream',
31
+    'exe' => 'application/octet-stream',
32
+    'class' => 'application/octet-stream',
33
+    'so' => 'application/octet-stream',
34
+    'dll' => 'application/octet-stream',
35
+    'pdf' => 'application/pdf',
36
+    'ai' => 'application/postscript',
37
+    'eps' => 'application/postscript',
38
+    'ps' => 'application/postscript',
39
+    'smi' => 'application/smil',
40
+    'smil' => 'application/smil',
41
+    'wbxml' => 'application/vnd.wap.wbxml',
42
+    'wmlc' => 'application/vnd.wap.wmlc',
43
+    'wmlsc' => 'application/vnd.wap.wmlscriptc',
44
+    'xla' => 'application/vnd.ms-excel',
45
+    'xls' => 'application/vnd.ms-excel',
46
+    'xlt' => 'application/vnd.ms-excel',
47
+    'ppt' => 'application/vnd.ms-powerpoint',
48
+    'csh' => 'application/x-csh',
49
+    'dcr' => 'application/x-director',
50
+    'dir' => 'application/x-director',
51
+    'dxr' => 'application/x-director',
52
+    'spl' => 'application/x-futuresplash',
53
+    'gtar' => 'application/x-gtar',
54
+    'php' => 'application/x-httpd-php',
55
+    'php3' => 'application/x-httpd-php',
56
+    'php4' => 'application/x-httpd-php',
57
+    'php5' => 'application/x-httpd-php',
58
+    'phtml' => 'application/x-httpd-php',
59
+    'js' => 'application/x-javascript',
60
+    'sh' => 'application/x-sh',
61
+    'swf' => 'application/x-shockwave-flash',
62
+    'sit' => 'application/x-stuffit',
63
+    'tar' => 'application/x-tar',
64
+    'tcl' => 'application/x-tcl',
65
+    'xhtml' => 'application/xhtml+xml',
66
+    'xht' => 'application/xhtml+xml',
67 67
 //    'xhtml' => 'application/xml' ,
68
-    'ent' => 'application/xml-external-parsed-entity' ,
69
-    'dtd' => 'application/xml-dtd' ,
70
-    'mod' => 'application/xml-dtd' ,
71
-    'gz' => 'application/x-gzip' ,
72
-    'zip' => 'application/zip' ,
73
-    'au' => 'audio/basic' ,
74
-    'snd' => 'audio/basic' ,
75
-    'mid' => 'audio/midi' ,
76
-    'midi' => 'audio/midi' ,
77
-    'kar' => 'audio/midi' ,
78
-    'mp1' => 'audio/mpeg' ,
79
-    'mp2' => 'audio/mpeg' ,
80
-    'mp3' => 'audio/mpeg' ,
81
-    'aif' => 'audio/x-aiff' ,
82
-    'aiff' => 'audio/x-aiff' ,
83
-    'm3u' => 'audio/x-mpegurl' ,
84
-    'ram' => 'audio/x-pn-realaudio' ,
85
-    'rm' => 'audio/x-pn-realaudio' ,
86
-    'rpm' => 'audio/x-pn-realaudio-plugin' ,
87
-    'ra' => 'audio/x-realaudio' ,
88
-    'wav' => 'audio/x-wav' ,
89
-    'ogg' => 'audio/ogg' ,
90
-    'bmp' => 'image/bmp' ,
91
-    'gif' => 'image/gif' ,
92
-    'jpeg' => 'image/jpeg' ,
93
-    'jpg' => 'image/jpeg' ,
94
-    'jpe' => 'image/jpeg' ,
95
-    'png' => 'image/png' ,
96
-    'tiff' => 'image/tiff' ,
97
-    'tif' => 'image/tif' ,
98
-    'wbmp' => 'image/vnd.wap.wbmp' ,
99
-    'pnm' => 'image/x-portable-anymap' ,
100
-    'pbm' => 'image/x-portable-bitmap' ,
101
-    'pgm' => 'image/x-portable-graymap' ,
102
-    'ppm' => 'image/x-portable-pixmap' ,
103
-    'xbm' => 'image/x-xbitmap' ,
104
-    'xpm' => 'image/x-xpixmap' ,
105
-    'ics' => 'text/calendar' ,
106
-    'ifb' => 'text/calendar' ,
107
-    'css' => 'text/css' ,
108
-    'html' => 'text/html' ,
109
-    'htm' => 'text/html' ,
110
-    'asc' => 'text/plain' ,
111
-    'txt' => 'text/plain' ,
112
-    'rtf' => 'text/rtf' ,
113
-    'sgml' => 'text/x-sgml' ,
114
-    'sgm' => 'text/x-sgml' ,
115
-    'tsv' => 'text/tab-seperated-values' ,
116
-    'wml' => 'text/vnd.wap.wml' ,
117
-    'wmls' => 'text/vnd.wap.wmlscript' ,
118
-    'xsl' => 'text/xml' ,
119
-    'ogv' => 'video/ogg' ,
120
-    'mpeg' => 'video/mpeg' ,
121
-    'mpg' => 'video/mpeg' ,
122
-    'mpe' => 'video/mpeg' ,
123
-    'qt' => 'video/quicktime' ,
124
-    'mov' => 'video/quicktime' ,
125
-    'avi' => 'video/x-msvideo' ,
126
-    'flv' => 'video/x-flv' ,
127
-    'mp4' => 'video/mp4' ,
128
-    'wmv' => 'video/x-ms-wmv' ,
129
-    'webm' => 'video/webm' ,
68
+    'ent' => 'application/xml-external-parsed-entity',
69
+    'dtd' => 'application/xml-dtd',
70
+    'mod' => 'application/xml-dtd',
71
+    'gz' => 'application/x-gzip',
72
+    'zip' => 'application/zip',
73
+    'au' => 'audio/basic',
74
+    'snd' => 'audio/basic',
75
+    'mid' => 'audio/midi',
76
+    'midi' => 'audio/midi',
77
+    'kar' => 'audio/midi',
78
+    'mp1' => 'audio/mpeg',
79
+    'mp2' => 'audio/mpeg',
80
+    'mp3' => 'audio/mpeg',
81
+    'aif' => 'audio/x-aiff',
82
+    'aiff' => 'audio/x-aiff',
83
+    'm3u' => 'audio/x-mpegurl',
84
+    'ram' => 'audio/x-pn-realaudio',
85
+    'rm' => 'audio/x-pn-realaudio',
86
+    'rpm' => 'audio/x-pn-realaudio-plugin',
87
+    'ra' => 'audio/x-realaudio',
88
+    'wav' => 'audio/x-wav',
89
+    'ogg' => 'audio/ogg',
90
+    'bmp' => 'image/bmp',
91
+    'gif' => 'image/gif',
92
+    'jpeg' => 'image/jpeg',
93
+    'jpg' => 'image/jpeg',
94
+    'jpe' => 'image/jpeg',
95
+    'png' => 'image/png',
96
+    'tiff' => 'image/tiff',
97
+    'tif' => 'image/tif',
98
+    'wbmp' => 'image/vnd.wap.wbmp',
99
+    'pnm' => 'image/x-portable-anymap',
100
+    'pbm' => 'image/x-portable-bitmap',
101
+    'pgm' => 'image/x-portable-graymap',
102
+    'ppm' => 'image/x-portable-pixmap',
103
+    'xbm' => 'image/x-xbitmap',
104
+    'xpm' => 'image/x-xpixmap',
105
+    'ics' => 'text/calendar',
106
+    'ifb' => 'text/calendar',
107
+    'css' => 'text/css',
108
+    'html' => 'text/html',
109
+    'htm' => 'text/html',
110
+    'asc' => 'text/plain',
111
+    'txt' => 'text/plain',
112
+    'rtf' => 'text/rtf',
113
+    'sgml' => 'text/x-sgml',
114
+    'sgm' => 'text/x-sgml',
115
+    'tsv' => 'text/tab-seperated-values',
116
+    'wml' => 'text/vnd.wap.wml',
117
+    'wmls' => 'text/vnd.wap.wmlscript',
118
+    'xsl' => 'text/xml',
119
+    'ogv' => 'video/ogg',
120
+    'mpeg' => 'video/mpeg',
121
+    'mpg' => 'video/mpeg',
122
+    'mpe' => 'video/mpeg',
123
+    'qt' => 'video/quicktime',
124
+    'mov' => 'video/quicktime',
125
+    'avi' => 'video/x-msvideo',
126
+    'flv' => 'video/x-flv',
127
+    'mp4' => 'video/mp4',
128
+    'wmv' => 'video/x-ms-wmv',
129
+    'webm' => 'video/webm',
130 130
     '3gp' => 'video/quicktime' );
Please login to merge, or discard this patch.
htdocs/include/functions.php 1 patch
Spacing   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -65,9 +65,9 @@  discard block
 block discarded – undo
65 65
  */
66 66
 function xoops_getHandler($name, $optional = false)
67 67
 {
68
-    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
68
+    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
69 69
     // Also can use: dedicated alias, i.e. $handler = $xoops->getHandlerConfig($optional);
70
-    $handler = Factory::newSpec()->scheme('kernel')->name($name)->optional((bool) $optional)->build();
70
+    $handler = Factory::newSpec()->scheme('kernel')->name($name)->optional((bool)$optional)->build();
71 71
     return $handler;
72 72
 }
73 73
 
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
80 80
  */
81 81
 function xoops_getModuleHandler($name = null, $module_dir = null, $optional = false)
82 82
 {
83
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
83
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
84 84
     return $xoops->getModuleHandler($name, $module_dir, $optional);
85 85
 }
86 86
 
@@ -95,7 +95,7 @@  discard block
 block discarded – undo
95 95
  */
96 96
 function xoops_load($name, $type = 'core')
97 97
 {
98
-    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
98
+    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
99 99
     // Note: most classes will autoload (i.e. $nav = new XoopsPageNav();) with no need for xoops_load()
100 100
     return XoopsLoad::load($name, $type);
101 101
 }
@@ -110,7 +110,7 @@  discard block
 block discarded – undo
110 110
  */
111 111
 function xoops_loadLanguage($name, $domain = '', $language = null)
112 112
 {
113
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
113
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
114 114
     return $xoops->loadLanguage($name, $domain, $language);
115 115
 }
116 116
 
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
  */
121 121
 function xoops_getActiveModules()
122 122
 {
123
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
123
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
124 124
     return $xoops->getActiveModules();
125 125
 }
126 126
 
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
  */
131 131
 function xoops_setActiveModules()
132 132
 {
133
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
133
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
134 134
     return $xoops->setActiveModules();
135 135
 }
136 136
 
@@ -141,7 +141,7 @@  discard block
 block discarded – undo
141 141
  */
142 142
 function xoops_isActiveModule($dirname)
143 143
 {
144
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
144
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
145 145
     return $xoops->isActiveModule($dirname);
146 146
 }
147 147
 
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
  */
153 153
 function xoops_header($closehead = true)
154 154
 {
155
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
155
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
156 156
     $xoops->simpleHeader($closehead);
157 157
 }
158 158
 
@@ -162,7 +162,7 @@  discard block
 block discarded – undo
162 162
  */
163 163
 function xoops_footer()
164 164
 {
165
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
165
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
166 166
     $xoops->simpleFooter();
167 167
 }
168 168
 
@@ -174,7 +174,7 @@  discard block
 block discarded – undo
174 174
  */
175 175
 function xoops_error($msg, $title = '')
176 176
 {
177
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
177
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
178 178
     echo $xoops->alert('error', $msg, $title);
179 179
 }
180 180
 
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
  */
187 187
 function xoops_result($msg, $title = '')
188 188
 {
189
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
189
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
190 190
     echo $xoops->alert('info', $msg, $title);
191 191
 }
192 192
 
@@ -201,7 +201,7 @@  discard block
 block discarded – undo
201 201
  */
202 202
 function xoops_confirm($hiddens, $action, $msg, $submit = '', $addtoken = true)
203 203
 {
204
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
204
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
205 205
     echo $xoops->confirm($hiddens, $action, $msg, $submit, $addtoken);
206 206
 }
207 207
 
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
213 213
  */
214 214
 function xoops_getUserTimestamp($time, $timeoffset = '')
215 215
 {
216
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
216
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
217 217
     return $xoops->getUserTimestamp($time);
218 218
 }
219 219
 
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
  */
227 227
 function formatTimestamp($time, $format = 'l', $timeoffset = '')
228 228
 {
229
-    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
229
+    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
230 230
     return XoopsLocale::formatTimestamp($time, $format);
231 231
 }
232 232
 
@@ -238,7 +238,7 @@  discard block
 block discarded – undo
238 238
  */
239 239
 function userTimeToServerTime($timestamp, $userTZ = null)
240 240
 {
241
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
241
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
242 242
     return $xoops->userTimeToServerTime($timestamp, $userTZ);
243 243
 }
244 244
 
@@ -248,7 +248,7 @@  discard block
 block discarded – undo
248 248
  */
249 249
 function xoops_makepass()
250 250
 {
251
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
251
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
252 252
     return $xoops->makePass();
253 253
 }
254 254
 
@@ -260,7 +260,7 @@  discard block
 block discarded – undo
260 260
  */
261 261
 function checkEmail($email, $antispam = false)
262 262
 {
263
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
263
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
264 264
     return $xoops->checkEmail($email, $antispam);
265 265
 }
266 266
 
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
  */
272 272
 function formatURL($url)
273 273
 {
274
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
274
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
275 275
     return $xoops->formatURL($url);
276 276
 }
277 277
 
@@ -281,7 +281,7 @@  discard block
 block discarded – undo
281 281
  */
282 282
 function xoops_getbanner()
283 283
 {
284
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
284
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
285 285
     return $xoops->getBanner();
286 286
 }
287 287
 
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
  */
298 298
 function redirect_header($url, $time = 3, $message = '', $addredirect = true, $allowExternalLink = false)
299 299
 {
300
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
300
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
301 301
     $xoops->redirect($url, $time, $message, $addredirect, $allowExternalLink);
302 302
 }
303 303
 
@@ -308,7 +308,7 @@  discard block
 block discarded – undo
308 308
  */
309 309
 function xoops_getenv($key)
310 310
 {
311
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
311
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
312 312
     return $xoops->getEnv($key);
313 313
 }
314 314
 
@@ -319,7 +319,7 @@  discard block
 block discarded – undo
319 319
  */
320 320
 function xoops_getcss($theme = '')
321 321
 {
322
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
322
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
323 323
     return $xoops->getCss($theme);
324 324
 }
325 325
 
@@ -329,7 +329,7 @@  discard block
 block discarded – undo
329 329
  */
330 330
 function xoops_getMailer()
331 331
 {
332
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
332
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
333 333
     return $xoops->getMailer();
334 334
 }
335 335
 
@@ -341,7 +341,7 @@  discard block
 block discarded – undo
341 341
  */
342 342
 function xoops_getrank($rank_id = 0, $posts = 0)
343 343
 {
344
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
344
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
345 345
     return $xoops->service('userrank')->getUserRank(['rank' => $rank_id, 'posts' => $posts, 'uid' => 0])->getValue();
346 346
 }
347 347
 
@@ -355,7 +355,7 @@  discard block
 block discarded – undo
355 355
  */
356 356
 function xoops_substr($str, $start, $length, $trimmarker = '...')
357 357
 {
358
-    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
358
+    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
359 359
     return XoopsLocale::substr($str, $start, $length, $trimmarker);
360 360
 }
361 361
 
@@ -422,7 +422,7 @@  discard block
 block discarded – undo
422 422
  */
423 423
 function xoops_groupperm_deletebymoditem($module_id, $perm_name, $item_id = null)
424 424
 {
425
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
425
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
426 426
     return $xoops->getHandlerGroupPermission()->deleteByModule($module_id, $perm_name, $item_id);
427 427
 }
428 428
 
@@ -433,7 +433,7 @@  discard block
 block discarded – undo
433 433
  */
434 434
 function xoops_utf8_encode(&$text)
435 435
 {
436
-    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
436
+    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
437 437
     $text = XoopsLocale::utf8_encode($text);
438 438
 }
439 439
 
@@ -444,7 +444,7 @@  discard block
 block discarded – undo
444 444
  */
445 445
 function xoops_convert_encoding(&$text)
446 446
 {
447
-    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
447
+    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
448 448
     $text = XoopsLocale::utf8_encode($text);
449 449
 }
450 450
 
@@ -455,7 +455,7 @@  discard block
 block discarded – undo
455 455
  */
456 456
 function xoops_trim($text)
457 457
 {
458
-    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
458
+    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
459 459
     return XoopsLocale::trim($text);
460 460
 }
461 461
 
@@ -466,7 +466,7 @@  discard block
 block discarded – undo
466 466
  */
467 467
 function xoops_getOption($option)
468 468
 {
469
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
469
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
470 470
     return $xoops->getOption($option);
471 471
 }
472 472
 
@@ -478,7 +478,7 @@  discard block
 block discarded – undo
478 478
  */
479 479
 function xoops_getConfigOption($option, $type = 'XOOPS_CONF')
480 480
 {
481
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
481
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
482 482
     return $xoops->getConfig($option);
483 483
 }
484 484
 
@@ -490,7 +490,7 @@  discard block
 block discarded – undo
490 490
  */
491 491
 function xoops_setConfigOption($option, $new = null)
492 492
 {
493
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
493
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
494 494
     $xoops->setConfig($option, $new);
495 495
 }
496 496
 
@@ -502,7 +502,7 @@  discard block
 block discarded – undo
502 502
  */
503 503
 function xoops_getModuleOption($option, $dirname = '')
504 504
 {
505
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
505
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
506 506
     return $xoops->getModuleConfig($option, $dirname);
507 507
 }
508 508
 
@@ -514,7 +514,7 @@  discard block
 block discarded – undo
514 514
  */
515 515
 function xoops_getBaseDomain($url, $debug = 0)
516 516
 {
517
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
517
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
518 518
     return $xoops->getBaseDomain($url);
519 519
 }
520 520
 
@@ -525,7 +525,7 @@  discard block
 block discarded – undo
525 525
  */
526 526
 function xoops_getUrlDomain($url)
527 527
 {
528
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
528
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
529 529
     return $xoops->getBaseDomain($url, true);
530 530
 }
531 531
 
@@ -538,7 +538,7 @@  discard block
 block discarded – undo
538 538
  */
539 539
 function xoops_template_touch($tpl_id, $clear_old = true)
540 540
 {
541
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
541
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
542 542
     return $xoops->templateTouch($tpl_id);
543 543
 }
544 544
 
@@ -550,6 +550,6 @@  discard block
 block discarded – undo
550 550
  */
551 551
 function xoops_template_clear_module_cache($mid)
552 552
 {
553
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
553
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
554 554
     $xoops->templateClearModuleCache($mid);
555 555
 }
Please login to merge, or discard this patch.
htdocs/include/cp_functions.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -26,7 +26,7 @@  discard block
 block discarded – undo
26 26
 function xoops_cp_header()
27 27
 {
28 28
     $xoops = Xoops::getInstance();
29
-    $xoops->deprecated('xoops_cp_header() is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
29
+    $xoops->deprecated('xoops_cp_header() is deprecated. See how to replace it in file '.__FILE__.' line '.__LINE__);
30 30
     $xoops->header($xoops->getOption('template_main'));
31 31
 }
32 32
 
@@ -38,6 +38,6 @@  discard block
 block discarded – undo
38 38
 function xoops_cp_footer()
39 39
 {
40 40
     $xoops = Xoops::getInstance();
41
-    $xoops->deprecated('xoops_cp_footer() is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
41
+    $xoops->deprecated('xoops_cp_footer() is deprecated. See how to replace it in file '.__FILE__.' line '.__LINE__);
42 42
     $xoops->footer();
43 43
 }
Please login to merge, or discard this patch.
htdocs/include/checklogin.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 $uname = Request::getString('uname', '', 'POST');
29 29
 $pass = Request::getString('pass', '', 'POST');
30 30
 if ($uname == '' || $pass == '') {
31
-    $xoops->redirect($xoops_url . '/user.php', 1, XoopsLocale::E_INCORRECT_LOGIN);
31
+    $xoops->redirect($xoops_url.'/user.php', 1, XoopsLocale::E_INCORRECT_LOGIN);
32 32
     exit();
33 33
 }
34 34
 $rememberme = Request::getBool('rememberme', false, 'POST');
@@ -42,11 +42,11 @@  discard block
 block discarded – undo
42 42
 if (false != $user) {
43 43
     /* @var $user XoopsUser */
44 44
     if (0 == $user->getVar('level')) {
45
-        $xoops->redirect($xoops_url . '/index.php', 5, XoopsLocale::E_SELECTED_USER_DEACTIVATED_OR_NOT_ACTIVE);
45
+        $xoops->redirect($xoops_url.'/index.php', 5, XoopsLocale::E_SELECTED_USER_DEACTIVATED_OR_NOT_ACTIVE);
46 46
         exit();
47 47
     }
48 48
     if (in_array(FixedGroups::REMOVED, $user->getGroups())) {
49
-        $xoops->redirect($xoops_url . '/index.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
49
+        $xoops->redirect($xoops_url.'/index.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
50 50
         exit();
51 51
     }
52 52
     if ($xoops->getConfig('closesite') == 1) {
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
             }
59 59
         }
60 60
         if (!$allowed) {
61
-            $xoops->redirect($xoops_url . '/index.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
61
+            $xoops->redirect($xoops_url.'/index.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
62 62
             exit();
63 63
         }
64 64
     }
@@ -77,11 +77,11 @@  discard block
 block discarded – undo
77 77
     if (!empty($xoops_redirect) && !strpos($xoops_redirect, 'register')) {
78 78
         $xoops_redirect = rawurldecode($xoops_redirect);
79 79
         $parsed = parse_url($xoops_url);
80
-        $url = isset($parsed['scheme']) ? $parsed['scheme'] . '://' : 'http://';
80
+        $url = isset($parsed['scheme']) ? $parsed['scheme'].'://' : 'http://';
81 81
         if (isset($parsed['host'])) {
82 82
             $url .= $parsed['host'];
83 83
             if (isset($parsed['port'])) {
84
-                $url .= ':' . $parsed['port'];
84
+                $url .= ':'.$parsed['port'];
85 85
             }
86 86
         } else {
87 87
             $url .= $_SERVER['HTTP_HOST'];
@@ -93,17 +93,17 @@  discard block
 block discarded – undo
93 93
         }
94 94
         $url .= $xoops_redirect;
95 95
     } else {
96
-        $url = $xoops_url . '/index.php';
96
+        $url = $xoops_url.'/index.php';
97 97
     }
98 98
 
99 99
     $xoops->redirect($url, 1, sprintf(XoopsLocale::SF_THANK_YOU_FOR_LOGGING_IN, $user->getVar('uname')), false);
100 100
 } else {
101 101
     $xoops->events()->triggerEvent('core.include.checklogin.failed');
102 102
     if (empty($xoops_redirect)) {
103
-        $xoops->redirect($xoops_url . '/user.php', 5, $xoopsAuth->getHtmlErrors());
103
+        $xoops->redirect($xoops_url.'/user.php', 5, $xoopsAuth->getHtmlErrors());
104 104
     } else {
105 105
         $xoops->redirect(
106
-            $xoops_url . '/user.php?xoops_redirect=' . urlencode($xoops_redirect),
106
+            $xoops_url.'/user.php?xoops_redirect='.urlencode($xoops_redirect),
107 107
             5,
108 108
             $xoopsAuth->getHtmlErrors(),
109 109
             false
Please login to merge, or discard this patch.
htdocs/include/formdhtmltextarea_preview.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,7 +18,7 @@  discard block
 block discarded – undo
18 18
  * @version         $Id$
19 19
  */
20 20
 use Xmf\Request;
21
-include_once dirname(__DIR__) . '/mainfile.php';
21
+include_once dirname(__DIR__).'/mainfile.php';
22 22
 
23 23
 $xoops = Xoops::getInstance();
24 24
 $xoops->logger()->quiet();
@@ -39,10 +39,10 @@  discard block
 block discarded – undo
39 39
 //    $content = urldecode($content);
40 40
 //}
41 41
 
42
-if (! headers_sent()) {
42
+if (!headers_sent()) {
43 43
     header('Content-Type:text/html; charset=UTF-8');
44 44
     header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
45 45
     header('Cache-Control: private, no-cache');
46 46
     header('Pragma: no-cache');
47 47
 }
48
-echo "<div>" . $content . "</div>";
48
+echo "<div>".$content."</div>";
Please login to merge, or discard this patch.
htdocs/include/findusers.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -147,9 +147,9 @@  discard block
 block discarded – undo
147 147
         $form->addElement($rank_select);
148 148
     } else {
149 149
         foreach (array(
150
-                     "uname",
151
-                     "email"
152
-                 ) as $var) {
150
+                        "uname",
151
+                        "email"
152
+                    ) as $var) {
153 153
             $title = $items_match[$var];
154 154
             $text = new Xoops\Form\Text("", $var, 30, 100, @$_POST[$var]);
155 155
             $match = new Xoops\Form\SelectMatchOption("", "{$var}_match", @$_POST["{$var}_match"]);
@@ -237,9 +237,9 @@  discard block
 block discarded – undo
237 237
             $criteria->add(new Criteria('user_occ', '%' . trim($_POST['user_occ']) . '%', 'LIKE'));
238 238
         }
239 239
         foreach (array(
240
-                     "last_login",
241
-                     "user_regdate"
242
-                 ) as $var) {
240
+                        "last_login",
241
+                        "user_regdate"
242
+                    ) as $var) {
243 243
             if (!empty($_POST["{$var}_more"]) && is_numeric($_POST["{$var}_more"])) {
244 244
                 $time = time() - (60 * 60 * 24 * (int)(trim($_POST["{$var}_more"])));
245 245
                 if ($time > 0) {
Please login to merge, or discard this patch.
Spacing   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@  discard block
 block discarded – undo
21 21
  * @author          Taiwen Jiang <[email protected]>
22 22
  * @version         $Id$
23 23
  */
24
-include_once dirname(__DIR__) . '/mainfile.php';
24
+include_once dirname(__DIR__).'/mainfile.php';
25 25
 
26 26
 $xoops = Xoops::getInstance();
27 27
 
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 
48 48
 $token = isset($_REQUEST['token']) ? $_REQUEST['token'] : '';
49 49
 $name_form = 'memberslist';
50
-$name_userid = 'uid' . (!empty($_REQUEST['multiple']) ? '[]' : '');
51
-$name_username = 'uname' . (!empty($_REQUEST['multiple']) ? '[]' : '');
50
+$name_userid = 'uid'.(!empty($_REQUEST['multiple']) ? '[]' : '');
51
+$name_username = 'uname'.(!empty($_REQUEST['multiple']) ? '[]' : '');
52 52
 
53 53
 $user_handler = $xoops->getHandlerUser();
54 54
 
@@ -187,16 +187,16 @@  discard block
 block discarded – undo
187 187
     $acttotal = $user_handler->getCount(new Criteria('level', 0, '>'));
188 188
     $inacttotal = $user_handler->getCount(new Criteria('level', 0, '<='));
189 189
     echo "</html><body>";
190
-    echo "<h2 style='text-align:left;'>" . XoopsLocale::FIND_USERS . " - " . $modes[$mode] . "</h2>";
190
+    echo "<h2 style='text-align:left;'>".XoopsLocale::FIND_USERS." - ".$modes[$mode]."</h2>";
191 191
     $modes_switch = array();
192 192
     foreach ($modes as $_mode => $title) {
193 193
         if ($mode == $_mode) {
194 194
             continue;
195 195
         }
196
-        $modes_switch[] = "<a href='findusers.php?target=" . $myts->htmlSpecialChars(@$_REQUEST["target"]) . "&amp;multiple=" . $myts->htmlSpecialChars(@$_REQUEST["multiple"]) . "&amp;token=" . $myts->htmlSpecialChars($token, ENT_QUOTES) . "&amp;mode={$_mode}'>{$title}</a>";
196
+        $modes_switch[] = "<a href='findusers.php?target=".$myts->htmlSpecialChars(@$_REQUEST["target"])."&amp;multiple=".$myts->htmlSpecialChars(@$_REQUEST["multiple"])."&amp;token=".$myts->htmlSpecialChars($token, ENT_QUOTES)."&amp;mode={$_mode}'>{$title}</a>";
197 197
     }
198
-    echo "<h4>" . implode(" | ", $modes_switch) . "</h4>";
199
-    echo "(" . sprintf(XoopsLocale::F_ACTIVE_USERS, "<span style='color:#ff0000;'>$acttotal</span>") . " " . sprintf(XoopsLocale::F_INACTIVE_USERS, "<span style='color:#ff0000;'>$inacttotal</span>") . ")";
198
+    echo "<h4>".implode(" | ", $modes_switch)."</h4>";
199
+    echo "(".sprintf(XoopsLocale::F_ACTIVE_USERS, "<span style='color:#ff0000;'>$acttotal</span>")." ".sprintf(XoopsLocale::F_INACTIVE_USERS, "<span style='color:#ff0000;'>$inacttotal</span>").")";
200 200
     $form->display();
201 201
 } else {
202 202
     $limit = empty($_POST['limit']) ? 50 : (int)($_POST['limit']);
@@ -209,32 +209,32 @@  discard block
 block discarded – undo
209 209
                 $value = str_replace("_", "\\\_", trim($_POST[$var]));
210 210
                 switch ($match) {
211 211
                     case XOOPS_MATCH_START:
212
-                        $criteria->add(new Criteria($var, $value . '%', 'LIKE'));
212
+                        $criteria->add(new Criteria($var, $value.'%', 'LIKE'));
213 213
                         break;
214 214
                     case XOOPS_MATCH_END:
215
-                        $criteria->add(new Criteria($var, '%' . $value, 'LIKE'));
215
+                        $criteria->add(new Criteria($var, '%'.$value, 'LIKE'));
216 216
                         break;
217 217
                     case XOOPS_MATCH_EQUAL:
218 218
                         $criteria->add(new Criteria($var, $value));
219 219
                         break;
220 220
                     case XOOPS_MATCH_CONTAIN:
221
-                        $criteria->add(new Criteria($var, '%' . $value . '%', 'LIKE'));
221
+                        $criteria->add(new Criteria($var, '%'.$value.'%', 'LIKE'));
222 222
                         break;
223 223
                 }
224 224
             }
225 225
         }
226 226
         if (!empty($_POST['url'])) {
227 227
             $url = $xoops->formatURL(trim($_POST['url']));
228
-            $criteria->add(new Criteria('url', $url . '%', 'LIKE'));
228
+            $criteria->add(new Criteria('url', $url.'%', 'LIKE'));
229 229
         }
230 230
         if (!empty($_POST['user_from'])) {
231
-            $criteria->add(new Criteria('user_from', '%' . trim($_POST['user_from']) . '%', 'LIKE'));
231
+            $criteria->add(new Criteria('user_from', '%'.trim($_POST['user_from']).'%', 'LIKE'));
232 232
         }
233 233
         if (!empty($_POST['user_intrest'])) {
234
-            $criteria->add(new Criteria('user_intrest', '%' . trim($_POST['user_intrest']) . '%', 'LIKE'));
234
+            $criteria->add(new Criteria('user_intrest', '%'.trim($_POST['user_intrest']).'%', 'LIKE'));
235 235
         }
236 236
         if (!empty($_POST['user_occ'])) {
237
-            $criteria->add(new Criteria('user_occ', '%' . trim($_POST['user_occ']) . '%', 'LIKE'));
237
+            $criteria->add(new Criteria('user_occ', '%'.trim($_POST['user_occ']).'%', 'LIKE'));
238 238
         }
239 239
         foreach (array(
240 240
                      "last_login",
@@ -315,15 +315,15 @@  discard block
 block discarded – undo
315 315
 
316 316
     echo $js_adduser = '
317 317
         <script type="text/javascript">
318
-        var multiple=' . (int)($_REQUEST['multiple']) . ';
318
+        var multiple=' . (int)($_REQUEST['multiple']).';
319 319
         function addusers()
320 320
         {
321 321
             var sel_str = "";
322 322
             var num = 0;
323
-            var mForm = document.forms["' . $name_form . '"];
323
+            var mForm = document.forms["' . $name_form.'"];
324 324
             for (var i=0;i!=mForm.elements.length;i++) {
325 325
                 var id=mForm.elements[i];
326
-                if ( ( (multiple > 0 && id.type == "checkbox") || (multiple == 0 && id.type == "radio") ) && (id.checked == true) && ( id.name == "' . $name_userid . '" ) ) {
326
+                if ( ( (multiple > 0 && id.type == "checkbox") || (multiple == 0 && id.type == "radio") ) && (id.checked == true) && ( id.name == "' . $name_userid.'" ) ) {
327 327
                     var name = mForm.elements[++i];
328 328
                     var len = id.value.length + name.value.length;
329 329
                     sel_str += len + ":" + id.value + ":" + name.value;
@@ -331,12 +331,12 @@  discard block
 block discarded – undo
331 331
                 }
332 332
             }
333 333
             if (num == 0) {
334
-                alert("' . XoopsLocale::E_NO_USER_SELECTED . '");
334
+                alert("' . XoopsLocale::E_NO_USER_SELECTED.'");
335 335
                 return false;
336 336
             }
337 337
             sel_str = num + ":" + sel_str;
338 338
             window.opener.addusers(sel_str);
339
-            alert("' . XoopsLocale::S_USERS_ADDED . '");
339
+            alert("' . XoopsLocale::S_USERS_ADDED.'");
340 340
             if (multiple == 0) {
341 341
                 window.close();
342 342
                 window.opener.focus();
@@ -347,16 +347,16 @@  discard block
 block discarded – undo
347 347
     ';
348 348
 
349 349
     echo "</html><body>";
350
-    echo "<a href='findusers.php?target=" . $myts->htmlSpecialChars(@$_POST["target"]) . "&amp;multiple=" . (int)(@$_POST["multiple"]) . "&amp;token=" . $myts->htmlSpecialChars($token) . "'>" . XoopsLocale::FIND_USERS . "</a>&nbsp;<span style='font-weight:bold;'>&raquo;&raquo;</span>&nbsp;" . XoopsLocale::SEARCH_RESULTS . "<br /><br />";
350
+    echo "<a href='findusers.php?target=".$myts->htmlSpecialChars(@$_POST["target"])."&amp;multiple=".(int)(@$_POST["multiple"])."&amp;token=".$myts->htmlSpecialChars($token)."'>".XoopsLocale::FIND_USERS."</a>&nbsp;<span style='font-weight:bold;'>&raquo;&raquo;</span>&nbsp;".XoopsLocale::SEARCH_RESULTS."<br /><br />";
351 351
     if (empty($start) && empty($foundusers)) {
352
-        echo "<h4>" . XoopsLocale::E_USERS_NOT_FOUND, "</h4>";
352
+        echo "<h4>".XoopsLocale::E_USERS_NOT_FOUND, "</h4>";
353 353
         $hiddenform = "<form name='findnext' action='findusers.php' method='post'>";
354 354
         foreach ($_POST as $k => $v) {
355 355
             if ($k === 'XOOPS_TOKEN_REQUEST') {
356 356
                 // regenerate token value
357
-                $hiddenform .= $xoops->security()->getTokenHTML() . "\n";
357
+                $hiddenform .= $xoops->security()->getTokenHTML()."\n";
358 358
             } else {
359
-                $hiddenform .= "<input type='hidden' name='" . $myts->htmlSpecialChars($k) . "' value='" . $myts->htmlSpecialChars($v) . "' />\n";
359
+                $hiddenform .= "<input type='hidden' name='".$myts->htmlSpecialChars($k)."' value='".$myts->htmlSpecialChars($v)."' />\n";
360 360
             }
361 361
         }
362 362
         if (!isset($_POST['limit'])) {
@@ -365,16 +365,16 @@  discard block
 block discarded – undo
365 365
         if (!isset($_POST['start'])) {
366 366
             $hiddenform .= "<input type='hidden' name='start' value='{$start}' />\n";
367 367
         }
368
-        $hiddenform .= "<input type='hidden' name='token' value='" . $myts->htmlSpecialChars($token) . "' />\n";
368
+        $hiddenform .= "<input type='hidden' name='token' value='".$myts->htmlSpecialChars($token)."' />\n";
369 369
         $hiddenform .= "</form>";
370 370
 
371
-        echo "<div>" . $hiddenform;
372
-        echo "<a href='#' onclick='javascript:document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>" . XoopsLocale::SEARCH_AGAIN . "</a>\n";
371
+        echo "<div>".$hiddenform;
372
+        echo "<a href='#' onclick='javascript:document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>".XoopsLocale::SEARCH_AGAIN."</a>\n";
373 373
         echo "</div>";
374 374
     } else {
375 375
         if ($start < $total) {
376 376
             if (!empty($total)) {
377
-                echo sprintf(XoopsLocale::F_USERS_FOUND, $total) . "<br />";
377
+                echo sprintf(XoopsLocale::F_USERS_FOUND, $total)."<br />";
378 378
             }
379 379
             if (!empty($foundusers)) {
380 380
                 echo "<form action='findusers.php' method='post' name='{$name_form}' id='{$name_form}'>
@@ -385,11 +385,11 @@  discard block
 block discarded – undo
385 385
                     echo "<input type='checkbox' name='memberslist_checkall' id='memberslist_checkall' onclick='xoopsCheckAll(\"{$name_form}\", \"memberslist_checkall\");' />";
386 386
                 }
387 387
                 echo "</th>
388
-            <th align='center'>" . XoopsLocale::USER_NAME . "</th>
389
-            <th align='center'>" . XoopsLocale::REAL_NAME . "</th>
390
-            <th align='center'>" . XoopsLocale::USER_REGISTRATION . "</th>
391
-            <th align='center'>" . XoopsLocale::LAST_LOGIN . "</th>
392
-            <th align='center'>" . XoopsLocale::POSTS . "</th>
388
+            <th align='center'>" . XoopsLocale::USER_NAME."</th>
389
+            <th align='center'>" . XoopsLocale::REAL_NAME."</th>
390
+            <th align='center'>" . XoopsLocale::USER_REGISTRATION."</th>
391
+            <th align='center'>" . XoopsLocale::LAST_LOGIN."</th>
392
+            <th align='center'>" . XoopsLocale::POSTS."</th>
393 393
             </tr>";
394 394
                 $ucount = 0;
395 395
                 foreach (array_keys($foundusers) as $j) {
@@ -403,32 +403,32 @@  discard block
 block discarded – undo
403 403
                     echo "<tr class='$class'>
404 404
                     <td align='center'>";
405 405
                     if (!empty($_POST["multiple"])) {
406
-                        echo "<input type='checkbox' name='{$name_userid}' id='{$name_userid}' value='" . $foundusers[$j]->getVar("uid") . "' />";
407
-                        echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='" . $foundusers[$j]->getVar("uname") . "' />";
406
+                        echo "<input type='checkbox' name='{$name_userid}' id='{$name_userid}' value='".$foundusers[$j]->getVar("uid")."' />";
407
+                        echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='".$foundusers[$j]->getVar("uname")."' />";
408 408
                     } else {
409
-                        echo "<input type='radio' name='{$name_userid}' id='{$name_userid}' value='" . $foundusers[$j]->getVar("uid") . "' />";
410
-                        echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='" . $foundusers[$j]->getVar("uname") . "' />";
409
+                        echo "<input type='radio' name='{$name_userid}' id='{$name_userid}' value='".$foundusers[$j]->getVar("uid")."' />";
410
+                        echo "<input type='hidden' name='{$name_username}' id='{$name_username}' value='".$foundusers[$j]->getVar("uname")."' />";
411 411
                     }
412 412
                     echo "</td>
413
-                    <td><a href='" . \XoopsBaseConfig::get('url') . "/userinfo.php?uid=" . $foundusers[$j]->getVar("uid") . "' target='_blank'>" . $foundusers[$j]->getVar("uname") . "</a></td>
414
-                    <td>" . $fuser_name . "</td>
415
-                    <td align='center'>" . ($foundusers[$j]->getVar("user_regdate") ? date("Y-m-d", $foundusers[$j]->getVar("user_regdate")) : "") . "</td>
416
-                    <td align='center'>" . ($foundusers[$j]->getVar("last_login") ? date("Y-m-d H:i", $foundusers[$j]->getVar("last_login")) : "") . "</td>
417
-                    <td align='center'>" . $foundusers[$j]->getVar("posts") . "</td>";
413
+                    <td><a href='" . \XoopsBaseConfig::get('url')."/userinfo.php?uid=".$foundusers[$j]->getVar("uid")."' target='_blank'>".$foundusers[$j]->getVar("uname")."</a></td>
414
+                    <td>" . $fuser_name."</td>
415
+                    <td align='center'>" . ($foundusers[$j]->getVar("user_regdate") ? date("Y-m-d", $foundusers[$j]->getVar("user_regdate")) : "")."</td>
416
+                    <td align='center'>" . ($foundusers[$j]->getVar("last_login") ? date("Y-m-d H:i", $foundusers[$j]->getVar("last_login")) : "")."</td>
417
+                    <td align='center'>" . $foundusers[$j]->getVar("posts")."</td>";
418 418
                     echo "</tr>\n";
419 419
                 }
420 420
                 echo "<tr class='foot'><td colspan='6'>";
421 421
 
422 422
                 // placeholder for external applications
423 423
                 if (empty($_POST["target"])) {
424
-                    echo "<select name='fct'><option value='users'>" . XoopsLocale::A_DELETE . "</option><option value='mailusers'>" . XoopsLocale::SEND_EMAIL . "</option>";
424
+                    echo "<select name='fct'><option value='users'>".XoopsLocale::A_DELETE."</option><option value='mailusers'>".XoopsLocale::SEND_EMAIL."</option>";
425 425
                     echo "</select>&nbsp;";
426
-                    echo $xoops->security()->getTokenHTML() . "<input type='submit' value='" . XoopsLocale::A_SUBMIT . "' />";
426
+                    echo $xoops->security()->getTokenHTML()."<input type='submit' value='".XoopsLocale::A_SUBMIT."' />";
427 427
                     // Add selected users
428 428
                 } else {
429
-                    echo "<input type='button' value='" . XoopsLocale::ADD_SELECTED_USERS . "' onclick='addusers();' />";
429
+                    echo "<input type='button' value='".XoopsLocale::ADD_SELECTED_USERS."' onclick='addusers();' />";
430 430
                 }
431
-                echo "<input type='hidden' name='token' value='" . $myts->htmlSpecialChars($token) . "' />\n";
431
+                echo "<input type='hidden' name='token' value='".$myts->htmlSpecialChars($token)."' />\n";
432 432
                 echo "</td></tr></table></form>\n";
433 433
             }
434 434
 
@@ -436,32 +436,32 @@  discard block
 block discarded – undo
436 436
             foreach ($_POST as $k => $v) {
437 437
                 if ($k === 'XOOPS_TOKEN_REQUEST') {
438 438
                     // regenerate token value
439
-                    $hiddenform .= $xoops->security()->getTokenHTML() . "\n";
439
+                    $hiddenform .= $xoops->security()->getTokenHTML()."\n";
440 440
                 } else {
441
-                    $hiddenform .= "<input type='hidden' name='" . $myts->htmlSpecialChars($k) . "' value='" . $myts->htmlSpecialChars($v) . "' />\n";
441
+                    $hiddenform .= "<input type='hidden' name='".$myts->htmlSpecialChars($k)."' value='".$myts->htmlSpecialChars($v)."' />\n";
442 442
                 }
443 443
             }
444 444
             if (!isset($_POST['limit'])) {
445
-                $hiddenform .= "<input type='hidden' name='limit' value='" . $limit . "' />\n";
445
+                $hiddenform .= "<input type='hidden' name='limit' value='".$limit."' />\n";
446 446
             }
447 447
             if (!isset($_POST['start'])) {
448
-                $hiddenform .= "<input type='hidden' name='start' value='" . $start . "' />\n";
448
+                $hiddenform .= "<input type='hidden' name='start' value='".$start."' />\n";
449 449
             }
450
-            $hiddenform .= "<input type='hidden' name='token' value='" . $myts->htmlSpecialChars($token) . "' />\n";
450
+            $hiddenform .= "<input type='hidden' name='token' value='".$myts->htmlSpecialChars($token)."' />\n";
451 451
             if (!isset($total) || ($totalpages = ceil($total / $limit)) > 1) {
452 452
                 $prev = $start - $limit;
453 453
                 if ($start - $limit >= 0) {
454
-                    $hiddenform .= "<a href='#0' onclick='javascript:document.findnext.start.value=" . $prev . ";document.findnext.submit();'>" . XoopsLocale::PREVIOUS . "</a>&nbsp;\n";
454
+                    $hiddenform .= "<a href='#0' onclick='javascript:document.findnext.start.value=".$prev.";document.findnext.submit();'>".XoopsLocale::PREVIOUS."</a>&nbsp;\n";
455 455
                 }
456 456
                 $counter = 1;
457 457
                 $currentpage = ($start + $limit) / $limit;
458 458
                 if (!isset($total)) {
459 459
                     while ($counter <= $currentpage) {
460 460
                         if ($counter == $currentpage) {
461
-                            $hiddenform .= "<strong>" . $counter . "</strong> ";
461
+                            $hiddenform .= "<strong>".$counter."</strong> ";
462 462
                         } else {
463 463
                             if (($counter > $currentpage - 4 && $counter < $currentpage + 4) || $counter == 1) {
464
-                                $hiddenform .= "<a href='#" . $counter . "' onclick='javascript:document.findnext.start.value=" . ($counter - 1) * $limit . ";document.findnext.submit();'>" . $counter . "</a> ";
464
+                                $hiddenform .= "<a href='#".$counter."' onclick='javascript:document.findnext.start.value=".($counter - 1) * $limit.";document.findnext.submit();'>".$counter."</a> ";
465 465
                                 if ($counter == 1 && $currentpage > 5) {
466 466
                                     $hiddenform .= "... ";
467 467
                                 }
@@ -472,13 +472,13 @@  discard block
 block discarded – undo
472 472
                 } else {
473 473
                     while ($counter <= $totalpages) {
474 474
                         if ($counter == $currentpage) {
475
-                            $hiddenform .= "<strong>" . $counter . "</strong> ";
475
+                            $hiddenform .= "<strong>".$counter."</strong> ";
476 476
                         } else {
477 477
                             if (($counter > $currentpage - 4 && $counter < $currentpage + 4) || $counter == 1 || $counter == $totalpages) {
478 478
                                 if ($counter == $totalpages && $currentpage < $totalpages - 4) {
479 479
                                     $hiddenform .= "... ";
480 480
                                 }
481
-                                $hiddenform .= "<a href='#" . $counter . "' onclick='javascript:document.findnext.start.value=" . ($counter - 1) * $limit . ";document.findnext.submit();'>" . $counter . "</a> ";
481
+                                $hiddenform .= "<a href='#".$counter."' onclick='javascript:document.findnext.start.value=".($counter - 1) * $limit.";document.findnext.submit();'>".$counter."</a> ";
482 482
                                 if ($counter == 1 && $currentpage > 5) {
483 483
                                     $hiddenform .= "... ";
484 484
                                 }
@@ -490,16 +490,16 @@  discard block
 block discarded – undo
490 490
 
491 491
                 $next = $start + $limit;
492 492
                 if ((isset($total) && $total > $next) || (!isset($total) && count($foundusers) >= $limit)) {
493
-                    $hiddenform .= "&nbsp;<a href='#" . $total . "' onclick='javascript:document.findnext.start.value=" . $next . ";document.findnext.submit();'>" . XoopsLocale::NEXT . "</a>\n";
493
+                    $hiddenform .= "&nbsp;<a href='#".$total."' onclick='javascript:document.findnext.start.value=".$next.";document.findnext.submit();'>".XoopsLocale::NEXT."</a>\n";
494 494
                 }
495 495
             }
496 496
             $hiddenform .= "</form>";
497 497
 
498
-            echo "<div>" . $hiddenform;
498
+            echo "<div>".$hiddenform;
499 499
             if (isset($total)) {
500
-                echo "<br />" . sprintf(XoopsLocale::F_USERS_FOUND, $total) . "&nbsp;";
500
+                echo "<br />".sprintf(XoopsLocale::F_USERS_FOUND, $total)."&nbsp;";
501 501
             }
502
-            echo "<a href='#' onclick='javascript:document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>" . XoopsLocale::SEARCH_AGAIN . "</a>\n";
502
+            echo "<a href='#' onclick='javascript:document.findnext.start.value=0;document.findnext.user_submit.value=0;document.findnext.submit();'>".XoopsLocale::SEARCH_AGAIN."</a>\n";
503 503
             echo "</div>";
504 504
         }
505 505
     }
Please login to merge, or discard this patch.
htdocs/include/version.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -19,5 +19,5 @@
 block discarded – undo
19 19
  * Define XOOPS version
20 20
  * @todo This should be eliminated in favor of \Xoops::VERSION, but it is still required in installer
21 21
  */
22
-$XoopsIncludeVersionString  = class_exists('\Xoops', false) ? \Xoops::VERSION : 'XOOPS 2.6.0';
22
+$XoopsIncludeVersionString = class_exists('\Xoops', false) ? \Xoops::VERSION : 'XOOPS 2.6.0';
23 23
 define('XOOPS_VERSION', $XoopsIncludeVersionString);
Please login to merge, or discard this patch.