mambax7 / smartobject

class/member.php

Doc Comments +1 added lines, -1 removed lines

@@ -237,7 +237,7 @@
      * Creates a random number with a specified number of $digits
      *
      * @param  int $digits number of digits
-     * @return return int random number
+     * @return string int random number
      * @author xHelp Team
      *
      * @access public

Spacing +9 added lines, -9 removed lines

@@ -18,9 +18,9 @@ 
  */
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
-require_once XOOPS_ROOT_PATH . '/kernel/user.php';
-require_once XOOPS_ROOT_PATH . '/kernel/group.php';
-require_once XOOPS_ROOT_PATH . '/kernel/member.php';
+require_once XOOPS_ROOT_PATH.'/kernel/user.php';
+require_once XOOPS_ROOT_PATH.'/kernel/group.php';
+require_once XOOPS_ROOT_PATH.'/kernel/member.php';
 
 /**
  * XOOPS member handler class.
@@ -141,12 +141,12 @@ 
             // send some notifications
             $xoopsMailer = xoops_getMailer();
             $xoopsMailer->useMail();
-            $xoopsMailer->setTemplateDir(SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/mail_template');
+            $xoopsMailer->setTemplateDir(SMARTOBJECT_ROOT_PATH.'language/'.$xoopsConfig['language'].'/mail_template');
             $xoopsMailer->setTemplate('smartobject_notify_user_added_by_admin.tpl');
             $xoopsMailer->assign('XOOPS_USER_PASSWORD', $password);
             $xoopsMailer->assign('SITENAME', $xoopsConfig['sitename']);
             $xoopsMailer->assign('ADMINMAIL', $xoopsConfig['adminmail']);
-            $xoopsMailer->assign('SITEURL', XOOPS_URL . '/');
+            $xoopsMailer->assign('SITEURL', XOOPS_URL.'/');
             $xoopsMailer->assign('NAME', $userObj->getVar('name'));
             $xoopsMailer->assign('UNAME', $userObj->getVar('uname'));
             $xoopsMailer->setToUsers($userObj);
@@ -192,7 +192,7 @@ 
         if (strlen($name) > 0) {
             $name = explode(' ', trim($name));
             if (count($name) > 1) {
-                $basename = strtolower(substr($name[0], 0, 1) . $name[count($name) - 1]);
+                $basename = strtolower(substr($name[0], 0, 1).$name[count($name) - 1]);
             } else {
                 $basename = strtolower($name[0]);
             }
@@ -209,9 +209,9 @@ 
         while ($i < $count) {
             $num = $this->genRandNumber();
             if ($onbasename < 0 && $hasbasename) {
-                $names[] = xoops_substr($basename, 0, 58, '') . $num;
+                $names[] = xoops_substr($basename, 0, 58, '').$num;
             } else {
-                $names[] = xoops_substr($emailname, 0, 58, '') . $num;
+                $names[] = xoops_substr($emailname, 0, 58, '').$num;
             }
             $i          = count($names);
             $onbasename = ~$onbasename;
@@ -253,7 +253,7 @@ 
     {
         static $randCalled = false;
         if (!$randCalled) {
-            mt_srand((double)microtime() * 1000000);
+            mt_srand((double) microtime() * 1000000);
             $randCalled = true;
         }
     }

class/smartobject.php

Doc Comments +9 added lines, -9 removed lines

@@ -176,7 +176,7 @@ 
     }
 
     /**
-     * @param        $key
+     * @param        string $key
      * @param        $data_type
      * @param bool   $itemName
      * @param string $form_caption
@@ -212,7 +212,7 @@ 
      * @param bool   $required     set to TRUE if this variable needs to have a value set before storing the object in the table
      * @param string $form_caption caption of this variable in a {@link SmartobjectForm} and title of a column in a  {@link SmartObjectTable}
      * @param string $form_dsc     description of this variable in a {@link SmartobjectForm}
-     * @param mixed  $value        default value of this variable
+     * @param string|false  $value        default value of this variable
      */
     public function quickInitVar(
         $key,
@@ -227,7 +227,7 @@ 
     }
 
     /**
-     * @param        $varname
+     * @param        string $varname
      * @param bool   $displayOnForm
      * @param string $default
      */
@@ -489,7 +489,7 @@ 
     /**
      * add an error
      *
-     * @param      $err_str
+     * @param      string $err_str
      * @param bool $prefix
      * @internal param string $value error to add
      * @access   public
@@ -751,8 +751,8 @@ 
 
     /**
      * @param $key
-     * @param $info
-     * @param $value
+     * @param string $info
+     * @param boolean $value
      */
     public function setVarInfo($key, $info, $value)
     {
@@ -760,7 +760,7 @@ 
     }
 
     /**
-     * @param         $key
+     * @param         string $key
      * @param  bool   $editor
      * @return string
      */
@@ -939,7 +939,7 @@ 
      * @access public
      * @param  string $key    key of the object's variable to be returned
      * @param  string $format format to use for the output
-     * @return mixed  formatted value of the variable
+     * @return string  formatted value of the variable
      */
     public function getVar($key, $format = 's')
     {
@@ -1249,7 +1249,7 @@ 
     }
 
     /**
-     * @param $key
+     * @param string $key
      */
     public function hideFieldFromForm($key)
     {

Spacing +19 added lines, -19 removed lines

@@ -12,9 +12,9 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 
-require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
+require_once SMARTOBJECT_ROOT_PATH.'class/smartobjectcontroller.php';
 
 if (!defined('XOBJ_DTYPE_SIMPLE_ARRAY')) {
     define('XOBJ_DTYPE_SIMPLE_ARRAY', 101);
@@ -113,7 +113,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);
     }
 
     /**
@@ -151,13 +151,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);
             }
@@ -441,7 +441,7 @@ 
         $cancel_js_action = false,
         $captcha = false
     ) {
-        require_once SMARTOBJECT_ROOT_PATH . 'class/form/smartobjectform.php';
+        require_once SMARTOBJECT_ROOT_PATH.'class/form/smartobjectform.php';
         $form = new SmartobjectForm($this, $form_name, $form_caption, $form_action, null, $submit_button_caption, $cancel_js_action, $captcha);
 
         return $form;
@@ -453,7 +453,7 @@ 
     public function toArray()
     {
         $ret  = array();
-        $vars =& $this->getVars();
+        $vars = & $this->getVars();
         foreach ($vars as $key => $var) {
             $value     = $this->getVar($key);
             $ret[$key] = $value;
@@ -471,7 +471,7 @@ 
         }
 
         // Hightlighting searched words
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smarthighlighter.php';
+        require_once SMARTOBJECT_ROOT_PATH.'class/smarthighlighter.php';
         $highlight = smart_getConfig('module_search_highlighter', false, true);
 
         if ($highlight && isset($_GET['keywords'])) {
@@ -502,7 +502,7 @@ 
             }
         } else {
             if ($prefix) {
-                $err_str = '[' . $prefix . '] ' . $err_str;
+                $err_str = '['.$prefix.'] '.$err_str;
             }
             parent::setErrors($err_str);
         }
@@ -830,8 +830,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']) {
@@ -860,7 +860,7 @@ 
                         break;
                     case XOBJ_DTYPE_INT:
                     case XOBJ_DTYPE_TIME_ONLY:
-                        $cleanv = (int)$cleanv;
+                        $cleanv = (int) $cleanv;
                         break;
 
                     case XOBJ_DTYPE_CURRENCY:
@@ -891,10 +891,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:
@@ -906,7 +906,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);
                         }
@@ -915,7 +915,7 @@ 
                         break;
                 }
             }
-            $this->cleanVars[$k] =& $cleanv;
+            $this->cleanVars[$k] = & $cleanv;
             unset($cleanv);
         }
         if (count($this->_errors) > 0) {
@@ -1140,10 +1140,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)) {
@@ -1301,7 +1301,7 @@ 
         $actions = array(),
         $headerAsRow = true
     ) {
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectsingleview.php';
+        require_once SMARTOBJECT_ROOT_PATH.'class/smartobjectsingleview.php';
         $singleview = new SmartObjectSingleView($this, $userSide, $actions, $headerAsRow);
         // add all fields mark as displayOnSingleView except the keyid
         foreach ($this->vars as $key => $var) {

class/smartobjecthandler.php

Doc Comments +2 added lines, -2 removed lines

@@ -189,7 +189,7 @@ 
 
     /**
      * @param $criteria
-     * @param $perm_name
+     * @param boolean $perm_name
      * @return bool
      */
     public function setGrantedObjectsCriteria(&$criteria, $perm_name)
@@ -383,7 +383,7 @@ 
     }
 
     /**
-     * @param        $sql
+     * @param        string $sql
      * @param        $criteria
      * @param  bool  $force
      * @param  bool  $debug

Spacing +48 added lines, -48 removed lines

@@ -146,16 +146,16 @@ 
 
         $this->_itemname      = $itemname;
         $this->_moduleName    = $modulename;
-        $this->table          = $db->prefix($modulename . '_' . $itemname);
+        $this->table          = $db->prefix($modulename.'_'.$itemname);
         $this->keyName        = $keyname;
-        $this->className      = ucfirst($modulename) . ucfirst($itemname);
+        $this->className      = ucfirst($modulename).ucfirst($itemname);
         $this->identifierName = $idenfierName;
         $this->summaryName    = $summaryName;
-        $this->_page          = $itemname . '.php';
-        $this->_modulePath    = XOOPS_ROOT_PATH . '/modules/' . $this->_moduleName . '/';
-        $this->_moduleUrl     = XOOPS_URL . '/modules/' . $this->_moduleName . '/';
-        $this->_uploadPath    = XOOPS_UPLOAD_PATH . '/' . $this->_moduleName . '/';
-        $this->_uploadUrl     = XOOPS_UPLOAD_URL . '/' . $this->_moduleName . '/';
+        $this->_page          = $itemname.'.php';
+        $this->_modulePath    = XOOPS_ROOT_PATH.'/modules/'.$this->_moduleName.'/';
+        $this->_moduleUrl     = XOOPS_URL.'/modules/'.$this->_moduleName.'/';
+        $this->_uploadPath    = XOOPS_UPLOAD_PATH.'/'.$this->_moduleName.'/';
+        $this->_uploadUrl     = XOOPS_UPLOAD_URL.'/'.$this->_moduleName.'/';
     }
 
     /**
@@ -178,7 +178,7 @@ 
      */
     public function addPermission($perm_name, $caption, $description = false)
     {
-        require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectpermission.php';
+        require_once SMARTOBJECT_ROOT_PATH.'class/smartobjectpermission.php';
 
         $this->permissionsArray[] = array(
             'perm_name'   => $perm_name,
@@ -197,7 +197,7 @@ 
         $smartPermissionsHandler = new SmartobjectPermissionHandler($this);
         $grantedItems            = $smartPermissionsHandler->getGrantedItems($perm_name);
         if (count($grantedItems) > 0) {
-            $criteria->add(new Criteria($this->keyName, '(' . implode(', ', $grantedItems) . ')', 'IN'));
+            $criteria->add(new Criteria($this->keyName, '('.implode(', ', $grantedItems).')', 'IN'));
 
             return true;
         } else {
@@ -253,7 +253,7 @@ 
      */
     public function getImageUrl()
     {
-        return $this->_uploadUrl . $this->_itemname . '/';
+        return $this->_uploadUrl.$this->_itemname.'/';
     }
 
     /**
@@ -261,12 +261,12 @@ 
      */
     public function getImagePath()
     {
-        $dir = $this->_uploadPath . $this->_itemname;
+        $dir = $this->_uploadPath.$this->_itemname;
         if (!file_exists($dir)) {
             smart_admin_mkdir($dir);
         }
 
-        return $dir . '/';
+        return $dir.'/';
     }
 
     /**
@@ -359,13 +359,13 @@ 
         if ($this->generalSQL) {
             $sql = $this->generalSQL;
         } elseif (!$sql) {
-            $sql = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname;
+            $sql = 'SELECT * FROM '.$this->table.' AS '.$this->_itemname;
         }
 
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->getSort() !== '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -394,12 +394,12 @@ 
         $ret = array();
 
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->groupby) {
                 $sql .= $criteria->getGroupby();
             }
             if ($criteria->getSort() !== '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
         }
         if ($debug) {
@@ -472,18 +472,18 @@ 
             $obj->assignVars($myrow);
             if (!$id_as_key) {
                 if ($as_object) {
-                    $ret[] =& $obj;
+                    $ret[] = & $obj;
                 } else {
                     $ret[] = $obj->toArray();
                 }
             } else {
                 if ($as_object) {
-                    $value =& $obj;
+                    $value = & $obj;
                 } else {
                     $value = $obj->toArray();
                 }
                 if ($id_as_key === 'parentid') {
-                    $ret[$obj->getVar('parentid', 'e')][$obj->getVar($this->keyName)] =& $value;
+                    $ret[$obj->getVar('parentid', 'e')][$obj->getVar($this->keyName)] = & $value;
                 } else {
                     $ret[$obj->getVar($this->keyName)] = $value;
                 }
@@ -526,15 +526,15 @@ 
             $criteria->setSort($this->getIdentifierName());
         }
 
-        $sql = 'SELECT ' . (is_array($this->keyName) ? implode(', ', $this->keyName) : $this->keyName);
+        $sql = 'SELECT '.(is_array($this->keyName) ? implode(', ', $this->keyName) : $this->keyName);
         if (!empty($this->identifierName)) {
-            $sql .= ', ' . $this->getIdentifierName();
+            $sql .= ', '.$this->getIdentifierName();
         }
-        $sql .= ' FROM ' . $this->table . ' AS ' . $this->_itemname;
+        $sql .= ' FROM '.$this->table.' AS '.$this->_itemname;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->getSort() !== '') {
-                $sql .= ' ORDER BY ' . $criteria->getSort() . ' ' . $criteria->getOrder();
+                $sql .= ' ORDER BY '.$criteria->getSort().' '.$criteria->getOrder();
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -571,7 +571,7 @@ 
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
             if ($criteria->groupby !== '') {
                 $groupby = true;
-                $field   = $criteria->groupby . ', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
+                $field   = $criteria->groupby.', '; //Not entirely secure unless you KNOW that no criteria's groupby clause is going to be mis-used
             }
         }
         /**
@@ -582,10 +582,10 @@ 
             $sql = $this->generalSQL;
             $sql = str_replace('SELECT *', 'SELECT COUNT(*)', $sql);
         } else {
-            $sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table . ' AS ' . $this->_itemname;
+            $sql = 'SELECT '.$field.'COUNT(*) FROM '.$this->table.' AS '.$this->_itemname;
         }
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->groupby !== '') {
                 $sql .= $criteria->getGroupby();
             }
@@ -628,13 +628,13 @@ 
         if (is_array($this->keyName)) {
             $clause = array();
             for ($i = 0, $iMax = count($this->keyName); $i < $iMax; ++$i) {
-                $clause[] = $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
+                $clause[] = $this->keyName[$i].' = '.$obj->getVar($this->keyName[$i]);
             }
             $whereclause = implode(' AND ', $clause);
         } else {
-            $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
+            $whereclause = $this->keyName.' = '.$obj->getVar($this->keyName);
         }
-        $sql = 'DELETE FROM ' . $this->table . ' WHERE ' . $whereclause;
+        $sql = 'DELETE FROM '.$this->table.' WHERE '.$whereclause;
         if (false !== $force) {
             $result = $this->db->queryF($sql);
         } else {
@@ -695,7 +695,7 @@ 
              * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
              */
             if (!is_a($obj, $this->className)) {
-                $obj->setError(get_class($obj) . ' Differs from ' . $this->className);
+                $obj->setError(get_class($obj).' Differs from '.$this->className);
 
                 return false;
             }
@@ -756,7 +756,7 @@ 
         $fieldsToStoreInDB = array();
         foreach ($obj->cleanVars as $k => $v) {
             if ($obj->vars[$k]['data_type'] == XOBJ_DTYPE_INT) {
-                $cleanvars[$k] = (int)$v;
+                $cleanvars[$k] = (int) $v;
             } elseif (is_array($v)) {
                 $cleanvars[$k] = $this->db->quoteString(implode(',', $v));
             } else {
@@ -769,13 +769,13 @@ 
         if ($obj->isNew()) {
             if (!is_array($this->keyName)) {
                 if ($cleanvars[$this->keyName] < 1) {
-                    $cleanvars[$this->keyName] = $this->db->genId($this->table . '_' . $this->keyName . '_seq');
+                    $cleanvars[$this->keyName] = $this->db->genId($this->table.'_'.$this->keyName.'_seq');
                 }
             }
 
-            $sql = 'INSERT INTO ' . $this->table . ' (' . implode(',', array_keys($fieldsToStoreInDB)) . ') VALUES (' . implode(',', array_values($fieldsToStoreInDB)) . ')';
+            $sql = 'INSERT INTO '.$this->table.' ('.implode(',', array_keys($fieldsToStoreInDB)).') VALUES ('.implode(',', array_values($fieldsToStoreInDB)).')';
         } else {
-            $sql = 'UPDATE ' . $this->table . ' SET';
+            $sql = 'UPDATE '.$this->table.' SET';
             foreach ($fieldsToStoreInDB as $key => $value) {
                 if ((!is_array($this->keyName) && $key == $this->keyName)
                     || (is_array($this->keyName)
@@ -785,7 +785,7 @@ 
                 if (isset($notfirst)) {
                     $sql .= ',';
                 }
-                $sql      .= ' ' . $key . ' = ' . $value;
+                $sql .= ' '.$key.' = '.$value;
                 $notfirst = true;
             }
             if (is_array($this->keyName)) {
@@ -794,12 +794,12 @@ 
                     if ($i > 0) {
                         $whereclause .= ' AND ';
                     }
-                    $whereclause .= $this->keyName[$i] . ' = ' . $obj->getVar($this->keyName[$i]);
+                    $whereclause .= $this->keyName[$i].' = '.$obj->getVar($this->keyName[$i]);
                 }
             } else {
-                $whereclause = $this->keyName . ' = ' . $obj->getVar($this->keyName);
+                $whereclause = $this->keyName.' = '.$obj->getVar($this->keyName);
             }
-            $sql .= ' WHERE ' . $whereclause;
+            $sql .= ' WHERE '.$whereclause;
         }
 
         if ($debug) {
@@ -872,7 +872,7 @@ 
      */
     public function updateAll($fieldname, $fieldvalue, CriteriaElement $criteria = null, $force = false)
     {
-        $set_clause = $fieldname . ' = ';
+        $set_clause = $fieldname.' = ';
         if (is_numeric($fieldvalue)) {
             $set_clause .= $fieldvalue;
         } elseif (is_array($fieldvalue)) {
@@ -880,9 +880,9 @@ 
         } else {
             $set_clause .= $this->db->quoteString($fieldvalue);
         }
-        $sql = 'UPDATE ' . $this->table . ' SET ' . $set_clause;
+        $sql = 'UPDATE '.$this->table.' SET '.$set_clause;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
         }
         if (false != $force) {
             $result = $this->db->queryF($sql);
@@ -906,8 +906,8 @@ 
     public function deleteAll(CriteriaElement $criteria = null)
     {
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql = 'DELETE FROM ' . $this->table;
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql = 'DELETE FROM '.$this->table;
+            $sql .= ' '.$criteria->renderWhere();
             if (!$this->db->query($sql)) {
                 return false;
             }
@@ -940,7 +940,7 @@ 
      */
     public function getModuleItemString()
     {
-        $ret = $this->_moduleName . '_' . $this->_itemname;
+        $ret = $this->_moduleName.'_'.$this->_itemname;
 
         return $ret;
     }
@@ -952,7 +952,7 @@ 
     {
         if (isset($object->vars['counter'])) {
             $new_counter = $object->getVar('counter') + 1;
-            $sql         = 'UPDATE ' . $this->table . ' SET counter=' . $new_counter . ' WHERE ' . $this->keyName . '=' . $object->id();
+            $sql         = 'UPDATE '.$this->table.' SET counter='.$new_counter.' WHERE '.$this->keyName.'='.$object->id();
             $this->query($sql, null, true);
         }
     }
@@ -996,7 +996,7 @@ 
     public function getIdentifierName($withprefix = true)
     {
         if ($withprefix) {
-            return $this->_itemname . '.' . $this->identifierName;
+            return $this->_itemname.'.'.$this->identifierName;
         } else {
             return $this->identifierName;
         }

class/smartobjecttable.php

Doc Comments +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
 
     /**
      * SmartObjectColumn constructor.
-     * @param        $keyname
+     * @param        string $keyname
      * @param string $align
      * @param bool   $width
      * @param bool   $customMethodForValue
@@ -193,7 +193,7 @@ 
     }
 
     /**
-     * @param $columnObj
+     * @param SmartObjectColumn $columnObj
      */
     public function addColumn($columnObj)
     {
@@ -201,8 +201,8 @@ 
     }
 
     /**
-     * @param $name
-     * @param $location
+     * @param string $name
+     * @param string $location
      * @param $value
      */
     public function addIntroButton($name, $location, $value)

Spacing +43 added lines, -43 removed lines

@@ -184,7 +184,7 @@ 
      */
     public function addActionButton($op, $caption = false, $text = false)
     {
-        $action                 = array(
+        $action = array(
             'op'      => $op,
             'caption' => $caption,
             'text'    => $text
@@ -219,7 +219,7 @@ 
     {
         $current_urls               = smart_getCurrentUrls();
         $current_url                = $current_urls['full'];
-        $this->_printerFriendlyPage = $current_url . '&print';
+        $this->_printerFriendlyPage = $current_url.'&print';
     }
 
     /**
@@ -252,7 +252,7 @@ 
      */
     public function addDefaultIntroButton($caption)
     {
-        $this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page . '?op=mod', $caption);
+        $this->addIntroButton($this->_objectHandler->_itemname, $this->_objectHandler->_page.'?op=mod', $caption);
     }
 
     /**
@@ -277,9 +277,9 @@ 
     public function getDefaultSort()
     {
         if ($this->_sortsel) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_sortsel', $this->_sortsel);
         } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_objectHandler->identifierName);
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_sortsel', $this->_objectHandler->identifierName);
         }
     }
 
@@ -297,9 +297,9 @@ 
     public function getDefaultOrder()
     {
         if ($this->_ordersel) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_ordersel', $this->_ordersel);
         } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', 'ASC');
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_ordersel', 'ASC');
         }
     }
 
@@ -348,21 +348,21 @@ 
 
     public function setSortOrder()
     {
-        $this->_sortsel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] : $this->getDefaultSort();
+        $this->_sortsel = isset($_GET[$this->_objectHandler->_itemname.'_'.'sortsel']) ? $_GET[$this->_objectHandler->_itemname.'_'.'sortsel'] : $this->getDefaultSort();
         //$this->_sortsel = isset($_POST['sortsel']) ? $_POST['sortsel']: $this->_sortsel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_sortsel', $this->_sortsel);
+        smart_setCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_sortsel', $this->_sortsel);
         $fieldsForSorting = $this->_tempObject->getFieldsForSorting($this->_sortsel);
 
         if (isset($this->_tempObject->vars[$this->_sortsel]['itemName'])
             && $this->_tempObject->vars[$this->_sortsel]['itemName']) {
-            $this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'] . '.' . $this->_sortsel);
+            $this->_criteria->setSort($this->_tempObject->vars[$this->_sortsel]['itemName'].'.'.$this->_sortsel);
         } else {
-            $this->_criteria->setSort($this->_objectHandler->_itemname . '.' . $this->_sortsel);
+            $this->_criteria->setSort($this->_objectHandler->_itemname.'.'.$this->_sortsel);
         }
 
-        $this->_ordersel = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : $this->getDefaultOrder();
+        $this->_ordersel = isset($_GET[$this->_objectHandler->_itemname.'_'.'ordersel']) ? $_GET[$this->_objectHandler->_itemname.'_'.'ordersel'] : $this->getDefaultOrder();
         //$this->_ordersel = isset($_POST['ordersel']) ? $_POST['ordersel']:$this->_ordersel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_ordersel', $this->_ordersel);
+        smart_setCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_ordersel', $this->_ordersel);
         $ordersArray = $this->getOrdersArray();
         $this->_criteria->setOrder($this->_ordersel);
     }
@@ -412,7 +412,7 @@ 
                         //$object->initiateCustomFields();
                     }
                     if ($column->_keyname === 'checked') {
-                        $value = '<input type ="checkbox" name="selected_smartobjects[]" value="' . $object->id() . '">';
+                        $value = '<input type ="checkbox" name="selected_smartobjects[]" value="'.$object->id().'">';
                     } elseif ($column->_customMethodForValue
                               && method_exists($object, $column->_customMethodForValue)) {
                         $method = $column->_customMethodForValue;
@@ -457,7 +457,7 @@ 
                     }
                 }
 
-                require_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
+                require_once SMARTOBJECT_ROOT_PATH.'class/smartobjectcontroller.php';
                 $controller = new SmartObjectController($this->_objectHandler);
 
                 if ((!is_array($this->_actions)) || in_array('edit', $this->_actions)) {
@@ -497,9 +497,9 @@ 
     public function getDefaultFilter()
     {
         if ($this->_filtersel) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_filtersel', $this->_filtersel);
         } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', 'default');
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_filtersel', 'default');
         }
     }
 
@@ -549,9 +549,9 @@ 
     public function getDefaultFilter2()
     {
         if ($this->_filtersel2) {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_filtersel2', $this->_filtersel2);
         } else {
-            return smart_getCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', 'default');
+            return smart_getCookieVar($_SERVER['PHP_SELF'].'_filtersel2', 'default');
         }
     }
 
@@ -679,7 +679,7 @@ 
      */
     public function render($fetchOnly = false, $debug = false)
     {
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
 
         $this->_tpl = new XoopsTpl();
 
@@ -690,24 +690,24 @@ 
          */
         $this->_tempObject = $this->_objectHandler->create();
 
-        $this->_criteria->setStart(isset($_GET['start' . $this->_objectHandler->keyName]) ? (int)$_GET['start' . $this->_objectHandler->keyName] : 0);
+        $this->_criteria->setStart(isset($_GET['start'.$this->_objectHandler->keyName]) ? (int) $_GET['start'.$this->_objectHandler->keyName] : 0);
 
         $this->setSortOrder();
 
         if (!$this->_isTree) {
-            $this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : smart_getCookieVar($_SERVER['PHP_SELF'] . '_limitsel', '15');
+            $this->_limitsel = isset($_GET['limitsel']) ? $_GET['limitsel'] : smart_getCookieVar($_SERVER['PHP_SELF'].'_limitsel', '15');
         } else {
             $this->_limitsel = 'all';
         }
 
         $this->_limitsel = isset($_POST['limitsel']) ? $_POST['limitsel'] : $this->_limitsel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_limitsel', $this->_limitsel);
+        smart_setCookieVar($_SERVER['PHP_SELF'].'_limitsel', $this->_limitsel);
         $limitsArray = $this->getLimitsArray();
         $this->_criteria->setLimit($this->_limitsel);
 
         $this->_filtersel = isset($_GET['filtersel']) ? $_GET['filtersel'] : $this->getDefaultFilter();
         $this->_filtersel = isset($_POST['filtersel']) ? $_POST['filtersel'] : $this->_filtersel;
-        smart_setCookieVar($_SERVER['PHP_SELF'] . '_' . $this->_id . '_filtersel', $this->_filtersel);
+        smart_setCookieVar($_SERVER['PHP_SELF'].'_'.$this->_id.'_filtersel', $this->_filtersel);
         $filtersArray = $this->getFiltersArray();
 
         if ($filtersArray) {
@@ -733,7 +733,7 @@ 
                     $filters2Array = $this->getFilters2Array();
                     $this->_tpl->assign('smartobject_optionssel_filters2Array', $filters2Array);
 
-                    smart_setCookieVar($_SERVER['PHP_SELF'] . '_filtersel2', $this->_filtersel2);
+                    smart_setCookieVar($_SERVER['PHP_SELF'].'_filtersel2', $this->_filtersel2);
                     if ($this->_filtersel2 !== 'default') {
                         $this->_criteria->add(new Criteria($this->_filtersel, $this->_filtersel2));
                     }
@@ -742,21 +742,21 @@ 
         }
         // Check if we have a quicksearch
 
-        if (isset($_POST['quicksearch_' . $this->_id]) && $_POST['quicksearch_' . $this->_id] != '') {
+        if (isset($_POST['quicksearch_'.$this->_id]) && $_POST['quicksearch_'.$this->_id] != '') {
             $quicksearch_criteria = new CriteriaCompo();
             if (is_array($this->_quickSearch['fields'])) {
                 foreach ($this->_quickSearch['fields'] as $v) {
-                    $quicksearch_criteria->add(new Criteria($v, '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'), 'OR');
+                    $quicksearch_criteria->add(new Criteria($v, '%'.$_POST['quicksearch_'.$this->_id].'%', 'LIKE'), 'OR');
                 }
             } else {
-                $quicksearch_criteria->add(new Criteria($this->_quickSearch['fields'], '%' . $_POST['quicksearch_' . $this->_id] . '%', 'LIKE'));
+                $quicksearch_criteria->add(new Criteria($this->_quickSearch['fields'], '%'.$_POST['quicksearch_'.$this->_id].'%', 'LIKE'));
             }
             $this->_criteria->add($quicksearch_criteria);
         }
 
         $this->_objects = $this->fetchObjects($debug);
 
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
         if ($this->_criteria->getLimit() > 0) {
 
             /**
@@ -772,7 +772,7 @@ 
              */
             $params_of_the_options_sel = array();
 
-            $not_needed_params = array('sortsel', 'limitsel', 'ordersel', 'start' . $this->_objectHandler->keyName);
+            $not_needed_params = array('sortsel', 'limitsel', 'ordersel', 'start'.$this->_objectHandler->keyName);
             foreach ($_GET as $k => $v) {
                 if (!in_array($k, $not_needed_params)) {
                     $new_get_array[]             = "$k=$v";
@@ -783,12 +783,12 @@ 
             /**
              * Adding the new params of the pagenav
              */
-            $new_get_array[] = 'sortsel=' . $this->_sortsel;
-            $new_get_array[] = 'ordersel=' . $this->_ordersel;
-            $new_get_array[] = 'limitsel=' . $this->_limitsel;
+            $new_get_array[] = 'sortsel='.$this->_sortsel;
+            $new_get_array[] = 'ordersel='.$this->_ordersel;
+            $new_get_array[] = 'limitsel='.$this->_limitsel;
             $otherParams     = implode('&', $new_get_array);
 
-            $pagenav = new XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start' . $this->_objectHandler->keyName, $otherParams);
+            $pagenav = new XoopsPageNav($this->_objectHandler->getCount($this->_criteria), $this->_criteria->getLimit(), $this->_criteria->getStart(), 'start'.$this->_objectHandler->keyName, $otherParams);
             $this->_tpl->assign('smartobject_pagenav', $pagenav->renderNav());
         }
         $this->renderOptionSelection($limitsArray, $params_of_the_options_sel);
@@ -824,20 +824,20 @@ 
             $aColumn['align'] = $column->getAlign();
             $aColumn['key']   = $column->getKeyName();
             if ($column->_keyname === 'checked') {
-                $aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"' . ' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_' . $this->_id . ', \'selected_smartobjects\');">';
+                $aColumn['caption'] = '<input type ="checkbox" id="checkall_smartobjects" name="checkall_smartobjects"'.' value="checkall_smartobjects" onclick="smartobject_checkall(window.document.form_'.$this->_id.', \'selected_smartobjects\');">';
             } elseif ($column->getCustomCaption()) {
                 $aColumn['caption'] = $column->getCustomCaption();
             } else {
                 $aColumn['caption'] = isset($this->_tempObject->vars[$column->getKeyName()]['form_caption']) ? $this->_tempObject->vars[$column->getKeyName()]['form_caption'] : $column->getKeyName();
             }
             // Are we doing a GET sort on this column ?
-            $getSort = (isset($_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'])
-                        && $_GET[$this->_objectHandler->_itemname . '_' . 'sortsel'] == $column->getKeyName())
+            $getSort = (isset($_GET[$this->_objectHandler->_itemname.'_'.'sortsel'])
+                        && $_GET[$this->_objectHandler->_itemname.'_'.'sortsel'] == $column->getKeyName())
                        || ($this->_sortsel == $column->getKeyName());
-            $order   = isset($_GET[$this->_objectHandler->_itemname . '_' . 'ordersel']) ? $_GET[$this->_objectHandler->_itemname . '_' . 'ordersel'] : 'DESC';
+            $order   = isset($_GET[$this->_objectHandler->_itemname.'_'.'ordersel']) ? $_GET[$this->_objectHandler->_itemname.'_'.'ordersel'] : 'DESC';
 
-            if (isset($_REQUEST['quicksearch_' . $this->_id]) && $_REQUEST['quicksearch_' . $this->_id] != '') {
-                $qs_param = '&quicksearch_' . $this->_id . '=' . $_REQUEST['quicksearch_' . $this->_id];
+            if (isset($_REQUEST['quicksearch_'.$this->_id]) && $_REQUEST['quicksearch_'.$this->_id] != '') {
+                $qs_param = '&quicksearch_'.$this->_id.'='.$_REQUEST['quicksearch_'.$this->_id];
             }
             if (!$this->_enableColumnsSorting || $column->_keyname === 'checked' || !$column->isSortable()) {
                 $aColumn['caption'] = $aColumn['caption'];
@@ -864,7 +864,7 @@ 
                                       . $orderArray[$order]['image']
                                       . '" alt="ASC"></a>';
             } else {
-                $aColumn['caption'] = '<a href="' . $current_url . '?' . $this->_objectHandler->_itemname . '_' . 'sortsel=' . $column->getKeyName() . '&' . $this->_objectHandler->_itemname . '_' . 'ordersel=ASC' . $qs_param . '&' . $new_query_string . '">' . $aColumn['caption'] . '</a>';
+                $aColumn['caption'] = '<a href="'.$current_url.'?'.$this->_objectHandler->_itemname.'_'.'sortsel='.$column->getKeyName().'&'.$this->_objectHandler->_itemname.'_'.'ordersel=ASC'.$qs_param.'&'.$new_query_string.'">'.$aColumn['caption'].'</a>';
             }
             $aColumns[] = $aColumn;
         }
@@ -894,9 +894,9 @@ 
 
         $smartobjectTable_template = $this->_customTemplate ?: 'smartobject_smarttable_display.tpl';
         if ($fetchOnly) {
-            return $this->_tpl->fetch('db:' . $smartobjectTable_template);
+            return $this->_tpl->fetch('db:'.$smartobjectTable_template);
         } else {
-            $this->_tpl->display('db:' . $smartobjectTable_template);
+            $this->_tpl->display('db:'.$smartobjectTable_template);
         }
     }
 

include/projax/classes/JavaScript.php

Doc Comments +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 
     /**
      * @param $javascript
-     * @return mixed|string
+     * @return string
      */
     public function escape($javascript)
     {
@@ -48,7 +48,7 @@ 
 
     /**
      * @param         $name
-     * @param         $function
+     * @param         string $function
      * @param  null   $html_options
      * @return string
      */

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function button_to_function($name, $function = null)
     {
-        return '<input type="button" value="' . $name . '" onclick="' . $function . '">';
+        return '<input type="button" value="'.$name.'" onclick="'.$function.'">';
     }
 
     /**
@@ -43,7 +43,7 @@ 
      */
     public function tag($content)
     {
-        return '<script type="text/javascript">' . $content . '</script>';
+        return '<script type="text/javascript">'.$content.'</script>';
     }
 
     /**
@@ -54,7 +54,7 @@ 
      */
     public function link_to_function($name, $function, $html_options = null)
     {
-        return '<a href="' . (isset($html_options['href']) ? $html_options['href'] : '#') . '" onclick="' . (isset($html_options['onclick']) ? $html_options['onclick'] . ';' : '') . $function . '; return false;">' . $name . '</a>';
+        return '<a href="'.(isset($html_options['href']) ? $html_options['href'] : '#').'" onclick="'.(isset($html_options['onclick']) ? $html_options['onclick'].';' : '').$function.'; return false;">'.$name.'</a>';
     }
 
     /////////////////////////////////////////////////////////////////////////////////////
@@ -76,7 +76,7 @@ 
                 $return_val .= $value;
             }
 
-            return '[' . $return_val . ']';
+            return '['.$return_val.']';
         }
 
         return "'$option'";
@@ -99,6 +99,6 @@ 
             }
         }
 
-        return '{' . $return_val . '}';
+        return '{'.$return_val.'}';
     }
 }

include/projax/classes/Prototype.php

Doc Comments +3 added lines, -3 removed lines

@@ -212,7 +212,7 @@ 
     }
 
     /**
-     * @param         $klass
+     * @param         string $klass
      * @param         $name
      * @param  null   $options
      * @return string
@@ -311,7 +311,7 @@ 
     }
 
     /**
-     * @param $variable
+     * @param string $variable
      * @param $value
      * @return string
      */
@@ -321,7 +321,7 @@ 
     }
 
     /**
-     * @param         $function
+     * @param         string $function
      * @param  null   $args
      * @return string
      */

Spacing +23 added lines, -23 removed lines

@@ -63,7 +63,7 @@ 
     {
         $options['form'] = true;
 
-        return '<form action="' . $options['url'] . '" onsubmit="' . $this->remote_function($options) . '; return false;" method="' . (isset($options['method']) ? $options['method'] : 'post') . '"  >';
+        return '<form action="'.$options['url'].'" onsubmit="'.$this->remote_function($options).'; return false;" method="'.(isset($options['method']) ? $options['method'] : 'post').'"  >';
     }
 
     /**
@@ -112,7 +112,7 @@ 
     public function periodically_call_remote($options = null)
     {
         $frequency = isset($options['frequency']) ? $options['frequency'] : 10;
-        $code      = 'new PeriodicalExecuter(function() {' . $this->remote_function($options) . '},' . $frequency . ')';
+        $code      = 'new PeriodicalExecuter(function() {'.$this->remote_function($options).'},'.$frequency.')';
 
         return $code;
     }
@@ -128,22 +128,22 @@ 
         $update = '';
 
         if (isset($options['update']) && is_array($options['update'])) {
-            $update = isset($options['update']['success']) ? 'success: ' . $options['update']['success'] : '';
+            $update = isset($options['update']['success']) ? 'success: '.$options['update']['success'] : '';
             $update .= empty($update) ? '' : ',';
-            $update .= isset($options['update']['failure']) ? 'failure: ' . $options['update']['failure'] : '';
+            $update .= isset($options['update']['failure']) ? 'failure: '.$options['update']['failure'] : '';
         } else {
             $update .= isset($options['update']) ? $options['update'] : '';
         }
 
-        $ajax_function = empty($update) ? 'new Ajax.Request(' : 'new Ajax.Updater(\'' . $update . '\',';
+        $ajax_function = empty($update) ? 'new Ajax.Request(' : 'new Ajax.Updater(\''.$update.'\',';
 
-        $ajax_function .= "'" . $options['url'] . "'";
-        $ajax_function .= ',' . $javascript_options . ')';
+        $ajax_function .= "'".$options['url']."'";
+        $ajax_function .= ','.$javascript_options.')';
 
-        $ajax_function = isset($options['before']) ? $options['before'] . ';' . $ajax_function : $ajax_function;
-        $ajax_function = isset($options['after']) ? $ajax_function . ';' . $options['after'] : $ajax_function;
-        $ajax_function = isset($options['condition']) ? 'if (' . $options['condition'] . ') {' . $ajax_function . '}' : $ajax_function;
-        $ajax_function = isset($options['confirm']) ? 'if ( confirm(\'' . $options['confirm'] . '\' ) ) { ' . $ajax_function . ' } ' : $ajax_function;
+        $ajax_function = isset($options['before']) ? $options['before'].';'.$ajax_function : $ajax_function;
+        $ajax_function = isset($options['after']) ? $ajax_function.';'.$options['after'] : $ajax_function;
+        $ajax_function = isset($options['condition']) ? 'if ('.$options['condition'].') {'.$ajax_function.'}' : $ajax_function;
+        $ajax_function = isset($options['confirm']) ? 'if ( confirm(\''.$options['confirm'].'\' ) ) { '.$ajax_function.' } ' : $ajax_function;
 
         return $ajax_function;
     }
@@ -160,7 +160,7 @@ 
             $options['with'] = 'Form.serialize(this.form)';
         }
 
-        return '<input type="button" onclick="' . $this->remote_function($options) . '" name="' . $name . '" value ="' . $value . '">';
+        return '<input type="button" onclick="'.$this->remote_function($options).'" name="'.$name.'" value ="'.$value.'">';
     }
 
     /**
@@ -203,8 +203,8 @@ 
         $callbacks = array();
         foreach ($options as $callback => $code) {
             if (in_array($callback, $this->CALLBACKS)) {
-                $name             = 'on' . ucfirst($callback);
-                $callbacks[$name] = 'function(request){' . $code . '}';
+                $name             = 'on'.ucfirst($callback);
+                $callbacks[$name] = 'function(request){'.$code.'}';
             }
         }
 
@@ -220,7 +220,7 @@ 
     public function _build_observer($klass, $name, $options = null)
     {
         if (isset($options['with']) && false === strpos($options['with'], '=')) {
-            $options['with'] = '\'' . $options['with'] . '=\' + value';
+            $options['with'] = '\''.$options['with'].'=\' + value';
         } elseif (isset($options['with']) && isset($options['update'])) {
             $options['with'] = 'value';
         }
@@ -228,10 +228,10 @@ 
         $callback = $options['function'] ?: $this->remote_function($options);
 
         $javascript = "new $klass('$name', ";
-        $javascript .= isset($options['frequency']) ? $options['frequency'] . ', ' : '';
+        $javascript .= isset($options['frequency']) ? $options['frequency'].', ' : '';
         $javascript .= 'function (element,value) { ';
         $javascript .= $callback;
-        $javascript .= isset($options['on']) ? ', ' . $options['on'] : '';
+        $javascript .= isset($options['on']) ? ', '.$options['on'] : '';
         $javascript .= '})';
 
         return $javascript;
@@ -263,7 +263,7 @@ 
         }
 
         if (isset($options['position'])) {
-            $js_options['insertion'] = 'Insertion.' . ucfirst($options['position']);
+            $js_options['insertion'] = 'Insertion.'.ucfirst($options['position']);
         }
 
         $js_options['evalScripts'] = isset($options['script']) ? $options['script'] : 'true';
@@ -271,7 +271,7 @@ 
         if (isset($options['form'])) {
             $js_options['parameters'] = 'Form.serialize(this)';
         } elseif (isset($options['parameters'])) {
-            $js_options['parameters'] = 'Form.serialize(\'' . $options['submit'] . '\')';
+            $js_options['parameters'] = 'Form.serialize(\''.$options['submit'].'\')';
         } elseif (isset($options['with'])) {
             $js_options['parameters'] = $options['with'];
         }
@@ -298,7 +298,7 @@ 
      */
     public function ID($id, $extend = null)
     {
-        return "$('$id')" . (!empty($extend)) ? '.' . $extend . '()' : '';
+        return "$('$id')".(!empty($extend)) ? '.'.$extend.'()' : '';
     }
 
     /**
@@ -357,7 +357,7 @@ 
      */
     public function delay($seconds = 1, $script = '')
     {
-        return "setTimeout( function() { $script } , " . ($seconds * 1000) . ' )';
+        return "setTimeout( function() { $script } , ".($seconds * 1000).' )';
     }
 
     /**
@@ -379,7 +379,7 @@ 
     {
         $args = array_merge(array($id), (is_array($options_for_render) ? $options_for_render : array($options_for_render)));
 
-        return $this->call('new Insertion.' . ucfirst($position), $args);
+        return $this->call('new Insertion.'.ucfirst($position), $args);
     }
 
     /**
@@ -443,7 +443,7 @@ 
      */
     public function select($pattern, $extend = null)
     {
-        return "$$('$pattern')" . (!empty($extend)) ? '.' . $extend : '';
+        return "$$('$pattern')".(!empty($extend)) ? '.'.$extend : '';
     }
 
     /**

include/projax_/classes/JavaScript.php

Doc Comments +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 
     /**
      * @param $javascript
-     * @return mixed|string
+     * @return string
      */
     public function escape($javascript)
     {
@@ -48,7 +48,7 @@ 
 
     /**
      * @param         $name
-     * @param         $function
+     * @param         string $function
      * @param  null   $html_options
      * @return string
      */

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
      */
     public function button_to_function($name, $function = null)
     {
-        return '<input type="button" value="' . $name . '" onclick="' . $function . '">';
+        return '<input type="button" value="'.$name.'" onclick="'.$function.'">';
     }
 
     /**
@@ -43,7 +43,7 @@ 
      */
     public function tag($content)
     {
-        return '<script type="text/javascript">' . $content . '</script>';
+        return '<script type="text/javascript">'.$content.'</script>';
     }
 
     /**
@@ -54,7 +54,7 @@ 
      */
     public function link_to_function($name, $function, $html_options = null)
     {
-        return '<a href="' . (isset($html_options['href']) ? $html_options['href'] : '#') . '" onclick="' . (isset($html_options['onclick']) ? $html_options['onclick'] . ';' : '') . $function . '; return false;">' . $name . '</a>';
+        return '<a href="'.(isset($html_options['href']) ? $html_options['href'] : '#').'" onclick="'.(isset($html_options['onclick']) ? $html_options['onclick'].';' : '').$function.'; return false;">'.$name.'</a>';
     }
 
     /////////////////////////////////////////////////////////////////////////////////////
@@ -76,7 +76,7 @@ 
                 $return_val .= $value;
             }
 
-            return '[' . $return_val . ']';
+            return '['.$return_val.']';
         }
 
         return "'$option'";
@@ -99,6 +99,6 @@ 
             }
         }
 
-        return '{' . $return_val . '}';
+        return '{'.$return_val.'}';
     }
 }

include/projax_/classes/Prototype.php

Doc Comments +3 added lines, -3 removed lines

@@ -212,7 +212,7 @@ 
     }
 
     /**
-     * @param         $klass
+     * @param         string $klass
      * @param         $name
      * @param  null   $options
      * @return string
@@ -311,7 +311,7 @@ 
     }
 
     /**
-     * @param $variable
+     * @param string $variable
      * @param $value
      * @return string
      */
@@ -321,7 +321,7 @@ 
     }
 
     /**
-     * @param         $function
+     * @param         string $function
      * @param  null   $args
      * @return string
      */

Spacing +23 added lines, -23 removed lines

@@ -63,7 +63,7 @@ 
     {
         $options['form'] = true;
 
-        return '<form action="' . $options['url'] . '" onsubmit="' . $this->remote_function($options) . '; return false;" method="' . (isset($options['method']) ? $options['method'] : 'post') . '"  >';
+        return '<form action="'.$options['url'].'" onsubmit="'.$this->remote_function($options).'; return false;" method="'.(isset($options['method']) ? $options['method'] : 'post').'"  >';
     }
 
     /**
@@ -112,7 +112,7 @@ 
     public function periodically_call_remote($options = null)
     {
         $frequency = isset($options['frequency']) ? $options['frequency'] : 10;
-        $code      = 'new PeriodicalExecuter(function() {' . $this->remote_function($options) . '},' . $frequency . ')';
+        $code      = 'new PeriodicalExecuter(function() {'.$this->remote_function($options).'},'.$frequency.')';
 
         return $code;
     }
@@ -128,22 +128,22 @@ 
         $update = '';
 
         if (isset($options['update']) && is_array($options['update'])) {
-            $update = isset($options['update']['success']) ? 'success: ' . $options['update']['success'] : '';
+            $update = isset($options['update']['success']) ? 'success: '.$options['update']['success'] : '';
             $update .= empty($update) ? '' : ',';
-            $update .= isset($options['update']['failure']) ? 'failure: ' . $options['update']['failure'] : '';
+            $update .= isset($options['update']['failure']) ? 'failure: '.$options['update']['failure'] : '';
         } else {
             $update .= isset($options['update']) ? $options['update'] : '';
         }
 
-        $ajax_function = empty($update) ? 'new Ajax.Request(' : 'new Ajax.Updater(\'' . $update . '\',';
+        $ajax_function = empty($update) ? 'new Ajax.Request(' : 'new Ajax.Updater(\''.$update.'\',';
 
-        $ajax_function .= "'" . $options['url'] . "'";
-        $ajax_function .= ',' . $javascript_options . ')';
+        $ajax_function .= "'".$options['url']."'";
+        $ajax_function .= ','.$javascript_options.')';
 
-        $ajax_function = isset($options['before']) ? $options['before'] . ';' . $ajax_function : $ajax_function;
-        $ajax_function = isset($options['after']) ? $ajax_function . ';' . $options['after'] : $ajax_function;
-        $ajax_function = isset($options['condition']) ? 'if (' . $options['condition'] . ') {' . $ajax_function . '}' : $ajax_function;
-        $ajax_function = isset($options['confirm']) ? 'if ( confirm(\'' . $options['confirm'] . '\' ) ) { ' . $ajax_function . ' } ' : $ajax_function;
+        $ajax_function = isset($options['before']) ? $options['before'].';'.$ajax_function : $ajax_function;
+        $ajax_function = isset($options['after']) ? $ajax_function.';'.$options['after'] : $ajax_function;
+        $ajax_function = isset($options['condition']) ? 'if ('.$options['condition'].') {'.$ajax_function.'}' : $ajax_function;
+        $ajax_function = isset($options['confirm']) ? 'if ( confirm(\''.$options['confirm'].'\' ) ) { '.$ajax_function.' } ' : $ajax_function;
 
         return $ajax_function;
     }
@@ -160,7 +160,7 @@ 
             $options['with'] = 'Form.serialize(this.form)';
         }
 
-        return '<input type="button" onclick="' . $this->remote_function($options) . '" name="' . $name . '" value ="' . $value . '">';
+        return '<input type="button" onclick="'.$this->remote_function($options).'" name="'.$name.'" value ="'.$value.'">';
     }
 
     /**
@@ -203,8 +203,8 @@ 
         $callbacks = array();
         foreach ($options as $callback => $code) {
             if (in_array($callback, $this->CALLBACKS)) {
-                $name             = 'on' . ucfirst($callback);
-                $callbacks[$name] = 'function(request){' . $code . '}';
+                $name             = 'on'.ucfirst($callback);
+                $callbacks[$name] = 'function(request){'.$code.'}';
             }
         }
 
@@ -220,7 +220,7 @@ 
     public function _build_observer($klass, $name, $options = null)
     {
         if (isset($options['with']) && false === strpos($options['with'], '=')) {
-            $options['with'] = '\'' . $options['with'] . '=\' + value';
+            $options['with'] = '\''.$options['with'].'=\' + value';
         } elseif (isset($options['with']) && isset($options['update'])) {
             $options['with'] = 'value';
         }
@@ -228,10 +228,10 @@ 
         $callback = $options['function'] ?: $this->remote_function($options);
 
         $javascript = "new $klass('$name', ";
-        $javascript .= isset($options['frequency']) ? $options['frequency'] . ', ' : '';
+        $javascript .= isset($options['frequency']) ? $options['frequency'].', ' : '';
         $javascript .= 'function (element,value) { ';
         $javascript .= $callback;
-        $javascript .= isset($options['on']) ? ', ' . $options['on'] : '';
+        $javascript .= isset($options['on']) ? ', '.$options['on'] : '';
         $javascript .= '})';
 
         return $javascript;
@@ -263,7 +263,7 @@ 
         }
 
         if (isset($options['position'])) {
-            $js_options['insertion'] = 'Insertion.' . ucfirst($options['position']);
+            $js_options['insertion'] = 'Insertion.'.ucfirst($options['position']);
         }
 
         $js_options['evalScripts'] = isset($options['script']) ? $options['script'] : 'true';
@@ -271,7 +271,7 @@ 
         if (isset($options['form'])) {
             $js_options['parameters'] = 'Form.serialize(this)';
         } elseif (isset($options['parameters'])) {
-            $js_options['parameters'] = 'Form.serialize(\'' . $options['submit'] . '\')';
+            $js_options['parameters'] = 'Form.serialize(\''.$options['submit'].'\')';
         } elseif (isset($options['with'])) {
             $js_options['parameters'] = $options['with'];
         }
@@ -298,7 +298,7 @@ 
      */
     public function ID($id, $extend = null)
     {
-        return "$('$id')" . (!empty($extend)) ? '.' . $extend . '()' : '';
+        return "$('$id')".(!empty($extend)) ? '.'.$extend.'()' : '';
     }
 
     /**
@@ -357,7 +357,7 @@ 
      */
     public function delay($seconds = 1, $script = '')
     {
-        return "setTimeout( function() { $script } , " . ($seconds * 1000) . ' )';
+        return "setTimeout( function() { $script } , ".($seconds * 1000).' )';
     }
 
     /**
@@ -379,7 +379,7 @@ 
     {
         $args = array_merge(array($id), (is_array($options_for_render) ? $options_for_render : array($options_for_render)));
 
-        return $this->call('new Insertion.' . ucfirst($position), $args);
+        return $this->call('new Insertion.'.ucfirst($position), $args);
     }
 
     /**
@@ -443,7 +443,7 @@ 
      */
     public function select($pattern, $extend = null)
     {
-        return "$$('$pattern')" . (!empty($extend)) ? '.' . $extend : '';
+        return "$$('$pattern')".(!empty($extend)) ? '.'.$extend : '';
     }
 
     /**

header.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@
  * Licence: GNU
  */
 
-include __DIR__ . '/../../mainfile.php';
-require_once XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php';
+include __DIR__.'/../../mainfile.php';
+require_once XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php';
 
 smart_loadCommonLanguageFile();