geekwright / XoopsCore

htdocs/modules/codex/class/plugin/system.php

Spacing +6 added lines, -6 removed lines

@@ -47,7 +47,7 @@ 
     public function waiting()
     {
         $xoops = Xoops::getInstance();
-        $ret['count'] = count(\Xoops\Core\Lists\File::getList($xoops->path('modules/codex/')))-2;
+        $ret['count'] = count(\Xoops\Core\Lists\File::getList($xoops->path('modules/codex/'))) - 2;
         $ret['name'] = $xoops->getHandlerModule()->getByDirname('codex')->getVar('name');
         $ret['link'] = $xoops->url('modules/codex/');
         return array();
@@ -69,16 +69,16 @@ 
     public function backend($limit)
     {
         $xoops = Xoops::getInstance();
-        $i=0;
-        $ret=array();
+        $i = 0;
+        $ret = array();
 
         $files = \Xoops\Core\Lists\File::getList($xoops->path('modules/codex/'));
         foreach ($files as $file) {
             if (!in_array($file, array('xoops_version.php', 'index.php'))) {
                 $ret[$i]['title']   = ucfirst(str_replace('.php', '', $file));
-                $ret[$i]['link']    = $xoops->url('modules/codex/' . $file);
-                $ret[$i]['content'] = 'Codex module : ' . ucfirst(str_replace('.php', '', $file));
-                $ret[$i]['date']    = filemtime($xoops->path('modules/codex/' . $file));
+                $ret[$i]['link']    = $xoops->url('modules/codex/'.$file);
+                $ret[$i]['content'] = 'Codex module : '.ucfirst(str_replace('.php', '', $file));
+                $ret[$i]['date']    = filemtime($xoops->path('modules/codex/'.$file));
                 ++$i;
             }
         }

htdocs/modules/codex/class/plugin/search.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
     public function search($queries, $andor, $limit, $start, $uid)
     {
         $xoops = Xoops::getInstance();
-        $queries = implode(' ', (array) $queries);
+        $queries = implode(' ', (array)$queries);
 
         $files = \Xoops\Core\Lists\File::getList($xoops->path('modules/codex/'));
         $res = array();

htdocs/modules/codex/search-plugin.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
  * @author    trabis <lusopoemas@gmail.com>
  */
 
-include dirname(dirname(__DIR__)) . '/mainfile.php';
+include dirname(dirname(__DIR__)).'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $xoops->header();
@@ -30,5 +30,5 @@ 
 See how Codex module hooks into the search module just by using this codex/class/plugin/search.php
 ";
 
-\Xoops\Utils::dumpFile(__DIR__ . '/class/plugin/search.php');
+\Xoops\Utils::dumpFile(__DIR__.'/class/plugin/search.php');
 $xoops->footer();

htdocs/modules/codex/usermessage.php

Spacing +2 added lines, -2 removed lines

@@ -21,7 +21,7 @@ 
  * @author    Laurent JEN - aka DuGris
  */
 
-include dirname(dirname(__DIR__)) . '/mainfile.php';
+include dirname(dirname(__DIR__)).'/mainfile.php';
 
 $xoops = Xoops::getInstance();
 $xoops->header();
@@ -45,7 +45,7 @@ 
         if ($response->isSuccess()) {
             echo 'Message sent. Check your inbox.';
         } else {
-            $errors = implode(', ', (array) $response->getErrorMessage());
+            $errors = implode(', ', (array)$response->getErrorMessage());
             echo 'Your message was not sent<br>';
             echo $errors;
         }

htdocs/include/site-closed.php

Indentation +12 added lines, -12 removed lines

@@ -48,18 +48,18 @@
     $xoops->theme()->addScript('/include/xoops.js', array('type' => 'text/javascript'));
     $xoops->setTpl($xoops->theme()->template);
     $xoops->tpl()->assign(array(
-                           'xoops_theme' => $xoops->getConfig('theme_set'),
-                           'xoops_imageurl' => \XoopsBaseConfig::get('themes-url') . '/' . $xoops->getConfig('theme_set') . '/',
-                           'xoops_themecss' => $xoops->getCss($xoops->getConfig('theme_set')),
-                           'xoops_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
-                           'xoops_sitename' => htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES),
-                           'xoops_slogan' => htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES),
-                           'xoops_dirname' => $xoops->isModule() ? $xoops->module->getVar('dirname') : 'system',
-                           'xoops_banner' => $xoops->getConfig('banners') ? $xoops->getBanner() : ' ',
-                           'xoops_pagetitle' => $xoops->isModule() ? $xoops->module->getVar('name') : htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES),
-                           'lang_login' => XoopsLocale::A_LOGIN, 'lang_username' => XoopsLocale::C_USERNAME, 'lang_password' => XoopsLocale::C_PASSWORD,
-                           'lang_siteclosemsg' => $xoops->getConfig('closesite_text')
-                      ));
+                            'xoops_theme' => $xoops->getConfig('theme_set'),
+                            'xoops_imageurl' => \XoopsBaseConfig::get('themes-url') . '/' . $xoops->getConfig('theme_set') . '/',
+                            'xoops_themecss' => $xoops->getCss($xoops->getConfig('theme_set')),
+                            'xoops_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
+                            'xoops_sitename' => htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES),
+                            'xoops_slogan' => htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES),
+                            'xoops_dirname' => $xoops->isModule() ? $xoops->module->getVar('dirname') : 'system',
+                            'xoops_banner' => $xoops->getConfig('banners') ? $xoops->getBanner() : ' ',
+                            'xoops_pagetitle' => $xoops->isModule() ? $xoops->module->getVar('name') : htmlspecialchars($xoops->getConfig('slogan'), ENT_QUOTES),
+                            'lang_login' => XoopsLocale::A_LOGIN, 'lang_username' => XoopsLocale::C_USERNAME, 'lang_password' => XoopsLocale::C_PASSWORD,
+                            'lang_siteclosemsg' => $xoops->getConfig('closesite_text')
+                        ));
     //todo check if we can use $xoops->getConfig() instead
     $config_handler = $xoops->getHandlerConfig();
     $criteria = new CriteriaCompo(new Criteria('conf_modid', 1));

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
     $xoops->setTpl($xoops->theme()->template);
     $xoops->tpl()->assign(array(
                            'xoops_theme' => $xoops->getConfig('theme_set'),
-                           'xoops_imageurl' => \XoopsBaseConfig::get('themes-url') . '/' . $xoops->getConfig('theme_set') . '/',
+                           'xoops_imageurl' => \XoopsBaseConfig::get('themes-url').'/'.$xoops->getConfig('theme_set').'/',
                            'xoops_themecss' => $xoops->getCss($xoops->getConfig('theme_set')),
                            'xoops_requesturi' => htmlspecialchars($_SERVER['REQUEST_URI'], ENT_QUOTES),
                            'xoops_sitename' => htmlspecialchars($xoops->getConfig('sitename'), ENT_QUOTES),

htdocs/include/mimetypes.inc.php

Spacing +104 added lines, -104 removed lines

@@ -22,109 +22,109 @@
  * This should really be replaced with a more accurate way of determining the actually mimetype
  */
 return array(
-    'hqx' => 'application/mac-binhex40' ,
-    'doc' => 'application/msword' ,
-    'dot' => 'application/msword' ,
-    'bin' => 'application/octet-stream' ,
-    'lha' => 'application/octet-stream' ,
-    'lzh' => 'application/octet-stream' ,
-    'exe' => 'application/octet-stream' ,
-    'class' => 'application/octet-stream' ,
-    'so' => 'application/octet-stream' ,
-    'dll' => 'application/octet-stream' ,
-    'pdf' => 'application/pdf' ,
-    'ai' => 'application/postscript' ,
-    'eps' => 'application/postscript' ,
-    'ps' => 'application/postscript' ,
-    'smi' => 'application/smil' ,
-    'smil' => 'application/smil' ,
-    'wbxml' => 'application/vnd.wap.wbxml' ,
-    'wmlc' => 'application/vnd.wap.wmlc' ,
-    'wmlsc' => 'application/vnd.wap.wmlscriptc' ,
-    'xla' => 'application/vnd.ms-excel' ,
-    'xls' => 'application/vnd.ms-excel' ,
-    'xlt' => 'application/vnd.ms-excel' ,
-    'ppt' => 'application/vnd.ms-powerpoint' ,
-    'csh' => 'application/x-csh' ,
-    'dcr' => 'application/x-director' ,
-    'dir' => 'application/x-director' ,
-    'dxr' => 'application/x-director' ,
-    'spl' => 'application/x-futuresplash' ,
-    'gtar' => 'application/x-gtar' ,
-    'php' => 'application/x-httpd-php' ,
-    'php3' => 'application/x-httpd-php' ,
-    'php4' => 'application/x-httpd-php' ,
-    'php5' => 'application/x-httpd-php' ,
-    'phtml' => 'application/x-httpd-php' ,
-    'js' => 'application/x-javascript' ,
-    'sh' => 'application/x-sh' ,
-    'swf' => 'application/x-shockwave-flash' ,
-    'sit' => 'application/x-stuffit' ,
-    'tar' => 'application/x-tar' ,
-    'tcl' => 'application/x-tcl' ,
-    'xhtml' => 'application/xhtml+xml' ,
-    'xht' => 'application/xhtml+xml' ,
+    'hqx' => 'application/mac-binhex40',
+    'doc' => 'application/msword',
+    'dot' => 'application/msword',
+    'bin' => 'application/octet-stream',
+    'lha' => 'application/octet-stream',
+    'lzh' => 'application/octet-stream',
+    'exe' => 'application/octet-stream',
+    'class' => 'application/octet-stream',
+    'so' => 'application/octet-stream',
+    'dll' => 'application/octet-stream',
+    'pdf' => 'application/pdf',
+    'ai' => 'application/postscript',
+    'eps' => 'application/postscript',
+    'ps' => 'application/postscript',
+    'smi' => 'application/smil',
+    'smil' => 'application/smil',
+    'wbxml' => 'application/vnd.wap.wbxml',
+    'wmlc' => 'application/vnd.wap.wmlc',
+    'wmlsc' => 'application/vnd.wap.wmlscriptc',
+    'xla' => 'application/vnd.ms-excel',
+    'xls' => 'application/vnd.ms-excel',
+    'xlt' => 'application/vnd.ms-excel',
+    'ppt' => 'application/vnd.ms-powerpoint',
+    'csh' => 'application/x-csh',
+    'dcr' => 'application/x-director',
+    'dir' => 'application/x-director',
+    'dxr' => 'application/x-director',
+    'spl' => 'application/x-futuresplash',
+    'gtar' => 'application/x-gtar',
+    'php' => 'application/x-httpd-php',
+    'php3' => 'application/x-httpd-php',
+    'php4' => 'application/x-httpd-php',
+    'php5' => 'application/x-httpd-php',
+    'phtml' => 'application/x-httpd-php',
+    'js' => 'application/x-javascript',
+    'sh' => 'application/x-sh',
+    'swf' => 'application/x-shockwave-flash',
+    'sit' => 'application/x-stuffit',
+    'tar' => 'application/x-tar',
+    'tcl' => 'application/x-tcl',
+    'xhtml' => 'application/xhtml+xml',
+    'xht' => 'application/xhtml+xml',
 //    'xhtml' => 'application/xml' ,
-    'ent' => 'application/xml-external-parsed-entity' ,
-    'dtd' => 'application/xml-dtd' ,
-    'mod' => 'application/xml-dtd' ,
-    'gz' => 'application/x-gzip' ,
-    'zip' => 'application/zip' ,
-    'au' => 'audio/basic' ,
-    'snd' => 'audio/basic' ,
-    'mid' => 'audio/midi' ,
-    'midi' => 'audio/midi' ,
-    'kar' => 'audio/midi' ,
-    'mp1' => 'audio/mpeg' ,
-    'mp2' => 'audio/mpeg' ,
-    'mp3' => 'audio/mpeg' ,
-    'aif' => 'audio/x-aiff' ,
-    'aiff' => 'audio/x-aiff' ,
-    'm3u' => 'audio/x-mpegurl' ,
-    'ram' => 'audio/x-pn-realaudio' ,
-    'rm' => 'audio/x-pn-realaudio' ,
-    'rpm' => 'audio/x-pn-realaudio-plugin' ,
-    'ra' => 'audio/x-realaudio' ,
-    'wav' => 'audio/x-wav' ,
-    'ogg' => 'audio/ogg' ,
-    'bmp' => 'image/bmp' ,
-    'gif' => 'image/gif' ,
-    'jpeg' => 'image/jpeg' ,
-    'jpg' => 'image/jpeg' ,
-    'jpe' => 'image/jpeg' ,
-    'png' => 'image/png' ,
-    'tiff' => 'image/tiff' ,
-    'tif' => 'image/tif' ,
-    'wbmp' => 'image/vnd.wap.wbmp' ,
-    'pnm' => 'image/x-portable-anymap' ,
-    'pbm' => 'image/x-portable-bitmap' ,
-    'pgm' => 'image/x-portable-graymap' ,
-    'ppm' => 'image/x-portable-pixmap' ,
-    'xbm' => 'image/x-xbitmap' ,
-    'xpm' => 'image/x-xpixmap' ,
-    'ics' => 'text/calendar' ,
-    'ifb' => 'text/calendar' ,
-    'css' => 'text/css' ,
-    'html' => 'text/html' ,
-    'htm' => 'text/html' ,
-    'asc' => 'text/plain' ,
-    'txt' => 'text/plain' ,
-    'rtf' => 'text/rtf' ,
-    'sgml' => 'text/x-sgml' ,
-    'sgm' => 'text/x-sgml' ,
-    'tsv' => 'text/tab-seperated-values' ,
-    'wml' => 'text/vnd.wap.wml' ,
-    'wmls' => 'text/vnd.wap.wmlscript' ,
-    'xsl' => 'text/xml' ,
-    'ogv' => 'video/ogg' ,
-    'mpeg' => 'video/mpeg' ,
-    'mpg' => 'video/mpeg' ,
-    'mpe' => 'video/mpeg' ,
-    'qt' => 'video/quicktime' ,
-    'mov' => 'video/quicktime' ,
-    'avi' => 'video/x-msvideo' ,
-    'flv' => 'video/x-flv' ,
-    'mp4' => 'video/mp4' ,
-    'wmv' => 'video/x-ms-wmv' ,
-    'webm' => 'video/webm' ,
+    'ent' => 'application/xml-external-parsed-entity',
+    'dtd' => 'application/xml-dtd',
+    'mod' => 'application/xml-dtd',
+    'gz' => 'application/x-gzip',
+    'zip' => 'application/zip',
+    'au' => 'audio/basic',
+    'snd' => 'audio/basic',
+    'mid' => 'audio/midi',
+    'midi' => 'audio/midi',
+    'kar' => 'audio/midi',
+    'mp1' => 'audio/mpeg',
+    'mp2' => 'audio/mpeg',
+    'mp3' => 'audio/mpeg',
+    'aif' => 'audio/x-aiff',
+    'aiff' => 'audio/x-aiff',
+    'm3u' => 'audio/x-mpegurl',
+    'ram' => 'audio/x-pn-realaudio',
+    'rm' => 'audio/x-pn-realaudio',
+    'rpm' => 'audio/x-pn-realaudio-plugin',
+    'ra' => 'audio/x-realaudio',
+    'wav' => 'audio/x-wav',
+    'ogg' => 'audio/ogg',
+    'bmp' => 'image/bmp',
+    'gif' => 'image/gif',
+    'jpeg' => 'image/jpeg',
+    'jpg' => 'image/jpeg',
+    'jpe' => 'image/jpeg',
+    'png' => 'image/png',
+    'tiff' => 'image/tiff',
+    'tif' => 'image/tif',
+    'wbmp' => 'image/vnd.wap.wbmp',
+    'pnm' => 'image/x-portable-anymap',
+    'pbm' => 'image/x-portable-bitmap',
+    'pgm' => 'image/x-portable-graymap',
+    'ppm' => 'image/x-portable-pixmap',
+    'xbm' => 'image/x-xbitmap',
+    'xpm' => 'image/x-xpixmap',
+    'ics' => 'text/calendar',
+    'ifb' => 'text/calendar',
+    'css' => 'text/css',
+    'html' => 'text/html',
+    'htm' => 'text/html',
+    'asc' => 'text/plain',
+    'txt' => 'text/plain',
+    'rtf' => 'text/rtf',
+    'sgml' => 'text/x-sgml',
+    'sgm' => 'text/x-sgml',
+    'tsv' => 'text/tab-seperated-values',
+    'wml' => 'text/vnd.wap.wml',
+    'wmls' => 'text/vnd.wap.wmlscript',
+    'xsl' => 'text/xml',
+    'ogv' => 'video/ogg',
+    'mpeg' => 'video/mpeg',
+    'mpg' => 'video/mpeg',
+    'mpe' => 'video/mpeg',
+    'qt' => 'video/quicktime',
+    'mov' => 'video/quicktime',
+    'avi' => 'video/x-msvideo',
+    'flv' => 'video/x-flv',
+    'mp4' => 'video/mp4',
+    'wmv' => 'video/x-ms-wmv',
+    'webm' => 'video/webm',
     '3gp' => 'video/quicktime' );

htdocs/include/functions.php

Spacing +38 added lines, -38 removed lines

@@ -65,9 +65,9 @@ 
  */
 function xoops_getHandler($name, $optional = false)
 {
-    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     // Also can use: dedicated alias, i.e. $handler = $xoops->getHandlerConfig($optional);
-    $handler = Factory::newSpec()->scheme('kernel')->name($name)->optional((bool) $optional)->build();
+    $handler = Factory::newSpec()->scheme('kernel')->name($name)->optional((bool)$optional)->build();
     return $handler;
 }
 
@@ -80,7 +80,7 @@ 
  */
 function xoops_getModuleHandler($name = null, $module_dir = null, $optional = false)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->getModuleHandler($name, $module_dir, $optional);
 }
 
@@ -95,7 +95,7 @@ 
  */
 function xoops_load($name, $type = 'core')
 {
-    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     // Note: most classes will autoload (i.e. $nav = new XoopsPageNav();) with no need for xoops_load()
     return XoopsLoad::load($name, $type);
 }
@@ -110,7 +110,7 @@ 
  */
 function xoops_loadLanguage($name, $domain = '', $language = null)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->loadLanguage($name, $domain, $language);
 }
 
@@ -120,7 +120,7 @@ 
  */
 function xoops_getActiveModules()
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->getActiveModules();
 }
 
@@ -130,7 +130,7 @@ 
  */
 function xoops_setActiveModules()
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->setActiveModules();
 }
 
@@ -141,7 +141,7 @@ 
  */
 function xoops_isActiveModule($dirname)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->isActiveModule($dirname);
 }
 
@@ -152,7 +152,7 @@ 
  */
 function xoops_header($closehead = true)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     $xoops->simpleHeader($closehead);
 }
 
@@ -162,7 +162,7 @@ 
  */
 function xoops_footer()
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     $xoops->simpleFooter();
 }
 
@@ -174,7 +174,7 @@ 
  */
 function xoops_error($msg, $title = '')
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     echo $xoops->alert('error', $msg, $title);
 }
 
@@ -186,7 +186,7 @@ 
  */
 function xoops_result($msg, $title = '')
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     echo $xoops->alert('info', $msg, $title);
 }
 
@@ -201,7 +201,7 @@ 
  */
 function xoops_confirm($hiddens, $action, $msg, $submit = '', $addtoken = true)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     echo $xoops->confirm($hiddens, $action, $msg, $submit, $addtoken);
 }
 
@@ -213,7 +213,7 @@ 
  */
 function xoops_getUserTimestamp($time, $timeoffset = '')
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->getUserTimestamp($time);
 }
 
@@ -226,7 +226,7 @@ 
  */
 function formatTimestamp($time, $format = 'l', $timeoffset = '')
 {
-    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return XoopsLocale::formatTimestamp($time, $format);
 }
 
@@ -238,7 +238,7 @@ 
  */
 function userTimeToServerTime($timestamp, $userTZ = null)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->userTimeToServerTime($timestamp, $userTZ);
 }
 
@@ -248,7 +248,7 @@ 
  */
 function xoops_makepass()
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->makePass();
 }
 
@@ -260,7 +260,7 @@ 
  */
 function checkEmail($email, $antispam = false)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->checkEmail($email, $antispam);
 }
 
@@ -271,7 +271,7 @@ 
  */
 function formatURL($url)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->formatURL($url);
 }
 
@@ -281,7 +281,7 @@ 
  */
 function xoops_getbanner()
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->getBanner();
 }
 
@@ -297,7 +297,7 @@ 
  */
 function redirect_header($url, $time = 3, $message = '', $addredirect = true, $allowExternalLink = false)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     $xoops->redirect($url, $time, $message, $addredirect, $allowExternalLink);
 }
 
@@ -308,7 +308,7 @@ 
  */
 function xoops_getenv($key)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->getEnv($key);
 }
 
@@ -319,7 +319,7 @@ 
  */
 function xoops_getcss($theme = '')
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->getCss($theme);
 }
 
@@ -329,7 +329,7 @@ 
  */
 function xoops_getMailer()
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->getMailer();
 }
 
@@ -341,7 +341,7 @@ 
  */
 function xoops_getrank($rank_id = 0, $posts = 0)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->service('userrank')->getUserRank(['rank' => $rank_id, 'posts' => $posts, 'uid' => 0])->getValue();
 }
 
@@ -355,7 +355,7 @@ 
  */
 function xoops_substr($str, $start, $length, $trimmarker = '...')
 {
-    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return XoopsLocale::substr($str, $start, $length, $trimmarker);
 }
 
@@ -422,7 +422,7 @@ 
  */
 function xoops_groupperm_deletebymoditem($module_id, $perm_name, $item_id = null)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->getHandlerGroupPermission()->deleteByModule($module_id, $perm_name, $item_id);
 }
 
@@ -433,7 +433,7 @@ 
  */
 function xoops_utf8_encode(&$text)
 {
-    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     $text = XoopsLocale::utf8_encode($text);
 }
 
@@ -444,7 +444,7 @@ 
  */
 function xoops_convert_encoding(&$text)
 {
-    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     $text = XoopsLocale::utf8_encode($text);
 }
 
@@ -455,7 +455,7 @@ 
  */
 function xoops_trim($text)
 {
-    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return XoopsLocale::trim($text);
 }
 
@@ -466,7 +466,7 @@ 
  */
 function xoops_getOption($option)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->getOption($option);
 }
 
@@ -478,7 +478,7 @@ 
  */
 function xoops_getConfigOption($option, $type = 'XOOPS_CONF')
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->getConfig($option);
 }
 
@@ -490,7 +490,7 @@ 
  */
 function xoops_setConfigOption($option, $new = null)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     $xoops->setConfig($option, $new);
 }
 
@@ -502,7 +502,7 @@ 
  */
 function xoops_getModuleOption($option, $dirname = '')
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->getModuleConfig($option, $dirname);
 }
 
@@ -514,7 +514,7 @@ 
  */
 function xoops_getBaseDomain($url, $debug = 0)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->getBaseDomain($url);
 }
 
@@ -525,7 +525,7 @@ 
  */
 function xoops_getUrlDomain($url)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->getBaseDomain($url, true);
 }
 
@@ -538,7 +538,7 @@ 
  */
 function xoops_template_touch($tpl_id, $clear_old = true)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     return $xoops->templateTouch($tpl_id);
 }
 
@@ -550,6 +550,6 @@ 
  */
 function xoops_template_clear_module_cache($mid)
 {
-    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ + 1));
+    $xoops = xoops_functions_php_deprecated(__FUNCTION__, __FILE__, (__LINE__ +1));
     $xoops->templateClearModuleCache($mid);
 }

htdocs/include/cp_functions.php

Spacing +2 added lines, -2 removed lines

@@ -26,7 +26,7 @@ 
 function xoops_cp_header()
 {
     $xoops = Xoops::getInstance();
-    $xoops->deprecated('xoops_cp_header() is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+    $xoops->deprecated('xoops_cp_header() is deprecated. See how to replace it in file '.__FILE__.' line '.__LINE__);
     $xoops->header($xoops->getOption('template_main'));
 }
 
@@ -38,6 +38,6 @@ 
 function xoops_cp_footer()
 {
     $xoops = Xoops::getInstance();
-    $xoops->deprecated('xoops_cp_footer() is deprecated. See how to replace it in file ' . __FILE__ . ' line ' . __LINE__);
+    $xoops->deprecated('xoops_cp_footer() is deprecated. See how to replace it in file '.__FILE__.' line '.__LINE__);
     $xoops->footer();
 }

htdocs/include/checklogin.php

Spacing +9 added lines, -9 removed lines

@@ -28,7 +28,7 @@ 
 $uname = Request::getString('uname', '', 'POST');
 $pass = Request::getString('pass', '', 'POST');
 if ($uname == '' || $pass == '') {
-    $xoops->redirect($xoops_url . '/user.php', 1, XoopsLocale::E_INCORRECT_LOGIN);
+    $xoops->redirect($xoops_url.'/user.php', 1, XoopsLocale::E_INCORRECT_LOGIN);
     exit();
 }
 $rememberme = Request::getBool('rememberme', false, 'POST');
@@ -42,11 +42,11 @@ 
 if (false != $user) {
     /* @var $user XoopsUser */
     if (0 == $user->getVar('level')) {
-        $xoops->redirect($xoops_url . '/index.php', 5, XoopsLocale::E_SELECTED_USER_DEACTIVATED_OR_NOT_ACTIVE);
+        $xoops->redirect($xoops_url.'/index.php', 5, XoopsLocale::E_SELECTED_USER_DEACTIVATED_OR_NOT_ACTIVE);
         exit();
     }
     if (in_array(FixedGroups::REMOVED, $user->getGroups())) {
-        $xoops->redirect($xoops_url . '/index.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
+        $xoops->redirect($xoops_url.'/index.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
         exit();
     }
     if ($xoops->getConfig('closesite') == 1) {
@@ -58,7 +58,7 @@ 
             }
         }
         if (!$allowed) {
-            $xoops->redirect($xoops_url . '/index.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
+            $xoops->redirect($xoops_url.'/index.php', 1, XoopsLocale::E_NO_ACCESS_PERMISSION);
             exit();
         }
     }
@@ -77,11 +77,11 @@ 
     if (!empty($xoops_redirect) && !strpos($xoops_redirect, 'register')) {
         $xoops_redirect = rawurldecode($xoops_redirect);
         $parsed = parse_url($xoops_url);
-        $url = isset($parsed['scheme']) ? $parsed['scheme'] . '://' : 'http://';
+        $url = isset($parsed['scheme']) ? $parsed['scheme'].'://' : 'http://';
         if (isset($parsed['host'])) {
             $url .= $parsed['host'];
             if (isset($parsed['port'])) {
-                $url .= ':' . $parsed['port'];
+                $url .= ':'.$parsed['port'];
             }
         } else {
             $url .= $_SERVER['HTTP_HOST'];
@@ -93,17 +93,17 @@ 
         }
         $url .= $xoops_redirect;
     } else {
-        $url = $xoops_url . '/index.php';
+        $url = $xoops_url.'/index.php';
     }
 
     $xoops->redirect($url, 1, sprintf(XoopsLocale::SF_THANK_YOU_FOR_LOGGING_IN, $user->getVar('uname')), false);
 } else {
     $xoops->events()->triggerEvent('core.include.checklogin.failed');
     if (empty($xoops_redirect)) {
-        $xoops->redirect($xoops_url . '/user.php', 5, $xoopsAuth->getHtmlErrors());
+        $xoops->redirect($xoops_url.'/user.php', 5, $xoopsAuth->getHtmlErrors());
     } else {
         $xoops->redirect(
-            $xoops_url . '/user.php?xoops_redirect=' . urlencode($xoops_redirect),
+            $xoops_url.'/user.php?xoops_redirect='.urlencode($xoops_redirect),
             5,
             $xoopsAuth->getHtmlErrors(),
             false