mambax7 / smartobject

class/smartjax.php

Spacing +3 added lines, -3 removed lines

@@ -29,7 +29,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once XOOPS_ROOT_PATH . '/modules/smartobject/include/projax/projax.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartobject/include/projax/projax.php';
 
 /**
  * Class SmartJax
@@ -39,7 +39,7 @@ 
     public function initiateFromUserside()
     {
         global $xoTheme;
-        $xoTheme->addScript(SMARTOBJECT_URL . 'include/projax/js/prototype.js');
-        $xoTheme->addScript(SMARTOBJECT_URL . 'include/projax/js/scriptaculous.js');
+        $xoTheme->addScript(SMARTOBJECT_URL.'include/projax/js/prototype.js');
+        $xoTheme->addScript(SMARTOBJECT_URL.'include/projax/js/scriptaculous.js');
     }
 }

class/smartobjecttreetable.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
  * @subpackage SmartObjectTable
  */
 
-include_once(SMARTOBJECT_ROOT_PATH . 'class/smartobjecttable.php');
+include_once(SMARTOBJECT_ROOT_PATH.'class/smartobjecttable.php');
 
 /**
  * SmartObjectTreeTable class
@@ -95,7 +95,7 @@ 
                 $space .= ' ';
             }
 
-            $aColumn['value'] = $space . $value;
+            $aColumn['value'] = $space.$value;
             $aColumn['class'] = $class;
             $aColumn['width'] = $column->getWidth();
             $aColumn['align'] = $column->getAlign();
@@ -119,7 +119,7 @@ 
             }
         }
 
-        include_once SMARTOBJECT_ROOT_PATH . 'class/smartobjectcontroller.php';
+        include_once SMARTOBJECT_ROOT_PATH.'class/smartobjectcontroller.php';
         $controller = new SmartObjectController($this->_objectHandler);
 
         if (in_array('edit', $this->_actions)) {

class/smartobjectlink.php

Spacing +16 added lines, -16 removed lines

@@ -28,7 +28,7 @@ 
 // -------------------------------------------------------------------------//
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
-include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
 
 /**
  * Class SmartobjectLink
@@ -117,7 +117,7 @@ 
 
             return $ret;
         } else {
-            $ret = '<a href="' . $ret . '" alt="' . $this->getVar('link', 'e') . '" title="' . $this->getVar('link', 'e') . '">' . _AM_SOBJECT_SENT_LINKS_GOTO . '</a>';
+            $ret = '<a href="'.$ret.'" alt="'.$this->getVar('link', 'e').'" title="'.$this->getVar('link', 'e').'">'._AM_SOBJECT_SENT_LINKS_GOTO.'</a>';
 
             return $ret;
         }
@@ -128,16 +128,16 @@ 
      */
     public function getViewItemLink()
     {
-        $ret = '<a href="' .
-               SMARTOBJECT_URL .
-               'admin/link.php?op=view&linkid=' .
-               $this->getVar('linkid') .
-               '"><img src="' .
-               SMARTOBJECT_IMAGES_ACTIONS_URL .
-               'mail_find.png" alt="' .
-               _AM_SOBJECT_SENT_LINK_VIEW .
-               '" title="' .
-               _AM_SOBJECT_SENT_LINK_VIEW .
+        $ret = '<a href="'.
+               SMARTOBJECT_URL.
+               'admin/link.php?op=view&linkid='.
+               $this->getVar('linkid').
+               '"><img src="'.
+               SMARTOBJECT_IMAGES_ACTIONS_URL.
+               'mail_find.png" alt="'.
+               _AM_SOBJECT_SENT_LINK_VIEW.
+               '" title="'.
+               _AM_SOBJECT_SENT_LINK_VIEW.
                '" /></a>';
 
         return $ret;
@@ -153,10 +153,10 @@ 
         if ($this->getVar('from_uid')) {
             $user = smart_getLinkedUnameFromId($this->getVar('from_uid'));
             if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
-                $user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
+                $user = '<a href="mailto:'.$this->getVar('from_email').'">'.$this->getVar('from_email').'</a>';
             }
         } else {
-            $user = '<a href="mailto:' . $this->getVar('from_email') . '">' . $this->getVar('from_email') . '</a>';
+            $user = '<a href="mailto:'.$this->getVar('from_email').'">'.$this->getVar('from_email').'</a>';
         }
 
         return $user;
@@ -185,10 +185,10 @@ 
         if ($this->getVar('to_uid')) {
             $user = smart_getLinkedUnameFromId($this->getVar('to_uid'));
             if ($user == $GLOBALS['xoopsConfig']['anonymous']) {
-                $user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
+                $user = '<a href="mailto:'.$this->getVar('to_email').'">'.$this->getVar('to_email').'</a>';
             }
         } else {
-            $user = '<a href="mailto:' . $this->getVar('to_email') . '">' . $this->getVar('to_email') . '</a>';
+            $user = '<a href="mailto:'.$this->getVar('to_email').'">'.$this->getVar('to_email').'</a>';
         }
 
         return $user;

class/customtag.php

Spacing +13 added lines, -13 removed lines

@@ -29,7 +29,7 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
 
 /**
  * Class SmartobjectCustomtag
@@ -122,7 +122,7 @@ 
      */
     public function getXoopsCode()
     {
-        $ret = '[customtag]' . $this->getVar('tag', 'n') . '[/customtag]';
+        $ret = '[customtag]'.$this->getVar('tag', 'n').'[/customtag]';
 
         return $ret;
     }
@@ -132,16 +132,16 @@ 
      */
     public function getCloneLink()
     {
-        $ret = '<a href="' .
-               SMARTOBJECT_URL .
-               'admin/customtag.php?op=clone&customtagid=' .
-               $this->id() .
-               '"><img src="' .
-               SMARTOBJECT_IMAGES_ACTIONS_URL .
-               'editcopy.png" style="vertical-align: middle;" alt="' .
-               _CO_SOBJECT_CUSTOMTAG_CLONE .
-               '" title="' .
-               _CO_SOBJECT_CUSTOMTAG_CLONE .
+        $ret = '<a href="'.
+               SMARTOBJECT_URL.
+               'admin/customtag.php?op=clone&customtagid='.
+               $this->id().
+               '"><img src="'.
+               SMARTOBJECT_IMAGES_ACTIONS_URL.
+               'editcopy.png" style="vertical-align: middle;" alt="'.
+               _CO_SOBJECT_CUSTOMTAG_CLONE.
+               '" title="'.
+               _CO_SOBJECT_CUSTOMTAG_CLONE.
                '" /></a>';
 
         return $ret;
@@ -278,7 +278,7 @@ 
             $granted_ids                   = $smartobjectPermissionsHandler->getGrantedItems('view');
 
             if ($granted_ids && count($granted_ids) > 0) {
-                $criteria->add(new Criteria('customtagid', '(' . implode(', ', $granted_ids) . ')', 'IN'));
+                $criteria->add(new Criteria('customtagid', '('.implode(', ', $granted_ids).')', 'IN'));
                 $customtagsObj = $this->getObjects($criteria, true);
                 foreach ($customtagsObj as $customtagObj) {
                     $ret[$customtagObj->getVar('name')] = $customtagObj;

class/smartobjectabout.php

Spacing +6 added lines, -6 removed lines

@@ -49,11 +49,11 @@ 
     {
         global $xoopsModule, $xoopsConfig;
 
-        $fileName = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/language/' . $xoopsConfig['language'] . '/modinfo.php';
+        $fileName = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/language/'.$xoopsConfig['language'].'/modinfo.php';
         if (file_exists($fileName)) {
             include_once $fileName;
         } 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';
         }
         $this->_aboutTitle = $aboutTitle;
 
@@ -104,7 +104,7 @@ 
 
         //smart_adminMenu(-1, $this->_aboutTitle . " " . $versioninfo->getInfo('name'));
 
-        include_once XOOPS_ROOT_PATH . '/class/template.php';
+        include_once XOOPS_ROOT_PATH.'/class/template.php';
 
         // ---
         // 2012-01-01 PHP 5.3: Assigning the return value of new by reference is now deprecated.
@@ -112,7 +112,7 @@ 
         $this->_tpl = new XoopsTpl();
         // ---
 
-        $this->_tpl->assign('module_url', XOOPS_URL . '/modules/' . $xoopsModule->getVar('dirname') . '/');
+        $this->_tpl->assign('module_url', XOOPS_URL.'/modules/'.$xoopsModule->getVar('dirname').'/');
         $this->_tpl->assign('module_image', $versioninfo->getInfo('image'));
         $this->_tpl->assign('module_name', $versioninfo->getInfo('name'));
         $this->_tpl->assign('module_version', $versioninfo->getInfo('version'));
@@ -120,7 +120,7 @@ 
 
         // Left headings...
         if ($versioninfo->getInfo('author_realname') !== '') {
-            $author_name = $versioninfo->getInfo('author') . ' (' . $versioninfo->getInfo('author_realname') . ')';
+            $author_name = $versioninfo->getInfo('author').' ('.$versioninfo->getInfo('author_realname').')';
         } else {
             $author_name = $versioninfo->getInfo('author');
         }
@@ -165,7 +165,7 @@ 
 
         // For changelog thanks to 3Dev
         global $xoopsModule;
-        $filename = XOOPS_ROOT_PATH . '/modules/' . $xoopsModule->getVar('dirname') . '/changelog.txt';
+        $filename = XOOPS_ROOT_PATH.'/modules/'.$xoopsModule->getVar('dirname').'/changelog.txt';
         if (is_file($filename)) {
             $filesize = filesize($filename);
             $handle   = fopen($filename, 'r');

class/smartdbupdater.php

Spacing +33 added lines, -33 removed lines

@@ -18,15 +18,15 @@ 
  */
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 if (!defined('SMARTOBJECT_ROOT_PATH')) {
-    include_once(XOOPS_ROOT_PATH . '/modules/smartobject/include/common.php');
+    include_once(XOOPS_ROOT_PATH.'/modules/smartobject/include/common.php');
 }
 /**
  * Include the language constants for the SmartObjectDBUpdater
  */
 global $xoopsConfig;
-$common_file = SMARTOBJECT_ROOT_PATH . 'language/' . $xoopsConfig['language'] . '/smartdbupdater.php';
+$common_file = SMARTOBJECT_ROOT_PATH.'language/'.$xoopsConfig['language'].'/smartdbupdater.php';
 if (!file_exists($common_file)) {
-    $common_file = SMARTOBJECT_ROOT_PATH . 'language/english/smartdbupdater.php';
+    $common_file = SMARTOBJECT_ROOT_PATH.'language/english/smartdbupdater.php';
 }
 include($common_file);
 
@@ -123,17 +123,17 @@ 
     public function getExistingFieldsArray()
     {
         global $xoopsDB;
-        $result = $xoopsDB->query('SHOW COLUMNS FROM ' . $this->name());
+        $result = $xoopsDB->query('SHOW COLUMNS FROM '.$this->name());
         while ($existing_field = $xoopsDB->fetchArray($result)) {
             $fields[$existing_field['Field']] = $existing_field['Type'];
             if ($existing_field['Null'] !== 'YES') {
                 $fields[$existing_field['Field']] .= ' NOT NULL';
             }
             if ($existing_field['Extra']) {
-                $fields[$existing_field['Field']] .= ' ' . $existing_field['Extra'];
+                $fields[$existing_field['Field']] .= ' '.$existing_field['Extra'];
             }
             if (!($existing_field['Default'] === null) && ($existing_field['Default'] || $existing_field['Default'] === '' || $existing_field['Default'] == 0)) {
-                $fields[$existing_field['Field']] .= " default '" . $existing_field['Default'] . "'";
+                $fields[$existing_field['Field']] .= " default '".$existing_field['Default']."'";
             }
         }
 
@@ -219,9 +219,9 @@ 
             $query = sprintf('INSERT INTO %s VALUES (%s)', $this->name(), $data);
             $ret   = $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA_ERR, $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_ADD_DATA, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_ADD_DATA, $this->name()).'<br>';
             }
         }
 
@@ -373,13 +373,13 @@ 
     {
         global $xoopsDB;
         $query = $this->getStructure();
-        $query = 'CREATE TABLE `' . $this->name() . '` (' . $query . ") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
+        $query = 'CREATE TABLE `'.$this->name().'` ('.$query.") ENGINE=MyISAM COMMENT='The SmartFactory <www.smartfactory.ca>'";
         //xoops_debug($query);
         $ret = $xoopsDB->query($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CREATE_TABLE, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CREATE_TABLE, $this->name()).'<br>';
         }
 
         return $ret;
@@ -397,11 +397,11 @@ 
         $query = sprintf('DROP TABLE %s', $this->name());
         $ret   = $xoopsDB->query($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
 
             return false;
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROP_TABLE, $this->name()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROP_TABLE, $this->name()).'<br>';
 
             return true;
         }
@@ -427,9 +427,9 @@ 
             $ret   = $ret && $xoopsDB->query($query);
             if ($alteredField['showerror']) {
                 if (!$ret) {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD_ERR, $alteredField['name'], $this->name()).' ('.$xoopsDB->error().')<br>';
                 } else {
-                    echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()) . '<br>';
+                    echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_CHGFIELD, $alteredField['name'], $this->name()).'<br>';
                 }
             }
         }
@@ -452,9 +452,9 @@ 
             //echo $query;
             $ret = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD_ERR, $newField['name'], $this->name()).'<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_NEWFIELD, $newField['name'], $this->name()).'<br>';
             }
         }
 
@@ -475,9 +475,9 @@ 
             $query = sprintf('UPDATE %s SET %s = %s', $this->name(), $updatedField['name'], $updatedField['value']);
             $ret   = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
             }
         }
 
@@ -498,9 +498,9 @@ 
             //echo $query."<br>";
             $ret = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE_ERR, $this->name()).' ('.$xoopsDB->error().')<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_UPDATE_TABLE, $this->name()).'<br>';
             }
         }
 
@@ -521,9 +521,9 @@ 
             $query = sprintf('ALTER TABLE %s DROP %s', $this->name(), $droppedField);
             $ret   = $ret && $xoopsDB->query($query);
             if (!$ret) {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()) . ' (' . $xoopsDB->error() . ')<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD_ERR, $droppedField, $this->name()).' ('.$xoopsDB->error().')<br>';
             } else {
-                echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()) . '<br>';
+                echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_DROPFIELD, $droppedField, $this->name()).'<br>';
             }
         }
 
@@ -610,11 +610,11 @@ 
         $query = sprintf('ALTER TABLE %s RENAME %s', $from, $to);
         $ret   = $xoopsDB->query($query);
         if (!$ret) {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE_ERR, $from).'<br>';
 
             return false;
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_SDU_MSG_RENAME_TABLE, $from, $to) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_SDU_MSG_RENAME_TABLE, $from, $to).'<br>';
 
             return true;
         }
@@ -734,7 +734,7 @@ 
             return false;
         }
 
-        $table      = new SmartDbTable($module . '_' . $item);
+        $table      = new SmartDbTable($module.'_'.$item);
         $object     = $moduleHandler->create();
         $objectVars = $object->getVars();
 
@@ -755,7 +755,7 @@ 
 ";
                 }
             }
-            $structure .= 'PRIMARY KEY  (`' . $moduleHandler->keyName . '`)
+            $structure .= 'PRIMARY KEY  (`'.$moduleHandler->keyName.'`)
 ';
             $table->setStructure($structure);
             if (!$this->updateTable($table)) {
@@ -815,7 +815,7 @@ 
 
         ob_start();
 
-        $table = new SmartDbTable($dirname . '_meta');
+        $table = new SmartDbTable($dirname.'_meta');
         if (!$table->exists()) {
             $table->setStructure("
               `metakey` varchar(50) NOT NULL default '',
@@ -833,20 +833,20 @@ 
         if (!$dbVersion) {
             $dbVersion = 0;
         }
-        $newDbVersion = constant(strtoupper($dirname . '_db_version')) ?: 0;
-        echo 'Database version: ' . $dbVersion . '<br>';
-        echo 'New database version: ' . $newDbVersion . '<br>';
+        $newDbVersion = constant(strtoupper($dirname.'_db_version')) ?: 0;
+        echo 'Database version: '.$dbVersion.'<br>';
+        echo 'New database version: '.$newDbVersion.'<br>';
 
         if ($newDbVersion > $dbVersion) {
             for ($i = $dbVersion + 1; $i <= $newDbVersion; ++$i) {
-                $upgrade_function = $dirname . '_db_upgrade_' . $i;
+                $upgrade_function = $dirname.'_db_upgrade_'.$i;
                 if (function_exists($upgrade_function)) {
                     $upgrade_function();
                 }
             }
         }
 
-        echo '<code>' . _SDU_UPDATE_UPDATING_DATABASE . '<br>';
+        echo '<code>'._SDU_UPDATE_UPDATING_DATABASE.'<br>';
 
         // if there is a function to execute for this DB version, let's do it
         //$function_

class/smartprinterfriendly.php

Spacing +1 added lines, -1 removed lines

@@ -42,7 +42,7 @@
          * @todo make the output XHTML compliant
          */
 
-        include_once XOOPS_ROOT_PATH . '/class/template.php';
+        include_once XOOPS_ROOT_PATH.'/class/template.php';
 
         $this->_tpl = new XoopsTpl();
 

class/smartobjectcontroller.php

Spacing +110 added lines, -110 removed lines

@@ -23,8 +23,8 @@ 
  * @credit  Jan Keller Pedersen <mithrandir@xoops.org> - IDG Danmark A/S <www.idg.dk>
  * @link    http://smartfactory.ca The SmartFactory
  */
-include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
-include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobjecthandler.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobjecthandler.php';
 
 /**
  * Class SmartObjectController
@@ -50,15 +50,15 @@ 
         foreach (array_keys($smartObj->vars) as $key) {
             switch ($smartObj->vars[$key]['data_type']) {
                 case XOBJ_DTYPE_IMAGE:
-                    if (isset($_POST['url_' . $key]) && $_POST['url_' . $key] !== '') {
-                        $oldFile = $smartObj->getUploadDir(true) . $smartObj->getVar($key, 'e');
-                        $smartObj->setVar($key, $_POST['url_' . $key]);
+                    if (isset($_POST['url_'.$key]) && $_POST['url_'.$key] !== '') {
+                        $oldFile = $smartObj->getUploadDir(true).$smartObj->getVar($key, 'e');
+                        $smartObj->setVar($key, $_POST['url_'.$key]);
                         if (file_exists($oldFile)) {
                             unlink($oldFile);
                         }
                     }
-                    if (isset($_POST['delete_' . $key]) && $_POST['delete_' . $key] == '1') {
-                        $oldFile = $smartObj->getUploadDir(true) . $smartObj->getVar($key, 'e');
+                    if (isset($_POST['delete_'.$key]) && $_POST['delete_'.$key] == '1') {
+                        $oldFile = $smartObj->getUploadDir(true).$smartObj->getVar($key, 'e');
                         $smartObj->setVar($key, '');
                         if (file_exists($oldFile)) {
                             unlink($oldFile);
@@ -68,10 +68,10 @@ 
 
                 case XOBJ_DTYPE_URLLINK:
                     $linkObj = $smartObj->getUrlLinkObj($key);
-                    $linkObj->setVar('caption', $_POST['caption_' . $key]);
-                    $linkObj->setVar('description', $_POST['desc_' . $key]);
-                    $linkObj->setVar('target', $_POST['target_' . $key]);
-                    $linkObj->setVar('url', $_POST['url_' . $key]);
+                    $linkObj->setVar('caption', $_POST['caption_'.$key]);
+                    $linkObj->setVar('description', $_POST['desc_'.$key]);
+                    $linkObj->setVar('target', $_POST['target_'.$key]);
+                    $linkObj->setVar('url', $_POST['url_'.$key]);
                     if ($linkObj->getVar('url') !== '') {
                         $smartObj->storeUrlLinkObj($linkObj);
                     }
@@ -80,11 +80,11 @@ 
                     break;
 
                 case XOBJ_DTYPE_FILE:
-                    if (!isset($_FILES['upload_' . $key]['name']) || $_FILES['upload_' . $key]['name'] === '') {
+                    if (!isset($_FILES['upload_'.$key]['name']) || $_FILES['upload_'.$key]['name'] === '') {
                         $fileObj = $smartObj->getFileObj($key);
-                        $fileObj->setVar('caption', $_POST['caption_' . $key]);
-                        $fileObj->setVar('description', $_POST['desc_' . $key]);
-                        $fileObj->setVar('url', $_POST['url_' . $key]);
+                        $fileObj->setVar('caption', $_POST['caption_'.$key]);
+                        $fileObj->setVar('description', $_POST['desc_'.$key]);
+                        $fileObj->setVar('url', $_POST['url_'.$key]);
                         if (!($fileObj->getVar('url') === '' && $fileObj->getVar('url') === '' && $fileObj->getVar('url') === '')) {
                             $res = $smartObj->storeFileObj($fileObj);
                             if ($res) {
@@ -107,7 +107,7 @@ 
                         $value = strtotime($_POST[$key]);
                         //if strtotime returns false, the value is already a time stamp
                         if (!$value) {
-                            $value = (int)$_POST[$key];
+                            $value = (int) $_POST[$key];
                         }
                     }
                     $smartObj->setVar($key, $value);
@@ -144,12 +144,12 @@ 
 
         // Check if there were uploaded files
         if (isset($_POST['smart_upload_image']) || isset($_POST['smart_upload_file'])) {
-            include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartuploader.php';
+            include_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartuploader.php';
             $uploaderObj = new SmartUploader($smartObj->getImageDir(true), $this->handler->_allowedMimeTypes, $this->handler->_maxFileSize, $this->handler->_maxWidth, $this->handler->_maxHeight);
             foreach ($_FILES as $name => $file_array) {
                 if (isset($file_array['name']) && $file_array['name'] !== '' && in_array(str_replace('upload_', '', $name), array_keys($smartObj->vars))) {
                     if ($uploaderObj->fetchMedia($name)) {
-                        $uploaderObj->setTargetFileName(time() . '_' . $uploaderObj->getMediaName());
+                        $uploaderObj->setTargetFileName(time().'_'.$uploaderObj->getMediaName());
                         if ($uploaderObj->upload()) {
                             // Find the related field in the SmartObject
                             $related_field   = str_replace('upload_', '', $name);
@@ -158,14 +158,14 @@ 
                             if ($smartObj->vars[$related_field]['data_type'] === XOBJ_DTYPE_FILE) {
                                 $object_fileurl = $smartObj->getUploadDir();
                                 $fileObj        = $smartObj->getFileObj($related_field);
-                                $fileObj->setVar('url', $object_fileurl . $uploaderObj->getSavedFileName());
-                                $fileObj->setVar('caption', $_POST['caption_' . $related_field]);
-                                $fileObj->setVar('description', $_POST['desc_' . $related_field]);
+                                $fileObj->setVar('url', $object_fileurl.$uploaderObj->getSavedFileName());
+                                $fileObj->setVar('caption', $_POST['caption_'.$related_field]);
+                                $fileObj->setVar('description', $_POST['desc_'.$related_field]);
                                 $smartObj->storeFileObj($fileObj);
                                 //todo: catch errors
                                 $smartObj->setVar($related_field, $fileObj->getVar('fileid'));
                             } else {
-                                $old_file = $smartObj->getUploadDir(true) . $smartObj->getVar($related_field);
+                                $old_file = $smartObj->getUploadDir(true).$smartObj->getVar($related_field);
                                 unlink($old_file);
                                 $smartObj->setVar($related_field, $uploaderObj->getSavedFileName());
                             }
@@ -196,7 +196,7 @@ 
             return $smartObj;
         } else {
             if (!$storeResult) {
-                redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR . $smartObj->getHtmlErrors());
+                redirect_header($smart_previous_page, 3, _CO_SOBJECT_SAVE_ERROR.$smartObj->getHtmlErrors());
             }
 
             $redirect_page = $redirect_page ?: smart_get_page_before_form();
@@ -220,7 +220,7 @@ 
      */
     public function storeFromDefaultForm($created_success_msg, $modified_success_msg, $redirect_page = false, $debug = false, $x_param = false)
     {
-        $objectid = isset($_POST[$this->handler->keyName]) ? (int)$_POST[$this->handler->keyName] : 0;
+        $objectid = isset($_POST[$this->handler->keyName]) ? (int) $_POST[$this->handler->keyName] : 0;
         if ($debug) {
             if ($x_param) {
                 $smartObj = $this->handler->getD($objectid, true, $x_param);
@@ -296,7 +296,7 @@ 
     {
         global $smart_previous_page;
 
-        $objectid = isset($_REQUEST[$this->handler->keyName]) ? (int)$_REQUEST[$this->handler->keyName] : 0;
+        $objectid = isset($_REQUEST[$this->handler->keyName]) ? (int) $_REQUEST[$this->handler->keyName] : 0;
         $smartObj = $this->handler->get($objectid);
 
         if ($smartObj->isNew()) {
@@ -306,7 +306,7 @@ 
         $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
         if ($confirm) {
             if (!$this->handler->delete($smartObj)) {
-                redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_ERROR . $smartObj->getHtmlErrors());
+                redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_ERROR.$smartObj->getHtmlErrors());
                 exit;
             }
 
@@ -336,7 +336,7 @@ 
     {
         global $smart_previous_page, $xoopsTpl;
 
-        $objectid = isset($_REQUEST[$this->handler->keyName]) ? (int)$_REQUEST[$this->handler->keyName] : 0;
+        $objectid = isset($_REQUEST[$this->handler->keyName]) ? (int) $_REQUEST[$this->handler->keyName] : 0;
         $smartObj = $this->handler->get($objectid);
 
         if ($smartObj->isNew()) {
@@ -346,7 +346,7 @@ 
         $confirm = isset($_POST['confirm']) ? $_POST['confirm'] : 0;
         if ($confirm) {
             if (!$this->handler->delete($smartObj)) {
-                redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_ERROR . $smartObj->getHtmlErrors());
+                redirect_header($_POST['redirect_page'], 3, _CO_SOBJECT_DELETE_ERROR.$smartObj->getHtmlErrors());
                 exit;
             }
 
@@ -375,22 +375,22 @@ 
      */
     public function getAdminViewItemLink(SmartObject $smartObj, $onlyUrl = false, $withimage = false)
     {
-        $ret = $this->handler->_moduleUrl . 'admin/' . $this->handler->_page . '?op=view&' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
+        $ret = $this->handler->_moduleUrl.'admin/'.$this->handler->_page.'?op=view&'.$this->handler->keyName.'='.$smartObj->getVar($this->handler->keyName);
         if ($onlyUrl) {
             return $ret;
         } elseif ($withimage) {
-            return "<a href='" .
-                   $ret .
-                   "'><img src='" .
-                   SMARTOBJECT_IMAGES_ACTIONS_URL .
-                   "viewmag.png' style='vertical-align: middle;' alt='" .
-                   _CO_SOBJECT_ADMIN_VIEW .
-                   "'  title='" .
-                   _CO_SOBJECT_ADMIN_VIEW .
+            return "<a href='".
+                   $ret.
+                   "'><img src='".
+                   SMARTOBJECT_IMAGES_ACTIONS_URL.
+                   "viewmag.png' style='vertical-align: middle;' alt='".
+                   _CO_SOBJECT_ADMIN_VIEW.
+                   "'  title='".
+                   _CO_SOBJECT_ADMIN_VIEW.
                    "'/></a>";
         }
 
-        return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
+        return "<a href='".$ret."'>".$smartObj->getVar($this->handler->identifierName).'</a>';
     }
 
     /**
@@ -412,31 +412,31 @@ 
         $seoIncludeId = true;
 
         if ($seoMode === 'rewrite') {
-            $ret = XOOPS_URL .
-                   '/' .
-                   $seoModuleName .
-                   '.' .
-                   $this->handler->_itemname .
-                   ($seoIncludeId ? '.' . $smartObj->getVar($this->handler->keyName) : '') .
-                   '/' .
-                   $smartObj->getVar('short_url') .
+            $ret = XOOPS_URL.
+                   '/'.
+                   $seoModuleName.
+                   '.'.
+                   $this->handler->_itemname.
+                   ($seoIncludeId ? '.'.$smartObj->getVar($this->handler->keyName) : '').
+                   '/'.
+                   $smartObj->getVar('short_url').
                    '.html';
         } elseif ($seoMode === 'pathinfo') {
-            $ret = SMARTOBJECT_URL .
-                   'seo.php/' .
-                   $seoModuleName .
-                   '.' .
-                   $this->handler->_itemname .
-                   ($seoIncludeId ? '.' . $smartObj->getVar($this->handler->keyName) : '') .
-                   '/' .
-                   $smartObj->getVar('short_url') .
+            $ret = SMARTOBJECT_URL.
+                   'seo.php/'.
+                   $seoModuleName.
+                   '.'.
+                   $this->handler->_itemname.
+                   ($seoIncludeId ? '.'.$smartObj->getVar($this->handler->keyName) : '').
+                   '/'.
+                   $smartObj->getVar('short_url').
                    '.html';
         } else {
-            $ret = $this->handler->_moduleUrl . $this->handler->_page . '?' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
+            $ret = $this->handler->_moduleUrl.$this->handler->_page.'?'.$this->handler->keyName.'='.$smartObj->getVar($this->handler->keyName);
         }
 
         if (!$onlyUrl) {
-            $ret = "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
+            $ret = "<a href='".$ret."'>".$smartObj->getVar($this->handler->identifierName).'</a>';
         }
 
         return $ret;
@@ -450,30 +450,30 @@ 
      */
     public function getEditLanguageLink($smartObj, $onlyUrl = false, $withimage = true)
     {
-        $ret = $this->handler->_moduleUrl .
-               'admin/' .
-               $this->handler->_page .
-               '?op=mod&' .
-               $this->handler->keyName .
-               '=' .
-               $smartObj->getVar($this->handler->keyName) .
-               '&language=' .
+        $ret = $this->handler->_moduleUrl.
+               'admin/'.
+               $this->handler->_page.
+               '?op=mod&'.
+               $this->handler->keyName.
+               '='.
+               $smartObj->getVar($this->handler->keyName).
+               '&language='.
                $smartObj->getVar('language');
         if ($onlyUrl) {
             return $ret;
         } elseif ($withimage) {
-            return "<a href='" .
-                   $ret .
-                   "'><img src='" .
-                   SMARTOBJECT_IMAGES_ACTIONS_URL .
-                   "wizard.png' style='vertical-align: middle;' alt='" .
-                   _CO_SOBJECT_LANGUAGE_MODIFY .
-                   "'  title='" .
-                   _CO_SOBJECT_LANGUAGE_MODIFY .
+            return "<a href='".
+                   $ret.
+                   "'><img src='".
+                   SMARTOBJECT_IMAGES_ACTIONS_URL.
+                   "wizard.png' style='vertical-align: middle;' alt='".
+                   _CO_SOBJECT_LANGUAGE_MODIFY.
+                   "'  title='".
+                   _CO_SOBJECT_LANGUAGE_MODIFY.
                    "'/></a>";
         }
 
-        return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
+        return "<a href='".$ret."'>".$smartObj->getVar($this->handler->identifierName).'</a>';
     }
 
     /**
@@ -486,22 +486,22 @@ 
     public function getEditItemLink($smartObj, $onlyUrl = false, $withimage = true, $userSide = false)
     {
         $admin_side = $userSide ? '' : 'admin/';
-        $ret        = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . '?op=mod&' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
+        $ret        = $this->handler->_moduleUrl.$admin_side.$this->handler->_page.'?op=mod&'.$this->handler->keyName.'='.$smartObj->getVar($this->handler->keyName);
         if ($onlyUrl) {
             return $ret;
         } elseif ($withimage) {
-            return "<a href='" .
-                   $ret .
-                   "'><img src='" .
-                   SMARTOBJECT_IMAGES_ACTIONS_URL .
-                   "edit.png' style='vertical-align: middle;' alt='" .
-                   _CO_SOBJECT_MODIFY .
-                   "'  title='" .
-                   _CO_SOBJECT_MODIFY .
+            return "<a href='".
+                   $ret.
+                   "'><img src='".
+                   SMARTOBJECT_IMAGES_ACTIONS_URL.
+                   "edit.png' style='vertical-align: middle;' alt='".
+                   _CO_SOBJECT_MODIFY.
+                   "'  title='".
+                   _CO_SOBJECT_MODIFY.
                    "'/></a>";
         }
 
-        return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
+        return "<a href='".$ret."'>".$smartObj->getVar($this->handler->identifierName).'</a>';
     }
 
     /**
@@ -514,22 +514,22 @@ 
     public function getDeleteItemLink($smartObj, $onlyUrl = false, $withimage = true, $userSide = false)
     {
         $admin_side = $userSide ? '' : 'admin/';
-        $ret        = $this->handler->_moduleUrl . $admin_side . $this->handler->_page . '?op=del&' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
+        $ret        = $this->handler->_moduleUrl.$admin_side.$this->handler->_page.'?op=del&'.$this->handler->keyName.'='.$smartObj->getVar($this->handler->keyName);
         if ($onlyUrl) {
             return $ret;
         } elseif ($withimage) {
-            return "<a href='" .
-                   $ret .
-                   "'><img src='" .
-                   SMARTOBJECT_IMAGES_ACTIONS_URL .
-                   "editdelete.png' style='vertical-align: middle;' alt='" .
-                   _CO_SOBJECT_DELETE .
-                   "'  title='" .
-                   _CO_SOBJECT_DELETE .
+            return "<a href='".
+                   $ret.
+                   "'><img src='".
+                   SMARTOBJECT_IMAGES_ACTIONS_URL.
+                   "editdelete.png' style='vertical-align: middle;' alt='".
+                   _CO_SOBJECT_DELETE.
+                   "'  title='".
+                   _CO_SOBJECT_DELETE.
                    "'/></a>";
         }
 
-        return "<a href='" . $ret . "'>" . $smartObj->getVar($this->handler->identifierName) . '</a>';
+        return "<a href='".$ret."'>".$smartObj->getVar($this->handler->identifierName).'</a>';
     }
 
     /**
@@ -540,28 +540,28 @@ 
     {
         global $xoopsConfig;
 
-        $printlink = $this->handler->_moduleUrl . 'print.php?' . $this->handler->keyName . '=' . $smartObj->getVar($this->handler->keyName);
-        $js        = "javascript:openWithSelfMain('" . $printlink . "', 'smartpopup', 700, 519);";
-        $printlink = '<a href="' . $js . '"><img  src="' . SMARTOBJECT_IMAGES_ACTIONS_URL . 'fileprint.png" alt="" style="vertical-align: middle;"/></a>';
+        $printlink = $this->handler->_moduleUrl.'print.php?'.$this->handler->keyName.'='.$smartObj->getVar($this->handler->keyName);
+        $js        = "javascript:openWithSelfMain('".$printlink."', 'smartpopup', 700, 519);";
+        $printlink = '<a href="'.$js.'"><img  src="'.SMARTOBJECT_IMAGES_ACTIONS_URL.'fileprint.png" alt="" style="vertical-align: middle;"/></a>';
 
         $smartModule = smart_getModuleInfo($smartObj->handler->_moduleName);
         $link        = smart_getCurrentPage();
         $mid         = $smartModule->getVar('mid');
-        $friendlink  = "<a href=\"javascript:openWithSelfMain('" .
-                       SMARTOBJECT_URL .
-                       'sendlink.php?link=' .
-                       $link .
-                       '&amp;mid=' .
-                       $mid .
-                       "', ',',',',',','sendmessage', 674, 500);\"><img src=\"" .
-                       SMARTOBJECT_IMAGES_ACTIONS_URL .
-                       "mail_send.png\"  alt=\"" .
-                       _CO_SOBJECT_EMAIL .
-                       "\" title=\"" .
-                       _CO_SOBJECT_EMAIL .
+        $friendlink  = "<a href=\"javascript:openWithSelfMain('".
+                       SMARTOBJECT_URL.
+                       'sendlink.php?link='.
+                       $link.
+                       '&amp;mid='.
+                       $mid.
+                       "', ',',',',',','sendmessage', 674, 500);\"><img src=\"".
+                       SMARTOBJECT_IMAGES_ACTIONS_URL.
+                       "mail_send.png\"  alt=\"".
+                       _CO_SOBJECT_EMAIL.
+                       "\" title=\"".
+                       _CO_SOBJECT_EMAIL.
                        "\" style=\"vertical-align: middle;\"/></a>";
 
-        $ret = '<span id="smartobject_print_button">' . $printlink . '&nbsp;</span>' . '<span id="smartobject_mail_button">' . $friendlink . '</span>';
+        $ret = '<span id="smartobject_print_button">'.$printlink.'&nbsp;</span>'.'<span id="smartobject_mail_button">'.$friendlink.'</span>';
 
         return $ret;
     }
@@ -571,7 +571,7 @@ 
      */
     public function getModuleItemString()
     {
-        $ret = $this->handler->_moduleName . '_' . $this->handler->_itemname;
+        $ret = $this->handler->_moduleName.'_'.$this->handler->_itemname;
 
         return $ret;
     }

class/rating.php

Spacing +6 added lines, -6 removed lines

@@ -29,8 +29,8 @@ 
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartobject.php';
-include_once XOOPS_ROOT_PATH . '/modules/smartobject/class/smartplugins.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartobject.php';
+include_once XOOPS_ROOT_PATH.'/modules/smartobject/class/smartplugins.php';
 
 /**
  * Class SmartobjectRating
@@ -124,14 +124,14 @@ 
      */
     public function getItemValue()
     {
-        $moduleUrl      = XOOPS_URL . '/modules/' . $this->getVar('dirname', 'n') . '/';
+        $moduleUrl      = XOOPS_URL.'/modules/'.$this->getVar('dirname', 'n').'/';
         $plugin         = $this->getModulePlugin();
         $pluginItemInfo = $plugin->getItemInfo($this->getVar('item'));
         if (!$pluginItemInfo) {
             return '';
         }
         $itemPath = sprintf($pluginItemInfo['url'], $this->getVar('itemid'));
-        $ret      = '<a href="' . $moduleUrl . $itemPath . '">' . $pluginItemInfo['caption'] . '</a>';
+        $ret      = '<a href="'.$moduleUrl.$itemPath.'">'.$pluginItemInfo['caption'].'</a>';
 
         return $ret;
     }
@@ -174,7 +174,7 @@ 
     public function __construct(XoopsDatabase $db)
     {
         parent::__construct($db, 'rating', 'ratingid', 'rate', '', 'smartobject');
-        $this->generalSQL = 'SELECT * FROM ' . $this->table . ' AS ' . $this->_itemname . ' INNER JOIN ' . $this->db->prefix('users') . ' AS user ON ' . $this->_itemname . '.uid=user.uid';
+        $this->generalSQL = 'SELECT * FROM '.$this->table.' AS '.$this->_itemname.' INNER JOIN '.$this->db->prefix('users').' AS user ON '.$this->_itemname.'.uid=user.uid';
 
         $this->_rateOptions[1] = 1;
         $this->_rateOptions[2] = 2;
@@ -217,7 +217,7 @@ 
      */
     public function getRatingAverageByItemId($itemid, $dirname, $item)
     {
-        $sql    = 'SELECT AVG(rate), COUNT(ratingid) FROM ' . $this->table . " WHERE itemid=$itemid AND dirname='$dirname' AND item='$item' GROUP BY itemid";
+        $sql    = 'SELECT AVG(rate), COUNT(ratingid) FROM '.$this->table." WHERE itemid=$itemid AND dirname='$dirname' AND item='$item' GROUP BY itemid";
         $result = $this->db->query($sql);
         if (!$result) {
             return 0;