mambax7 / smartobject

class/Utility.php

Doc Comments +12 added lines, -12 removed lines

@@ -398,7 +398,7 @@ 
 
     /**
      * Thanks to the NewBB2 Development Team
-     * @param $target
+     * @param string $target
      * @return bool
      */
     public static function mkdirAsAdmin($target)
@@ -551,7 +551,7 @@ 
 
     /**
      * @param $dirname
-     * @return bool
+     * @return boolean|null
      */
     public static function deleteFile($dirname)
     {
@@ -744,7 +744,7 @@ 
     }
 
     /**
-     * @param $name
+     * @param string $name
      */
     public static function closeCollapsable($name)
     {
@@ -754,7 +754,7 @@ 
     }
 
     /**
-     * @param     $name
+     * @param     string $name
      * @param     $value
      * @param int $time
      */
@@ -768,7 +768,7 @@ 
     }
 
     /**
-     * @param         $name
+     * @param         string $name
      * @param  string $default
      * @return string
      */
@@ -917,7 +917,7 @@ 
     }
 
     /**
-     * @param $src
+     * @param string $src
      */
     public static function addScript($src)
     {
@@ -1096,8 +1096,8 @@ 
     }
 
     /**
-     * @param $module
-     * @param $file
+     * @param string $module
+     * @param string $file
      */
     public static function loadLanguageFile($module, $file)
     {
@@ -1215,7 +1215,7 @@ 
      * This function should be able to cover almost all floats that appear in an european environment.
      * @param            $str
      * @param  bool      $set
-     * @return float|int
+     * @return double
      */
     public static function getFloat($str, $set = false)
     {
@@ -1250,7 +1250,7 @@ 
     /**
      * @param                         $var
      * @param  bool                   $currencyObj
-     * @return float|int|mixed|string
+     * @return string
      */
     public static function getCurrency($var, $currencyObj = false)
     {
@@ -1278,7 +1278,7 @@ 
 
     /**
      * @param $var
-     * @return float|int|mixed|string
+     * @return string
      */
     public static function float($var)
     {
@@ -1326,7 +1326,7 @@ 
     /**
      * @param $moduleName
      * @param $items
-     * @return array
+     * @return string[]
      */
     public static function getTablesArray($moduleName, $items)
     {

Spacing +66 added lines, -66 removed lines

@@ -25,7 +25,7 @@ 
      */
     public static function getCssLink($cssfile)
     {
-        $ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '">';
+        $ret = '<link rel="stylesheet" type="text/css" href="'.$cssfile.'">';
 
         return $ret;
     }
@@ -116,14 +116,14 @@ 
             $seoMode = static::getModuleModeSEO($moduleName);
             if ('rewrite' === $seoMode) {
                 $seoModuleName = static::getModuleNameForSEO($moduleName);
-                $ret           = XOOPS_URL . '/' . $seoModuleName . '/';
+                $ret           = XOOPS_URL.'/'.$seoModuleName.'/';
             } elseif ('pathinfo' === $seoMode) {
-                $ret = XOOPS_URL . '/modules/' . $moduleName . '/seo.php/' . $seoModuleName . '/';
+                $ret = XOOPS_URL.'/modules/'.$moduleName.'/seo.php/'.$seoModuleName.'/';
             } else {
-                $ret = XOOPS_URL . '/modules/' . $moduleName . '/';
+                $ret = XOOPS_URL.'/modules/'.$moduleName.'/';
             }
 
-            return '<a href="' . $ret . '">' . $smartModule->getVar('name') . '</a>';
+            return '<a href="'.$ret.'">'.$smartModule->getVar('name').'</a>';
         }
     }
 
@@ -225,7 +225,7 @@ 
         //Verifies that a MySQL table exists
         $xoopsDB  = \XoopsDatabaseFactory::getDatabaseConnection();
         $realname = $xoopsDB->prefix($table);
-        $sql      = 'SHOW TABLES FROM ' . XOOPS_DB_NAME;
+        $sql      = 'SHOW TABLES FROM '.XOOPS_DB_NAME;
         $ret      = $xoopsDB->queryF($sql);
         while (false !== (list($m_table) = $xoopsDB->fetchRow($ret))) {
             if ($m_table == $realname) {
@@ -254,7 +254,7 @@ 
             $moduleName = static::getCurrentModuleName();
         }
         $xoopsDB = \XoopsDatabaseFactory::getDatabaseConnection();
-        $sql     = sprintf('SELECT metavalue FROM `%s` WHERE metakey=%s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key));
+        $sql     = sprintf('SELECT metavalue FROM `%s` WHERE metakey=%s', $xoopsDB->prefix($moduleName.'_meta'), $xoopsDB->quoteString($key));
         $ret     = $xoopsDB->query($sql);
         if (!$ret) {
             $value = false;
@@ -297,9 +297,9 @@ 
         $xoopsDB = \XoopsDatabaseFactory::getDatabaseConnection();
         $ret     = static::getMeta($key, $moduleName);
         if ('0' === $ret || $ret > 0) {
-            $sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
+            $sql = sprintf('UPDATE %s SET metavalue = %s WHERE metakey = %s', $xoopsDB->prefix($moduleName.'_meta'), $xoopsDB->quoteString($value), $xoopsDB->quoteString($key));
         } else {
-            $sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName . '_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
+            $sql = sprintf('INSERT INTO %s (metakey, metavalue) VALUES (%s, %s)', $xoopsDB->prefix($moduleName.'_meta'), $xoopsDB->quoteString($key), $xoopsDB->quoteString($value));
         }
         $ret = $xoopsDB->queryF($sql);
         if (!$ret) {
@@ -479,7 +479,7 @@ 
     {
         static $smartModules;
         if (isset($smartModules[$moduleName])) {
-            $ret =& $smartModules[$moduleName];
+            $ret = & $smartModules[$moduleName];
 
             return $ret;
         }
@@ -515,7 +515,7 @@ 
     {
         static $smartConfigs;
         if (isset($smartConfigs[$moduleName])) {
-            $ret =& $smartConfigs[$moduleName];
+            $ret = & $smartConfigs[$moduleName];
 
             return $ret;
         }
@@ -543,7 +543,7 @@ 
                 return $ret;
             }
             $hModConfig                = xoops_getHandler('config');
-            $smartConfigs[$moduleName] =& $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
+            $smartConfigs[$moduleName] = & $hModConfig->getConfigsByCat(0, $module->getVar('mid'));
         }
 
         return $smartConfigs[$moduleName];
@@ -569,7 +569,7 @@ 
     {
         $ret = '';
         foreach ($errors as $key => $value) {
-            $ret .= '<br> - ' . $value;
+            $ret .= '<br> - '.$value;
         }
 
         return $ret;
@@ -589,17 +589,17 @@ 
         if (!is_numeric($userid)) {
             return $userid;
         }
-        $userid = (int)$userid;
+        $userid = (int) $userid;
         if ($userid > 0) {
             if ($users == []) {
                 //fetching users
                 $memberHandler = xoops_getHandler('member');
-                $user          =& $memberHandler->getUser($userid);
+                $user          = & $memberHandler->getUser($userid);
             } else {
                 if (!isset($users[$userid])) {
                     return $GLOBALS['xoopsConfig']['anonymous'];
                 }
-                $user =& $users[$userid];
+                $user = & $users[$userid];
             }
             if (is_object($user)) {
                 $ts        = \MyTextSanitizer:: getInstance();
@@ -610,15 +610,15 @@ 
                     $fullname = $user->getVar('name');
                 }
                 if (!empty($fullname)) {
-                    $linkeduser = "$fullname [<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . $ts->htmlSpecialChars($username) . '</a>]';
+                    $linkeduser = "$fullname [<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".$ts->htmlSpecialChars($username).'</a>]';
                 } else {
-                    $linkeduser = "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $userid . "'>" . ucwords($ts->htmlSpecialChars($username)) . '</a>';
+                    $linkeduser = "<a href='".XOOPS_URL.'/userinfo.php?uid='.$userid."'>".ucwords($ts->htmlSpecialChars($username)).'</a>';
                 }
                 // add contact info: email + PM
                 if ($withContact) {
-                    $linkeduser .= ' <a href="mailto:' . $user->getVar('email') . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/email.gif' . '" alt="' . _CO_SOBJECT_SEND_EMAIL . '" title="' . _CO_SOBJECT_SEND_EMAIL . '"></a>';
-                    $js         = "javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&to_userid=' . $userid . "', 'pmlite',450,370);";
-                    $linkeduser .= ' <a href="' . $js . '"><img style="vertical-align: middle;" src="' . XOOPS_URL . '/images/icons/pm.gif' . '" alt="' . _CO_SOBJECT_SEND_PM . '" title="' . _CO_SOBJECT_SEND_PM . '"></a>';
+                    $linkeduser .= ' <a href="mailto:'.$user->getVar('email').'"><img style="vertical-align: middle;" src="'.XOOPS_URL.'/images/icons/email.gif'.'" alt="'._CO_SOBJECT_SEND_EMAIL.'" title="'._CO_SOBJECT_SEND_EMAIL.'"></a>';
+                    $js = "javascript:openWithSelfMain('".XOOPS_URL.'/pmlite.php?send2=1&to_userid='.$userid."', 'pmlite',450,370);";
+                    $linkeduser .= ' <a href="'.$js.'"><img style="vertical-align: middle;" src="'.XOOPS_URL.'/images/icons/pm.gif'.'" alt="'._CO_SOBJECT_SEND_PM.'" title="'._CO_SOBJECT_SEND_PM.'"></a>';
                 }
 
                 return $linkeduser;
@@ -637,7 +637,7 @@ 
     public static function getAdminMenu($currentoption = 0, $breadcrumb = '', $submenus = false, $currentsub = -1)
     {
         global $xoopsModule, $xoopsConfig;
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
 
 
         /** @var Smartobject\Helper $helper */
@@ -646,7 +646,7 @@ 
         $helper->loadLanguage('modinfo');
         $headermenu  = [];
         $adminObject = [];
-        include XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/admin/menu.php';
+        include XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/admin/menu.php';
         $tpl = new \XoopsTpl();
         $tpl->assign([
                          'headermenu'      => $headermenu,
@@ -669,11 +669,11 @@ 
     public static function getCollapsableBar($id = '', $title = '', $dsc = '')
     {
         global $xoopsModule;
-        echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('" . $id . "'); toggleIcon('" . $id . "_icon')\";>";
-        echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
-        echo "<div id='" . $id . "'>";
+        echo "<h3 style=\"color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; \"><a href='javascript:;' onclick=\"togglecollapse('".$id."'); toggleIcon('".$id."_icon')\";>";
+        echo "<img id='".$id."_icon' src=".SMARTOBJECT_URL."assets/images/close12.gif alt=''></a>&nbsp;".$title.'</h3>';
+        echo "<div id='".$id."'>";
         if ('' !== $dsc) {
-            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . $dsc . '</span>';
+            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.$dsc.'</span>';
         }
     }
 
@@ -687,11 +687,11 @@ 
         global $xoopsModule;
         $onClick = "ajaxtogglecollapse('$id')";
         //$onClick = "togglecollapse('$id'); toggleIcon('" . $id . "_icon')";
-        echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="' . $onClick . '">';
-        echo "<img id='" . $id . "_icon' src=" . SMARTOBJECT_URL . "assets/images/close12.gif alt=''></a>&nbsp;" . $title . '</h3>';
-        echo "<div id='" . $id . "'>";
+        echo '<h3 style="border: 1px solid; color: #2F5376; font-weight: bold; font-size: 14px; margin: 6px 0 0 0; " onclick="'.$onClick.'">';
+        echo "<img id='".$id."_icon' src=".SMARTOBJECT_URL."assets/images/close12.gif alt=''></a>&nbsp;".$title.'</h3>';
+        echo "<div id='".$id."'>";
         if ('' !== $dsc) {
-            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . $dsc . '</span>';
+            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.$dsc.'</span>';
         }
     }
 
@@ -721,13 +721,13 @@ 
     {
         $urls        = static::getCurrentUrls();
         $path        = $urls['phpself'];
-        $cookie_name = $path . '_smart_collaps_' . $name;
+        $cookie_name = $path.'_smart_collaps_'.$name;
         $cookie_name = str_replace('.', '_', $cookie_name);
         $cookie      = static::getCookieVar($cookie_name, '');
         if ('none' === $cookie) {
             echo '
                 <script type="text/javascript"><!--
-                togglecollapse("' . $name . '"); toggleIcon("' . $name . '_icon");
+                togglecollapse("' . $name.'"); toggleIcon("'.$name.'_icon");
                     //-->
                 </script>
                 ';
@@ -793,17 +793,17 @@ 
         $httphost    = $_SERVER['HTTP_HOST'];
         $querystring = $_SERVER['QUERY_STRING'];
         if ('' !== $querystring) {
-            $querystring = '?' . $querystring;
+            $querystring = '?'.$querystring;
         }
-        $currenturl           = $http . $httphost . $phpself . $querystring;
+        $currenturl           = $http.$httphost.$phpself.$querystring;
         $urls                 = [];
         $urls['http']         = $http;
         $urls['httphost']     = $httphost;
         $urls['phpself']      = $phpself;
         $urls['querystring']  = $querystring;
-        $urls['full_phpself'] = $http . $httphost . $phpself;
+        $urls['full_phpself'] = $http.$httphost.$phpself;
         $urls['full']         = $currenturl;
-        $urls['isHomePage']   = (XOOPS_URL . '/index.php') == ($http . $httphost . $phpself);
+        $urls['isHomePage']   = (XOOPS_URL.'/index.php') == ($http.$httphost.$phpself);
 
         return $urls;
     }
@@ -880,13 +880,13 @@ 
     {
         global $xoopsConfig, $xoopsModule;
 
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
         $tpl = new \XoopsTpl();
 
         $hModule      = xoops_getHandler('module');
-        $versioninfo  =& $hModule->get($xoopsModule->getVar('mid'));
-        $modfootertxt = 'Module ' . $versioninfo->getInfo('name') . ' - Version ' . $versioninfo->getInfo('version') . '';
-        $modfooter    = "<a href='" . $versioninfo->getInfo('support_site_url') . "' target='_blank'><img src='" . XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . "/assets/images/cssbutton.gif' title='" . $modfootertxt . "' alt='" . $modfootertxt . "'></a>";
+        $versioninfo  = & $hModule->get($xoopsModule->getVar('mid'));
+        $modfootertxt = 'Module '.$versioninfo->getInfo('name').' - Version '.$versioninfo->getInfo('version').'';
+        $modfooter    = "<a href='".$versioninfo->getInfo('support_site_url')."' target='_blank'><img src='".XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname')."/assets/images/cssbutton.gif' title='".$modfootertxt."' alt='".$modfootertxt."'></a>";
         $tpl->assign('modfooter', $modfooter);
 
         if (!defined('_AM_SOBJECT_XOOPS_PRO')) {
@@ -894,7 +894,7 @@ 
         }
         $smartobjectConfig = static::getModuleConfig('smartobject');
         $tpl->assign('smartobject_enable_admin_footer', $smartobjectConfig['enable_admin_footer']);
-        $tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.tpl');
+        $tpl->display(SMARTOBJECT_ROOT_PATH.'templates/smartobject_admin_footer.tpl');
     }
 
     public static function getXoopsCpFooter()
@@ -921,7 +921,7 @@ 
      */
     public static function addScript($src)
     {
-        echo '<script src="' . $src . '" type="text/javascript"></script>';
+        echo '<script src="'.$src.'" type="text/javascript"></script>';
     }
 
     /**
@@ -930,16 +930,16 @@ 
     public static function addStyle($src)
     {
         if ('smartobject' === $src) {
-            $src = SMARTOBJECT_URL . 'assets/css/module.css';
+            $src = SMARTOBJECT_URL.'assets/css/module.css';
         }
         echo static::getCssLink($src);
     }
 
     public static function addAdminAjaxSupport()
     {
-        static::addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
-        static::addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
-        static::addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
+        static::addScript(SMARTOBJECT_URL.'include/scriptaculous/lib/prototype.js');
+        static::addScript(SMARTOBJECT_URL.'include/scriptaculous/src/scriptaculous.js');
+        static::addScript(SMARTOBJECT_URL.'include/scriptaculous/src/smart.js');
     }
 
     /**
@@ -999,8 +999,8 @@ 
     public static function getHtmlnumericentities($str)
     {
         //    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
-        return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) {
-            return '&#' . ord($m[0]) . chr(59);
+        return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function($m) {
+            return '&#'.ord($m[0]).chr(59);
         }, $str);
     }
 
@@ -1014,16 +1014,16 @@ 
         static $handlers;
         $name = strtolower(trim($name));
         if (!isset($handlers[$name])) {
-            if (file_exists($hnd_file = XOOPS_ROOT_PATH . '/kernel/' . $name . '.php')) {
+            if (file_exists($hnd_file = XOOPS_ROOT_PATH.'/kernel/'.$name.'.php')) {
                 require_once $hnd_file;
             }
-            $class = 'Xoops' . ucfirst($name) . 'Handler';
+            $class = 'Xoops'.ucfirst($name).'Handler';
             if (class_exists($class)) {
                 $handlers[$name] = new $class($GLOBALS['xoopsDB'], 'xoops');
             }
         }
         if (!isset($handlers[$name]) && !$optional) {
-            trigger_error('Class <b>' . $class . '</b> does not exist<br>Handler Name: ' . $name, E_USER_ERROR);
+            trigger_error('Class <b>'.$class.'</b> does not exist<br>Handler Name: '.$name, E_USER_ERROR);
         }
         if (isset($handlers[$name])) {
             return $handlers[$name];
@@ -1103,9 +1103,9 @@ 
     {
         global $xoopsConfig;
 
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/' . $xoopsConfig['language'] . '/' . $file . '.php';
+        $filename = XOOPS_ROOT_PATH.'/modules/'.$module.'/language/'.$xoopsConfig['language'].'/'.$file.'.php';
         if (!file_exists($filename)) {
-            $filename = XOOPS_ROOT_PATH . '/modules/' . $module . '/language/english/' . $file . '.php';
+            $filename = XOOPS_ROOT_PATH.'/modules/'.$module.'/language/english/'.$file.'.php';
         }
         if (file_exists($filename)) {
             require_once $filename;
@@ -1201,7 +1201,7 @@ 
 
         $text = preg_replace($search, $replace, $document);
 
-        preg_replace_callback('/&#(\d+);/', function ($matches) {
+        preg_replace_callback('/&#(\d+);/', function($matches) {
             return chr($matches[1]);
         }, $document);
 
@@ -1224,21 +1224,21 @@ 
             $str = $match[0];
             if (false !== strpos($str, ',')) {
                 // A comma exists, that makes it easy, cos we assume it separates the decimal part.
-                $str = str_replace('.', '', $str);    // Erase thousand seps
-                $str = str_replace(',', '.', $str);    // Convert , to . for floatval command
+                $str = str_replace('.', '', $str); // Erase thousand seps
+                $str = str_replace(',', '.', $str); // Convert , to . for floatval command
 
-                return (float)$str;
+                return (float) $str;
             } else {
                 // No comma exists, so we have to decide, how a single dot shall be treated
                 if (true === preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) && true === $set['single_dot_as_decimal']) {
                     // Treat single dot as decimal separator
-                    return (float)$str;
+                    return (float) $str;
                 } else {
                     //echo "str: ".$str; echo "ret: ".str_replace('.', '', $str); echo "<br><br> ";
                     // Else, treat all dots as thousand seps
-                    $str = str_replace('.', '', $str);    // Erase thousand seps
+                    $str = str_replace('.', '', $str); // Erase thousand seps
 
-                    return (float)$str;
+                    return (float) $str;
                 }
             }
         } else {
@@ -1270,7 +1270,7 @@ 
             $ret .= '.00';
         }
         if ($currencyObj) {
-            $ret = $ret . ' ' . $currencyObj->getCode();
+            $ret = $ret.' '.$currencyObj->getCode();
         }
 
         return $ret;
@@ -1297,7 +1297,7 @@ 
         }
         $ret = '';
         if ($moduleName) {
-            $ret = "<a href='" . XOOPS_URL . "/modules/$moduleName/admin/index.php'>" . _CO_SOBJECT_ADMIN_PAGE . '</a>';
+            $ret = "<a href='".XOOPS_URL."/modules/$moduleName/admin/index.php'>"._CO_SOBJECT_ADMIN_PAGE.'</a>';
         }
 
         return $ret;
@@ -1308,7 +1308,7 @@ 
      */
     public static function getEditors()
     {
-        $filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
+        $filename = XOOPS_ROOT_PATH.'/class/xoopseditor/xoopseditor.php';
         if (!file_exists($filename)) {
             return false;
         }
@@ -1332,9 +1332,9 @@ 
     {
         $ret = [];
         foreach ($items as $item) {
-            $ret[] = $moduleName . '_' . $item;
+            $ret[] = $moduleName.'_'.$item;
         }
-        $ret[] = $moduleName . '_meta';
+        $ret[] = $moduleName.'_meta';
 
         return $ret;
     }

admin/admin_header.php

Spacing +2 added lines, -2 removed lines

@@ -19,11 +19,11 @@
 
 use XoopsModules\Smartobject;
 
-require_once __DIR__ . '/../../../include/cp_header.php';
+require_once __DIR__.'/../../../include/cp_header.php';
 //require_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
 
 //require_once __DIR__ . '/../class/Utility.php';
-require_once __DIR__ . '/../include/common.php';
+require_once __DIR__.'/../include/common.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 $helper = Smartobject\Helper::getInstance();

admin/adsense.php

Spacing +4 added lines, -4 removed lines

@@ -47,9 +47,9 @@ 
     }
 }
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
-require_once SMARTOBJECT_ROOT_PATH . 'class/adsense.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/adsense.php';
 
 //$helper = \XoopsModules\Smartobject\Helper::getInstance();
 //$helper = Smartobject\Helper::getInstance();
@@ -89,7 +89,7 @@ 
         break;
 
     case 'addadsense':
-        if (@require_once SMARTOBJECT_ROOT_PATH . 'include/captcha/captcha.php') {
+        if (@require_once SMARTOBJECT_ROOT_PATH.'include/captcha/captcha.php') {
             $xoopsCaptcha = XoopsCaptcha::getInstance();
             if (!$xoopsCaptcha->verify()) {
                 redirect_header('javascript:history.go(-1);', 3, $xoopsCaptcha->getMessage());
@@ -164,4 +164,4 @@ 
 
 //Smartobject\Utility::getModFooter();
 //xoops_cp_footer();
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/currency.php

Spacing +5 added lines, -5 removed lines

@@ -40,7 +40,7 @@ 
     }
 }
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
 //require_once SMARTOBJECT_ROOT_PATH . 'class/currency.php';
 $smartobjectCurrencyHandler = Smartobject\Helper::getInstance()->getHandler('Currency');
@@ -71,9 +71,9 @@ 
 
         if (isset($_POST['default_currency'])) {
             $newDefaultCurrency = $_POST['default_currency'];
-            $sql                = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=0';
+            $sql                = 'UPDATE '.$smartobjectCurrencyHandler->table.' SET default_currency=0';
             $smartobjectCurrencyHandler->query($sql);
-            $sql = 'UPDATE ' . $smartobjectCurrencyHandler->table . ' SET default_currency=1 WHERE currencyid=' . $newDefaultCurrency;
+            $sql = 'UPDATE '.$smartobjectCurrencyHandler->table.' SET default_currency=1 WHERE currencyid='.$newDefaultCurrency;
             $smartobjectCurrencyHandler->query($sql);
         }
 
@@ -93,7 +93,7 @@ 
     case 'addcurrency':
 //        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
         $controller = new ObjectController($smartobjectCurrencyHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL . 'admin/currency.php');
+        $controller->storeFromDefaultForm(_AM_SOBJECT_CURRENCIES_CREATED, _AM_SOBJECT_CURRENCIES_MODIFIED, SMARTOBJECT_URL.'admin/currency.php');
 
         break;
 
@@ -134,4 +134,4 @@ 
 
 //Smartobject\Utility::getModFooter();
 //xoops_cp_footer();
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/update.php

Spacing +10 added lines, -10 removed lines

@@ -10,8 +10,8 @@ 
 use XoopsModules\Wfdownloads;
 use XoopsModules\Smartobject;
 
-require_once __DIR__ . '/admin_header.php';
-require_once SMARTCONTENT_ROOT_PATH . 'class/dbupdater.php';
+require_once __DIR__.'/admin_header.php';
+require_once SMARTCONTENT_ROOT_PATH.'class/dbupdater.php';
 
 smartcontent_xoops_cp_header();
 
@@ -219,7 +219,7 @@ 
     global $xoopsDB;
     $helperWfdownloads = \Xmf\Module\Helper::getHelper('wfdownloads');
     $catHandler = $helperWfdownloads->getHandler('Category');
-    $result     = $xoopsDB->query('SHOW COLUMNS FROM ' . $catHandler->table);
+    $result     = $xoopsDB->query('SHOW COLUMNS FROM '.$catHandler->table);
     while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
         $fields[$existing_field['field']] = $existing_field['type'];
     }
@@ -278,7 +278,7 @@ 
         //$xoopsDB->query("ALTER TABLE ".$table." ADD ".$field." ".$type);
             //echo $field."(".$type.") <FONT COLOR='##22DD51'>Added</FONT><br>";
         } elseif ($existing_fields[$field] != $type) {
-            $table->addAlteredField($field, $field . ' ' . $type);
+            $table->addAlteredField($field, $field.' '.$type);
         // check $fields[$field]['type'] for things like "int(10) unsigned"
             //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$field." ".$type);
             //echo $field." <FONT COLOR='#FF6600'>Changed to</FONT> ".$type."<br>";
@@ -299,17 +299,17 @@ 
 function get_table_info($table, $default_fields)
 {
     global $xoopsDB;
-    $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $table);
+    $result = $xoopsDB->query('SHOW COLUMNS FROM '.$table);
     while (false !== ($existing_field = $xoopsDB->fetchArray($result))) {
         $fields[$existing_field['Field']] = $existing_field['Type'];
         if ('YES' !== $existing_field['Null']) {
             $fields[$existing_field['Field']] .= ' NOT NULL';
         }
         if ($existing_field['Extra']) {
-            $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+            $fields[$existing_field['Field']] .= ' '.$existing_field['Extra'];
         }
         if ($default_fields[$existing_field['Field']]['Default']) {
-            $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
+            $fields[$existing_field['Field']] .= " default '".$existing_field['Default']."'";
         }
     }
 
@@ -331,7 +331,7 @@ 
         if (in_array($field, array_keys($renamed_fields))) {
             $new_field_name = $renamed_fields[$field];
             $new_field_type = $new_fields[$new_field_name]['Type'];
-            $table->addAltered($field, $new_field_name . ' ' . $new_field_type);
+            $table->addAltered($field, $new_field_name.' '.$new_field_type);
             //$xoopsDB->query("ALTER TABLE ".$table." CHANGE ".$field." ".$new_field_name." ".$new_field_type);
             //echo $field." Renamed to ".$new_field_name."<br>";
             $fields[$new_field_name] = $new_field_type;
@@ -359,7 +359,7 @@ 
 
     default:
         //ask what to do
-        include XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+        include XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
         $form = new \XoopsThemeForm('Upgrade WF-Downloads', 'form', $_SERVER['REQUEST_URI']);
 
         //Is MyDownloads installed?
@@ -384,4 +384,4 @@ 
 }
 //wfdownloads_modFooter();
 //xoops_cp_footer();
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/customtag.php

Spacing +2 added lines, -2 removed lines

@@ -45,7 +45,7 @@ 
     }
 }
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 Smartobject\Utility::loadLanguageFile('smartobject', 'customtag');
 
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
@@ -158,4 +158,4 @@ 
 
 //Smartobject\Utility::getModFooter();
 //xoops_cp_footer();
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/rating.php

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,7 @@ 
     }
 }
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 //require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php';
 //require_once SMARTOBJECT_ROOT_PATH . 'class/rating.php';
 $smartobjectRatingHandler = Smartobject\Helper::getInstance()->getHandler('Rating');
@@ -86,7 +86,7 @@ 
     case 'addrating':
 //        require_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjectcontroller.php';
         $controller = new XoopsModules\Smartobject\ObjectController($smartobjectRatingHandler);
-        $controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL . 'admin/rating.php');
+        $controller->storeFromDefaultForm(_AM_SOBJECT_RATINGS_CREATED, _AM_SOBJECT_RATINGS_MODIFIED, SMARTOBJECT_URL.'admin/rating.php');
 
         break;
 
@@ -154,4 +154,4 @@ 
 
 //Smartobject\Utility::getModFooter();
 //xoops_cp_footer();
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

class/MetaGen.php

Spacing +3 added lines, -3 removed lines

@@ -213,7 +213,7 @@ 
 
         $titleTag = [];
 
-        $show_mod_name_breadcrumb = null !==($helper->getConfig('show_mod_name_breadcrumb')) ? $helper->getConfig('show_mod_name_breadcrumb') : true;
+        $show_mod_name_breadcrumb = null !== ($helper->getConfig('show_mod_name_breadcrumb')) ? $helper->getConfig('show_mod_name_breadcrumb') : true;
 
         if ($moduleName && $show_mod_name_breadcrumb) {
             $titleTag['module'] = $moduleName;
@@ -270,7 +270,7 @@ 
             /** @var Smartobject\Helper $helper */
             $helper = Smartobject\Helper::getInstance();
 
-            if  (null !== ($helper->getConfig('module_meta_description'))) {
+            if (null !== ($helper->getConfig('module_meta_description'))) {
                 $description = $helper->getConfig('module_meta_description');
             }
         }
@@ -365,7 +365,7 @@ 
         /** @var Smartobject\Helper $helper */
         $helper = Smartobject\Helper::getInstance();
 
-        $keywords = $this->findMetaKeywords($this->_original_title . ' ' . $this->_description, $this->_minChar);
+        $keywords = $this->findMetaKeywords($this->_original_title.' '.$this->_description, $this->_minChar);
         if (null !== ($helper->getModule()) && null !== ($helper->getConfig('moduleMetaKeywords'))
             && '' !== $helper->getConfig('moduleMetaKeywords')) {
             $moduleKeywords = explode(',', $helper->getConfig('moduleMetaKeywords'));

class/BaseSmartObject.php

Spacing +16 added lines, -16 removed lines

@@ -17,7 +17,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || die('Restricted access');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 
 if (!defined('XOBJ_DTYPE_SIMPLE_ARRAY')) {
     define('XOBJ_DTYPE_SIMPLE_ARRAY', 101);
@@ -116,7 +116,7 @@ 
      */
     public function closeSection($section_name)
     {
-        $this->initVar('close_section_' . $section_name, XOBJ_DTYPE_FORM_SECTION_CLOSE, '', false, null, '', false, '', '', false, false, true);
+        $this->initVar('close_section_'.$section_name, XOBJ_DTYPE_FORM_SECTION_CLOSE, '', false, null, '', false, '', '', false, false, true);
     }
 
     /**
@@ -154,13 +154,13 @@ 
         }
         parent::initVar($key, $data_type, $value, $required, $maxlength, $options);
         if ($this->handler && (!$form_caption || '' === $form_caption)) {
-            $dyn_form_caption = strtoupper('_CO_' . $this->handler->_moduleName . '_' . $this->handler->_itemname . '_' . $key);
+            $dyn_form_caption = strtoupper('_CO_'.$this->handler->_moduleName.'_'.$this->handler->_itemname.'_'.$key);
             if (defined($dyn_form_caption)) {
                 $form_caption = constant($dyn_form_caption);
             }
         }
         if ($this->handler && (!$form_dsc || '' === $form_dsc)) {
-            $dyn_form_dsc = strtoupper('_CO_' . $this->handler->_moduleName . '_' . $this->handler->_itemname . '_' . $key . '_DSC');
+            $dyn_form_dsc = strtoupper('_CO_'.$this->handler->_moduleName.'_'.$this->handler->_itemname.'_'.$key.'_DSC');
             if (defined($dyn_form_dsc)) {
                 $form_dsc = constant($dyn_form_dsc);
             }
@@ -456,7 +456,7 @@ 
     public function toArray()
     {
         $ret  = [];
-        $vars =& $this->getVars();
+        $vars = & $this->getVars();
         foreach ($vars as $key => $var) {
             $value     = $this->getVar($key);
             $ret[$key] = $value;
@@ -505,7 +505,7 @@ 
             }
         } else {
             if ($prefix) {
-                $err_str = '[' . $prefix . '] ' . $err_str;
+                $err_str = '['.$prefix.'] '.$err_str;
             }
             parent::setErrors($err_str);
         }
@@ -789,7 +789,7 @@ 
             /** @var Smartmedia\Helper $helper */
             $helper = Smartmedia\Helper::getInstance();
 
-            $form_editor = null !==($helper->getConfig('default_editor')) ? $helper->getConfig('default_editor') : 'textarea';
+            $form_editor = null !== ($helper->getConfig('default_editor')) ? $helper->getConfig('default_editor') : 'textarea';
         }
 
         if ($editor) {
@@ -836,8 +836,8 @@ 
                             $this->setErrors(sprintf(_XOBJ_ERR_REQUIRED, $k));
                             continue 2;
                         }
-                        if (isset($v['maxlength']) && strlen($cleanv) > (int)$v['maxlength']) {
-                            $this->setErrors(sprintf(_XOBJ_ERR_SHORTERTHAN, $k, (int)$v['maxlength']));
+                        if (isset($v['maxlength']) && strlen($cleanv) > (int) $v['maxlength']) {
+                            $this->setErrors(sprintf(_XOBJ_ERR_SHORTERTHAN, $k, (int) $v['maxlength']));
                             continue 2;
                         }
                         if (!$v['not_gpc']) {
@@ -866,7 +866,7 @@ 
                         break;
                     case XOBJ_DTYPE_INT:
                     case XOBJ_DTYPE_TIME_ONLY:
-                        $cleanv = (int)$cleanv;
+                        $cleanv = (int) $cleanv;
                         break;
 
                     case XOBJ_DTYPE_CURRENCY:
@@ -897,10 +897,10 @@ 
                             continue 2;
                         }
                         if ('' !== $cleanv && !preg_match("/^http[s]*:\/\//i", $cleanv)) {
-                            $cleanv = 'http://' . $cleanv;
+                            $cleanv = 'http://'.$cleanv;
                         }
                         if (!$v['not_gpc']) {
-                            $cleanv =& $ts->stripSlashesGPC($cleanv);
+                            $cleanv = & $ts->stripSlashesGPC($cleanv);
                         }
                         break;
                     case XOBJ_DTYPE_SIMPLE_ARRAY:
@@ -912,7 +912,7 @@ 
                     case XOBJ_DTYPE_STIME:
                     case XOBJ_DTYPE_MTIME:
                     case XOBJ_DTYPE_LTIME:
-                        $cleanv = !is_string($cleanv) ? (int)$cleanv : strtotime($cleanv);
+                        $cleanv = !is_string($cleanv) ? (int) $cleanv : strtotime($cleanv);
                         if (!($cleanv > 0)) {
                             $cleanv = strtotime($cleanv);
                         }
@@ -921,7 +921,7 @@ 
                         break;
                 }
             }
-            $this->cleanVars[$k] =& $cleanv;
+            $this->cleanVars[$k] = & $cleanv;
             unset($cleanv);
         }
         if (count($this->_errors) > 0) {
@@ -1146,10 +1146,10 @@ 
                 }
                 break;
             case XOBJ_DTYPE_SIMPLE_ARRAY:
-                $ret =& explode('|', $ret);
+                $ret = & explode('|', $ret);
                 break;
             case XOBJ_DTYPE_ARRAY:
-                $ret =& unserialize($ret);
+                $ret = & unserialize($ret);
                 break;
             case XOBJ_DTYPE_SOURCE:
                 switch (strtolower($format)) {