XOOPS / XoopsCore

xoops_lib/Xmf/FilterInput.php

Spacing +44 added lines, -44 removed lines

@@ -34,13 +34,13 @@ 
  */
 class FilterInput
 {
-    protected $tagsArray;         // default is empty array
-    protected $attrArray;         // default is empty array
+    protected $tagsArray; // default is empty array
+    protected $attrArray; // default is empty array
 
-    protected $tagsMethod;        // default is 0
-    protected $attrMethod;        // default is 0
+    protected $tagsMethod; // default is 0
+    protected $attrMethod; // default is 0
 
-    protected $xssAuto;           // default is 1
+    protected $xssAuto; // default is 1
     protected $tagBlacklist = array(
         'applet',
         'body',
@@ -94,8 +94,8 @@ 
             $attrArray[$i] = strtolower($attrArray[$i]);
         }
         // assign to member vars
-        $this->tagsArray  = (array) $tagsArray;
-        $this->attrArray  = (array) $attrArray;
+        $this->tagsArray  = (array)$tagsArray;
+        $this->attrArray  = (array)$attrArray;
         $this->tagsMethod = $tagsMethod;
         $this->attrMethod = $attrMethod;
         $this->xssAuto    = $xssAuto;
@@ -213,61 +213,61 @@ 
             case 'INT':
             case 'INTEGER':
                 // Only use the first integer value
-                preg_match('/-?\d+/', (string) $source, $matches);
-                $result = @ (int) $matches[0];
+                preg_match('/-?\d+/', (string)$source, $matches);
+                $result = @ (int)$matches[0];
                 break;
 
             case 'FLOAT':
             case 'DOUBLE':
                 // Only use the first floating point value
-                preg_match('/-?\d+(\.\d+)?/', (string) $source, $matches);
-                $result = @ (float) $matches[0];
+                preg_match('/-?\d+(\.\d+)?/', (string)$source, $matches);
+                $result = @ (float)$matches[0];
                 break;
 
             case 'BOOL':
             case 'BOOLEAN':
-                $result = (bool) $source;
+                $result = (bool)$source;
                 break;
 
             case 'WORD':
-                $result = (string) preg_replace('/[^A-Z_]/i', '', $source);
+                $result = (string)preg_replace('/[^A-Z_]/i', '', $source);
                 break;
 
             case 'ALPHANUM':
             case 'ALNUM':
-                $result = (string) preg_replace('/[^A-Z0-9]/i', '', $source);
+                $result = (string)preg_replace('/[^A-Z0-9]/i', '', $source);
                 break;
 
             case 'CMD':
-                $result = (string) preg_replace('/[^A-Z0-9_\.-]/i', '', $source);
+                $result = (string)preg_replace('/[^A-Z0-9_\.-]/i', '', $source);
                 $result = strtolower($result);
                 break;
 
             case 'BASE64':
-                $result = (string) preg_replace('/[^A-Z0-9\/+=]/i', '', $source);
+                $result = (string)preg_replace('/[^A-Z0-9\/+=]/i', '', $source);
                 break;
 
             case 'STRING':
-                $result = (string) $this->process($source);
+                $result = (string)$this->process($source);
                 break;
 
             case 'ARRAY':
-                $result = (array) $this->process($source);
+                $result = (array)$this->process($source);
                 break;
 
             case 'PATH':
-                $source = trim((string) $source);
+                $source = trim((string)$source);
                 $pattern = '/^([-_\.\/A-Z0-9=&%?~]+)(.*)$/i';
                 preg_match($pattern, $source, $matches);
-                $result = @ (string) $matches[1];
+                $result = @ (string)$matches[1];
                 break;
 
             case 'USERNAME':
-                $result = (string) preg_replace('/[\x00-\x1F\x7F<>"\'%&]/', '', $source);
+                $result = (string)preg_replace('/[\x00-\x1F\x7F<>"\'%&]/', '', $source);
                 break;
 
             case 'WEBURL':
-                $result = (string) $this->process($source);
+                $result = (string)$this->process($source);
                 // allow only relative, http or https
                 $urlparts = parse_url($result);
                 if (!empty($urlparts['scheme'])
@@ -282,17 +282,17 @@ 
                 break;
 
             case 'EMAIL':
-                $result = (string) $source;
-                if (!filter_var((string) $source, FILTER_VALIDATE_EMAIL)) {
+                $result = (string)$source;
+                if (!filter_var((string)$source, FILTER_VALIDATE_EMAIL)) {
                     $result = '';
                 }
                 break;
 
             case 'IP':
-                $result = (string) $source;
+                $result = (string)$source;
                 // this may be too restrictive.
                 // Should the FILTER_FLAG_NO_PRIV_RANGE flag be excluded?
-                if (!filter_var((string) $source, FILTER_VALIDATE_IP)) {
+                if (!filter_var((string)$source, FILTER_VALIDATE_IP)) {
                     $result = '';
                 }
                 break;
@@ -425,20 +425,20 @@ 
                 // reconstruct tag with allowed attributes
                 if (!$isCloseTag) {
                     $attrSet = $this->filterAttr($attrSet);
-                    $preTag .= '<' . $tagName;
+                    $preTag .= '<'.$tagName;
                     $attrSetCount = count($attrSet);
                     for ($i = 0; $i < $attrSetCount; ++$i) {
-                        $preTag .= ' ' . $attrSet[$i];
+                        $preTag .= ' '.$attrSet[$i];
                     }
                     // reformat single tags to XHTML
-                    if (strpos($fromTagOpen, "</" . $tagName)) {
+                    if (strpos($fromTagOpen, "</".$tagName)) {
                         $preTag .= '>';
                     } else {
                         $preTag .= ' />';
                     }
                 } else {
                     // just the tagname
-                    $preTag .= '</' . $tagName . '>';
+                    $preTag .= '</'.$tagName.'>';
                 }
             }
             // find next tag's start
@@ -515,13 +515,13 @@ 
             if ((!$attrFound && $this->attrMethod) || ($attrFound && !$this->attrMethod)) {
                 if ($attrSubSet[1]) {
                     // attr has value
-                    $newSet[] = $attrSubSet[0] . '="' . $attrSubSet[1] . '"';
+                    $newSet[] = $attrSubSet[0].'="'.$attrSubSet[1].'"';
                 } elseif ($attrSubSet[1] == "0") {
                     // attr has decimal zero as value
-                    $newSet[] = $attrSubSet[0] . '="0"';
+                    $newSet[] = $attrSubSet[0].'="0"';
                 } else {
                     // reformat single attributes to XHTML
-                    $newSet[] = $attrSubSet[0] . '="' . $attrSubSet[0] . '"';
+                    $newSet[] = $attrSubSet[0].'="'.$attrSubSet[0].'"';
                 }
             }
         }
@@ -544,7 +544,7 @@ 
         // convert decimal
         $source = preg_replace_callback(
             '/&#(\d+);/m',
-            function ($matches) {
+            function($matches) {
                 return chr($matches[1]);
             },
             $source
@@ -552,8 +552,8 @@ 
         // convert hex notation
         $source = preg_replace_callback(
             '/&#x([a-f0-9]+);/mi',
-            function ($matches) {
-                return chr('0x' . $matches[1]);
+            function($matches) {
+                return chr('0x'.$matches[1]);
             },
             $source
         );
@@ -595,37 +595,37 @@ 
                     $name = $input[0];
                     $type = isset($input[1]) ? $input[1] : 'string';
                     $default = isset($input[2]) ?
-                        (($require && $require==$name) ? '': $input[2]) : '';
+                        (($require && $require == $name) ? '' : $input[2]) : '';
                     $trim = isset($input[3]) ? $input[3] : true;
                     $maxlen = isset($input[4]) ? $input[4] : 0;
                     $value = $default;
                     switch ($source) {
                         case 'get':
                             if (isset($_GET[$name])) {
-                                $value=$_GET[$name];
+                                $value = $_GET[$name];
                             }
                             break;
                         case 'post':
                             if (isset($_POST[$name])) {
-                                $value=$_POST[$name];
+                                $value = $_POST[$name];
                             }
                             break;
                         case 'cookie':
                             if (isset($_COOKIE[$name])) {
-                                $value=$_COOKIE[$name];
+                                $value = $_COOKIE[$name];
                             }
                             break;
                     }
                     if ($trim) {
                         $value = trim($value);
                     }
-                    if ($maxlen>0) {
+                    if ($maxlen > 0) {
                         if (function_exists('mb_strlen')) {
-                            if (mb_strlen($value)>$maxlen) {
-                                $value=mb_substr($value, 0, $maxlen);
+                            if (mb_strlen($value) > $maxlen) {
+                                $value = mb_substr($value, 0, $maxlen);
                             }
                         } else {
-                            $value=substr($value, 0, $maxlen);
+                            $value = substr($value, 0, $maxlen);
                         }
                         if ($trim) {
                             $value = trim($value);

xoops_lib/Xmf/Language.php

Spacing +2 added lines, -2 removed lines

@@ -56,8 +56,8 @@
                 $language = 'english';
             }
         }
-        $path = \XoopsBaseConfig::get('root-path') . '/' . ((empty($domain) || 'global' === $domain) ? ''
-            : "modules/{$domain}/") . 'language';
+        $path = \XoopsBaseConfig::get('root-path').'/'.((empty($domain) || 'global' === $domain) ? ''
+            : "modules/{$domain}/").'language';
         if (!$ret = static::loadFile("{$path}/{$language}/{$name}.php")) {
             $ret = static::loadFile("{$path}/english/{$name}.php");
         }

xoops_lib/Xmf/Module/Helper/Session.php

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
      */
     public function init()
     {
-        $this->prefix = $this->module->getVar('dirname') . '_';
+        $this->prefix = $this->module->getVar('dirname').'_';
     }
 
     /**
@@ -51,7 +51,7 @@ 
      */
     protected function prefix($name)
     {
-        $prefixedName = $this->prefix . $name;
+        $prefixedName = $this->prefix.$name;
 
         return $prefixedName;
     }

xoops_lib/Xmf/Module/Helper/AbstractHelper.php

Spacing +2 added lines, -2 removed lines

@@ -90,7 +90,7 @@ 
      */
     public function setDebug($bool = true)
     {
-        $this->debug = (bool) $bool;
+        $this->debug = (bool)$bool;
     }
 
     /**
@@ -127,6 +127,6 @@ 
         if (!is_string($value)) {
             $value = json_encode($value);
         }
-        return (string) $value;
+        return (string)$value;
     }
 }

xoops_lib/Xmf/Module/Helper/Permission.php

Spacing +13 added lines, -13 removed lines

@@ -66,7 +66,7 @@ 
      **/
     public function checkPermission($gperm_name, $gperm_itemid, $trueifadmin = true)
     {
-        $gperm_itemid = (int) $gperm_itemid;
+        $gperm_itemid = (int)$gperm_itemid;
         $gperm_groupid = \Xoops::getInstance()->getUserGroups();
 
         return $this->permissionHandler->checkRight(
@@ -74,7 +74,7 @@ 
             $gperm_itemid,
             $gperm_groupid,
             $this->mid,
-            (bool) $trueifadmin
+            (bool)$trueifadmin
         );
     }
 
@@ -98,14 +98,14 @@ 
         $message = '',
         $trueifadmin = true
     ) {
-        $gperm_itemid = (int) $gperm_itemid;
+        $gperm_itemid = (int)$gperm_itemid;
         $gperm_groupid = \Xoops::getInstance()->getUserGroups();
         $permission = $this->permissionHandler->checkRight(
             $gperm_name,
             $gperm_itemid,
             $gperm_groupid,
             $this->mid,
-            (bool) $trueifadmin
+            (bool)$trueifadmin
         );
         if (!$permission) {
             $helper = Helper::getHelper($this->dirname);
@@ -123,7 +123,7 @@ 
      **/
     public function getGroupsForItem($gperm_name, $gperm_itemid)
     {
-        $gperm_itemid = (int) $gperm_itemid;
+        $gperm_itemid = (int)$gperm_itemid;
         return $this->permissionHandler->getGroupIds($gperm_name, $gperm_itemid, $this->mid);
     }
 
@@ -138,9 +138,9 @@ 
      **/
     public function savePermissionForItem($gperm_name, $gperm_itemid, $groups)
     {
-        $gperm_itemid = (int) $gperm_itemid;
+        $gperm_itemid = (int)$gperm_itemid;
         foreach ($groups as $index => $group) {
-            $groups[$index] = (int) $group;
+            $groups[$index] = (int)$group;
         }
 
         $result = true;
@@ -173,9 +173,9 @@ 
      */
     public function deletePermissionForItem($gperm_name, $gperm_itemid)
     {
-        $gperm_itemid = (int) $gperm_itemid;
+        $gperm_itemid = (int)$gperm_itemid;
         if (!is_array($gperm_name)) {
-            $gperm_name = (array) $gperm_name;
+            $gperm_name = (array)$gperm_name;
         }
         $return = true;
         foreach ($gperm_name as $pname) {
@@ -211,7 +211,7 @@ 
         if (empty($name)) {
             $name = $this->defaultFieldName($gperm_name, $gperm_itemid);
         }
-        $gperm_itemid = (int) $gperm_itemid;
+        $gperm_itemid = (int)$gperm_itemid;
         $value = $this->getGroupsForItem($gperm_name, $gperm_itemid);
         $element = new SelectGroup(
             $caption,
@@ -236,9 +236,9 @@ 
      */
     public function defaultFieldName($gperm_name, $gperm_itemid)
     {
-        $gperm_itemid = (int) $gperm_itemid;
-        $name = $this->module->getVar('dirname') . '_' .
-            $gperm_name . '_' . $gperm_itemid;
+        $gperm_itemid = (int)$gperm_itemid;
+        $name = $this->module->getVar('dirname').'_'.
+            $gperm_name.'_'.$gperm_itemid;
 
         return $name;
     }

xoops_lib/Xmf/Module/Helper/GenericHelper.php

Spacing +6 added lines, -6 removed lines

@@ -103,7 +103,7 @@ 
             return $default;
         }
 
-        $this->addLog("Getting config '{$name}' : " . $this->serializeForHelperLog($this->configs[$name]));
+        $this->addLog("Getting config '{$name}' : ".$this->serializeForHelperLog($this->configs[$name]));
 
         return $this->configs[$name];
     }
@@ -183,15 +183,15 @@ 
      */
     protected function initHandler($name)
     {
-        $this->addLog('INIT ' . $name . ' HANDLER');
+        $this->addLog('INIT '.$name.' HANDLER');
 
         if (!isset($this->handlers[$name])) {
-            $hnd_file = XOOPS_ROOT_PATH . "/modules/{$this->dirname}/class/{$name}.php";
+            $hnd_file = XOOPS_ROOT_PATH."/modules/{$this->dirname}/class/{$name}.php";
             if (file_exists($hnd_file)) {
                 include_once $hnd_file;
             }
             $class = ucfirst(strtolower($this->dirname))
-                . ucfirst(strtolower($name)) . 'Handler';
+                . ucfirst(strtolower($name)).'Handler';
             if (class_exists($class)) {
                 $db = \XoopsDatabaseFactory::getDatabaseConnection();
                 $this->handlers[$name] = new $class($db);
@@ -254,7 +254,7 @@ 
      */
     public function url($url = '')
     {
-        return XOOPS_URL . '/modules/' . $this->dirname . '/' . $url;
+        return XOOPS_URL.'/modules/'.$this->dirname.'/'.$url;
     }
 
     /**
@@ -266,7 +266,7 @@ 
      */
     public function path($path = '')
     {
-        return XOOPS_ROOT_PATH . '/modules/' . $this->dirname . '/' . $path;
+        return XOOPS_ROOT_PATH.'/modules/'.$this->dirname.'/'.$path;
     }
 
     /**

xoops_lib/Xmf/Module/Helper/Cache.php

Spacing +2 added lines, -2 removed lines

@@ -44,7 +44,7 @@ 
      */
     public function init()
     {
-        $this->prefix = 'module/' . $this->module->getVar('dirname');
+        $this->prefix = 'module/'.$this->module->getVar('dirname');
         $this->cache = \Xoops::getInstance()->cache();
     }
 
@@ -57,7 +57,7 @@ 
      */
     protected function prefix($name)
     {
-        return $this->prefix . '/'. $name;
+        return $this->prefix.'/'.$name;
     }
 
     /**

xoops_lib/Xmf/Module/Admin.php

Spacing +10 added lines, -10 removed lines

@@ -276,10 +276,10 @@ 
      */
     public function addConfigError($value = '')
     {
-        $path = XOOPS_URL . '/Frameworks/moduleclasses/icons/16/';
+        $path = XOOPS_URL.'/Frameworks/moduleclasses/icons/16/';
         $line = "";
         $line .= "<span style='color : red; font-weight : bold;'>";
-        $line .= "<img src='" . $path . "0.png' >";
+        $line .= "<img src='".$path."0.png' >";
         $line .= $value;
         $line .= "</span>";
         $value = $line;
@@ -297,10 +297,10 @@ 
      */
     public function addConfigAccept($value = '')
     {
-        $path = XOOPS_URL . '/Frameworks/moduleclasses/icons/16/';
+        $path = XOOPS_URL.'/Frameworks/moduleclasses/icons/16/';
         $line = "";
         $line .= "<span style='color : green;'>";
-        $line .= "<img src='" . $path . "1.png' >";
+        $line .= "<img src='".$path."1.png' >";
         $line .= $value;
         $line .= "</span>";
         $value = $line;
@@ -318,10 +318,10 @@ 
      */
     public function addConfigWarning($value = '')
     {
-        $path = XOOPS_URL . '/Frameworks/moduleclasses/icons/16/';
+        $path = XOOPS_URL.'/Frameworks/moduleclasses/icons/16/';
         $line = "";
         $line .= "<span style='color : orange; font-weight : bold;'>";
-        $line .= "<img src='" . $path . "warning.png' >";
+        $line .= "<img src='".$path."warning.png' >";
         $line .= $value;
         $line .= "</span>";
         $value = $line;
@@ -403,7 +403,7 @@ 
         } else {
             $path = '../../Frameworks/moduleclasses/icons/32/';
 
-            return($path . $image);
+            return($path.$image);
         }
     }
 
@@ -439,12 +439,12 @@ 
         }
 
         if (static::isXng()) {
-            $path = '/media/xoops/images/icons/' . $path;
+            $path = '/media/xoops/images/icons/'.$path;
         } else {
-            $path = '/Frameworks/moduleclasses/icons/' . $path;
+            $path = '/Frameworks/moduleclasses/icons/'.$path;
         }
 
-        return(XOOPS_URL . $path . $name);
+        return(XOOPS_URL.$path.$name);
     }
 
     /**

xoops_lib/Xmf/Request.php

Spacing +6 added lines, -6 removed lines

@@ -234,7 +234,7 @@ 
     public static function getString($name, $default = '', $hash = 'default', $mask = 0)
     {
         // Cast to string, in case static::MASK_ALLOW_RAW was specified for mask
-        return (string) static::getVar($name, $default, $hash, 'string', $mask);
+        return (string)static::getVar($name, $default, $hash, 'string', $mask);
     }
 
     /**
@@ -262,7 +262,7 @@ 
      */
     public static function getText($name, $default = '', $hash = 'default')
     {
-        return (string) static::getVar($name, $default, $hash, 'string', static::MASK_ALLOW_RAW);
+        return (string)static::getVar($name, $default, $hash, 'string', static::MASK_ALLOW_RAW);
     }
 
     /**
@@ -276,7 +276,7 @@ 
      */
     public static function getUrl($name, $default = '', $hash = 'default')
     {
-        return (string) static::getVar($name, $default, $hash, 'weburl');
+        return (string)static::getVar($name, $default, $hash, 'weburl');
     }
 
     /**
@@ -290,7 +290,7 @@ 
      */
     public static function getPath($name, $default = '', $hash = 'default')
     {
-        return (string) static::getVar($name, $default, $hash, 'path');
+        return (string)static::getVar($name, $default, $hash, 'path');
     }
 
     /**
@@ -304,7 +304,7 @@ 
      */
     public static function getEmail($name, $default = '', $hash = 'default')
     {
-        $ret = (string) static::getVar($name, $default, $hash, 'email');
+        $ret = (string)static::getVar($name, $default, $hash, 'email');
         return empty($ret) ? $default : $ret;
     }
 
@@ -319,7 +319,7 @@ 
      */
     public static function getIP($name, $default = '', $hash = 'default')
     {
-        $ret = (string) static::getVar($name, $default, $hash, 'ip');
+        $ret = (string)static::getVar($name, $default, $hash, 'ip');
         return empty($ret) ? $default : $ret;
     }