@@ -117,15 +117,15 @@ discard block |
||
117 | 117 | } |
118 | 118 | |
119 | 119 | return true; |
120 | - } elseif (self::fileExists($file = \XoopsBaseConfig::get('root-path') . '/class/' . $name . '.php')) { |
|
120 | + } elseif (self::fileExists($file = \XoopsBaseConfig::get('root-path').'/class/'.$name.'.php')) { |
|
121 | 121 | //attempt loading from file |
122 | 122 | include_once $file; |
123 | - $class = 'Xoops' . ucfirst($name); |
|
123 | + $class = 'Xoops'.ucfirst($name); |
|
124 | 124 | if (class_exists($class)) { |
125 | 125 | return $class; |
126 | 126 | } else { |
127 | 127 | trigger_error( |
128 | - 'Class ' . $name . ' not found in file ' . __FILE__ . 'at line ' . __LINE__, |
|
128 | + 'Class '.$name.' not found in file '.__FILE__.'at line '.__LINE__, |
|
129 | 129 | E_USER_WARNING |
130 | 130 | ); |
131 | 131 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | */ |
144 | 144 | private static function loadFramework($name) |
145 | 145 | { |
146 | - if (!self::fileExists($file = \XoopsBaseConfig::get('root-path') . '/Frameworks/' . $name . '/xoops' . $name . '.php')) { |
|
146 | + if (!self::fileExists($file = \XoopsBaseConfig::get('root-path').'/Frameworks/'.$name.'/xoops'.$name.'.php')) { |
|
147 | 147 | /* |
148 | 148 | trigger_error( |
149 | 149 | 'File ' . str_replace(\XoopsBaseConfig::get('root-path'), '', $file) |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | return false; |
155 | 155 | } |
156 | 156 | include_once $file; |
157 | - $class = 'Xoops' . ucfirst($name); |
|
157 | + $class = 'Xoops'.ucfirst($name); |
|
158 | 158 | if (class_exists($class, false)) { |
159 | 159 | return $class; |
160 | 160 | } |
@@ -175,9 +175,9 @@ discard block |
||
175 | 175 | if (empty($dirname)) { |
176 | 176 | return false; |
177 | 177 | } |
178 | - if (self::fileExists($file = \XoopsBaseConfig::get('root-path') . '/modules/' . $dirname . '/class/' . $name . '.php')) { |
|
178 | + if (self::fileExists($file = \XoopsBaseConfig::get('root-path').'/modules/'.$dirname.'/class/'.$name.'.php')) { |
|
179 | 179 | include_once $file; |
180 | - if (class_exists(ucfirst($dirname) . ucfirst($name))) { |
|
180 | + if (class_exists(ucfirst($dirname).ucfirst($name))) { |
|
181 | 181 | return true; |
182 | 182 | } |
183 | 183 | } |
@@ -195,50 +195,50 @@ discard block |
||
195 | 195 | { |
196 | 196 | $xoops_root_path = \XoopsBaseConfig::get('root-path'); |
197 | 197 | return array( |
198 | - 'bloggerapi' => $xoops_root_path . '/class/xml/rpc/bloggerapi.php', |
|
199 | - 'criteria' => $xoops_root_path . '/class/criteria.php', |
|
200 | - 'criteriacompo' => $xoops_root_path . '/class/criteria.php', |
|
201 | - 'criteriaelement' => $xoops_root_path . '/class/criteria.php', |
|
202 | - 'formdhtmltextarea' => $xoops_root_path . '/class/xoopseditor/dhtmltextarea/dhtmltextarea.php', |
|
203 | - 'formtextarea' => $xoops_root_path . '/class/xoopseditor/textarea/textarea.php', |
|
204 | - 'htmlawed' => $xoops_root_path . '/class/vendor/htmLawed.php', |
|
205 | - 'metaweblogapi' => $xoops_root_path . '/class/xml/rpc/metaweblogapi.php', |
|
206 | - 'movabletypeapi' => $xoops_root_path . '/class/xml/rpc/movabletypeapi.php', |
|
207 | - 'mytextsanitizer' => $xoops_root_path . '/class/module.textsanitizer.php', |
|
198 | + 'bloggerapi' => $xoops_root_path.'/class/xml/rpc/bloggerapi.php', |
|
199 | + 'criteria' => $xoops_root_path.'/class/criteria.php', |
|
200 | + 'criteriacompo' => $xoops_root_path.'/class/criteria.php', |
|
201 | + 'criteriaelement' => $xoops_root_path.'/class/criteria.php', |
|
202 | + 'formdhtmltextarea' => $xoops_root_path.'/class/xoopseditor/dhtmltextarea/dhtmltextarea.php', |
|
203 | + 'formtextarea' => $xoops_root_path.'/class/xoopseditor/textarea/textarea.php', |
|
204 | + 'htmlawed' => $xoops_root_path.'/class/vendor/htmLawed.php', |
|
205 | + 'metaweblogapi' => $xoops_root_path.'/class/xml/rpc/metaweblogapi.php', |
|
206 | + 'movabletypeapi' => $xoops_root_path.'/class/xml/rpc/movabletypeapi.php', |
|
207 | + 'mytextsanitizer' => $xoops_root_path.'/class/module.textsanitizer.php', |
|
208 | 208 | //'mytextsanitizerextension' => $xoops_root_path . '/class/module.textsanitizer.php', |
209 | 209 | //'phpmailer' => $xoops_root_path . '/class/mail/phpmailer/class.phpmailer.php', |
210 | - 'rssauthorhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
211 | - 'rsscategoryhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
212 | - 'rsscommentshandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
213 | - 'rsscopyrighthandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
214 | - 'rssdescriptionhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
215 | - 'rssdocshandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
216 | - 'rssgeneratorhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
217 | - 'rssguidhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
218 | - 'rssheighthandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
219 | - 'rssimagehandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
220 | - 'rssitemhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
221 | - 'rsslanguagehandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
222 | - 'rsslastbuilddatehandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
223 | - 'rsslinkhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
224 | - 'rssmanagingeditorhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
225 | - 'rssnamehandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
226 | - 'rsspubdatehandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
227 | - 'rsssourcehandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
228 | - 'rsstextinputhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
229 | - 'rsstitlehandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
230 | - 'rssttlhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
231 | - 'rssurlhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
232 | - 'rsswebmasterhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
233 | - 'rsswidthhandler' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
234 | - 'saxparser' => $xoops_root_path . '/class/xml/saxparser.php', |
|
210 | + 'rssauthorhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
211 | + 'rsscategoryhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
212 | + 'rsscommentshandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
213 | + 'rsscopyrighthandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
214 | + 'rssdescriptionhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
215 | + 'rssdocshandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
216 | + 'rssgeneratorhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
217 | + 'rssguidhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
218 | + 'rssheighthandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
219 | + 'rssimagehandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
220 | + 'rssitemhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
221 | + 'rsslanguagehandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
222 | + 'rsslastbuilddatehandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
223 | + 'rsslinkhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
224 | + 'rssmanagingeditorhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
225 | + 'rssnamehandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
226 | + 'rsspubdatehandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
227 | + 'rsssourcehandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
228 | + 'rsstextinputhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
229 | + 'rsstitlehandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
230 | + 'rssttlhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
231 | + 'rssurlhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
232 | + 'rsswebmasterhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
233 | + 'rsswidthhandler' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
234 | + 'saxparser' => $xoops_root_path.'/class/xml/saxparser.php', |
|
235 | 235 | //'smarty' => $xoops_root_path . '/smarty/Smarty.class.php', |
236 | - 'snoopy' => $xoops_root_path . '/class/vendor/snoopy.php', |
|
237 | - 'sqlutility' => $xoops_root_path . '/class/database/sqlutility.php', |
|
238 | - 'tar' => $xoops_root_path . '/class/class.tar.php', |
|
239 | - 'xmltaghandler' => $xoops_root_path . '/class/xml/xmltaghandler.php', |
|
240 | - 'xoopsadminthemefactory' => $xoops_root_path . '/class/theme.php', |
|
241 | - 'xoopsapi' => $xoops_root_path . '/class/xml/rpc/xoopsapi.php', |
|
236 | + 'snoopy' => $xoops_root_path.'/class/vendor/snoopy.php', |
|
237 | + 'sqlutility' => $xoops_root_path.'/class/database/sqlutility.php', |
|
238 | + 'tar' => $xoops_root_path.'/class/class.tar.php', |
|
239 | + 'xmltaghandler' => $xoops_root_path.'/class/xml/xmltaghandler.php', |
|
240 | + 'xoopsadminthemefactory' => $xoops_root_path.'/class/theme.php', |
|
241 | + 'xoopsapi' => $xoops_root_path.'/class/xml/rpc/xoopsapi.php', |
|
242 | 242 | //'xoopsauth' => $xoops_root_path . '/class/auth/auth.php', |
243 | 243 | //'xoopsauthfactory' => $xoops_root_path . '/class/auth/authfactory.php', |
244 | 244 | //'xoopsauthads' => $xoops_root_path . '/class/auth/auth_ads.php', |
@@ -255,12 +255,12 @@ discard block |
||
255 | 255 | //'xoopsblockmodulelink' => $xoops_root_path . '/kernel/blockmodulelink.php', |
256 | 256 | //'xoopsblockmodulelinkhandler' => $xoops_root_path . '/kernel/blockmodulelink.php', |
257 | 257 | //'xoopscalendar' => $xoops_root_path . '/class/calendar/xoopscalendar.php', |
258 | - 'xoopscaptcha' => $xoops_root_path . '/class/captcha/xoopscaptcha.php', |
|
259 | - 'xoopscaptchamethod' => $xoops_root_path . '/class/captcha/xoopscaptchamethod.php', |
|
260 | - 'xoopscaptchaimage' => $xoops_root_path . '/class/captcha/image.php', |
|
261 | - 'xoopscaptcharecaptcha' => $xoops_root_path . '/class/captcha/recaptcha.php', |
|
262 | - 'xoopscaptchatext' => $xoops_root_path . '/class/captcha/text.php', |
|
263 | - 'xoopscaptchaimagehandler' => $xoops_root_path . '/class/captcha/image/scripts/imageclass.php', |
|
258 | + 'xoopscaptcha' => $xoops_root_path.'/class/captcha/xoopscaptcha.php', |
|
259 | + 'xoopscaptchamethod' => $xoops_root_path.'/class/captcha/xoopscaptchamethod.php', |
|
260 | + 'xoopscaptchaimage' => $xoops_root_path.'/class/captcha/image.php', |
|
261 | + 'xoopscaptcharecaptcha' => $xoops_root_path.'/class/captcha/recaptcha.php', |
|
262 | + 'xoopscaptchatext' => $xoops_root_path.'/class/captcha/text.php', |
|
263 | + 'xoopscaptchaimagehandler' => $xoops_root_path.'/class/captcha/image/scripts/imageclass.php', |
|
264 | 264 | //'xoopscomment' => $xoops_root_path . '/kernel/comment.php', |
265 | 265 | //'xoopscommenthandler' => $xoops_root_path . '/kernel/comment.php', |
266 | 266 | //'xoopscommentrenderer' => $xoops_root_path . '/class/commentrenderer.php', |
@@ -271,15 +271,15 @@ discard block |
||
271 | 271 | //'xoopsconfigitemhandler' => $xoops_root_path . '/kernel/configitem.php', |
272 | 272 | //'xoopsconfigoption' => $xoops_root_path . '/kernel/configoption.php', |
273 | 273 | //'xoopsconfigoptionhandler' => $xoops_root_path . '/kernel/configoption.php', |
274 | - 'xoopsdatabase' => $xoops_root_path . '/class/database/database.php', |
|
274 | + 'xoopsdatabase' => $xoops_root_path.'/class/database/database.php', |
|
275 | 275 | //'xoopsconnection' => $xoops_root_path . '/class/database/connection.php', |
276 | 276 | //'xoopsquerybuilder' => $xoops_root_path . '/class/database/querybuilder.php', |
277 | - 'xoopsdatabasefactory' => $xoops_root_path . '/class/database/databasefactory.php', |
|
278 | - 'xoopsdatabasemanager' => $xoops_root_path . '/class/database/manager.php', |
|
279 | - 'xoopsdownloader' => $xoops_root_path . '/class/downloader.php', |
|
280 | - 'xoopsmysqldatabase' => $xoops_root_path . '/class/database/mysqldatabase.php', |
|
281 | - 'xoopsmysqldatabaseproxy' => $xoops_root_path . '/class/database/mysqldatabaseproxy.php', |
|
282 | - 'xoopsmysqldatabasesafe' => $xoops_root_path . '/class/database/mysqldatabasesafe.php', |
|
277 | + 'xoopsdatabasefactory' => $xoops_root_path.'/class/database/databasefactory.php', |
|
278 | + 'xoopsdatabasemanager' => $xoops_root_path.'/class/database/manager.php', |
|
279 | + 'xoopsdownloader' => $xoops_root_path.'/class/downloader.php', |
|
280 | + 'xoopsmysqldatabase' => $xoops_root_path.'/class/database/mysqldatabase.php', |
|
281 | + 'xoopsmysqldatabaseproxy' => $xoops_root_path.'/class/database/mysqldatabaseproxy.php', |
|
282 | + 'xoopsmysqldatabasesafe' => $xoops_root_path.'/class/database/mysqldatabasesafe.php', |
|
283 | 283 | //'xoopsgroup' => $xoops_root_path . '/kernel/group.php', |
284 | 284 | //'xoopsgrouphandler' => $xoops_root_path . '/kernel/group.php', |
285 | 285 | //'xoopsgroupperm' => $xoops_root_path . '/kernel/groupperm.php', |
@@ -292,61 +292,61 @@ discard block |
||
292 | 292 | //'xoopsimagesethandler' => $xoops_root_path . '/kernel/imageset.php', |
293 | 293 | //'xoopsimagesetimg' => $xoops_root_path . '/kernel/imagesetimg.php', |
294 | 294 | //'xoopsimagesetimghandler' => $xoops_root_path . '/kernel/imagesetimg.php', |
295 | - 'xoopslists' => $xoops_root_path . '/class/xoopslists.php', |
|
295 | + 'xoopslists' => $xoops_root_path.'/class/xoopslists.php', |
|
296 | 296 | //'xoopslocal' => $xoops_root_path . '/include/xoopslocal.php', |
297 | - 'xoopslocalabstract' => $xoops_root_path . '/class/xoopslocal.php', |
|
298 | - 'xoopslogger' => $xoops_root_path . '/class/logger/xoopslogger.php', |
|
299 | - 'xoopseditor' => $xoops_root_path . '/class/xoopseditor/xoopseditor.php', |
|
300 | - 'xoopseditorhandler' => $xoops_root_path . '/class/xoopseditor/xoopseditor.php', |
|
301 | - 'xoopsfile' => $xoops_root_path . '/class/file/xoopsfile.php', |
|
302 | - 'xoopsfilehandler' => $xoops_root_path . '/class/file/file.php', |
|
303 | - 'xoopsfilterinput' => $xoops_root_path . '/class/xoopsfilterinput.php', |
|
304 | - 'xoopsfolderhandler' => $xoops_root_path . '/class/file/folder.php', |
|
305 | - 'xoopsform' => $xoops_root_path . '/class/xoopsform/form.php', |
|
306 | - 'xoopsformbutton' => $xoops_root_path . '/class/xoopsform/formbutton.php', |
|
307 | - 'xoopsformbuttontray' => $xoops_root_path . '/class/xoopsform/formbuttontray.php', |
|
297 | + 'xoopslocalabstract' => $xoops_root_path.'/class/xoopslocal.php', |
|
298 | + 'xoopslogger' => $xoops_root_path.'/class/logger/xoopslogger.php', |
|
299 | + 'xoopseditor' => $xoops_root_path.'/class/xoopseditor/xoopseditor.php', |
|
300 | + 'xoopseditorhandler' => $xoops_root_path.'/class/xoopseditor/xoopseditor.php', |
|
301 | + 'xoopsfile' => $xoops_root_path.'/class/file/xoopsfile.php', |
|
302 | + 'xoopsfilehandler' => $xoops_root_path.'/class/file/file.php', |
|
303 | + 'xoopsfilterinput' => $xoops_root_path.'/class/xoopsfilterinput.php', |
|
304 | + 'xoopsfolderhandler' => $xoops_root_path.'/class/file/folder.php', |
|
305 | + 'xoopsform' => $xoops_root_path.'/class/xoopsform/form.php', |
|
306 | + 'xoopsformbutton' => $xoops_root_path.'/class/xoopsform/formbutton.php', |
|
307 | + 'xoopsformbuttontray' => $xoops_root_path.'/class/xoopsform/formbuttontray.php', |
|
308 | 308 | //'xoopsformcalendar' => $xoops_root_path . '/class/xoopsform/formcalendar.php', |
309 | - 'xoopsformcaptcha' => $xoops_root_path . '/class/xoopsform/formcaptcha.php', |
|
310 | - 'xoopsformcheckbox' => $xoops_root_path . '/class/xoopsform/formcheckbox.php', |
|
311 | - 'xoopsformcolorpicker' => $xoops_root_path . '/class/xoopsform/formcolorpicker.php', |
|
309 | + 'xoopsformcaptcha' => $xoops_root_path.'/class/xoopsform/formcaptcha.php', |
|
310 | + 'xoopsformcheckbox' => $xoops_root_path.'/class/xoopsform/formcheckbox.php', |
|
311 | + 'xoopsformcolorpicker' => $xoops_root_path.'/class/xoopsform/formcolorpicker.php', |
|
312 | 312 | //'xoopsformcontainer' => $xoops_root_path . '/class/xoopsform/formcontainer.php', |
313 | - 'xoopsformdatetime' => $xoops_root_path . '/class/xoopsform/formdatetime.php', |
|
314 | - 'xoopsformdhtmltextarea' => $xoops_root_path . '/class/xoopsform/formdhtmltextarea.php', |
|
315 | - 'xoopsformeditor' => $xoops_root_path . '/class/xoopsform/formeditor.php', |
|
316 | - 'xoopsformelement' => $xoops_root_path . '/class/xoopsform/formelement.php', |
|
317 | - 'xoopsformelementtray' => $xoops_root_path . '/class/xoopsform/formelementtray.php', |
|
318 | - 'xoopsformfile' => $xoops_root_path . '/class/xoopsform/formfile.php', |
|
319 | - 'xoopsformhidden' => $xoops_root_path . '/class/xoopsform/formhidden.php', |
|
320 | - 'xoopsformhiddentoken' => $xoops_root_path . '/class/xoopsform/formhiddentoken.php', |
|
321 | - 'xoopsformlabel' => $xoops_root_path . '/class/xoopsform/formlabel.php', |
|
322 | - 'xoopsformloader' => $xoops_root_path . '/class/xoopsformloader.php', |
|
323 | - 'xoopsformpassword' => $xoops_root_path . '/class/xoopsform/formpassword.php', |
|
324 | - 'xoopsformradio' => $xoops_root_path . '/class/xoopsform/formradio.php', |
|
325 | - 'xoopsformradioyn' => $xoops_root_path . '/class/xoopsform/formradioyn.php', |
|
313 | + 'xoopsformdatetime' => $xoops_root_path.'/class/xoopsform/formdatetime.php', |
|
314 | + 'xoopsformdhtmltextarea' => $xoops_root_path.'/class/xoopsform/formdhtmltextarea.php', |
|
315 | + 'xoopsformeditor' => $xoops_root_path.'/class/xoopsform/formeditor.php', |
|
316 | + 'xoopsformelement' => $xoops_root_path.'/class/xoopsform/formelement.php', |
|
317 | + 'xoopsformelementtray' => $xoops_root_path.'/class/xoopsform/formelementtray.php', |
|
318 | + 'xoopsformfile' => $xoops_root_path.'/class/xoopsform/formfile.php', |
|
319 | + 'xoopsformhidden' => $xoops_root_path.'/class/xoopsform/formhidden.php', |
|
320 | + 'xoopsformhiddentoken' => $xoops_root_path.'/class/xoopsform/formhiddentoken.php', |
|
321 | + 'xoopsformlabel' => $xoops_root_path.'/class/xoopsform/formlabel.php', |
|
322 | + 'xoopsformloader' => $xoops_root_path.'/class/xoopsformloader.php', |
|
323 | + 'xoopsformpassword' => $xoops_root_path.'/class/xoopsform/formpassword.php', |
|
324 | + 'xoopsformradio' => $xoops_root_path.'/class/xoopsform/formradio.php', |
|
325 | + 'xoopsformradioyn' => $xoops_root_path.'/class/xoopsform/formradioyn.php', |
|
326 | 326 | //'xoopsformraw' => $xoops_root_path . '/class/xoopsform/formraw.php', |
327 | - 'xoopsformselect' => $xoops_root_path . '/class/xoopsform/formselect.php', |
|
328 | - 'xoopsformselectcheckgroup' => $xoops_root_path . '/class/xoopsform/formselectcheckgroup.php', |
|
329 | - 'xoopsformselectcountry' => $xoops_root_path . '/class/xoopsform/formselectcountry.php', |
|
330 | - 'xoopsformselecteditor' => $xoops_root_path . '/class/xoopsform/formselecteditor.php', |
|
331 | - 'xoopsformselectgroup' => $xoops_root_path . '/class/xoopsform/formselectgroup.php', |
|
332 | - 'xoopsformselectlang' => $xoops_root_path . '/class/xoopsform/formselectlang.php', |
|
327 | + 'xoopsformselect' => $xoops_root_path.'/class/xoopsform/formselect.php', |
|
328 | + 'xoopsformselectcheckgroup' => $xoops_root_path.'/class/xoopsform/formselectcheckgroup.php', |
|
329 | + 'xoopsformselectcountry' => $xoops_root_path.'/class/xoopsform/formselectcountry.php', |
|
330 | + 'xoopsformselecteditor' => $xoops_root_path.'/class/xoopsform/formselecteditor.php', |
|
331 | + 'xoopsformselectgroup' => $xoops_root_path.'/class/xoopsform/formselectgroup.php', |
|
332 | + 'xoopsformselectlang' => $xoops_root_path.'/class/xoopsform/formselectlang.php', |
|
333 | 333 | //'xoopsformselectlocale' => $xoops_root_path . '/class/xoopsform/formselectlocale.php', |
334 | - 'xoopsformselectmatchoption' => $xoops_root_path . '/class/xoopsform/formselectmatchoption.php', |
|
335 | - 'xoopsformselecttheme' => $xoops_root_path . '/class/xoopsform/formselecttheme.php', |
|
336 | - 'xoopsformselecttimezone' => $xoops_root_path . '/class/xoopsform/formselecttimezone.php', |
|
337 | - 'xoopsformselectuser' => $xoops_root_path . '/class/xoopsform/formselectuser.php', |
|
334 | + 'xoopsformselectmatchoption' => $xoops_root_path.'/class/xoopsform/formselectmatchoption.php', |
|
335 | + 'xoopsformselecttheme' => $xoops_root_path.'/class/xoopsform/formselecttheme.php', |
|
336 | + 'xoopsformselecttimezone' => $xoops_root_path.'/class/xoopsform/formselecttimezone.php', |
|
337 | + 'xoopsformselectuser' => $xoops_root_path.'/class/xoopsform/formselectuser.php', |
|
338 | 338 | //'xoopsformtab' => $xoops_root_path . '/class/xoopsform/formtab.php', |
339 | 339 | //'xoopsformtabtray' => $xoops_root_path . '/class/xoopsform/formtabtray.php', |
340 | - 'xoopsformtext' => $xoops_root_path . '/class/xoopsform/formtext.php', |
|
341 | - 'xoopsformtextarea' => $xoops_root_path . '/class/xoopsform/formtextarea.php', |
|
342 | - 'xoopsformtextdateselect' => $xoops_root_path . '/class/xoopsform/formtextdateselect.php', |
|
340 | + 'xoopsformtext' => $xoops_root_path.'/class/xoopsform/formtext.php', |
|
341 | + 'xoopsformtextarea' => $xoops_root_path.'/class/xoopsform/formtextarea.php', |
|
342 | + 'xoopsformtextdateselect' => $xoops_root_path.'/class/xoopsform/formtextdateselect.php', |
|
343 | 343 | //'xoopsformmail' => $xoops_root_path . '/class/xoopsform/formmail.php', |
344 | 344 | //'xoopsformurl' => $xoops_root_path . '/class/xoopsform/formurl.php', |
345 | - 'xoopsgroupformcheckbox' => $xoops_root_path . '/class/xoopsform/grouppermform.php', |
|
346 | - 'xoopsgrouppermform' => $xoops_root_path . '/class/xoopsform/grouppermform.php', |
|
345 | + 'xoopsgroupformcheckbox' => $xoops_root_path.'/class/xoopsform/grouppermform.php', |
|
346 | + 'xoopsgrouppermform' => $xoops_root_path.'/class/xoopsform/grouppermform.php', |
|
347 | 347 | //'xoopsguestuser' => $xoops_root_path . '/kernel/user.php', |
348 | - 'xoopsmailer' => $xoops_root_path . '/class/xoopsmailer.php', |
|
349 | - 'xoopsmediauploader' => $xoops_root_path . '/class/uploader.php', |
|
348 | + 'xoopsmailer' => $xoops_root_path.'/class/xoopsmailer.php', |
|
349 | + 'xoopsmediauploader' => $xoops_root_path.'/class/uploader.php', |
|
350 | 350 | //'xoopsmemberhandler' => $xoops_root_path . '/kernel/member.php', |
351 | 351 | //'xoopsmembership' => $xoops_root_path . '/kernel/membership.php', |
352 | 352 | //'xoopsmembershiphandler' => $xoops_root_path . '/kernel/membership.php', |
@@ -354,35 +354,35 @@ discard block |
||
354 | 354 | //'xoopsmoduleadmin' => $xoops_root_path . '/class/moduleadmin.php', |
355 | 355 | //'xoopsmodule' => $xoops_root_path . '/kernel/module.php', |
356 | 356 | //'xoopsmodulehandler' => $xoops_root_path . '/kernel/module.php', |
357 | - 'xoopsmultimailer' => $xoops_root_path . '/class/xoopsmultimailer.php', |
|
357 | + 'xoopsmultimailer' => $xoops_root_path.'/class/xoopsmultimailer.php', |
|
358 | 358 | //'xoopsnotification' => $xoops_root_path . '/kernel/notification.php', |
359 | 359 | //'xoopsnotificationhandler' => $xoops_root_path . '/kernel/notification.php', |
360 | - 'xoopsobject' => $xoops_root_path . '/kernel/object.php', |
|
361 | - 'xoopsobjecthandler' => $xoops_root_path . '/kernel/object.php', |
|
362 | - 'xoopsobjecttree' => $xoops_root_path . '/class/tree.php', |
|
360 | + 'xoopsobject' => $xoops_root_path.'/kernel/object.php', |
|
361 | + 'xoopsobjecthandler' => $xoops_root_path.'/kernel/object.php', |
|
362 | + 'xoopsobjecttree' => $xoops_root_path.'/class/tree.php', |
|
363 | 363 | //'xoopsonline' => $xoops_root_path . '/kernel/online.php', |
364 | 364 | //'xoopsonlinehandler' => $xoops_root_path . '/kernel/online.php', |
365 | - 'xoopspagenav' => $xoops_root_path . '/class/pagenav.php', |
|
366 | - 'xoopspersistableobjecthandler' => $xoops_root_path . '/kernel/object.php', |
|
367 | - 'xoopspreload' => $xoops_root_path . '/class/preload.php', |
|
368 | - 'xoopspreloaditem' => $xoops_root_path . '/class/preload.php', |
|
365 | + 'xoopspagenav' => $xoops_root_path.'/class/pagenav.php', |
|
366 | + 'xoopspersistableobjecthandler' => $xoops_root_path.'/kernel/object.php', |
|
367 | + 'xoopspreload' => $xoops_root_path.'/class/preload.php', |
|
368 | + 'xoopspreloaditem' => $xoops_root_path.'/class/preload.php', |
|
369 | 369 | //'xoopsprivmessage' => $xoops_root_path . '/kernel/privmessage.php', |
370 | 370 | //'xoopsprivmessagehandler' => $xoops_root_path . '/kernel/privmessage.php', |
371 | 371 | //'xoopsranks' => $xoops_root_path . '/kernel/ranks.php', |
372 | 372 | //'xoopsrankshandler' => $xoops_root_path . '/kernel/ranks.php', |
373 | 373 | // 'xoopsregistry' => $xoops_root_path . '/class/registry.php', |
374 | - 'xoopsrequest' => $xoops_root_path . '/class/xoopsrequest.php', |
|
374 | + 'xoopsrequest' => $xoops_root_path.'/class/xoopsrequest.php', |
|
375 | 375 | // 'xoopssecurity' => $xoops_root_path . '/class/xoopssecurity.php', |
376 | 376 | // 'xoopssessionhandler' => $xoops_root_path . '/kernel/session.php', |
377 | - 'xoopssimpleform' => $xoops_root_path . '/class/xoopsform/simpleform.php', |
|
378 | - 'xoopstableform' => $xoops_root_path . '/class/xoopsform/tableform.php', |
|
379 | - 'xoopstardownloader' => $xoops_root_path . '/class/tardownloader.php', |
|
380 | - 'xoopstheme' => $xoops_root_path . '/class/theme.php', |
|
381 | - 'xoopsthemeblocksplugin' => $xoops_root_path . '/class/theme_blocks.php', |
|
382 | - 'xoopsthemefactory' => $xoops_root_path . '/class/theme.php', |
|
383 | - 'xoopsthemeform' => $xoops_root_path . '/class/xoopsform/themeform.php', |
|
384 | - 'xoopsthemeplugin' => $xoops_root_path . '/class/theme.php', |
|
385 | - 'xoopsthemesetparser' => $xoops_root_path . '/class/xml/themesetparser.php', |
|
377 | + 'xoopssimpleform' => $xoops_root_path.'/class/xoopsform/simpleform.php', |
|
378 | + 'xoopstableform' => $xoops_root_path.'/class/xoopsform/tableform.php', |
|
379 | + 'xoopstardownloader' => $xoops_root_path.'/class/tardownloader.php', |
|
380 | + 'xoopstheme' => $xoops_root_path.'/class/theme.php', |
|
381 | + 'xoopsthemeblocksplugin' => $xoops_root_path.'/class/theme_blocks.php', |
|
382 | + 'xoopsthemefactory' => $xoops_root_path.'/class/theme.php', |
|
383 | + 'xoopsthemeform' => $xoops_root_path.'/class/xoopsform/themeform.php', |
|
384 | + 'xoopsthemeplugin' => $xoops_root_path.'/class/theme.php', |
|
385 | + 'xoopsthemesetparser' => $xoops_root_path.'/class/xml/themesetparser.php', |
|
386 | 386 | //'xoopstpl' => $xoops_root_path . '/class/template.php', |
387 | 387 | //'xoopstplfile' => $xoops_root_path . '/kernel/tplfile.php', |
388 | 388 | //'xoopstplfilehandler' => $xoops_root_path . '/kernel/tplfile.php', |
@@ -390,26 +390,26 @@ discard block |
||
390 | 390 | //'xoopstplsethandler' => $xoops_root_path . '/kernel/tplset.php', |
391 | 391 | //'xoopsuser' => $xoops_root_path . '/kernel/user.php', |
392 | 392 | //'xoopsuserhandler' => $xoops_root_path . '/kernel/user.php', |
393 | - 'xoopsuserutility' => $xoops_root_path . '/class/userutility.php', |
|
394 | - 'xoopsutility' => $xoops_root_path . '/class/utility/xoopsutility.php', |
|
395 | - 'xoopsxmlrpcapi' => $xoops_root_path . '/class/xml/rpc/xmlrpcapi.php', |
|
396 | - 'xoopsxmlrpcarray' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php', |
|
397 | - 'xoopsxmlrpcbase64'=> $xoops_root_path . '/class/xml/rpc/xmlrpctag.php', |
|
398 | - 'xoopsxmlrpcboolean' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php', |
|
399 | - 'xoopsxmlrpcdatetime' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php', |
|
400 | - 'xoopsxmlrpcdocument' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php', |
|
401 | - 'xoopsxmlrpcdouble' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php', |
|
402 | - 'xoopsxmlrpcfault' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php', |
|
403 | - 'xoopsxmlrpcint' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php', |
|
404 | - 'xoopsxmlrpcparser' => $xoops_root_path . '/class/xml/rpc/xmlrpcparser.php', |
|
405 | - 'xoopsxmlrpcrequest' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php', |
|
406 | - 'xoopsxmlrpcresponse' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php', |
|
407 | - 'xoopsxmlrpcstring' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php', |
|
408 | - 'xoopsxmlrpcstruct' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php', |
|
409 | - 'xoopsxmlrpctag' => $xoops_root_path . '/class/xml/rpc/xmlrpctag.php', |
|
410 | - 'xoopsxmlrss2parser' => $xoops_root_path . '/class/xml/rss/xmlrss2parser.php', |
|
411 | - 'xoopszipdownloader' => $xoops_root_path . '/class/zipdownloader.php', |
|
412 | - 'zipfile' => $xoops_root_path . '/class/class.zipfile.php', |
|
393 | + 'xoopsuserutility' => $xoops_root_path.'/class/userutility.php', |
|
394 | + 'xoopsutility' => $xoops_root_path.'/class/utility/xoopsutility.php', |
|
395 | + 'xoopsxmlrpcapi' => $xoops_root_path.'/class/xml/rpc/xmlrpcapi.php', |
|
396 | + 'xoopsxmlrpcarray' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php', |
|
397 | + 'xoopsxmlrpcbase64'=> $xoops_root_path.'/class/xml/rpc/xmlrpctag.php', |
|
398 | + 'xoopsxmlrpcboolean' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php', |
|
399 | + 'xoopsxmlrpcdatetime' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php', |
|
400 | + 'xoopsxmlrpcdocument' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php', |
|
401 | + 'xoopsxmlrpcdouble' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php', |
|
402 | + 'xoopsxmlrpcfault' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php', |
|
403 | + 'xoopsxmlrpcint' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php', |
|
404 | + 'xoopsxmlrpcparser' => $xoops_root_path.'/class/xml/rpc/xmlrpcparser.php', |
|
405 | + 'xoopsxmlrpcrequest' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php', |
|
406 | + 'xoopsxmlrpcresponse' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php', |
|
407 | + 'xoopsxmlrpcstring' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php', |
|
408 | + 'xoopsxmlrpcstruct' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php', |
|
409 | + 'xoopsxmlrpctag' => $xoops_root_path.'/class/xml/rpc/xmlrpctag.php', |
|
410 | + 'xoopsxmlrss2parser' => $xoops_root_path.'/class/xml/rss/xmlrss2parser.php', |
|
411 | + 'xoopszipdownloader' => $xoops_root_path.'/class/zipdownloader.php', |
|
412 | + 'zipfile' => $xoops_root_path.'/class/class.zipfile.php', |
|
413 | 413 | ); |
414 | 414 | } |
415 | 415 | |
@@ -434,7 +434,7 @@ discard block |
||
434 | 434 | } else { |
435 | 435 | return false; |
436 | 436 | } |
437 | - if (self::fileExists($file = \XoopsBaseConfig::get('root-path') . '/modules/' . $dirname . '/include/autoload.php')) { |
|
437 | + if (self::fileExists($file = \XoopsBaseConfig::get('root-path').'/modules/'.$dirname.'/include/autoload.php')) { |
|
438 | 438 | if (!$configs = include $file) { |
439 | 439 | return false; |
440 | 440 | } |
@@ -481,8 +481,8 @@ discard block |
||
481 | 481 | return true; |
482 | 482 | } |
483 | 483 | |
484 | - $file = str_replace('_', DIRECTORY_SEPARATOR, $class) . '.php'; |
|
485 | - if (!self::loadFile(\XoopsBaseConfig::get('lib-path') . DIRECTORY_SEPARATOR . $file)) { |
|
484 | + $file = str_replace('_', DIRECTORY_SEPARATOR, $class).'.php'; |
|
485 | + if (!self::loadFile(\XoopsBaseConfig::get('lib-path').DIRECTORY_SEPARATOR.$file)) { |
|
486 | 486 | return false; |
487 | 487 | } |
488 | 488 | |
@@ -543,7 +543,7 @@ discard block |
||
543 | 543 | static $libPath = null; |
544 | 544 | |
545 | 545 | if ($libPath === null) { |
546 | - $loaderPath = $path . '/vendor/autoload.php'; |
|
546 | + $loaderPath = $path.'/vendor/autoload.php'; |
|
547 | 547 | if (self::fileExists($loaderPath)) { |
548 | 548 | $libPath = $path; |
549 | 549 | include $loaderPath; |
@@ -113,18 +113,18 @@ discard block |
||
113 | 113 | $stop = ''; |
114 | 114 | // Invalid email address |
115 | 115 | if (!$xoops->checkEmail($email)) { |
116 | - $stop .= XoopsLocale::E_INVALID_EMAIL . '<br />'; |
|
116 | + $stop .= XoopsLocale::E_INVALID_EMAIL.'<br />'; |
|
117 | 117 | } |
118 | 118 | if (strrpos($email, ' ') > 0) { |
119 | - $stop .= XoopsLocale::E_EMAIL_SHOULD_NOT_CONTAIN_SPACES . '<br />'; |
|
119 | + $stop .= XoopsLocale::E_EMAIL_SHOULD_NOT_CONTAIN_SPACES.'<br />'; |
|
120 | 120 | } |
121 | 121 | // Check forbidden email address if current operator is not an administrator |
122 | 122 | if (!$xoops->userIsAdmin) { |
123 | 123 | $bad_emails = $xoops->getConfig('bad_emails'); |
124 | 124 | if (!empty($bad_emails)) { |
125 | 125 | foreach ($bad_emails as $be) { |
126 | - if (!empty($be) && preg_match('/' . $be . '/i', $email)) { |
|
127 | - $stop .= XoopsLocale::E_INVALID_EMAIL . '<br />'; |
|
126 | + if (!empty($be) && preg_match('/'.$be.'/i', $email)) { |
|
127 | + $stop .= XoopsLocale::E_INVALID_EMAIL.'<br />'; |
|
128 | 128 | break; |
129 | 129 | } |
130 | 130 | } |
@@ -133,23 +133,23 @@ discard block |
||
133 | 133 | // $uname = XoopsLocale::trim($uname); |
134 | 134 | // no controls, puctuation, symbols, spaces or invisible separators |
135 | 135 | if (!preg_match('/^[^\p{C}\p{P}\p{S}\p{Z}]+$/u', $uname)) { |
136 | - $stop .= XoopsLocale::E_INVALID_USERNAME . '<br />'; |
|
136 | + $stop .= XoopsLocale::E_INVALID_USERNAME.'<br />'; |
|
137 | 137 | } |
138 | 138 | // Check uname settings if current operator is not an administrator |
139 | 139 | if (!$xoops->userIsAdmin) { |
140 | 140 | $maxuname = $xoops->getConfig('maxuname'); |
141 | 141 | if (!empty($maxuname) && mb_strlen($uname) > $maxuname) { |
142 | - $stop .= sprintf(XoopsLocale::EF_USERNAME_MUST_BE_LESS_THAN, $maxuname) . '<br />'; |
|
142 | + $stop .= sprintf(XoopsLocale::EF_USERNAME_MUST_BE_LESS_THAN, $maxuname).'<br />'; |
|
143 | 143 | } |
144 | 144 | $minuname = $xoops->getConfig('minuname'); |
145 | 145 | if (!empty($minuname) && mb_strlen($uname) < $minuname) { |
146 | - $stop .= sprintf(XoopsLocale::EF_USERNAME_MUST_BE_MORE_THAN, $minuname) . '<br />'; |
|
146 | + $stop .= sprintf(XoopsLocale::EF_USERNAME_MUST_BE_MORE_THAN, $minuname).'<br />'; |
|
147 | 147 | } |
148 | 148 | $bad_unames = $xoops->getConfig('bad_unames'); |
149 | 149 | if (!empty($bad_unames)) { |
150 | 150 | foreach ($bad_unames as $bu) { |
151 | - if (!empty($bu) && preg_match('/' . $bu . '/i', $uname)) { |
|
152 | - $stop .= XoopsLocale::E_NAME_IS_RESERVED . '<br />'; |
|
151 | + if (!empty($bu) && preg_match('/'.$bu.'/i', $uname)) { |
|
152 | + $stop .= XoopsLocale::E_NAME_IS_RESERVED.'<br />'; |
|
153 | 153 | break; |
154 | 154 | } |
155 | 155 | } |
@@ -166,7 +166,7 @@ discard block |
||
166 | 166 | } |
167 | 167 | $count = $user_handler->getCount($criteria); |
168 | 168 | if ($count > 0) { |
169 | - $stop .= XoopsLocale::E_USERNAME_TAKEN . '<br />'; |
|
169 | + $stop .= XoopsLocale::E_USERNAME_TAKEN.'<br />'; |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | $criteria = new CriteriaCompo(new Criteria('email', $email)); |
@@ -175,7 +175,7 @@ discard block |
||
175 | 175 | } |
176 | 176 | $count = $user_handler->getCount($criteria); |
177 | 177 | if ($count > 0) { |
178 | - $stop .= XoopsLocale::E_EMAIL_TAKEN . '<br />'; |
|
178 | + $stop .= XoopsLocale::E_EMAIL_TAKEN.'<br />'; |
|
179 | 179 | } |
180 | 180 | |
181 | 181 | // If password is not set, skip password validation |
@@ -184,14 +184,14 @@ discard block |
||
184 | 184 | } |
185 | 185 | |
186 | 186 | if (empty($pass) || empty($vpass)) { |
187 | - $stop .= XoopsLocale::E_MUST_PROVIDE_PASSWORD . '<br />'; |
|
187 | + $stop .= XoopsLocale::E_MUST_PROVIDE_PASSWORD.'<br />'; |
|
188 | 188 | } |
189 | 189 | if (isset($pass) && isset($vpass) && ($pass != $vpass)) { |
190 | - $stop .= XoopsLocale::E_PASSWORDS_MUST_MATCH . '<br />'; |
|
190 | + $stop .= XoopsLocale::E_PASSWORDS_MUST_MATCH.'<br />'; |
|
191 | 191 | } else { |
192 | 192 | $minpass = $xoops->getConfig('minpass'); |
193 | 193 | if (($pass != '') && (!empty($minpass)) && (mb_strlen($pass) < $minpass)) { |
194 | - $stop .= sprintf(XoopsLocale::EF_PASSWORD_MUST_BE_GREATER_THAN, $minpass) . '<br />'; |
|
194 | + $stop .= sprintf(XoopsLocale::EF_PASSWORD_MUST_BE_GREATER_THAN, $minpass).'<br />'; |
|
195 | 195 | } |
196 | 196 | } |
197 | 197 | return $stop; |
@@ -269,7 +269,7 @@ discard block |
||
269 | 269 | $users = array(); |
270 | 270 | if (count($userids) > 0) { |
271 | 271 | $criteria = new CriteriaCompo(new Criteria('level', 0, '>')); |
272 | - $criteria->add(new Criteria('uid', "('" . implode(',', array_unique($userids)) . "')", 'IN')); |
|
272 | + $criteria->add(new Criteria('uid', "('".implode(',', array_unique($userids))."')", 'IN')); |
|
273 | 273 | |
274 | 274 | $user_handler = $xoops->getHandlerUser(); |
275 | 275 | if (!$rows = $user_handler->getAll($criteria, array('uid', 'uname', 'name'), false, true)) { |
@@ -282,8 +282,8 @@ discard block |
||
282 | 282 | $users[$uid] = $myts->htmlSpecialChars($row['uname']); |
283 | 283 | } |
284 | 284 | if ($linked) { |
285 | - $users[$uid] = '<a href="' . \XoopsBaseConfig::get('url') . '/userinfo.php?uid=' |
|
286 | - . $uid . '" title="' . $users[$uid] . '">' . $users[$uid] . '</a>'; |
|
285 | + $users[$uid] = '<a href="'.\XoopsBaseConfig::get('url').'/userinfo.php?uid=' |
|
286 | + . $uid.'" title="'.$users[$uid].'">'.$users[$uid].'</a>'; |
|
287 | 287 | } |
288 | 288 | } |
289 | 289 | } |
@@ -318,8 +318,8 @@ discard block |
||
318 | 318 | $username = $user->getVar('uname'); |
319 | 319 | } |
320 | 320 | if (!empty($linked)) { |
321 | - $username = '<a href="' . \XoopsBaseConfig::get('url') . '/userinfo.php?uid=' |
|
322 | - . $userid . '" title="' . $username . '">' . $username . '</a>'; |
|
321 | + $username = '<a href="'.\XoopsBaseConfig::get('url').'/userinfo.php?uid=' |
|
322 | + . $userid.'" title="'.$username.'">'.$username.'</a>'; |
|
323 | 323 | } |
324 | 324 | } |
325 | 325 | } |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | */ |
97 | 97 | public function addFileData(&$data, $filename, $time = 0) |
98 | 98 | { |
99 | - $dummyfile = \XoopsBaseConfig::get('caches-path') . '/dummy_' . time() . '.html'; |
|
99 | + $dummyfile = \XoopsBaseConfig::get('caches-path').'/dummy_'.time().'.html'; |
|
100 | 100 | $fp = @fopen($dummyfile, 'w'); |
101 | 101 | if ($fp === false) { |
102 | 102 | return false; |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | */ |
132 | 132 | public function addBinaryFileData(&$data, $filename, $time = 0) |
133 | 133 | { |
134 | - $dummyfile = \XoopsBaseConfig::get('caches-path') . '/dummy_' . time() . '.html'; |
|
134 | + $dummyfile = \XoopsBaseConfig::get('caches-path').'/dummy_'.time().'.html'; |
|
135 | 135 | $fp = @fopen($dummyfile, 'wb'); |
136 | 136 | if ($fp === false) { |
137 | 137 | return false; |
@@ -165,8 +165,8 @@ discard block |
||
165 | 165 | */ |
166 | 166 | public function download($name, $gzip = true) |
167 | 167 | { |
168 | - $this->_header($name . $this->ext); |
|
169 | - $str = $this->archiver->toTarOutput($name . $this->ext, $gzip); |
|
168 | + $this->_header($name.$this->ext); |
|
169 | + $str = $this->archiver->toTarOutput($name.$this->ext, $gzip); |
|
170 | 170 | if ($str !== false) { |
171 | 171 | echo $str; |
172 | 172 | } |
@@ -158,9 +158,9 @@ |
||
158 | 158 | $ctrldir = implode('', $this->ctrl_dir); |
159 | 159 | |
160 | 160 | return $data . $ctrldir . $this->eof_ctrl_dir . pack('v', count($this->ctrl_dir)) . // total # of entries "on this disk" |
161 | - pack('v', count($this->ctrl_dir)) . // total # of entries overall |
|
162 | - pack('V', strlen($ctrldir)) . // size of central dir |
|
163 | - pack('V', strlen($data)) . // offset to start of central dir |
|
164 | - "\x00\x00"; // .zip file comment length |
|
161 | + pack('v', count($this->ctrl_dir)) . // total # of entries overall |
|
162 | + pack('V', strlen($ctrldir)) . // size of central dir |
|
163 | + pack('V', strlen($data)) . // offset to start of central dir |
|
164 | + "\x00\x00"; // .zip file comment length |
|
165 | 165 | } // end of the 'file()' method |
166 | 166 | } // end of the 'zipfile' class |
167 | 167 | \ No newline at end of file |
@@ -92,8 +92,8 @@ discard block |
||
92 | 92 | $name = str_replace('\\', '/', $name); |
93 | 93 | |
94 | 94 | $dtime = dechex($this->unix2DosTime($time)); |
95 | - $hexdtime = '\x' . $dtime[6] . $dtime[7] . '\x' . $dtime[4] . $dtime[5] . '\x' . $dtime[2] . $dtime[3] . '\x' . $dtime[0] . $dtime[1]; |
|
96 | - eval('$hexdtime = "' . $hexdtime . '";'); |
|
95 | + $hexdtime = '\x'.$dtime[6].$dtime[7].'\x'.$dtime[4].$dtime[5].'\x'.$dtime[2].$dtime[3].'\x'.$dtime[0].$dtime[1]; |
|
96 | + eval('$hexdtime = "'.$hexdtime.'";'); |
|
97 | 97 | |
98 | 98 | $fr = "\x50\x4b\x03\x04"; |
99 | 99 | $fr .= "\x14\x00"; // ver needed to extract |
@@ -157,10 +157,10 @@ discard block |
||
157 | 157 | $data = implode('', $this->datasec); |
158 | 158 | $ctrldir = implode('', $this->ctrl_dir); |
159 | 159 | |
160 | - return $data . $ctrldir . $this->eof_ctrl_dir . pack('v', count($this->ctrl_dir)) . // total # of entries "on this disk" |
|
161 | - pack('v', count($this->ctrl_dir)) . // total # of entries overall |
|
162 | - pack('V', strlen($ctrldir)) . // size of central dir |
|
163 | - pack('V', strlen($data)) . // offset to start of central dir |
|
160 | + return $data.$ctrldir.$this->eof_ctrl_dir.pack('v', count($this->ctrl_dir)).// total # of entries "on this disk" |
|
161 | + pack('v', count($this->ctrl_dir)).// total # of entries overall |
|
162 | + pack('V', strlen($ctrldir)).// size of central dir |
|
163 | + pack('V', strlen($data)).// offset to start of central dir |
|
164 | 164 | "\x00\x00"; // .zip file comment length |
165 | 165 | } // end of the 'file()' method |
166 | 166 | } // end of the 'zipfile' class |
167 | 167 | \ No newline at end of file |
@@ -41,12 +41,12 @@ |
||
41 | 41 | { |
42 | 42 | $handler = null; |
43 | 43 | $name = strtolower(trim($name)); |
44 | - $class = 'Xoops' . ucfirst($name) . 'Handler'; |
|
44 | + $class = 'Xoops'.ucfirst($name).'Handler'; |
|
45 | 45 | if (in_array($name, array('file', 'folder'))) { |
46 | 46 | $handler = new $class($path, $create, $mode); |
47 | 47 | } else { |
48 | 48 | trigger_error( |
49 | - 'Class ' . $class . ' not exist in File ' . __FILE__ . ' at Line ' . __LINE__, |
|
49 | + 'Class '.$class.' not exist in File '.__FILE__.' at Line '.__LINE__, |
|
50 | 50 | E_USER_WARNING |
51 | 51 | ); |
52 | 52 | return false; |
@@ -340,7 +340,7 @@ discard block |
||
340 | 340 | $this->info(); |
341 | 341 | } |
342 | 342 | if (isset($this->info['extension'])) { |
343 | - return basename($this->name, '.' . $this->info['extension']); |
|
343 | + return basename($this->name, '.'.$this->info['extension']); |
|
344 | 344 | } elseif ($this->name) { |
345 | 345 | return $this->name; |
346 | 346 | } |
@@ -393,7 +393,7 @@ discard block |
||
393 | 393 | */ |
394 | 394 | public function pwd() |
395 | 395 | { |
396 | - return $this->folder->slashTerm($this->folder->pwd()) . $this->name; |
|
396 | + return $this->folder->slashTerm($this->folder->pwd()).$this->name; |
|
397 | 397 | } |
398 | 398 | |
399 | 399 | /** |
@@ -102,18 +102,18 @@ discard block |
||
102 | 102 | public function __construct($path = '', $create = true, $mode = false) |
103 | 103 | { |
104 | 104 | if (empty($path)) { |
105 | - $path = \XoopsBaseConfig::get('var-path') . '/caches/xoops_cache'; |
|
105 | + $path = \XoopsBaseConfig::get('var-path').'/caches/xoops_cache'; |
|
106 | 106 | } |
107 | 107 | if ($mode) { |
108 | 108 | $this->mode = intval($mode, 8); |
109 | 109 | } |
110 | - if (! XoopsLoad::fileExists($path) && $create == true) { |
|
110 | + if (!XoopsLoad::fileExists($path) && $create == true) { |
|
111 | 111 | $this->create($path, $this->mode); |
112 | 112 | } |
113 | - if (! $this->isAbsolute($path)) { |
|
113 | + if (!$this->isAbsolute($path)) { |
|
114 | 114 | $path1 = $this->realpath($path); |
115 | - if (false===$path1) |
|
116 | - throw new InvalidArgumentException($path . ' not found'); |
|
115 | + if (false === $path1) |
|
116 | + throw new InvalidArgumentException($path.' not found'); |
|
117 | 117 | $path = $path1; |
118 | 118 | } |
119 | 119 | $this->cd($path); |
@@ -275,7 +275,7 @@ discard block |
||
275 | 275 | */ |
276 | 276 | public static function isWindowsPath($path) |
277 | 277 | { |
278 | - if (preg_match('/^[A-Z]:/i', $path) || false !== strpos($path,'\\')) { |
|
278 | + if (preg_match('/^[A-Z]:/i', $path) || false !== strpos($path, '\\')) { |
|
279 | 279 | return true; |
280 | 280 | } |
281 | 281 | return false; |
@@ -292,7 +292,7 @@ discard block |
||
292 | 292 | */ |
293 | 293 | public static function isAbsolute($path) |
294 | 294 | { |
295 | - $path = str_replace('\\','/',$path); |
|
295 | + $path = str_replace('\\', '/', $path); |
|
296 | 296 | $match = preg_match('/^(\/|[A-Z]:\/|\/\/)/', $path); |
297 | 297 | return ($match == 1); |
298 | 298 | } |
@@ -345,7 +345,7 @@ discard block |
||
345 | 345 | if (self::isSlashTerm($path)) { |
346 | 346 | return $path; |
347 | 347 | } |
348 | - return $path . self::correctSlashFor($path); |
|
348 | + return $path.self::correctSlashFor($path); |
|
349 | 349 | } |
350 | 350 | |
351 | 351 | /** |
@@ -360,7 +360,7 @@ discard block |
||
360 | 360 | */ |
361 | 361 | public static function addPathElement($path, $element) |
362 | 362 | { |
363 | - return self::slashTerm($path) . $element; |
|
363 | + return self::slashTerm($path).$element; |
|
364 | 364 | } |
365 | 365 | |
366 | 366 | /** |
@@ -375,7 +375,7 @@ discard block |
||
375 | 375 | { |
376 | 376 | $xoops_root_path = \XoopsBaseConfig::get('root-path'); |
377 | 377 | $dir = substr($this->slashTerm($xoops_root_path), 0, -1); |
378 | - $newdir = $dir . ($path{0}==='/'?'':'/') . $path; |
|
378 | + $newdir = $dir.($path{0} === '/' ? '' : '/').$path; |
|
379 | 379 | return $this->inPath($newdir); |
380 | 380 | } |
381 | 381 | |
@@ -503,7 +503,7 @@ discard block |
||
503 | 503 | } |
504 | 504 | $found = false; |
505 | 505 | if (($hidden === true) || ($hidden === false && $item{0} !== '.')) { |
506 | - $found = $path . '/' . $item; |
|
506 | + $found = $path.'/'.$item; |
|
507 | 507 | } |
508 | 508 | if ($found !== false) { |
509 | 509 | if (is_dir($found)) { |
@@ -112,8 +112,9 @@ |
||
112 | 112 | } |
113 | 113 | if (! $this->isAbsolute($path)) { |
114 | 114 | $path1 = $this->realpath($path); |
115 | - if (false===$path1) |
|
116 | - throw new InvalidArgumentException($path . ' not found'); |
|
115 | + if (false===$path1) { |
|
116 | + throw new InvalidArgumentException($path . ' not found'); |
|
117 | + } |
|
117 | 118 | $path = $path1; |
118 | 119 | } |
119 | 120 | $this->cd($path); |
@@ -130,7 +130,7 @@ |
||
130 | 130 | */ |
131 | 131 | public function download($name, $gzip = true) |
132 | 132 | { |
133 | - $this->_header($name . $this->ext); |
|
133 | + $this->_header($name.$this->ext); |
|
134 | 134 | $result = $this->archiver->file(); |
135 | 135 | if ($result !== false) { |
136 | 136 | echo $result; |
@@ -74,7 +74,7 @@ |
||
74 | 74 | * @param boolean|string $newfilename |
75 | 75 | * @return void |
76 | 76 | */ |
77 | - abstract function addFile($filepath, $newfilename = null); |
|
77 | + abstract function addFile($filepath, $newfilename = null); |
|
78 | 78 | |
79 | 79 | /** |
80 | 80 | * @abstract |
@@ -55,14 +55,14 @@ |
||
55 | 55 | if (function_exists('mb_http_output')) { |
56 | 56 | mb_http_output('pass'); |
57 | 57 | } |
58 | - header('Content-Type: ' . $this->mimetype); |
|
58 | + header('Content-Type: '.$this->mimetype); |
|
59 | 59 | if (preg_match("/MSIE ([0-9]\.[0-9]{1,2})/", $_SERVER['HTTP_USER_AGENT'])) { |
60 | - header('Content-Disposition: attachment; filename="' . $filename . '"'); |
|
60 | + header('Content-Disposition: attachment; filename="'.$filename.'"'); |
|
61 | 61 | header('Expires: 0'); |
62 | 62 | header('Cache-Control: must-revalidate, post-check=0, pre-check=0'); |
63 | 63 | header('Pragma: public'); |
64 | 64 | } else { |
65 | - header('Content-Disposition: attachment; filename="' . $filename . '"'); |
|
65 | + header('Content-Disposition: attachment; filename="'.$filename.'"'); |
|
66 | 66 | header('Expires: 0'); |
67 | 67 | header('Pragma: no-cache'); |
68 | 68 | } |