mambax7 / smartobject

include/projax_/classes/Scriptaculous.php

Spacing +24 added lines, -24 removed lines

@@ -61,9 +61,9 @@ 
         }
 
         if (in_array($name, $this->TOGGLE_EFFECTS)) {
-            return "Effect.toggle($element,'" . str_replace('toggle_', '', $name) . "'," . $this->_options_for_javascript($js_options) . ')';
+            return "Effect.toggle($element,'".str_replace('toggle_', '', $name)."',".$this->_options_for_javascript($js_options).')';
         } else {
-            return 'new Effect.' . ucwords($name) . "($element," . $this->_options_for_javascript($js_options) . ')';
+            return 'new Effect.'.ucwords($name)."($element,".$this->_options_for_javascript($js_options).')';
         }
     }
 
@@ -93,7 +93,7 @@ 
         //    }
 
         //if (isset($option['onUpdate'])) {
-        $options['onUpdate'] = 'function(){' . $this->remote_function($options) . '}';
+        $options['onUpdate'] = 'function(){'.$this->remote_function($options).'}';
         //}
 
         foreach ($options as $var => $val) {
@@ -106,7 +106,7 @@ 
 
         foreach ($arr as $var) {
             if (isset($options[$var])) {
-                $options[$var] = "'" . $options[$var] . "'";
+                $options[$var] = "'".$options[$var]."'";
             }
         }
 
@@ -118,7 +118,7 @@ 
             $options['only'] = $this->_array_or_string_for_javascript($options['only']);
         }
 
-        return "Sortable.create('$element_id'," . $this->_options_for_javascript($options) . ')';
+        return "Sortable.create('$element_id',".$this->_options_for_javascript($options).')';
     }
 
     /**
@@ -128,7 +128,7 @@ 
      */
     public function _dragable_element_js($element_id, $options)
     {
-        return 'new Draggable(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+        return 'new Draggable(\''.$element_id.'\','.$this->_options_for_javascript($options).')';
     }
 
     /**
@@ -146,7 +146,7 @@ 
         //if (isset($option['onDrop']))
 
         {
-            $options['onDrop'] = 'function(element){' . $this->remote_function($options) . '}';
+            $options['onDrop'] = 'function(element){'.$this->remote_function($options).'}';
         }
 
         if (is_array($options)) {
@@ -162,10 +162,10 @@ 
         }
 
         if (isset($options['hoverclass'])) {
-            $options['hoverclass'] = "'" . $options['hoverclass'] . "'";
+            $options['hoverclass'] = "'".$options['hoverclass']."'";
         }
 
-        return 'Droppables.add(\'' . $element_id . '\',' . $this->_options_for_javascript($options) . ')';
+        return 'Droppables.add(\''.$element_id.'\','.$this->_options_for_javascript($options).')';
     }
 
     /////////////////////////////////////////////////////////////////////////////////////
@@ -182,7 +182,7 @@ 
     {
         $function = 'new Ajax.InPlaceEditor(';
         $function .= "'$field_id', ";
-        $function .= "'" . $options['url'] . "'";
+        $function .= "'".$options['url']."'";
 
         $js_options = array();
         if (isset($options['cancel_text'])) {
@@ -204,10 +204,10 @@ 
             $js_options['size'] = $options['size'];
         }
         if (isset($options['external_control'])) {
-            $js_options['externalControl'] = "'" . $options['external_control'] . "'";
+            $js_options['externalControl'] = "'".$options['external_control']."'";
         }
         if (isset($options['load_text_url'])) {
-            $js_options['loadTextURL'] = "'" . $options['load_text_url'] . "'";
+            $js_options['loadTextURL'] = "'".$options['load_text_url']."'";
         }
         if (isset($options['options'])) {
             $js_options['ajaxOptions'] = $options['options'];
@@ -216,10 +216,10 @@ 
             $js_options['evalScripts'] = $options['script'];
         }
         if (isset($options['with'])) {
-            $js_options['callback'] = 'function(form) { return ' . $options['with'] . ' }';
+            $js_options['callback'] = 'function(form) { return '.$options['with'].' }';
         }
 
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+        $function .= ', '.$this->_options_for_javascript($js_options).' )';
         if ($tag) {
             return $this->tag($function);
         } else {
@@ -236,7 +236,7 @@ 
     public function in_place_editor_field($object, $tag_options = null, $in_place_editor_options = null)
     {
         $ret_val = '';
-        $ret_val .= '<span id="' . $object . '" class="in_place_editor_field">' . (isset($tag_options['value']) ? $tag_options['value'] : '') . '</span>';
+        $ret_val .= '<span id="'.$object.'" class="in_place_editor_field">'.(isset($tag_options['value']) ? $tag_options['value'] : '').'</span>';
         $ret_val .= $this->in_place_editor($object, $in_place_editor_options);
 
         return $ret_val;
@@ -249,23 +249,23 @@ 
      */
     public function auto_complete_field($field_id, $options)
     {
-        $function = "var $field_id" . '_auto_completer = new Ajax.Autocompleter(';
+        $function = "var $field_id".'_auto_completer = new Ajax.Autocompleter(';
         $function .= "'$field_id', ";
-        $function .= "'" . (isset($options['update']) ? $options['update'] : $field_id . '_auto_complete') . "', ";
-        $function .= "'" . $options['url'] . "'";
+        $function .= "'".(isset($options['update']) ? $options['update'] : $field_id.'_auto_complete')."', ";
+        $function .= "'".$options['url']."'";
 
         $js_options = array();
         if (isset($options['tokens'])) {
             $js_options['tokens'] = $this->javascript->_array_or_string_for_javascript($options['tokens']);
         }
         if (isset($options['with'])) {
-            $js_options['callback'] = 'function(element, value) { return ' . $options['with'] . ' }';
+            $js_options['callback'] = 'function(element, value) { return '.$options['with'].' }';
         }
         if (isset($options['indicator'])) {
-            $js_options['indicator'] = "'" . $options['indicator'] . "'";
+            $js_options['indicator'] = "'".$options['indicator']."'";
         }
         if (isset($options['select'])) {
-            $js_options['select'] = "'" . $options['select'] . "'";
+            $js_options['select'] = "'".$options['select']."'";
         }
 
         foreach (array('on_show' => 'onShow', 'on_hide' => 'onHide', 'min_chars' => 'min_chars') as $var => $val) {
@@ -274,7 +274,7 @@ 
             }
         }
 
-        $function .= ', ' . $this->_options_for_javascript($js_options) . ' )';
+        $function .= ', '.$this->_options_for_javascript($js_options).' )';
 
         return $this->tag($function);
     }
@@ -302,9 +302,9 @@ 
     public function text_field_with_auto_complete($object, $tag_options = null, $completion_options = null)
     {
         $ret_val = isset($completion_options['skip_style']) ? '' : $this->_auto_complete_stylesheet();
-        $ret_val .= '<input autocomplete="off" id="' . $object . '" name="' . $object . '" size="' . (isset($tag_options['size']) ? $tag_options['size'] : 30) . '" type="text" value="' . (isset($tag_options['size']) ? $tag_options['value'] : '') . '" ' . (isset($tag_options['class']) ? 'class = "' . $tag_options['class'] . '" ' : '') . '/>';
+        $ret_val .= '<input autocomplete="off" id="'.$object.'" name="'.$object.'" size="'.(isset($tag_options['size']) ? $tag_options['size'] : 30).'" type="text" value="'.(isset($tag_options['size']) ? $tag_options['value'] : '').'" '.(isset($tag_options['class']) ? 'class = "'.$tag_options['class'].'" ' : '').'/>';
 
-        $ret_val .= '<div id="' . $object . '_auto_complete" class="auto_complete"></div>';
+        $ret_val .= '<div id="'.$object.'_auto_complete" class="auto_complete"></div>';
         $ret_val .= $this->auto_complete_field($object, $completion_options);
 
         return $ret_val;

include/functions.php

Spacing +106 added lines, -106 removed lines

@@ -11,7 +11,7 @@ 
 
 function smart_get_css_link($cssfile)
 {
-    $ret = '<link rel="stylesheet" type="text/css" href="' . $cssfile . '" />';
+    $ret = '<link rel="stylesheet" type="text/css" href="'.$cssfile.'" />';
 
     return $ret;
 }
@@ -100,14 +100,14 @@ 
         $seoMode = smart_getModuleModeSEO($moduleName);
         if ($seoMode === 'rewrite') {
             $seoModuleName = smart_getModuleNameForSEO($moduleName);
-            $ret           = XOOPS_URL . '/' . $seoModuleName . '/';
+            $ret           = XOOPS_URL.'/'.$seoModuleName.'/';
         } elseif ($seoMode === 'pathinfo') {
-            $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>';
     }
 }
 
@@ -170,11 +170,11 @@ 
     /**
      * include SmartObject admin language file
      */
-    $fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+    $fileName = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/admin.php';
     if (file_exists($fileName)) {
         include_once $fileName;
     } else {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+        include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/english/admin.php';
     }
     ?>
     <script type='text/javascript'>
@@ -192,9 +192,9 @@ 
     /**
      * Include the admin language constants for the SmartObject Framework
      */
-    $admin_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/admin.php';
+    $admin_file = SMARTOBJECT_ROOT_PATH.'language/'.$xoopsConfig['language'].'/admin.php';
     if (!file_exists($admin_file)) {
-        $admin_file = SMARTOBJECT_ROOT_PATH . 'language/english/admin.php';
+        $admin_file = SMARTOBJECT_ROOT_PATH.'language/english/admin.php';
     }
     include_once($admin_file);
 }
@@ -214,7 +214,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 (list($m_table) = $xoopsDB->fetchRow($ret)) {
         if ($m_table == $realname) {
@@ -243,7 +243,7 @@ 
         $moduleName = smart_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;
@@ -286,9 +286,9 @@ 
     $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
     $ret     = smart_GetMeta($key, $moduleName);
     if ($ret === '0' || $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) {
@@ -468,7 +468,7 @@ 
 {
     static $smartModules;
     if (isset($smartModules[$moduleName])) {
-        $ret =& $smartModules[$moduleName];
+        $ret = & $smartModules[$moduleName];
 
         return $ret;
     }
@@ -504,7 +504,7 @@ 
 {
     static $smartConfigs;
     if (isset($smartConfigs[$moduleName])) {
-        $ret =& $smartConfigs[$moduleName];
+        $ret = & $smartConfigs[$moduleName];
 
         return $ret;
     }
@@ -532,7 +532,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];
@@ -558,7 +558,7 @@ 
 {
     $ret = '';
     foreach ($errors as $key => $value) {
-        $ret .= '<br> - ' . $value;
+        $ret .= '<br> - '.$value;
     }
 
     return $ret;
@@ -578,17 +578,17 @@ 
     if (!is_numeric($userid)) {
         return $userid;
     }
-    $userid = (int)$userid;
+    $userid = (int) $userid;
     if ($userid > 0) {
         if ($users == array()) {
             //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();
@@ -599,32 +599,32 @@ 
                 $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 .
+                $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 .
+                $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>';
             }
 
@@ -644,20 +644,20 @@ 
 function smart_adminMenu($currentoption = 0, $breadcrumb = '', $submenus = false, $currentsub = -1)
 {
     global $xoopsModule, $xoopsConfig;
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php')) {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
+    include_once XOOPS_ROOT_PATH.'/class/template.php';
+    if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/modinfo.php')) {
+        include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/modinfo.php';
     } else {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/modinfo.php';
+        include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/english/modinfo.php';
     }
-    if (file_exists(XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php')) {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/admin.php';
+    if (file_exists(XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/admin.php')) {
+        include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/admin.php';
     } else {
-        include_once XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/english/admin.php';
+        include_once XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/english/admin.php';
     }
     $headermenu = array();
     $adminmenu  = array();
-    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(array(
                      'headermenu'      => $headermenu,
@@ -680,11 +680,11 @@ 
 function smart_collapsableBar($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>';
     }
 }
 
@@ -698,11 +698,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>';
     }
 }
 
@@ -732,13 +732,13 @@ 
 {
     $urls        = smart_getCurrentUrls();
     $path        = $urls['phpself'];
-    $cookie_name = $path . '_smart_collaps_' . $name;
+    $cookie_name = $path.'_smart_collaps_'.$name;
     $cookie_name = str_replace('.', '_', $cookie_name);
     $cookie      = smart_getCookieVar($cookie_name, '');
     if ($cookie === 'none') {
         echo '
                 <script type="text/javascript"><!--
-                togglecollapse("' . $name . '"); toggleIcon("' . $name . '_icon");
+                togglecollapse("' . $name.'"); toggleIcon("'.$name.'_icon");
                     //-->
                 </script>
                 ';
@@ -804,17 +804,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                 = array();
     $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;
 }
@@ -891,22 +891,22 @@ 
 {
     global $xoopsConfig, $xoopsModule, $xoopsModuleConfig;
 
-    include_once XOOPS_ROOT_PATH . '/class/template.php';
+    include_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 .
+    $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);
 
@@ -915,7 +915,7 @@ 
     }
     $smartobjectConfig = smart_getModuleConfig('smartobject');
     $tpl->assign('smartobject_enable_admin_footer', $smartobjectConfig['enable_admin_footer']);
-    $tpl->display(SMARTOBJECT_ROOT_PATH . 'templates/smartobject_admin_footer.html');
+    $tpl->display(SMARTOBJECT_ROOT_PATH.'templates/smartobject_admin_footer.html');
 }
 
 function smart_xoops_cp_footer()
@@ -942,7 +942,7 @@ 
  */
 function smart_addScript($src)
 {
-    echo '<script src="' . $src . '" type="text/javascript"></script>';
+    echo '<script src="'.$src.'" type="text/javascript"></script>';
 }
 
 /**
@@ -951,16 +951,16 @@ 
 function smart_addStyle($src)
 {
     if ($src === 'smartobject') {
-        $src = SMARTOBJECT_URL . 'assets/css/module.css';
+        $src = SMARTOBJECT_URL.'assets/css/module.css';
     }
     echo smart_get_css_link($src);
 }
 
 function smart_addAdminAjaxSupport()
 {
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/lib/prototype.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/scriptaculous.js');
-    smart_addScript(SMARTOBJECT_URL . 'include/scriptaculous/src/smart.js');
+    smart_addScript(SMARTOBJECT_URL.'include/scriptaculous/lib/prototype.js');
+    smart_addScript(SMARTOBJECT_URL.'include/scriptaculous/src/scriptaculous.js');
+    smart_addScript(SMARTOBJECT_URL.'include/scriptaculous/src/smart.js');
 }
 
 /**
@@ -1020,7 +1020,7 @@ 
 function smart_htmlnumericentities($str)
 {
     //    return preg_replace('/[^!-%\x27-;=?-~ ]/e', '"&#".ord("$0").chr(59)', $str);
-    return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function ($m) { return '&#' . ord($m[0]) . chr(59); }, $str);
+    return preg_replace_callback('/[^!-%\x27-;=?-~ ]/', function($m) { return '&#'.ord($m[0]).chr(59); }, $str);
 }
 
 /**
@@ -1033,16 +1033,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');
+            $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];
@@ -1122,9 +1122,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)) {
         include_once($filename);
@@ -1187,11 +1187,11 @@ 
     // common HTML entities to their text equivalent.
     // Credits: newbb2
     $search = array(
-        "'<script[^>]*?>.*?</script>'si",  // Strip out javascript
-        "'<img.*?/>'si",       // Strip out img tags
-        "'<[\/\!]*?[^<>]*?>'si",          // Strip out HTML tags
-        "'([\r\n])[\s]+'",                // Strip out white space
-        "'&(quot|#34);'i",                // Replace HTML entities
+        "'<script[^>]*?>.*?</script>'si", // Strip out javascript
+        "'<img.*?/>'si", // Strip out img tags
+        "'<[\/\!]*?[^<>]*?>'si", // Strip out HTML tags
+        "'([\r\n])[\s]+'", // Strip out white space
+        "'&(quot|#34);'i", // Replace HTML entities
         "'&(amp|#38);'i",
         "'&(lt|#60);'i",
         "'&(gt|#62);'i",
@@ -1201,7 +1201,7 @@ 
         "'&(pound|#163);'i",
         "'&(copy|#169);'i",
         "'&#(\d+);'e"
-    );                    // evaluate as php
+    ); // evaluate as php
 
     $replace = array(
         '',
@@ -1241,21 +1241,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 (preg_match("/^[0-9\-]*[\.]{1}[0-9-]+$/", $str) == true && $set['single_dot_as_decimal'] == true) {
                 // 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 {
@@ -1287,7 +1287,7 @@ 
         $ret .= '.00';
     }
     if ($currencyObj) {
-        $ret = $ret . ' ' . $currencyObj->getCode();
+        $ret = $ret.' '.$currencyObj->getCode();
     }
 
     return $ret;
@@ -1314,7 +1314,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;
@@ -1325,7 +1325,7 @@ 
  */
 function smart_getEditors()
 {
-    $filename = XOOPS_ROOT_PATH . '/class/xoopseditor/xoopseditor.php';
+    $filename = XOOPS_ROOT_PATH.'/class/xoopseditor/xoopseditor.php';
     if (!file_exists($filename)) {
         return false;
     }
@@ -1349,9 +1349,9 @@ 
 {
     $ret = array();
     foreach ($items as $item) {
-        $ret[] = $moduleName . '_' . $item;
+        $ret[] = $moduleName.'_'.$item;
     }
-    $ret[] = $moduleName . '_meta';
+    $ret[] = $moduleName.'_meta';
 
     return $ret;
 }

include/update.php

Spacing +9 added lines, -9 removed lines

@@ -26,8 +26,8 @@ 
 //  ------------------------------------------------------------------------ //
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
-include_once(XOOPS_ROOT_PATH . '/modules/smartobject/class/smartdbupdater.php');
+include_once(XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php');
+include_once(XOOPS_ROOT_PATH.'/modules/smartobject/class/smartdbupdater.php');
 
 /**
  * @param $module
@@ -44,12 +44,12 @@ 
 
     $dbupdater = new SmartobjectDbupdater();
 
-    echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
+    echo '<code>'._SDU_UPDATE_UPDATING_DATABASE.'<br>';
 
     // db migrate version = 1
     $newDbVersion = 1;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
 
         // Create table smartobject_link
         $table = new SmartDbTable('smartobject_link');
@@ -152,7 +152,7 @@ 
     // db migrate version = 2
     $newDbVersion = 2;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
 
         // Create table smartobject_rating
         $table = new SmartDbTable('smartobject_rating');
@@ -192,7 +192,7 @@ 
     // db migrate version = 3
     $newDbVersion = 3;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
 
         // Create table smartobject_customtag
         $table = new SmartDbTable('smartobject_customtag');
@@ -217,7 +217,7 @@ 
     // db migrate version = 4
     $newDbVersion = 4;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
 
         // Create table smartobject_currency
         $table = new SmartDbTable('smartobject_currency');
@@ -243,12 +243,12 @@ 
     // db migrate version = 6
     $newDbVersion = 6;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
     }
 
     $newDbVersion = 7;
     if ($dbVersion < $newDbVersion) {
-        echo 'Database migrate to version ' . $newDbVersion . '<br>';
+        echo 'Database migrate to version '.$newDbVersion.'<br>';
 
         // Create table smartobject_file
         $table = new SmartDbTable('smartobject_file');

include/captcha/text.php

Spacing +10 added lines, -10 removed lines

@@ -42,7 +42,7 @@ 
 
     public function setCode()
     {
-        $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
+        $_SESSION['XoopsCaptcha_sessioncode'] = (string) $this->code;
     }
 
     /**
@@ -50,15 +50,15 @@ 
      */
     public function render()
     {
-        $form = $this->loadText() .
-                "&nbsp;&nbsp; <input type='text' name='" .
-                $this->config['name'] .
-                "' id='" .
-                $this->config['name'] .
-                "' size='" .
-                $this->config['num_chars'] .
-                "' maxlength='" .
-                $this->config['num_chars'] .
+        $form = $this->loadText().
+                "&nbsp;&nbsp; <input type='text' name='".
+                $this->config['name'].
+                "' id='".
+                $this->config['name'].
+                "' size='".
+                $this->config['num_chars'].
+                "' maxlength='".
+                $this->config['num_chars'].
                 "' value='' />";
         $rule = constant('XOOPS_CAPTCHA_RULE_TEXT');
         if (!empty($rule)) {

include/captcha/config.php

Spacing +13 added lines, -13 removed lines

@@ -14,27 +14,27 @@
 $config = array(
     'mode'       => 'image',
     'name'       => 'xoopscaptcha',
-    'skipmember' => true,                    // Skip CAPTCHA check for members
-    'maxattempt' => 100,                    // Maximum attempts for each session
+    'skipmember' => true, // Skip CAPTCHA check for members
+    'maxattempt' => 100, // Maximum attempts for each session
 
-    'num_chars'       => 4,                        // Maximum characters
+    'num_chars'       => 4, // Maximum characters
 
     // For image mode, based on DuGris' SecurityImage
-    'rootpath'        => __DIR__,        // __Absolute__ Path to the root of fonts and backgrounds
-    'imagepath'       => 'uploads/captcha',        // Path to temporary image files, __relative__ to XOOPS_ROOT_PATH
-    'imageurl'        => 'modules/smartobject/include/captcha/scripts/img.php',        // Path to the script for creating image, __relative__ to XOOPS_ROOT_PATH
-    'casesensitive'   => false,                    // Characters in image mode is case-sensitive
-    'fontsize_min'    => 12,                    // Minimum font-size
-    'fontsize_max'    => 12,                    // Maximum font-size
-    'background_type' => 0,                        // Background type in image mode: 0 - bar; 1 - circle; 2 - line; 3 - rectangle; 4 - ellipse; 5 - polygon; 100 - generated from files
-    'background_num'  => 50,                        // Number of background images to generate
+    'rootpath'        => __DIR__, // __Absolute__ Path to the root of fonts and backgrounds
+    'imagepath'       => 'uploads/captcha', // Path to temporary image files, __relative__ to XOOPS_ROOT_PATH
+    'imageurl'        => 'modules/smartobject/include/captcha/scripts/img.php', // Path to the script for creating image, __relative__ to XOOPS_ROOT_PATH
+    'casesensitive'   => false, // Characters in image mode is case-sensitive
+    'fontsize_min'    => 12, // Minimum font-size
+    'fontsize_max'    => 12, // Maximum font-size
+    'background_type' => 0, // Background type in image mode: 0 - bar; 1 - circle; 2 - line; 3 - rectangle; 4 - ellipse; 5 - polygon; 100 - generated from files
+    'background_num'  => 50, // Number of background images to generate
     'polygon_point'   => 3
 );
 
 $language = preg_replace("/[^a-z0-9_\-]/i", '', $GLOBALS['xoopsConfig']['language']);
 
-if (!@include_once __DIR__ . "/language/{$language}.php") {
-    require_once __DIR__ . '/language/english.php';
+if (!@include_once __DIR__."/language/{$language}.php") {
+    require_once __DIR__.'/language/english.php';
 }
 
 return $config;

include/captcha/scripts/img.php

Spacing +15 added lines, -15 removed lines

@@ -5,11 +5,11 @@ 
  * D.J.
  */
 
-include dirname(dirname(dirname(dirname(dirname(__DIR__))))) . '/mainfile.php';
+include dirname(dirname(dirname(dirname(dirname(__DIR__))))).'/mainfile.php';
 error_reporting(0);
 $xoopsLogger->activated = false;
 
-if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/^' . preg_quote(XOOPS_URL, '/') . '/', $_SERVER['HTTP_REFERER'])) {
+if (empty($_SERVER['HTTP_REFERER']) || !preg_match('/^'.preg_quote(XOOPS_URL, '/').'/', $_SERVER['HTTP_REFERER'])) {
     exit();
 }
 
@@ -78,7 +78,7 @@ 
 
         if ($this->mode === 'bmp') {
             $this->config['num_chars'] = 4;
-            $this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int)str_pad('9', $this->config['num_chars'], '9'));
+            $this->code                = mt_rand(pow(10, $this->config['num_chars'] - 1), (int) str_pad('9', $this->config['num_chars'], '9'));
         } else {
             $this->code = substr(md5(uniqid(mt_rand(), 1)), 0, $this->config['num_chars']);
             if (!$this->config['casesensitive']) {
@@ -93,13 +93,13 @@ 
             return;
         }
 
-        $_SESSION['XoopsCaptcha_sessioncode'] = (string)$this->code;
-        $maxAttempts                          = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
+        $_SESSION['XoopsCaptcha_sessioncode'] = (string) $this->code;
+        $maxAttempts                          = (int) (@$_SESSION['XoopsCaptcha_maxattempts']);
 
         // Increase the attempt records on refresh
         if (!empty($maxAttempts)) {
-            $_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']]++;
-            if ($_SESSION['XoopsCaptcha_attempt_' . $_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
+            $_SESSION['XoopsCaptcha_attempt_'.$_SESSION['XoopsCaptcha_name']]++;
+            if ($_SESSION['XoopsCaptcha_attempt_'.$_SESSION['XoopsCaptcha_name']] > $maxAttempts) {
                 $this->invalid = true;
             }
         }
@@ -113,7 +113,7 @@ 
     {
         if ($this->invalid) {
             header('Content-type: image/gif');
-            readfile(XOOPS_ROOT_PATH . '/images/subject/icon2.gif');
+            readfile(XOOPS_ROOT_PATH.'/images/subject/icon2.gif');
 
             return;
         }
@@ -183,7 +183,7 @@ 
             header('Content-type: image/jpeg');
             imagejpeg($this->oImage);
         } else {
-            imagejpeg($this->oImage, XOOPS_ROOT_PATH . '/' . $this->config['imagepath'] . '/' . $file . '.jpg');
+            imagejpeg($this->oImage, XOOPS_ROOT_PATH.'/'.$this->config['imagepath'].'/'.$file.'.jpg');
         }
         imagedestroy($this->oImage);
     }
@@ -204,8 +204,8 @@ 
          }
          }
          */
-        require_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-        $file_path = $this->config['rootpath'] . "/{$name}";
+        require_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+        $file_path = $this->config['rootpath']."/{$name}";
         $files     = XoopsLists::getFileListAsArray($file_path);
         foreach ($files as $item) {
             if (empty($extension) || preg_match("/(\.{$extension})$/i", $item)) {
@@ -222,7 +222,7 @@ 
     public function loadFont()
     {
         $fonts      = $this->_getList('fonts', 'ttf');
-        $this->font = $this->config['rootpath'] . '/fonts/' . $fonts[array_rand($fonts)];
+        $this->font = $this->config['rootpath'].'/fonts/'.$fonts[array_rand($fonts)];
     }
 
     public function setImageSize()
@@ -248,7 +248,7 @@ 
         imagedestroy($oImage);
 
         $this->height  = $MaxCharHeight + 2;
-        $this->spacing = (int)(($this->config['num_chars'] * $MaxCharWidth) / $this->config['num_chars']);
+        $this->spacing = (int) (($this->config['num_chars'] * $MaxCharWidth) / $this->config['num_chars']);
         $this->width   = ($this->config['num_chars'] * $MaxCharWidth) + ($this->spacing / 2);
     }
 
@@ -261,7 +261,7 @@ 
     {
         $RandBackground = null;
         if ($backgrounds = $this->_getList('backgrounds', '(gif|jpg|png)')) {
-            $RandBackground = $this->config['rootpath'] . '/backgrounds/' . $backgrounds[array_rand($backgrounds)];
+            $RandBackground = $this->config['rootpath'].'/backgrounds/'.$backgrounds[array_rand($backgrounds)];
         }
 
         return $RandBackground;
@@ -431,7 +431,7 @@ 
     }
 }
 
-$config       = @include dirname(__DIR__) . '/config.php';
+$config       = @include dirname(__DIR__).'/config.php';
 $imageHandler = new XoopsCaptchaImageHandler();
 $imageHandler->setConfig($config);
 $imageHandler->loadImage();

include/captcha/formcaptcha.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/formelement.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/formelement.php';
 
 /*
  * Usage
@@ -54,7 +54,7 @@ 
     public function __construct($caption = '', $name = 'xoopscaptcha', $skipmember = null, $numchar = null, $minfontsize = null, $maxfontsize = null, $backgroundtype = null, $backgroundnum = null)
     {
         if (!class_exists('XoopsCaptcaha')) {
-            require_once SMARTOBJECT_ROOT_PATH . '/include/captcha/captcha.php';
+            require_once SMARTOBJECT_ROOT_PATH.'/include/captcha/captcha.php';
         }
 
         $this->_captchaHandler = XoopsCaptcha::getInstance();

include/captcha/captcha.php

Spacing +11 added lines, -11 removed lines

@@ -14,7 +14,7 @@ 
 class XoopsCaptcha
 {
     public $active = true;
-    public $mode   = 'text';    // potential values: image, text
+    public $mode   = 'text'; // potential values: image, text
     public $config = array();
 
     public $message = array(); // Logging error messages
@@ -25,7 +25,7 @@ 
     public function __construct()
     {
         // Loading default preferences
-        $this->config = @include __DIR__ . '/config.php';
+        $this->config = @include __DIR__.'/config.php';
 
         $this->setMode($this->config['mode']);
     }
@@ -127,7 +127,7 @@ 
     {
         $sessionName = @$_SESSION['XoopsCaptcha_name'];
         $skipMember  = ($skipMember === null) ? @$_SESSION['XoopsCaptcha_skipmember'] : $skipMember;
-        $maxAttempts = (int)(@$_SESSION['XoopsCaptcha_maxattempts']);
+        $maxAttempts = (int) (@$_SESSION['XoopsCaptcha_maxattempts']);
 
         $is_valid = false;
 
@@ -135,7 +135,7 @@ 
         if (is_object($GLOBALS['xoopsUser']) && !empty($skipMember)) {
             $is_valid = true;
             // Kill too many attempts
-        } elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_' . $sessionName] > $maxAttempts) {
+        } elseif (!empty($maxAttempts) && $_SESSION['XoopsCaptcha_attempt_'.$sessionName] > $maxAttempts) {
             $this->message[] = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
 
             // Verify the code
@@ -147,13 +147,13 @@ 
         if (!empty($maxAttempts)) {
             if (!$is_valid) {
                 // Increase the attempt records on failure
-                $_SESSION['XoopsCaptcha_attempt_' . $sessionName]++;
+                $_SESSION['XoopsCaptcha_attempt_'.$sessionName]++;
                 // Log the error message
                 $this->message[] = XOOPS_CAPTCHA_INVALID_CODE;
             } else {
 
                 // reset attempt records on success
-                $_SESSION['XoopsCaptcha_attempt_' . $sessionName] = null;
+                $_SESSION['XoopsCaptcha_attempt_'.$sessionName] = null;
             }
         }
         $this->destroyGarbage(true);
@@ -184,8 +184,8 @@ 
      */
     public function destroyGarbage($clearSession = false)
     {
-        require_once __DIR__ . '/' . $this->mode . '.php';
-        $class          = 'XoopsCaptcha' . ucfirst($this->mode);
+        require_once __DIR__.'/'.$this->mode.'.php';
+        $class          = 'XoopsCaptcha'.ucfirst($this->mode);
         $captchaHandler = new $class();
         if (method_exists($captchaHandler, 'destroyGarbage')) {
             $captchaHandler->loadConfig($this->config);
@@ -224,7 +224,7 @@ 
          */
 
         // Fail on too many attempts
-        if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_' . $this->config['name']] > $maxAttempts) {
+        if (!empty($maxAttempts) && @$_SESSION['XoopsCaptcha_attempt_'.$this->config['name']] > $maxAttempts) {
             $form = XOOPS_CAPTCHA_TOOMANYATTEMPTS;
             // Load the form element
         } else {
@@ -239,8 +239,8 @@ 
      */
     public function loadForm()
     {
-        require_once __DIR__ . '/' . $this->mode . '.php';
-        $class          = 'XoopsCaptcha' . ucfirst($this->mode);
+        require_once __DIR__.'/'.$this->mode.'.php';
+        $class          = 'XoopsCaptcha'.ucfirst($this->mode);
         $captchaHandler = new $class();
         $captchaHandler->loadConfig($this->config);
 

include/captcha/image.php

Spacing +21 added lines, -21 removed lines

@@ -45,19 +45,19 @@ 
      */
     public function render()
     {
-        $form = "<input type='text' name='" .
-                $this->config['name'] .
-                "' id='" .
-                $this->config['name'] .
-                "' size='" .
-                $this->config['num_chars'] .
-                "' maxlength='" .
-                $this->config['num_chars'] .
-                "' value='' /> &nbsp; " .
+        $form = "<input type='text' name='".
+                $this->config['name'].
+                "' id='".
+                $this->config['name'].
+                "' size='".
+                $this->config['num_chars'].
+                "' maxlength='".
+                $this->config['num_chars'].
+                "' value='' /> &nbsp; ".
                 $this->loadImage();
         $rule = htmlspecialchars(XOOPS_CAPTCHA_REFRESH, ENT_QUOTES);
         if ($this->config['maxattempt']) {
-            $rule .= ' | ' . sprintf(constant('XOOPS_CAPTCHA_MAXATTEMPTS'), $this->config['maxattempt']);
+            $rule .= ' | '.sprintf(constant('XOOPS_CAPTCHA_MAXATTEMPTS'), $this->config['maxattempt']);
         }
         $form .= "&nbsp;&nbsp;<small>{$rule}</small>";
 
@@ -70,17 +70,17 @@ 
     public function loadImage()
     {
         $rule = $this->config['casesensitive'] ? constant('XOOPS_CAPTCHA_RULE_CASESENSITIVE') : constant('XOOPS_CAPTCHA_RULE_CASEINSENSITIVE');
-        $ret  = "<img id='captcha' src='" .
-                XOOPS_URL .
-                '/' .
-                $this->config['imageurl'] .
-                "' onclick=\"this.src='" .
-                XOOPS_URL .
-                '/' .
-                $this->config['imageurl'] .
-                "?refresh='+Math.random()" .
-                "\" align='absmiddle'  style='cursor: pointer;' alt='" .
-                htmlspecialchars($rule, ENT_QUOTES) .
+        $ret  = "<img id='captcha' src='".
+                XOOPS_URL.
+                '/'.
+                $this->config['imageurl'].
+                "' onclick=\"this.src='".
+                XOOPS_URL.
+                '/'.
+                $this->config['imageurl'].
+                "?refresh='+Math.random()".
+                "\" align='absmiddle'  style='cursor: pointer;' alt='".
+                htmlspecialchars($rule, ENT_QUOTES).
                 "' />";
 
         return $ret;