mambax7 / references

class/references_listFilter.php

Spacing +43 added lines, -43 removed lines

@@ -200,7 +200,7 @@ 
         $this->jsFolderUrl                      = '';
         $this->additionnalPagerParameters       = array();
         $this->additionnalClearButtonParameters = array();
-        $this->sortFields                       = array();    // Les champs qui peuvent être utilisés pour trier
+        $this->sortFields                       = array(); // Les champs qui peuvent être utilisés pour trier
     }
 
     /**
@@ -257,7 +257,7 @@ 
      */
     private function getSortPlaceHolderNames()
     {
-        return array(self::PREFIX . 'sortFields', self::PREFIX . 'sortOrder');
+        return array(self::PREFIX.'sortFields', self::PREFIX.'sortOrder');
     }
 
     /**
@@ -271,7 +271,7 @@ 
         $sortFieldsHtml = references_utils::htmlSelect($sortNames[0], $this->sortFields, $this->sortField, false);
         $sortOrderHtml  = references_utils::htmlSelect($sortNames[1], array('asc' => _MD_REFERENCES_ASC, 'desc' => _MD_REFERENCES_DESC), $this->sortOrder, false);
 
-        return _MD_REFERENCES_SORT_BY . ' ' . $sortFieldsHtml . ' ' . $sortOrderHtml;
+        return _MD_REFERENCES_SORT_BY.' '.$sortFieldsHtml.' '.$sortOrderHtml;
     }
 
     /**
@@ -309,7 +309,7 @@ 
     private function getArrayValue($array, $index, $defaultValue = false)
     {
         if ($index === 'autoComplete' && isset($array[$index]) && isset($array[$index]) == true) {
-            $this->hasAutoComplete = true;    // On en profite pour vérifier si un champ utilise l'autocomplétion
+            $this->hasAutoComplete = true; // On en profite pour vérifier si un champ utilise l'autocomplétion
         }
 
         return isset($array[$index]) ? $array[$index] : $defaultValue;
@@ -333,14 +333,14 @@ 
         if (isset($this->vars[$fieldName])) {    // On vérifie que le champ demandé est bien en autocomplétion
             if ($this->vars[$fieldName]['autoComplete'] == true) {
                 if ($this->vars[$fieldName]['dataType'] == self::FILTER_DATA_TEXT) {
-                    $criteria = new Criteria($fieldName, $query . '%', 'LIKE');
+                    $criteria = new Criteria($fieldName, $query.'%', 'LIKE');
                 }
-                $criteria->setLimit((int)$limit);
+                $criteria->setLimit((int) $limit);
                 $ret = $this->handler->getObjects($criteria);
 
                 if (count($ret) > 0) {
                     foreach ($ret as $object) {
-                        $return .= $object->getVar($fieldName, 'n') . "\n";
+                        $return .= $object->getVar($fieldName, 'n')."\n";
                     }
                 }
             }
@@ -362,23 +362,23 @@ 
             return $return;
         }
         $return = '';
-        $return .= "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" title=\"Style sheet\" href=\"" . $this->jsFolderUrl . "autocomplete/jquery.autocomplete.css\" />\n";
+        $return .= "<link rel=\"stylesheet\" type=\"text/css\" media=\"all\" title=\"Style sheet\" href=\"".$this->jsFolderUrl."autocomplete/jquery.autocomplete.css\" />\n";
         if (!$jqueryAlreadyLoaded) {
-            $return .= "<script type=\"text/javascript\" src=\"" . $this->jsFolderUrl . "jquery/jquery.js\"></script>\n";
+            $return .= "<script type=\"text/javascript\" src=\"".$this->jsFolderUrl."jquery/jquery.js\"></script>\n";
         }
-        $return .= "<script type=\"text/javascript\" src=\"" . $this->jsFolderUrl . "noconflict.js\"></script>\n";
-        $return .= "<script type=\"text/javascript\" src=\"" . $this->jsFolderUrl . "autocomplete/jquery.autocomplete.min.js\"></script>\n";
+        $return .= "<script type=\"text/javascript\" src=\"".$this->jsFolderUrl."noconflict.js\"></script>\n";
+        $return .= "<script type=\"text/javascript\" src=\"".$this->jsFolderUrl."autocomplete/jquery.autocomplete.min.js\"></script>\n";
         $return .= "<script type=\"text/javascript\">\n";
         $return .= "jQuery(function($) {\n";
-        $return .= "var url='" . $this->baseUrl . "';\n";    // TODO: Supprimer "var" car cela limite sa portée !
-        $return .= "var handlerName='" . $this->handler->className . "';\n";
+        $return .= "var url='".$this->baseUrl."';\n"; // TODO: Supprimer "var" car cela limite sa portée !
+        $return .= "var handlerName='".$this->handler->className."';\n";
 
         foreach ($this->vars as $fieldName => $parameters) {
             if ($parameters['autoComplete'] == true) {
-                $field = self::PREFIX . $fieldName;
-                $return .= "$('#" . $field . "').autocomplete(url, {\n";
+                $field = self::PREFIX.$fieldName;
+                $return .= "$('#".$field."').autocomplete(url, {\n";
                 $return .= "extraParams: {\n";
-                $return .= "    field: '" . $fieldName . "',\n";
+                $return .= "    field: '".$fieldName."',\n";
                 $return .= "    op: 'autocomplete',\n";
                 $return .= "    handler: handlerName\n";
                 $return .= "}\n";
@@ -431,7 +431,7 @@ 
      */
     private function getSessionName()
     {
-        return self::MODULE_NAME . '_' . $this->handler->table;
+        return self::MODULE_NAME.'_'.$this->handler->table;
     }
 
     /**
@@ -441,7 +441,7 @@ 
      */
     private function getStartSessionName()
     {
-        return $this->getSessionName() . '_start';
+        return $this->getSessionName().'_start';
     }
 
     /**
@@ -533,11 +533,11 @@ 
             $sortField = $_REQUEST[$orderFieldsNames[0]];
             $sortOrder = $_REQUEST[$orderFieldsNames[1]];
         } else {
-            if (isset($_SESSION[$cookieName . '_sortField'])) {
-                $sortField = $_SESSION[$cookieName . '_sortField'];
+            if (isset($_SESSION[$cookieName.'_sortField'])) {
+                $sortField = $_SESSION[$cookieName.'_sortField'];
             }
-            if (isset($_SESSION[$cookieName . '_sortOrder'])) {
-                $sortOrder = $_SESSION[$cookieName . '_sortOrder'];
+            if (isset($_SESSION[$cookieName.'_sortOrder'])) {
+                $sortOrder = $_SESSION[$cookieName.'_sortOrder'];
             }
         }
 
@@ -546,8 +546,8 @@ 
             $this->sortOrder = $sortOrder;
         }
         if (trim($sortField) != '' && trim($sortOrder) != '') {
-            $_SESSION[$cookieName . '_sortField'] = $sortField;
-            $_SESSION[$cookieName . '_sortOrder'] = $sortOrder;
+            $_SESSION[$cookieName.'_sortField'] = $sortField;
+            $_SESSION[$cookieName.'_sortOrder'] = $sortOrder;
         }
     }
 
@@ -596,19 +596,19 @@ 
      */
     public function filter()
     {
-        $this->setupFilter();                // Réinitialisations
+        $this->setupFilter(); // Réinitialisations
         $ts = MyTextSanitizer::getInstance();
-        $this->setSortFieldsFromRequest();    // On récupère la zone de tri éventuellement passée dans la requête
+        $this->setSortFieldsFromRequest(); // On récupère la zone de tri éventuellement passée dans la requête
         $this->isSetCleanFilter();
 
         foreach ($this->vars as $fieldName => $fieldProperties) {
             // On commence par récupérer toutes les valeurs
-            $formFieldName           = self::PREFIX . $fieldName;    // "filter_website_id" par exemple
-            $fieldProperties['data'] = null;    // Valeur par défaut
+            $formFieldName           = self::PREFIX.$fieldName; // "filter_website_id" par exemple
+            $fieldProperties['data'] = null; // Valeur par défaut
             if (isset($_REQUEST[$formFieldName])) {
                 if ($fieldProperties['dataType'] == self::FILTER_DATA_NUMERIC) {    // Zone numérique
-                    if ((int)$_REQUEST[$formFieldName] != 0) {
-                        $fieldProperties['data'] = (int)$_REQUEST[$formFieldName];
+                    if ((int) $_REQUEST[$formFieldName] != 0) {
+                        $fieldProperties['data'] = (int) $_REQUEST[$formFieldName];
                         if (!$fieldProperties['minusOne']) {
                             $this->criteria->add(new Criteria($fieldName, $fieldProperties['data'], $fieldProperties['operator']));
                         } else {
@@ -620,9 +620,9 @@ 
                     if (trim($_REQUEST[$formFieldName]) != '') {
                         $fieldProperties['data'] = $_REQUEST[$formFieldName];
                         if (!REFERENCES_EXACT_SEARCH) {
-                            $this->criteria->add(new Criteria($fieldName, '%' . $ts->addSlashes($fieldProperties['data']) . '%', 'LIKE'));
+                            $this->criteria->add(new Criteria($fieldName, '%'.$ts->addSlashes($fieldProperties['data']).'%', 'LIKE'));
                         } else {
-                            $this->criteria->add(new Criteria($fieldName, $ts->addSlashes($fieldProperties['data']) . '%', 'LIKE'));
+                            $this->criteria->add(new Criteria($fieldName, $ts->addSlashes($fieldProperties['data']).'%', 'LIKE'));
                         }
                         $this->newFilter = true;
                     }
@@ -686,7 +686,7 @@ 
     {
         if ($this->keepStart) {
             $startSessionName            = $this->getStartSessionName();
-            $_SESSION[$startSessionName] = (int)$start;
+            $_SESSION[$startSessionName] = (int) $start;
         }
     }
 
@@ -699,11 +699,11 @@ 
     {
         $start = 0;
         if (isset($_REQUEST[$this->startName])) {
-            $start = (int)$_REQUEST[$this->startName];
+            $start = (int) $_REQUEST[$this->startName];
         } elseif ($this->keepStart) {
             $startSessionName = $this->getStartSessionName();
             if (isset($_SESSION[$startSessionName])) {
-                $start = (int)$_SESSION[$startSessionName];
+                $start = (int) $_SESSION[$startSessionName];
             }
         }
         // Mise en session
@@ -769,7 +769,7 @@ 
         if (!$this->isInitialized) {
             $this->filter();
         }
-        require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+        require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
         $itemsCount  = $this->getCount();
         $queryString = array();
         if (trim($this->op) != '') {
@@ -779,7 +779,7 @@ 
 
         if ($itemsCount > $this->limit) {
             foreach ($this->vars as $fieldName => $fieldProperties) {
-                $formFieldName               = self::PREFIX . $fieldName;    // "filter_website_id" par exemple
+                $formFieldName               = self::PREFIX.$fieldName; // "filter_website_id" par exemple
                 $queryString[$formFieldName] = $fieldProperties['data'];
             }
             // Ajout des paramètres supplémentaires éventuels
@@ -839,15 +839,15 @@ 
             return $html;
         }
         $fieldData     = $this->vars[$fieldName];
-        $htmlFieldName = self::PREFIX . $fieldName;
+        $htmlFieldName = self::PREFIX.$fieldName;
 
         switch ($fieldData['fieldType']) {
             case self::FILTER_FIELD_TEXT:    // Zone de texte
                 $ts   = MyTextSanitizer::getInstance();
-                $html = "<input type='text' name='$htmlFieldName' id='$htmlFieldName' size='" . $fieldData['size'] . "' maxlength='" . $fieldData['maxLength'] . "' value='" . $ts->htmlSpecialChars($fieldData['data']) . "' />";
+                $html = "<input type='text' name='$htmlFieldName' id='$htmlFieldName' size='".$fieldData['size']."' maxlength='".$fieldData['maxLength']."' value='".$ts->htmlSpecialChars($fieldData['data'])."' />";
                 break;
 
-            case self::FILTER_FIELD_SELECT;     // Select
+            case self::FILTER_FIELD_SELECT; // Select
                 $style = '';
                 if (isset($fieldData['style']) && trim($fieldData['style']) != '') {
                     $style = $fieldData['style'];
@@ -900,7 +900,7 @@ 
         $queryString['cleanFilter'] = '1';
         $baseurl                    = $this->baseUrl;
 
-        return "&nbsp;&nbsp;<a href='$baseurl?" . http_build_query($queryString) . "' title='" . _MD_REFERENCES_CLEAN_FILTER . "'><img align='top' src='../assets/images/clear_left.png' alt='" . _MD_REFERENCES_CLEAN_FILTER . "' /></a>";
+        return "&nbsp;&nbsp;<a href='$baseurl?".http_build_query($queryString)."' title='"._MD_REFERENCES_CLEAN_FILTER."'><img align='top' src='../assets/images/clear_left.png' alt='"._MD_REFERENCES_CLEAN_FILTER."' /></a>";
     }
 
     /**
@@ -914,11 +914,11 @@ 
     {
         $html = '';
         if (trim($this->operationName) != '' && trim($this->op) != '') {
-            $html .= "<input type='hidden' name='" . $this->operationName . "' id='" . $this->operationName . "' value='" . $this->op . "' />";
+            $html .= "<input type='hidden' name='".$this->operationName."' id='".$this->operationName."' value='".$this->op."' />";
         }
         if (!is_null($additionnals)) {
             foreach ($additionnals as $key => $value) {
-                $html .= "<input type='hidden' name='" . $key . "' id='" . $key . "' value='" . $value . "' />";
+                $html .= "<input type='hidden' name='".$key."' id='".$key."' value='".$value."' />";
             }
         }
         $html .= "<input type='submit' name='btngo' id='btngo' value='$description' />";

class/references_utils.php

Spacing +199 added lines, -199 removed lines

@@ -109,7 +109,7 @@ 
     {
         $x23 = false;
         $xv  = str_replace('XOOPS ', '', XOOPS_VERSION);
-        if ((int)substr($xv, 2, 1) >= 3) {
+        if ((int) substr($xv, 2, 1) >= 3) {
             $x23 = true;
         }
 
@@ -149,15 +149,15 @@ 
         // Only for Xoops 2.0.x
         switch ($editor_option) {
             case 'fckeditor':
-                if (is_readable(XOOPS_ROOT_PATH . '/class/fckeditor/formfckeditor.php')) {
-                    require_once(XOOPS_ROOT_PATH . '/class/fckeditor/formfckeditor.php');
+                if (is_readable(XOOPS_ROOT_PATH.'/class/fckeditor/formfckeditor.php')) {
+                    require_once(XOOPS_ROOT_PATH.'/class/fckeditor/formfckeditor.php');
                     $editor = new XoopsFormFckeditor($caption, $name, $value);
                 }
                 break;
 
             case 'htmlarea':
-                if (is_readable(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php')) {
-                    require_once(XOOPS_ROOT_PATH . '/class/htmlarea/formhtmlarea.php');
+                if (is_readable(XOOPS_ROOT_PATH.'/class/htmlarea/formhtmlarea.php')) {
+                    require_once(XOOPS_ROOT_PATH.'/class/htmlarea/formhtmlarea.php');
                     $editor = new XoopsFormHtmlarea($caption, $name, $value);
                 }
                 break;
@@ -172,15 +172,15 @@ 
 
             case 'tinyeditor':
             case 'tinymce':
-                if (is_readable(XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinyeditortextarea.php')) {
-                    require_once XOOPS_ROOT_PATH . '/class/xoopseditor/tinyeditor/formtinyeditortextarea.php';
+                if (is_readable(XOOPS_ROOT_PATH.'/class/xoopseditor/tinyeditor/formtinyeditortextarea.php')) {
+                    require_once XOOPS_ROOT_PATH.'/class/xoopseditor/tinyeditor/formtinyeditortextarea.php';
                     $editor = new XoopsFormTinyeditorTextArea(array('caption' => $caption, 'name' => $name, 'value' => $value, 'width' => '100%', 'height' => '400px'));
                 }
                 break;
 
             case 'koivi':
-                if (is_readable(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php')) {
-                    require_once(XOOPS_ROOT_PATH . '/class/wysiwyg/formwysiwygtextarea.php');
+                if (is_readable(XOOPS_ROOT_PATH.'/class/wysiwyg/formwysiwygtextarea.php')) {
+                    require_once(XOOPS_ROOT_PATH.'/class/wysiwyg/formwysiwygtextarea.php');
                     $editor = new XoopsFormWysiwygTextArea($caption, $name, $value, $width, $height, '');
                 }
                 break;
@@ -202,9 +202,9 @@ 
     public static function javascriptLinkConfirm($message, $form = false)
     {
         if (!$form) {
-            return "onclick=\"javascript:return confirm('" . str_replace("'", ' ', $message) . "')\"";
+            return "onclick=\"javascript:return confirm('".str_replace("'", ' ', $message)."')\"";
         } else {
-            return "onSubmit=\"javascript:return confirm('" . str_replace("'", ' ', $message) . "')\"";
+            return "onSubmit=\"javascript:return confirm('".str_replace("'", ' ', $message)."')\"";
         }
     }
 
@@ -284,7 +284,7 @@ 
     public static function sendEmailFromTpl($tplName, $recipients, $subject, $variables)
     {
         global $xoopsConfig;
-        require_once XOOPS_ROOT_PATH . '/class/xoopsmailer.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsmailer.php';
         if (!is_array($recipients)) {
             if (trim($recipients) == '') {
                 return false;
@@ -295,13 +295,13 @@ 
             }
         }
         if (function_exists('xoops_getMailer')) {
-            $xoopsMailer =& xoops_getMailer();
+            $xoopsMailer = & xoops_getMailer();
         } else {
-            $xoopsMailer =& getMailer();
+            $xoopsMailer = & getMailer();
         }
 
         $xoopsMailer->useMail();
-        $xoopsMailer->setTemplateDir(XOOPS_ROOT_PATH . '/modules/' . self::MODULE_NAME . '/language/' . $xoopsConfig['language'] . '/mail_template');
+        $xoopsMailer->setTemplateDir(XOOPS_ROOT_PATH.'/modules/'.self::MODULE_NAME.'/language/'.$xoopsConfig['language'].'/mail_template');
         $xoopsMailer->setTemplate($tplName);
         $xoopsMailer->setToEmails($recipients);
         // TODO: Change !
@@ -313,7 +313,7 @@ 
         }
         $res = $xoopsMailer->send();
         unset($xoopsMailer);
-        $filename = XOOPS_UPLOAD_PATH . '/logmail_' . self::MODULE_NAME . '.php';
+        $filename = XOOPS_UPLOAD_PATH.'/logmail_'.self::MODULE_NAME.'.php';
         if (!file_exists($filename)) {
             $fp = @fopen($filename, 'a');
             if ($fp) {
@@ -324,16 +324,16 @@ 
         $fp = @fopen($filename, 'a');
 
         if ($fp) {
-            fwrite($fp, str_repeat('-', 120) . "\n");
-            fwrite($fp, date('d/m/Y H:i:s') . "\n");
-            fwrite($fp, 'Template name : ' . $tplName . "\n");
-            fwrite($fp, 'Email subject : ' . $subject . "\n");
+            fwrite($fp, str_repeat('-', 120)."\n");
+            fwrite($fp, date('d/m/Y H:i:s')."\n");
+            fwrite($fp, 'Template name : '.$tplName."\n");
+            fwrite($fp, 'Email subject : '.$subject."\n");
             if (is_array($recipients)) {
-                fwrite($fp, 'Recipient(s) : ' . implode(',', $recipients) . "\n");
+                fwrite($fp, 'Recipient(s) : '.implode(',', $recipients)."\n");
             } else {
-                fwrite($fp, 'Recipient(s) : ' . $recipients . "\n");
+                fwrite($fp, 'Recipient(s) : '.$recipients."\n");
             }
-            fwrite($fp, 'Transmited variables : ' . implode(',', $variables) . "\n");
+            fwrite($fp, 'Transmited variables : '.implode(',', $variables)."\n");
             fclose($fp);
         }
 
@@ -348,17 +348,17 @@ 
         global $xoopsModule;
         $folder  = $xoopsModule->getVar('dirname');
         $tpllist = array();
-        require_once XOOPS_ROOT_PATH . '/class/xoopsblock.php';
-        require_once XOOPS_ROOT_PATH . '/class/template.php';
+        require_once XOOPS_ROOT_PATH.'/class/xoopsblock.php';
+        require_once XOOPS_ROOT_PATH.'/class/template.php';
         $tplfile_handler = xoops_getHandler('tplfile');
         $tpllist         = $tplfile_handler->find(null, null, null, $folder);
-        xoops_template_clear_module_cache($xoopsModule->getVar('mid'));            // Clear module's blocks cache
+        xoops_template_clear_module_cache($xoopsModule->getVar('mid')); // Clear module's blocks cache
 
         foreach ($tpllist as $onetemplate) {    // Remove cache for each page.
             if ($onetemplate->getVar('tpl_type') === 'module') {
                 //  Note, I've been testing all the other methods (like the one of Smarty) and none of them run, that's why I have used this code
                 $files_del = array();
-                $files_del = glob(XOOPS_CACHE_PATH . '/*' . $onetemplate->getVar('tpl_file') . '*');
+                $files_del = glob(XOOPS_CACHE_PATH.'/*'.$onetemplate->getVar('tpl_file').'*');
                 if (count($files_del) > 0 && is_array($files_del)) {
                     foreach ($files_del as $one_file) {
                         if (is_file($one_file)) {
@@ -394,7 +394,7 @@ 
         if (!isset($mymodule)) {
             global $xoopsModule;
             if (isset($xoopsModule) && is_object($xoopsModule) && $xoopsModule->getVar('dirname') == REFERENCES_DIRNAME) {
-                $mymodule =& $xoopsModule;
+                $mymodule = & $xoopsModule;
             } else {
                 $hModule  = xoops_getHandler('module');
                 $mymodule = $hModule->getByDirname(REFERENCES_DIRNAME);
@@ -512,12 +512,12 @@ 
      */
     public static function getCurrentSQLDate()
     {
-        return date('Y-m-d');    // 2007-05-02
+        return date('Y-m-d'); // 2007-05-02
     }
 
     public static function getCurrentSQLDateTime()
     {
-        return date('Y-m-d H:i:s');    // 2007-05-02
+        return date('Y-m-d H:i:s'); // 2007-05-02
     }
 
     /**
@@ -544,7 +544,7 @@ 
      */
     public static function timestampToMysqlDate($timestamp)
     {
-        return date('Y-m-d', (int)$timestamp);
+        return date('Y-m-d', (int) $timestamp);
     }
 
     /**
@@ -582,7 +582,7 @@ 
         }
         if (strpos(strtolower(XOOPS_VERSION), 'legacy') === false) {
             $xv = xoops_trim(str_replace('XOOPS ', '', XOOPS_VERSION));
-            if ((int)substr($xv, 4, 2) >= 17) {
+            if ((int) substr($xv, 4, 2) >= 17) {
                 return false;
             }
         }
@@ -645,25 +645,25 @@ 
         }
         $ext  = basename($fileName);
         $ext  = explode('.', $ext);
-        $ext  = '.' . $ext[count($ext) - 1];
+        $ext  = '.'.$ext[count($ext) - 1];
         $true = true;
         while ($true) {
             $ipbits = explode('.', $_SERVER['REMOTE_ADDR']);
             list($usec, $sec) = explode(' ', microtime());
-            $usec = (integer)($usec * 65536);
-            $sec  = ((integer)$sec) & 0xFFFF;
+            $usec = (integer) ($usec * 65536);
+            $sec  = ((integer) $sec)&0xFFFF;
 
             if ($trimName) {
-                $uid = sprintf('%06x%04x%04x', ($ipbits[0] << 24) | ($ipbits[1] << 16) | ($ipbits[2] << 8) | $ipbits[3], $sec, $usec);
+                $uid = sprintf('%06x%04x%04x', ($ipbits[0] << 24)|($ipbits[1] << 16)|($ipbits[2] << 8)|$ipbits[3], $sec, $usec);
             } else {
-                $uid = sprintf('%08x-%04x-%04x', ($ipbits[0] << 24) | ($ipbits[1] << 16) | ($ipbits[2] << 8) | $ipbits[3], $sec, $usec);
+                $uid = sprintf('%08x-%04x-%04x', ($ipbits[0] << 24)|($ipbits[1] << 16)|($ipbits[2] << 8)|$ipbits[3], $sec, $usec);
             }
-            if (!file_exists($workingfolder . $uid . $ext)) {
+            if (!file_exists($workingfolder.$uid.$ext)) {
                 $true = false;
             }
         }
 
-        return $uid . $ext;
+        return $uid.$ext;
     }
 
     /**
@@ -678,135 +678,135 @@ 
         $chaine = html_entity_decode($chaine);
 
         for ($i = 0; $i <= 255; ++$i) {
-            $search[]  = '&#' . $i . ';';
+            $search[]  = '&#'.$i.';';
             $replace[] = chr($i);
         }
-		$replace[]='...'; $search[]='…';
-		$replace[]="'";	$search[]='‘';
-		$replace[]="'";	$search[]= '’';
-		$replace[]='-';	$search[] = '&bull;';	// $replace[] = '•';
-		$replace[]='—'; $search[]='&mdash;';
-		$replace[]='-'; $search[]='&ndash;';
-		$replace[]='-'; $search[]='&shy;';
-		$replace[]='"'; $search[]='&quot;';
-		$replace[]='&'; $search[]='&amp;';
-		$replace[]='ˆ'; $search[]='&circ;';
-		$replace[]='¡'; $search[]='&iexcl;';
-		$replace[]='¦'; $search[]='&brvbar;';
-		$replace[]='¨'; $search[]='&uml;';
-		$replace[]='¯'; $search[]='&macr;';
-		$replace[]='´'; $search[]='&acute;';
-		$replace[]='¸'; $search[]='&cedil;';
-		$replace[]='¿'; $search[]='&iquest;';
-		$replace[]='˜'; $search[]='&tilde;';
-		$replace[]="'"; $search[]='&lsquo;';	// $replace[]='‘';
-		$replace[]="'"; $search[]='&rsquo;';	// $replace[]='’';
-		$replace[]='‚'; $search[]='&sbquo;';
-		$replace[]="'"; $search[]='&ldquo;';	// $replace[]='“';
-		$replace[]="'"; $search[]='&rdquo;';	// $replace[]='”';
-		$replace[]='„'; $search[]='&bdquo;';
-		$replace[]='‹'; $search[]='&lsaquo;';
-		$replace[]='›'; $search[]='&rsaquo;';
-		$replace[]='<'; $search[]='&lt;';
-		$replace[]='>'; $search[]='&gt;';
-		$replace[]='±'; $search[]='&plusmn;';
-		$replace[]='«'; $search[]='&laquo;';
-		$replace[]='»'; $search[]='&raquo;';
-		$replace[]='×'; $search[]='&times;';
-		$replace[]='÷'; $search[]='&divide;';
-		$replace[]='¢'; $search[]='&cent;';
-		$replace[]='£'; $search[]='&pound;';
-		$replace[]='¤'; $search[]='&curren;';
-		$replace[]='¥'; $search[]='&yen;';
-		$replace[]='§'; $search[]='&sect;';
-		$replace[]='©'; $search[]='&copy;';
-		$replace[]='¬'; $search[]='&not;';
-		$replace[]='®'; $search[]='&reg;';
-		$replace[]='°'; $search[]='&deg;';
-		$replace[]='µ'; $search[]='&micro;';
-		$replace[]='¶'; $search[]='&para;';
-		$replace[]='·'; $search[]='&middot;';
-		$replace[]='†'; $search[]='&dagger;';
-		$replace[]='‡'; $search[]='&Dagger;';
-		$replace[]='‰'; $search[]='&permil;';
-		$replace[]='Euro'; $search[]='&euro;';		// $replace[]='€'
-		$replace[]='¼'; $search[]='&frac14;';
-		$replace[]='½'; $search[]='&frac12;';
-		$replace[]='¾'; $search[]='&frac34;';
-		$replace[]='¹'; $search[]='&sup1;';
-		$replace[]='²'; $search[]='&sup2;';
-		$replace[]='³'; $search[]='&sup3;';
-		$replace[]='á'; $search[]='&aacute;';
-		$replace[]='Á'; $search[]='&Aacute;';
-		$replace[]='â'; $search[]='&acirc;';
-		$replace[]='Â'; $search[]='&Acirc;';
-		$replace[]='à'; $search[]='&agrave;';
-		$replace[]='À'; $search[]='&Agrave;';
-		$replace[]='å'; $search[]='&aring;';
-		$replace[]='Å'; $search[]='&Aring;';
-		$replace[]='ã'; $search[]='&atilde;';
-		$replace[]='Ã'; $search[]='&Atilde;';
-		$replace[]='ä'; $search[]='&auml;';
-		$replace[]='Ä'; $search[]='&Auml;';
-		$replace[]='ª'; $search[]='&ordf;';
-		$replace[]='æ'; $search[]='&aelig;';
-		$replace[]='Æ'; $search[]='&AElig;';
-		$replace[]='ç'; $search[]='&ccedil;';
-		$replace[]='Ç'; $search[]='&Ccedil;';
-		$replace[]='ð'; $search[]='&eth;';
-		$replace[]='Ð'; $search[]='&ETH;';
-		$replace[]='é'; $search[]='&eacute;';
-		$replace[]='É'; $search[]='&Eacute;';
-		$replace[]='ê'; $search[]='&ecirc;';
-		$replace[]='Ê'; $search[]='&Ecirc;';
-		$replace[]='è'; $search[]='&egrave;';
-		$replace[]='È'; $search[]='&Egrave;';
-		$replace[]='ë'; $search[]='&euml;';
-		$replace[]='Ë'; $search[]='&Euml;';
-		$replace[]='ƒ'; $search[]='&fnof;';
-		$replace[]='í'; $search[]='&iacute;';
-		$replace[]='Í'; $search[]='&Iacute;';
-		$replace[]='î'; $search[]='&icirc;';
-		$replace[]='Î'; $search[]='&Icirc;';
-		$replace[]='ì'; $search[]='&igrave;';
-		$replace[]='Ì'; $search[]='&Igrave;';
-		$replace[]='ï'; $search[]='&iuml;';
-		$replace[]='Ï'; $search[]='&Iuml;';
-		$replace[]='ñ'; $search[]='&ntilde;';
-		$replace[]='Ñ'; $search[]='&Ntilde;';
-		$replace[]='ó'; $search[]='&oacute;';
-		$replace[]='Ó'; $search[]='&Oacute;';
-		$replace[]='ô'; $search[]='&ocirc;';
-		$replace[]='Ô'; $search[]='&Ocirc;';
-		$replace[]='ò'; $search[]='&ograve;';
-		$replace[]='Ò'; $search[]='&Ograve;';
-		$replace[]='º'; $search[]='&ordm;';
-		$replace[]='ø'; $search[]='&oslash;';
-		$replace[]='Ø'; $search[]='&Oslash;';
-		$replace[]='õ'; $search[]='&otilde;';
-		$replace[]='Õ'; $search[]='&Otilde;';
-		$replace[]='ö'; $search[]='&ouml;';
-		$replace[]='Ö'; $search[]='&Ouml;';
-		$replace[]='œ'; $search[]='&oelig;';
-		$replace[]='Œ'; $search[]='&OElig;';
-		$replace[]='š'; $search[]='&scaron;';
-		$replace[]='Š'; $search[]='&Scaron;';
-		$replace[]='ß'; $search[]='&szlig;';
-		$replace[]='þ'; $search[]='&thorn;';
-		$replace[]='Þ'; $search[]='&THORN;';
-		$replace[]='ú'; $search[]='&uacute;';
-		$replace[]='Ú'; $search[]='&Uacute;';
-		$replace[]='û'; $search[]='&ucirc;';
-		$replace[]='Û'; $search[]='&Ucirc;';
-		$replace[]='ù'; $search[]='&ugrave;';
-		$replace[]='Ù'; $search[]='&Ugrave;';
-		$replace[]='ü'; $search[]='&uuml;';
-		$replace[]='Ü'; $search[]='&Uuml;';
-		$replace[]='ý'; $search[]='&yacute;';
-		$replace[]='Ý'; $search[]='&Yacute;';
-		$replace[]='ÿ'; $search[]='&yuml;';
-		$replace[]='Ÿ'; $search[]='&Yuml;';
-        $chaine    = str_replace($search, $replace, $chaine);
+		$replace[] = '...'; $search[] = '…';
+		$replace[] = "'"; $search[] = '‘';
+		$replace[] = "'"; $search[] = '’';
+		$replace[] = '-'; $search[] = '&bull;'; // $replace[] = '•';
+		$replace[] = '—'; $search[] = '&mdash;';
+		$replace[] = '-'; $search[] = '&ndash;';
+		$replace[] = '-'; $search[] = '&shy;';
+		$replace[] = '"'; $search[] = '&quot;';
+		$replace[] = '&'; $search[] = '&amp;';
+		$replace[] = 'ˆ'; $search[] = '&circ;';
+		$replace[] = '¡'; $search[] = '&iexcl;';
+		$replace[] = '¦'; $search[] = '&brvbar;';
+		$replace[] = '¨'; $search[] = '&uml;';
+		$replace[] = '¯'; $search[] = '&macr;';
+		$replace[] = '´'; $search[] = '&acute;';
+		$replace[] = '¸'; $search[] = '&cedil;';
+		$replace[] = '¿'; $search[] = '&iquest;';
+		$replace[] = '˜'; $search[] = '&tilde;';
+		$replace[] = "'"; $search[] = '&lsquo;'; // $replace[]='‘';
+		$replace[] = "'"; $search[] = '&rsquo;'; // $replace[]='’';
+		$replace[] = '‚'; $search[] = '&sbquo;';
+		$replace[] = "'"; $search[] = '&ldquo;'; // $replace[]='“';
+		$replace[] = "'"; $search[] = '&rdquo;'; // $replace[]='”';
+		$replace[] = '„'; $search[] = '&bdquo;';
+		$replace[] = '‹'; $search[] = '&lsaquo;';
+		$replace[] = '›'; $search[] = '&rsaquo;';
+		$replace[] = '<'; $search[] = '&lt;';
+		$replace[] = '>'; $search[] = '&gt;';
+		$replace[] = '±'; $search[] = '&plusmn;';
+		$replace[] = '«'; $search[] = '&laquo;';
+		$replace[] = '»'; $search[] = '&raquo;';
+		$replace[] = '×'; $search[] = '&times;';
+		$replace[] = '÷'; $search[] = '&divide;';
+		$replace[] = '¢'; $search[] = '&cent;';
+		$replace[] = '£'; $search[] = '&pound;';
+		$replace[] = '¤'; $search[] = '&curren;';
+		$replace[] = '¥'; $search[] = '&yen;';
+		$replace[] = '§'; $search[] = '&sect;';
+		$replace[] = '©'; $search[] = '&copy;';
+		$replace[] = '¬'; $search[] = '&not;';
+		$replace[] = '®'; $search[] = '&reg;';
+		$replace[] = '°'; $search[] = '&deg;';
+		$replace[] = 'µ'; $search[] = '&micro;';
+		$replace[] = '¶'; $search[] = '&para;';
+		$replace[] = '·'; $search[] = '&middot;';
+		$replace[] = '†'; $search[] = '&dagger;';
+		$replace[] = '‡'; $search[] = '&Dagger;';
+		$replace[] = '‰'; $search[] = '&permil;';
+		$replace[] = 'Euro'; $search[] = '&euro;'; // $replace[]='€'
+		$replace[] = '¼'; $search[] = '&frac14;';
+		$replace[] = '½'; $search[] = '&frac12;';
+		$replace[] = '¾'; $search[] = '&frac34;';
+		$replace[] = '¹'; $search[] = '&sup1;';
+		$replace[] = '²'; $search[] = '&sup2;';
+		$replace[] = '³'; $search[] = '&sup3;';
+		$replace[] = 'á'; $search[] = '&aacute;';
+		$replace[] = 'Á'; $search[] = '&Aacute;';
+		$replace[] = 'â'; $search[] = '&acirc;';
+		$replace[] = 'Â'; $search[] = '&Acirc;';
+		$replace[] = 'à'; $search[] = '&agrave;';
+		$replace[] = 'À'; $search[] = '&Agrave;';
+		$replace[] = 'å'; $search[] = '&aring;';
+		$replace[] = 'Å'; $search[] = '&Aring;';
+		$replace[] = 'ã'; $search[] = '&atilde;';
+		$replace[] = 'Ã'; $search[] = '&Atilde;';
+		$replace[] = 'ä'; $search[] = '&auml;';
+		$replace[] = 'Ä'; $search[] = '&Auml;';
+		$replace[] = 'ª'; $search[] = '&ordf;';
+		$replace[] = 'æ'; $search[] = '&aelig;';
+		$replace[] = 'Æ'; $search[] = '&AElig;';
+		$replace[] = 'ç'; $search[] = '&ccedil;';
+		$replace[] = 'Ç'; $search[] = '&Ccedil;';
+		$replace[] = 'ð'; $search[] = '&eth;';
+		$replace[] = 'Ð'; $search[] = '&ETH;';
+		$replace[] = 'é'; $search[] = '&eacute;';
+		$replace[] = 'É'; $search[] = '&Eacute;';
+		$replace[] = 'ê'; $search[] = '&ecirc;';
+		$replace[] = 'Ê'; $search[] = '&Ecirc;';
+		$replace[] = 'è'; $search[] = '&egrave;';
+		$replace[] = 'È'; $search[] = '&Egrave;';
+		$replace[] = 'ë'; $search[] = '&euml;';
+		$replace[] = 'Ë'; $search[] = '&Euml;';
+		$replace[] = 'ƒ'; $search[] = '&fnof;';
+		$replace[] = 'í'; $search[] = '&iacute;';
+		$replace[] = 'Í'; $search[] = '&Iacute;';
+		$replace[] = 'î'; $search[] = '&icirc;';
+		$replace[] = 'Î'; $search[] = '&Icirc;';
+		$replace[] = 'ì'; $search[] = '&igrave;';
+		$replace[] = 'Ì'; $search[] = '&Igrave;';
+		$replace[] = 'ï'; $search[] = '&iuml;';
+		$replace[] = 'Ï'; $search[] = '&Iuml;';
+		$replace[] = 'ñ'; $search[] = '&ntilde;';
+		$replace[] = 'Ñ'; $search[] = '&Ntilde;';
+		$replace[] = 'ó'; $search[] = '&oacute;';
+		$replace[] = 'Ó'; $search[] = '&Oacute;';
+		$replace[] = 'ô'; $search[] = '&ocirc;';
+		$replace[] = 'Ô'; $search[] = '&Ocirc;';
+		$replace[] = 'ò'; $search[] = '&ograve;';
+		$replace[] = 'Ò'; $search[] = '&Ograve;';
+		$replace[] = 'º'; $search[] = '&ordm;';
+		$replace[] = 'ø'; $search[] = '&oslash;';
+		$replace[] = 'Ø'; $search[] = '&Oslash;';
+		$replace[] = 'õ'; $search[] = '&otilde;';
+		$replace[] = 'Õ'; $search[] = '&Otilde;';
+		$replace[] = 'ö'; $search[] = '&ouml;';
+		$replace[] = 'Ö'; $search[] = '&Ouml;';
+		$replace[] = 'œ'; $search[] = '&oelig;';
+		$replace[] = 'Œ'; $search[] = '&OElig;';
+		$replace[] = 'š'; $search[] = '&scaron;';
+		$replace[] = 'Š'; $search[] = '&Scaron;';
+		$replace[] = 'ß'; $search[] = '&szlig;';
+		$replace[] = 'þ'; $search[] = '&thorn;';
+		$replace[] = 'Þ'; $search[] = '&THORN;';
+		$replace[] = 'ú'; $search[] = '&uacute;';
+		$replace[] = 'Ú'; $search[] = '&Uacute;';
+		$replace[] = 'û'; $search[] = '&ucirc;';
+		$replace[] = 'Û'; $search[] = '&Ucirc;';
+		$replace[] = 'ù'; $search[] = '&ugrave;';
+		$replace[] = 'Ù'; $search[] = '&Ugrave;';
+		$replace[] = 'ü'; $search[] = '&uuml;';
+		$replace[] = 'Ü'; $search[] = '&Uuml;';
+		$replace[] = 'ý'; $search[] = '&yacute;';
+		$replace[] = 'Ý'; $search[] = '&Yacute;';
+		$replace[] = 'ÿ'; $search[] = '&yuml;';
+		$replace[] = 'Ÿ'; $search[] = '&Yuml;';
+        $chaine = str_replace($search, $replace, $chaine);
 
         return $chaine;
     }
@@ -823,11 +823,11 @@ 
     {
         $s       = "ÀÁÂÃÄÅÒÓÔÕÖØÈÉÊËÇÌÍÎÏÙÚÛÜŸÑàáâãäåòóôõöøèéêëçìíîïùúûüÿñ '()";
         $r       = 'AAAAAAOOOOOOEEEECIIIIUUUUYNaaaaaaooooooeeeeciiiiuuuuyn----';
-        $content = self::unhtml($content);    // First, remove html entities
+        $content = self::unhtml($content); // First, remove html entities
         $content = strtr($content, $s, $r);
         $content = strip_tags($content);
         $content = strtolower($content);
-        $content = htmlentities($content);    // TODO: Vérifier
+        $content = htmlentities($content); // TODO: Vérifier
         $content = preg_replace('/&([a-zA-Z])(uml|acute|grave|circ|tilde);/', '$1', $content);
         $content = html_entity_decode($content);
         $content = eregi_replace('quot', ' ', $content);
@@ -842,7 +842,7 @@ 
         $keywords = '';
         foreach ($words as $word) {
             if (strlen($word) >= $urw) {
-                $keywords .= '-' . trim($word);
+                $keywords .= '-'.trim($word);
             }
         }
         if (!$keywords) {
@@ -877,7 +877,7 @@ 
             $limit = $_SESSION['references_keywords_limit'];
         } else {
             $config_handler                        = xoops_getHandler('config');
-            $xoopsConfigSearch                     =& $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH);
+            $xoopsConfigSearch                     = & $config_handler->getConfigsByCat(XOOPS_CONF_SEARCH);
             $limit                                 = $xoopsConfigSearch['keyword_min'];
             $_SESSION['references_keywords_limit'] = $limit;
         }
@@ -925,7 +925,7 @@ 
             if (!isset($config_handler) || !is_object($config_handler)) {
                 $config_handler = xoops_getHandler('config');
             }
-            $xoopsConfigMetaFooter =& $config_handler->getConfigsByCat(XOOPS_CONF_METAFOOTER);
+            $xoopsConfigMetaFooter = & $config_handler->getConfigsByCat(XOOPS_CONF_METAFOOTER);
             if (isset($xoopsConfigMetaFooter['meta_keywords'])) {
                 return $xoopsConfigMetaFooter['meta_keywords'];
             } else {
@@ -947,10 +947,10 @@ 
      */
     public static function uploadFile($indice, $dstpath = XOOPS_UPLOAD_PATH, $mimeTypes = null, $uploadMaxSize = null, $maxWidth = null, $maxHeight = null)
     {
-        require_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        require_once XOOPS_ROOT_PATH.'/class/uploader.php';
         global $destname;
         if (isset($_POST['xoops_upload_file'])) {
-            require_once XOOPS_ROOT_PATH . '/class/uploader.php';
+            require_once XOOPS_ROOT_PATH.'/class/uploader.php';
             $fldname = '';
             $fldname = $_FILES[$_POST['xoops_upload_file'][$indice]];
             $fldname = get_magic_quotes_gpc() ? stripslashes($fldname['name']) : $fldname['name'];
@@ -974,7 +974,7 @@ 
                     if ($uploader->upload()) {
                         return true;
                     } else {
-                        return _ERRORS . ' ' . htmlentities($uploader->getErrors());
+                        return _ERRORS.' '.htmlentities($uploader->getErrors());
                     }
                 } else {
                     return htmlentities($uploader->getErrors());
@@ -1057,9 +1057,9 @@ 
         $workingBreadcrumb = array();
         if (is_array($path)) {
             $moduleName          = self::getModuleName();
-            $workingBreadcrumb[] = "<a href='" . REFERENCES_URL . "' title='" . self::makeHrefTitle($moduleName) . "'>" . $moduleName . '</a>';
+            $workingBreadcrumb[] = "<a href='".REFERENCES_URL."' title='".self::makeHrefTitle($moduleName)."'>".$moduleName.'</a>';
             foreach ($path as $url => $title) {
-                $workingBreadcrumb[] = "<a href='" . $url . "'>" . $title . '</a>';
+                $workingBreadcrumb[] = "<a href='".$url."'>".$title.'</a>';
             }
             $cnt = count($workingBreadcrumb);
             for ($i = 0; $i < $cnt; ++$i) {
@@ -1098,7 +1098,7 @@ 
 
             $complete_tags = array_reverse($complete_tags);
             for ($i = 0; $i < count($complete_tags); ++$i) {
-                $string .= '</' . $complete_tags[$i] . '>';
+                $string .= '</'.$complete_tags[$i].'>';
             }
         }
 
@@ -1119,7 +1119,7 @@ 
                 $string = self::close_tags($string);
             }
 
-            return $string . $etc;
+            return $string.$etc;
         } else {
             return $string;
         }
@@ -1151,7 +1151,7 @@ 
     public static function getMimeType($filename)
     {
         if (function_exists('finfo_open')) {
-            $pathToMagic = REFERENCES_PATH . 'mime/magic';
+            $pathToMagic = REFERENCES_PATH.'mime/magic';
             $finfo       = new finfo(FILEINFO_MIME, $pathToMagic);
             $mimetype    = $finfo->file($filename);
             finfo_close($finfo);
@@ -1181,7 +1181,7 @@ 
             sort($xoopsUsersIDs);
             if (count($xoopsUsersIDs) > 0) {
                 $member_handler = xoops_getHandler('user');
-                $criteria       = new Criteria('uid', '(' . implode(',', $xoopsUsersIDs) . ')', 'IN');
+                $criteria       = new Criteria('uid', '('.implode(',', $xoopsUsersIDs).')', 'IN');
                 $criteria->setSort('uid');
                 $users = $member_handler->getObjects($criteria, true);
             }
@@ -1219,7 +1219,7 @@ 
         } else {
             if ($uid > 0) {
                 $member_handler = xoops_getHandler('member');
-                $buffer[$uid]   = $member_handler->getGroupsByUser($uid, false);    // Renvoie un tableau d'ID (de groupes)
+                $buffer[$uid]   = $member_handler->getGroupsByUser($uid, false); // Renvoie un tableau d'ID (de groupes)
             } else {
                 $buffer[$uid] = array(XOOPS_GROUP_ANONYMOUS);
             }
@@ -1246,7 +1246,7 @@ 
             $retval = $buffer[$group];
         } else {
             $member_handler = xoops_getHandler('member');
-            $groups         = $member_handler->getGroupsByUser($uid, false);    // Renvoie un tableau d'ID (de groupes)
+            $groups         = $member_handler->getGroupsByUser($uid, false); // Renvoie un tableau d'ID (de groupes)
             $retval         = in_array($group, $groups);
             $buffer[$group] = $retval;
         }
@@ -1286,7 +1286,7 @@ 
         static $cache = -1;
         if ($cache == -1) {
             global $xoopsDB;
-            $sql    = 'SELECT COUNT(*) FROM ' . $xoopsDB->prefix('groups');
+            $sql    = 'SELECT COUNT(*) FROM '.$xoopsDB->prefix('groups');
             $result = $xoopsDB->query($sql);
             if (!$result) {
                 return false;
@@ -1307,7 +1307,7 @@ 
     {
         if (!is_dir($folder)) {
             mkdir($folder, 0777);
-            file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
+            file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
         } else {
             if (!is_writable($folder)) {
                 chmod($folder, 0777);
@@ -1328,10 +1328,10 @@ 
         if (strstr($languageFile, $defaultExtension) === false) {
             $languageFile .= $defaultExtension;
         }
-        if (file_exists($root . 'language' . DIRECTORY_SEPARATOR . $xoopsConfig['language'] . DIRECTORY_SEPARATOR . $languageFile)) {
-            require_once $root . 'language' . DIRECTORY_SEPARATOR . $xoopsConfig['language'] . DIRECTORY_SEPARATOR . $languageFile;
+        if (file_exists($root.'language'.DIRECTORY_SEPARATOR.$xoopsConfig['language'].DIRECTORY_SEPARATOR.$languageFile)) {
+            require_once $root.'language'.DIRECTORY_SEPARATOR.$xoopsConfig['language'].DIRECTORY_SEPARATOR.$languageFile;
         } else {    // Fallback
-            require_once $root . 'language' . DIRECTORY_SEPARATOR . 'english' . DIRECTORY_SEPARATOR . $languageFile;
+            require_once $root.'language'.DIRECTORY_SEPARATOR.'english'.DIRECTORY_SEPARATOR.$languageFile;
         }
     }
 
@@ -1369,10 +1369,10 @@ 
                 $left = $top = 0;
                 if (is_array($pictureDimensions)) {
                     if ($pictureWidth > $param_width) {
-                        $left = (int)(($pictureWidth / 2) - ($param_width / 2));
+                        $left = (int) (($pictureWidth / 2) - ($param_width / 2));
                     }
                     if ($pictureHeight > $param_height) {
-                        $top = (int)(($pictureHeight / 2) - ($param_height / 2));
+                        $top = (int) (($pictureHeight / 2) - ($param_height / 2));
                     }
                 }
                 $result = $img->crop($left, $top, $param_width, $param_height);
@@ -1412,7 +1412,7 @@ 
                     $selected = " selected = 'selected'";
                 }
             }
-            $ret[] = '<option value=0' . $selected . '>---</option>';
+            $ret[] = '<option value=0'.$selected.'>---</option>';
         }
 
         foreach ($array as $index => $label) {
@@ -1426,7 +1426,7 @@ 
                     $selected = " selected = 'selected'";
                 }
             }
-            $ret[] = "<option value=\"" . $index . "\"" . $selected . '>' . $label . '</option>';
+            $ret[] = "<option value=\"".$index."\"".$selected.'>'.$label.'</option>';
         }
 
         return implode("\n", $ret);
@@ -1448,14 +1448,14 @@ 
     public static function htmlSelect($selectName, $array, $default, $withNull = true, $style = '', $multiple = false, $size = 1, $extra = '')
     {
         $ret = '';
-        $ret .= "<select name='" . $selectName . "' id='" . $selectName . "'";
+        $ret .= "<select name='".$selectName."' id='".$selectName."'";
         if (xoops_trim($style) != '') {
-            $ret .= " style='" . $style . "' ";
+            $ret .= " style='".$style."' ";
         }
         if (xoops_trim($multiple) != '') {
-            $ret .= " multiple = 'multiple' size='" . $size . "' ";
+            $ret .= " multiple = 'multiple' size='".$size."' ";
         }
-        $ret .= $extra . ">\n";
+        $ret .= $extra.">\n";
         $ret .= self::htmlSelectOptions($array, $default, $withNull);
         $ret .= "</select>\n";
 
@@ -1530,16 +1530,16 @@ 
     {
         global $xoopsDB;
         define('REFERENCES_MAINTAIN', true);
-        require self::MODULE_PATH . 'xoops_version.php';
+        require self::MODULE_PATH.'xoops_version.php';
         $tables = array();
         foreach ($modversion['tables'] as $table) {
             $tables[] = $xoopsDB->prefix($table);
         }
         if (count($tables) > 0) {
             $list = implode(',', $tables);
-            $xoopsDB->queryF('CHECK TABLE ' . $list);
-            $xoopsDB->queryF('ANALYZE TABLE ' . $list);
-            $xoopsDB->queryF('OPTIMIZE TABLE ' . $list);
+            $xoopsDB->queryF('CHECK TABLE '.$list);
+            $xoopsDB->queryF('ANALYZE TABLE '.$list);
+            $xoopsDB->queryF('OPTIMIZE TABLE '.$list);
         }
         self::updateCache();
         $handlers = references_handler::getInstance();

class/references_plugins.php

Spacing +9 added lines, -9 removed lines

@@ -59,11 +59,11 @@ 
      * Priorités des plugins
      * @var constant
      */
-    const EVENT_PRIORITY_1 = 1;    // Priorité la plus haute
+    const EVENT_PRIORITY_1 = 1; // Priorité la plus haute
     const EVENT_PRIORITY_2 = 2;
     const EVENT_PRIORITY_3 = 3;
     const EVENT_PRIORITY_4 = 4;
-    const EVENT_PRIORITY_5 = 5;    // Priorité la plus basse
+    const EVENT_PRIORITY_5 = 5; // Priorité la plus basse
 
     /**
      * Utilisé pour construire le nom de la classe
@@ -123,8 +123,8 @@ 
      */
     public function loadPlugins()
     {
-        $this->loadPluginsFiles(REFERENCES_PLUGINS_PATH . $this->pluginsTypesFolder[self::PLUGIN_ACTION], self::PLUGIN_ACTION);
-        $this->loadPluginsFiles(REFERENCES_PLUGINS_PATH . $this->pluginsTypesFolder[self::PLUGIN_FILTER], self::PLUGIN_FILTER);
+        $this->loadPluginsFiles(REFERENCES_PLUGINS_PATH.$this->pluginsTypesFolder[self::PLUGIN_ACTION], self::PLUGIN_ACTION);
+        $this->loadPluginsFiles(REFERENCES_PLUGINS_PATH.$this->pluginsTypesFolder[self::PLUGIN_FILTER], self::PLUGIN_FILTER);
     }
 
     /**
@@ -138,14 +138,14 @@ 
     {
         require_once $fullPathName;
         // Du style referencesRegionalizationFilter
-        $className = self::MODULE_DIRNAME . ucfirst(strtolower($pluginFolder)) . $this->pluginsTypeLabel[$type];
+        $className = self::MODULE_DIRNAME.ucfirst(strtolower($pluginFolder)).$this->pluginsTypeLabel[$type];
         if (class_exists($className) && get_parent_class($className) == $this->pluginsClassName[$type]) {
             // TODO: Vérifier que l'évènement n'est pas déjà en mémoire
             $events = call_user_func(array($className, self::PLUGIN_DESCRIBE_METHOD));
             foreach ($events as $event) {
                 $eventName                                         = $event[0];
                 $eventPriority                                     = $event[1];
-                $fileToInclude                                     = REFERENCES_PLUGINS_PATH . $this->pluginsTypesFolder[$type] . DIRECTORY_SEPARATOR . $pluginFolder . DIRECTORY_SEPARATOR . $event[2];
+                $fileToInclude                                     = REFERENCES_PLUGINS_PATH.$this->pluginsTypesFolder[$type].DIRECTORY_SEPARATOR.$pluginFolder.DIRECTORY_SEPARATOR.$event[2];
                 $classToCall                                       = $event[3];
                 $methodToCall                                      = $event[4];
                 $this->events[$type][$eventName][$eventPriority][] = array('fullPathName' => $fileToInclude, 'className' => $classToCall, 'method' => $methodToCall);
@@ -165,7 +165,7 @@ 
         $objects = new DirectoryIterator($path);
         foreach ($objects as $object) {
             if ($object->isDir() && !$object->isDot()) {
-                $file = $path . DIRECTORY_SEPARATOR . $object->current() . DIRECTORY_SEPARATOR . self::PLUGIN_SCRIPT_NAME;
+                $file = $path.DIRECTORY_SEPARATOR.$object->current().DIRECTORY_SEPARATOR.self::PLUGIN_SCRIPT_NAME;
                 if (file_exists($file)) {
                     $this->loadClass($file, $type, $object->current());
                 }
@@ -187,7 +187,7 @@ 
 
             return $this;
         }
-        ksort($this->events[self::PLUGIN_ACTION][$eventToFire]);    // Tri par priorit�
+        ksort($this->events[self::PLUGIN_ACTION][$eventToFire]); // Tri par priorit�
         foreach ($this->events[self::PLUGIN_ACTION][$eventToFire] as $priority => $events) {
             foreach ($events as $event) {
                 if ($this->isUnplug(self::PLUGIN_ACTION, $eventToFire, $event['fullPathName'], $event['className'], $event['method'])) {
@@ -222,7 +222,7 @@ 
 
             return $this;
         }
-        ksort($this->events[self::PLUGIN_FILTER][$eventToFire]);    // Tri par priorité
+        ksort($this->events[self::PLUGIN_FILTER][$eventToFire]); // Tri par priorité
         foreach ($this->events[self::PLUGIN_FILTER][$eventToFire] as $priority => $events) {
             foreach ($events as $event) {
                 if ($this->isUnplug(self::PLUGIN_FILTER, $eventToFire, $event['fullPathName'], $event['className'], $event['method'])) {

class/lite.php

Spacing +12 added lines, -12 removed lines

@@ -314,7 +314,7 @@ 
             'pearErrorMode'
         );
         if (in_array($name, $availableOptions)) {
-            $property        = '_' . $name;
+            $property        = '_'.$name;
             $this->$property = $value;
         }
     }
@@ -511,7 +511,7 @@ 
                 'counter' => $this->_memoryCachingCounter,
                 'array'   => $this->_memoryCachingArray
             );
-            $data  = serialize($array);
+            $data = serialize($array);
             $this->save($data, $id, $group);
         }
     }
@@ -623,9 +623,9 @@ 
     public function _cleanDir($dir, $group = false, $mode = 'ingroup')
     {
         if ($this->_fileNameProtection) {
-            $motif = $group ? 'cache_' . md5($group) . '_' : 'cache_';
+            $motif = $group ? 'cache_'.md5($group).'_' : 'cache_';
         } else {
-            $motif = $group ? 'cache_' . $group . '_' : 'cache_';
+            $motif = $group ? 'cache_'.$group.'_' : 'cache_';
         }
         if ($this->_memoryCaching) {
             foreach ($this->_memoryCachingArray as $key => $v) {
@@ -645,7 +645,7 @@ 
         while ($file = readdir($dh)) {
             if (($file !== '.') && ($file !== '..')) {
                 if (substr($file, 0, 6) === 'cache_') {
-                    $file2 = $dir . $file;
+                    $file2 = $dir.$file;
                     if (is_file($file2)) {
                         switch (substr($mode, 0, 9)) {
                             case 'old':
@@ -676,7 +676,7 @@ 
                         }
                     }
                     if (is_dir($file2) and ($this->_hashedDirectoryLevel > 0)) {
-                        $result = ($result and $this->_cleanDir($file2 . '/', $group, $mode));
+                        $result = ($result and $this->_cleanDir($file2.'/', $group, $mode));
                     }
                 }
             }
@@ -712,19 +712,19 @@ 
     public function _setFileName($id, $group)
     {
         if ($this->_fileNameProtection) {
-            $suffix = 'cache_' . md5($group) . '_' . md5($id);
+            $suffix = 'cache_'.md5($group).'_'.md5($id);
         } else {
-            $suffix = 'cache_' . $group . '_' . $id;
+            $suffix = 'cache_'.$group.'_'.$id;
         }
         $root = $this->_cacheDir;
         if ($this->_hashedDirectoryLevel > 0) {
             $hash = md5($suffix);
             for ($i = 0; $i < $this->_hashedDirectoryLevel; ++$i) {
-                $root = $root . 'cache_' . substr($hash, 0, $i + 1) . '/';
+                $root = $root.'cache_'.substr($hash, 0, $i + 1).'/';
             }
         }
         $this->_fileName = $suffix;
-        $this->_file     = $root . $suffix;
+        $this->_file     = $root.$suffix;
     }
 
     /**
@@ -790,7 +790,7 @@ 
             $hash = md5($this->_fileName);
             $root = $this->_cacheDir;
             for ($i = 0; $i < $this->_hashedDirectoryLevel; ++$i) {
-                $root = $root . 'cache_' . substr($hash, 0, $i + 1) . '/';
+                $root = $root.'cache_'.substr($hash, 0, $i + 1).'/';
                 if (!(@is_dir($root))) {
                     @mkdir($root, $this->_hashedDirectoryUmask);
                 }
@@ -816,7 +816,7 @@ 
             return true;
         }
 
-        return $this->raiseError('Cache_Lite : Unable to write cache file : ' . $this->_file, -1);
+        return $this->raiseError('Cache_Lite : Unable to write cache file : '.$this->_file, -1);
     }
 
     /**

class/references_articles.php

Spacing +45 added lines, -45 removed lines

@@ -22,13 +22,13 @@ 
     die('XOOPS root path not defined');
 }
 
-require_once XOOPS_ROOT_PATH . '/kernel/object.php';
+require_once XOOPS_ROOT_PATH.'/kernel/object.php';
 if (!class_exists('references_XoopsPersistableObjectHandler')) {
-    require_once XOOPS_ROOT_PATH . '/modules/references/class/PersistableObjectHandler.php';
+    require_once XOOPS_ROOT_PATH.'/modules/references/class/PersistableObjectHandler.php';
 }
 
-define('REFERENCES_STATUS_ONLINE', 1);    // Articles en ligne
-define('REFERENCES_STATUS_OFFLINE', 0);    // Articles hors ligne
+define('REFERENCES_STATUS_ONLINE', 1); // Articles en ligne
+define('REFERENCES_STATUS_OFFLINE', 0); // Articles hors ligne
 
 class references_articles extends references_Object
 {
@@ -89,9 +89,9 @@ 
     public function getOnlinePicture()
     {
         if ($this->isArticleOnline()) {
-            return REFERENCES_IMAGES_URL . 'status_online.png';
+            return REFERENCES_IMAGES_URL.'status_online.png';
         } else {
-            return REFERENCES_IMAGES_URL . 'status_offline.png';
+            return REFERENCES_IMAGES_URL.'status_offline.png';
         }
     }
 
@@ -114,8 +114,8 @@ 
     public function pictureExists($indice)
     {
         $return    = false;
-        $fieldName = 'article_picture' . $indice;
-        if (xoops_trim($this->getVar($fieldName)) != '' && file_exists(references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . $this->getVar($fieldName))) {
+        $fieldName = 'article_picture'.$indice;
+        if (xoops_trim($this->getVar($fieldName)) != '' && file_exists(references_utils::getModuleOption('images_path').DIRECTORY_SEPARATOR.$this->getVar($fieldName))) {
             $return = true;
         }
 
@@ -130,9 +130,9 @@ 
      */
     public function deletePicture($indice)
     {
-        $fieldName = 'article_picture' . $indice;
+        $fieldName = 'article_picture'.$indice;
         if ($this->pictureExists($indice)) {
-            @unlink(references_utils::getModuleOption('images_path') . references_utils::getModuleOption('images_path') . $this->getVar($fieldName));
+            @unlink(references_utils::getModuleOption('images_path').references_utils::getModuleOption('images_path').$this->getVar($fieldName));
         }
         $this->setVar($fieldName, '');
     }
@@ -145,11 +145,11 @@ 
      */
     public function getPictureUrl($indice)
     {
-        $fieldName = 'article_picture' . $indice;
+        $fieldName = 'article_picture'.$indice;
         if (xoops_trim($this->getVar($fieldName)) != '' && $this->pictureExists($indice)) {
-            return references_utils::getModuleOption('images_url') . '/' . $this->getVar($fieldName);
+            return references_utils::getModuleOption('images_url').'/'.$this->getVar($fieldName);
         } else {
-            return REFERENCES_IMAGES_URL . 'blank.gif';
+            return REFERENCES_IMAGES_URL.'blank.gif';
         }
     }
 
@@ -161,9 +161,9 @@ 
      */
     public function getPicturePath($indice)
     {
-        $fieldName = 'article_picture' . $indice;
+        $fieldName = 'article_picture'.$indice;
         if (xoops_trim($this->getVar($fieldName)) != '') {
-            return references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . $this->getVar($fieldName);
+            return references_utils::getModuleOption('images_path').DIRECTORY_SEPARATOR.$this->getVar($fieldName);
         } else {
             return '';
         }
@@ -177,9 +177,9 @@ 
      */
     public function thumbExists($indice)
     {
-        $fieldName = 'article_picture' . $indice;
+        $fieldName = 'article_picture'.$indice;
         $return    = false;
-        if (xoops_trim($this->getVar($fieldName)) != '' && file_exists(references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName))) {
+        if (xoops_trim($this->getVar($fieldName)) != '' && file_exists(references_utils::getModuleOption('images_path').DIRECTORY_SEPARATOR.REFERENCES_THUMBS_PREFIX.$this->getVar($fieldName))) {
             $return = true;
         }
 
@@ -194,11 +194,11 @@ 
      */
     public function getThumbUrl($indice)
     {
-        $fieldName = 'article_picture' . $indice;
+        $fieldName = 'article_picture'.$indice;
         if (xoops_trim($this->getVar($fieldName)) != '') {
-            return references_utils::getModuleOption('images_url') . '/' . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName);
+            return references_utils::getModuleOption('images_url').'/'.REFERENCES_THUMBS_PREFIX.$this->getVar($fieldName);
         } else {
-            return REFERENCES_IMAGES_URL . 'blank.gif';
+            return REFERENCES_IMAGES_URL.'blank.gif';
         }
     }
 
@@ -210,9 +210,9 @@ 
      */
     public function getThumbPath($indice)
     {
-        $fieldName = 'article_picture' . $indice;
+        $fieldName = 'article_picture'.$indice;
         if (xoops_trim($this->getVar($fieldName)) != '') {
-            return references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName);
+            return references_utils::getModuleOption('images_path').DIRECTORY_SEPARATOR.REFERENCES_THUMBS_PREFIX.$this->getVar($fieldName);
         } else {
             return '';
         }
@@ -226,7 +226,7 @@ 
     public function attachmentExists()
     {
         $return = false;
-        if (xoops_trim($this->getVar('article_attached_file')) != '' && file_exists(references_utils::getModuleOption('attached_path') . DIRECTORY_SEPARATOR . $this->getVar('article_attached_file'))) {
+        if (xoops_trim($this->getVar('article_attached_file')) != '' && file_exists(references_utils::getModuleOption('attached_path').DIRECTORY_SEPARATOR.$this->getVar('article_attached_file'))) {
             $return = true;
         }
 
@@ -241,7 +241,7 @@ 
     public function getAttachmentUrl()
     {
         if (xoops_trim($this->getVar('article_attached_file')) != '' && $this->attachmentExists()) {
-            return references_utils::getModuleOption('attached_url') . '/' . $this->getVar('article_attached_file');
+            return references_utils::getModuleOption('attached_url').'/'.$this->getVar('article_attached_file');
         } else {
             return '';
         }
@@ -255,7 +255,7 @@ 
     public function getAttachmentPath()
     {
         if (xoops_trim($this->getVar('article_attached_file')) != '' && $this->attachmentExists()) {
-            return references_utils::getModuleOption('attached_path') . DIRECTORY_SEPARATOR . $this->getVar('article_attached_file');
+            return references_utils::getModuleOption('attached_path').DIRECTORY_SEPARATOR.$this->getVar('article_attached_file');
         } else {
             return '';
         }
@@ -267,7 +267,7 @@ 
     public function deleteAttachment()
     {
         if ($this->attachmentExists()) {
-            @unlink(references_utils::getModuleOption('attached_path') . DIRECTORY_SEPARATOR . $this->getVar('article_attached_file'));
+            @unlink(references_utils::getModuleOption('attached_path').DIRECTORY_SEPARATOR.$this->getVar('article_attached_file'));
         }
         $this->setVar('article_attached_file', '');
     }
@@ -280,9 +280,9 @@ 
      */
     public function deleteThumb($indice)
     {
-        $fieldName = 'article_picture' . $indice;
+        $fieldName = 'article_picture'.$indice;
         if ($this->thumbExists($indice)) {
-            @unlink(references_utils::getModuleOption('images_path') . DIRECTORY_SEPARATOR . REFERENCES_THUMBS_PREFIX . $this->getVar($fieldName));
+            @unlink(references_utils::getModuleOption('images_path').DIRECTORY_SEPARATOR.REFERENCES_THUMBS_PREFIX.$this->getVar($fieldName));
         }
     }
 
@@ -350,9 +350,9 @@ 
     public function getUrl($shortVersion = false)
     {
         if (!$shortVersion) {
-            return REFERENCES_URL . 'reference.php?article_id=' . $this->getVar('article_id');
+            return REFERENCES_URL.'reference.php?article_id='.$this->getVar('article_id');
         } else {
-            return 'reference.php?article_id=' . $this->getVar('article_id');
+            return 'reference.php?article_id='.$this->getVar('article_id');
         }
     }
 
@@ -375,11 +375,11 @@ 
             $ret['article_picture_exists'] = true;
             for ($i = 1; $i <= 10; ++$i) {
                 if ($this->pictureExists($i)) {
-                    $ret['article_picture_url' . $i]  = $this->getPictureUrl($i);
-                    $ret['article_picture_path' . $i] = $this->getPicturePath($i);
+                    $ret['article_picture_url'.$i]  = $this->getPictureUrl($i);
+                    $ret['article_picture_path'.$i] = $this->getPicturePath($i);
                     $ret['article_pictures_urls'][]   = $this->getPictureUrl($i);
                     $ret['article_pictures_paths'][]  = $this->getPicturePath($i);
-                    $fieldName                        = 'article_picture' . $i . '_text';
+                    $fieldName                        = 'article_picture'.$i.'_text';
                     if (xoops_trim($this->getVar($fieldName)) != '') {
                         $ret['article_pictures_texts'][] = references_utils::makeHrefTitle($this->getVar($fieldName));
                     } else {
@@ -404,8 +404,8 @@ 
             $ret['article_thumb_exists'] = true;
             for ($i = 1; $i <= 10; ++$i) {
                 if ($this->thumbExists($i)) {
-                    $ret['article_thumb_url' . $i]  = $this->getThumbUrl($i);
-                    $ret['article_thumb_path' . $i] = $this->getThumbPath($i);
+                    $ret['article_thumb_url'.$i]  = $this->getThumbUrl($i);
+                    $ret['article_thumb_path'.$i] = $this->getThumbPath($i);
                     $ret['article_thumbs_urls'][]   = $this->getThumbUrl($i);
                     $ret['article_thumbs_paths'][]  = $this->getThumbPath($i);
                 }
@@ -446,7 +446,7 @@ 
         $gperm_handler = xoops_getHandler('groupperm');
         $categories    = $gperm_handler->getItemIds($permissionsType, $groups, $currentModule->getVar('mid'));
         if (is_array($categories) && count($categories) > 0) {
-            $permissions[$permissionsType] = new Criteria('article_category_id', '(' . implode(',', $categories) . ')', 'IN');
+            $permissions[$permissionsType] = new Criteria('article_category_id', '('.implode(',', $categories).')', 'IN');
         } else {    // Ne peut rien voir
             $permissions[$permissionsType] = new Criteria('article_category_id', '0', '=');
         }
@@ -474,7 +474,7 @@ 
             $criteria->add(new Criteria('article_online', REFERENCES_STATUS_ONLINE, '='));
         }
         if (is_array($categoryId) && count($categoryId) > 0) {
-            $criteria->add(new Criteria('article_category_id', '(' . implode(',', $categoryId) . ')', 'IN'));
+            $criteria->add(new Criteria('article_category_id', '('.implode(',', $categoryId).')', 'IN'));
         } elseif ($categoryId > 0) {
             $criteria->add(new Criteria('article_category_id', $categoryId, '='));
         }
@@ -531,8 +531,8 @@ 
     public function getDistinctCategoriesIds()
     {
         $ret = array();
-        $sql = 'SELECT distinct(article_category_id) FROM ' . $this->table;
-        $sql .= ' ' . $this->getPermissionsCategoriesCriteria()->renderWhere();    // Permissions
+        $sql = 'SELECT distinct(article_category_id) FROM '.$this->table;
+        $sql .= ' '.$this->getPermissionsCategoriesCriteria()->renderWhere(); // Permissions
         $sql .= ' GROUP BY article_category_id ORDER BY article_category_id';
         $result = $this->db->query($sql);
         if (!$result) {
@@ -600,17 +600,17 @@ 
      */
     public function moveUp($currentId, $currentOrder)
     {
-        $sql_plus = 'SELECT article_id FROM ' . $this->table . ' WHERE article_weight = ' . ((int)$currentOrder - 1);
+        $sql_plus = 'SELECT article_id FROM '.$this->table.' WHERE article_weight = '.((int) $currentOrder - 1);
         $res_plus = $this->db->query($sql_plus);
         if ($this->db->getRowsNum($res_plus) == 0) {
             return;
         }
         $row_plus = $this->db->fetchArray($res_plus);
 
-        $upd1 = 'UPDATE ' . $this->table . ' SET article_weight = (article_weight + 1) WHERE article_id = ' . $row_plus['article_id'];
+        $upd1 = 'UPDATE '.$this->table.' SET article_weight = (article_weight + 1) WHERE article_id = '.$row_plus['article_id'];
         $this->db->queryF($upd1);
 
-        $upd2 = 'UPDATE ' . $this->table . ' SET article_weight = (article_weight - 1) WHERE article_id = ' . (int)$currentId;
+        $upd2 = 'UPDATE '.$this->table.' SET article_weight = (article_weight - 1) WHERE article_id = '.(int) $currentId;
         $this->db->queryF($upd2);
         $this->forceCacheClean();
     }
@@ -624,17 +624,17 @@ 
      */
     public function moveDown($currentId, $currentOrder)
     {
-        $sql_moins = 'SELECT article_id FROM ' . $this->table . ' WHERE article_weight = ' . ((int)$currentOrder + 1);
+        $sql_moins = 'SELECT article_id FROM '.$this->table.' WHERE article_weight = '.((int) $currentOrder + 1);
         $res_moins = $this->db->query($sql_moins);
         if ($this->db->getRowsNum($res_moins) == 0) {
             return;
         }
 
         $row_moins = $this->db->fetchArray($res_moins);
-        $upd1      = 'UPDATE ' . $this->table . ' SET article_weight = (article_weight - 1) WHERE article_id = ' . $row_moins['article_id'];
+        $upd1      = 'UPDATE '.$this->table.' SET article_weight = (article_weight - 1) WHERE article_id = '.$row_moins['article_id'];
         $this->db->queryF($upd1);
 
-        $upd2 = 'UPDATE ' . $this->table . ' SET article_weight =( article_weight + 1) WHERE article_id = ' . (int)$currentId;
+        $upd2 = 'UPDATE '.$this->table.' SET article_weight =( article_weight + 1) WHERE article_id = '.(int) $currentId;
         $this->db->queryF($upd2);
         $this->forceCacheClean();
     }

class/PersistableObjectHandler.php

Spacing +59 added lines, -59 removed lines

@@ -129,7 +129,7 @@ 
      */
     protected function _getIdForCache($query, $start, $limit)
     {
-        $id = md5($query . '-' . (string)$start . '-' . (string)$limit);
+        $id = md5($query.'-'.(string) $start.'-'.(string) $limit);
 
         return $id;
     }
@@ -164,17 +164,17 @@ 
             $criteria = new CriteriaCompo();
             $vnb      = count($this->keyName);
             for ($i = 0; $i < $vnb; ++$i) {
-                $criteria->add(new Criteria($this->keyName[$i], (int)$id[$i]));
+                $criteria->add(new Criteria($this->keyName[$i], (int) $id[$i]));
             }
         } else {
-            $criteria = new Criteria($this->keyName, (int)$id);
+            $criteria = new Criteria($this->keyName, (int) $id);
         }
         $criteria->setLimit(1);
-        $obj_array =& $this->getObjects($criteria, false, $as_object);
+        $obj_array = & $this->getObjects($criteria, false, $as_object);
         if (count($obj_array) != 1) {
             $ret = null;
         } else {
-            $ret =& $obj_array[0];
+            $ret = & $obj_array[0];
         }
 
         return $ret;
@@ -193,19 +193,19 @@ 
      */
     public function &getObjects(CriteriaElement $criteria = null, $id_as_key = false, $as_object = true, $fields = '*', $autoSort = true)
     {
-        require_once __DIR__ . '/lite.php';
+        require_once __DIR__.'/lite.php';
         $ret   = array();
         $limit = $start = 0;
-        $sql   = 'SELECT ' . $fields . ' FROM ' . $this->table;
+        $sql   = 'SELECT '.$fields.' FROM '.$this->table;
         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();
             } elseif ($this->identifierName != '' && $autoSort) {
-                $sql .= ' ORDER BY ' . $this->identifierName;
+                $sql .= ' ORDER BY '.$this->identifierName;
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -241,11 +241,11 @@ 
     {
         $ret = array();
         while ($myrow = $this->db->fetchArray($result)) {
-            $obj =& $this->create(false);
+            $obj = & $this->create(false);
             $obj->assignVars($myrow);
             if (!$id_as_key) {
                 if ($as_object) {
-                    $ret[] =& $obj;
+                    $ret[] = & $obj;
                 } else {
                     $row     = array();
                     $vars    = $obj->getVars();
@@ -258,9 +258,9 @@ 
             } else {
                 if ($as_object) {
                     if ($fields === '*') {
-                        $ret[$myrow[$this->keyName]] =& $obj;
+                        $ret[$myrow[$this->keyName]] = & $obj;
                     } else {
-                        $ret[] =& $obj;
+                        $ret[] = & $obj;
                     }
                 } else {
                     $row     = array();
@@ -286,20 +286,20 @@ 
      */
     public function getIds($criteria = null)
     {
-        require_once __DIR__ . '/lite.php';
+        require_once __DIR__.'/lite.php';
         $limit = $start = 0;
 
         $Cache_Lite = new references_Cache_Lite($this->cacheOptions);
-        $sql        = 'SELECT ' . $this->keyName . ' FROM ' . $this->table;
+        $sql        = 'SELECT '.$this->keyName.' FROM '.$this->table;
         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();
             } elseif ($this->identifierName != '') {
-                $sql .= ' ORDER BY ' . $this->identifierName;
+                $sql .= ' ORDER BY '.$this->identifierName;
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -329,26 +329,26 @@ 
      */
     public function getList($criteria = null)
     {
-        require_once __DIR__ . '/lite.php';
+        require_once __DIR__.'/lite.php';
         $limit      = $start = 0;
         $Cache_Lite = new references_Cache_Lite($this->cacheOptions);
 
         $ret = array();
 
-        $sql = 'SELECT ' . $this->keyName;
+        $sql = 'SELECT '.$this->keyName;
         if (!empty($this->identifierName)) {
-            $sql .= ', ' . $this->identifierName;
+            $sql .= ', '.$this->identifierName;
         }
-        $sql .= ' FROM ' . $this->table;
+        $sql .= ' FROM '.$this->table;
         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();
             } elseif ($this->identifierName != '') {
-                $sql .= ' ORDER BY ' . $this->identifierName;
+                $sql .= ' ORDER BY '.$this->identifierName;
             }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
@@ -389,11 +389,11 @@ 
         $ret = array();
         if (is_array($ids) && count($ids) > 0) {
             $criteria = new CriteriaCompo();
-            $criteria->add(new Criteria($this->keyName, '(' . implode(',', $ids) . ')', 'IN'));
+            $criteria->add(new Criteria($this->keyName, '('.implode(',', $ids).')', 'IN'));
             if (!is_null($additionnal)) {
                 $criteria->add($additionnal);
             }
-            $ret =& $this->getObjects($criteria, true);
+            $ret = & $this->getObjects($criteria, true);
         }
 
         return $ret;
@@ -410,17 +410,17 @@ 
         $field   = '';
         $groupby = false;
         $limit   = $start = 0;
-        require_once __DIR__ . '/lite.php';
+        require_once __DIR__.'/lite.php';
 
         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
             }
         }
-        $sql = 'SELECT ' . $field . 'COUNT(*) FROM ' . $this->table;
+        $sql = 'SELECT '.$field.'COUNT(*) FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->groupby != '') {
                 $sql .= $criteria->getGroupby();
             }
@@ -467,11 +467,11 @@ 
     public function getSum($field, $criteria = null)
     {
         $limit = $start = 0;
-        require_once __DIR__ . '/lite.php';
+        require_once __DIR__.'/lite.php';
 
-        $sql = 'SELECT Sum(' . $field . ') as cpt FROM ' . $this->table;
+        $sql = 'SELECT Sum('.$field.') as cpt FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             if ($criteria->groupby != '') {
                 $sql .= $criteria->getGroupby();
             }
@@ -512,13 +512,13 @@ 
             $clause = array();
             $vnb    = count($this->keyName);
             for ($i = 0; $i < $vnb; ++$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 {
@@ -545,7 +545,7 @@ 
     {
         $object = $this->create(true);
         $object->setVars($vars);
-        $retval =& $this->insert($object, $force);
+        $retval = & $this->insert($object, $force);
         unset($object);
 
         // Clear cache
@@ -576,7 +576,7 @@ 
              * @TODO: Change to if (!(class_exists($this->className) && $obj instanceof $this->className)) when going fully PHP5
              */
             if (!is_a($obj, $this->className)) {
-                $obj->setErrors(get_class($obj) . ' Differs from ' . $this->className);
+                $obj->setErrors(get_class($obj).' Differs from '.$this->className);
 
                 return false;
             }
@@ -595,7 +595,7 @@ 
         }
         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 {
@@ -608,16 +608,16 @@ 
         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');
                 }
             }
             $ignore = '';
             if ($ignoreInsert) {
                 $ignore = 'IGNORE';
             }
-            $sql = "INSERT $ignore INTO " . $this->table . ' (' . implode(',', array_keys($cleanvars)) . ') VALUES (' . implode(',', array_values($cleanvars)) . ')';
+            $sql = "INSERT $ignore INTO ".$this->table.' ('.implode(',', array_keys($cleanvars)).') VALUES ('.implode(',', array_values($cleanvars)).')';
         } else {
-            $sql = 'UPDATE ' . $this->table . ' SET';
+            $sql = 'UPDATE '.$this->table.' SET';
             foreach ($cleanvars as $key => $value) {
                 if ((!is_array($this->keyName) && $key == $this->keyName) || (is_array($this->keyName) && in_array($key, $this->keyName))) {
                     continue;
@@ -625,7 +625,7 @@ 
                 if (isset($notfirst)) {
                     $sql .= ',';
                 }
-                $sql .= ' ' . $key . ' = ' . $value;
+                $sql .= ' '.$key.' = '.$value;
                 $notfirst = true;
             }
             if (is_array($this->keyName)) {
@@ -635,12 +635,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 (false != $force) {
@@ -674,7 +674,7 @@ 
      */
     public function updateAll($fieldname, $fieldvalue, $criteria = null, $force = false)
     {
-        $set_clause = $fieldname . ' = ';
+        $set_clause = $fieldname.' = ';
         if (is_numeric($fieldvalue)) {
             $set_clause .= $fieldvalue;
         } elseif (is_array($fieldvalue)) {
@@ -682,9 +682,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 ($force) {
             $result = $this->db->queryF($sql);
@@ -732,8 +732,8 @@ 
     public function deleteAll($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->queryF($sql)) {
                 return false;
             }
@@ -779,15 +779,15 @@ 
      */
     public function getDistincts($field, $criteria = null, $format = 's')
     {
-        require_once __DIR__ . '/lite.php';
+        require_once __DIR__.'/lite.php';
         $limit = $start = 0;
-        $sql   = 'SELECT ' . $this->keyName . ', ' . $field . ' FROM ' . $this->table;
+        $sql   = 'SELECT '.$this->keyName.', '.$field.' FROM '.$this->table;
         if (isset($criteria) && is_subclass_of($criteria, 'criteriaelement')) {
-            $sql .= ' ' . $criteria->renderWhere();
+            $sql .= ' '.$criteria->renderWhere();
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         }
-        $sql .= ' GROUP BY ' . $field . ' ORDER BY ' . $field;
+        $sql .= ' GROUP BY '.$field.' ORDER BY '.$field;
 
         $Cache_Lite = new references_Cache_Lite($this->cacheOptions);
         $id         = $this->_getIdForCache($sql, $start, $limit);
@@ -835,7 +835,7 @@ 
         $critere->setStart($start);
         $critere->setSort($sort);
         $critere->setOrder($order);
-        $items =& $this->getObjects($critere, $idAsKey);
+        $items = & $this->getObjects($critere, $idAsKey);
 
         return $items;
     }
@@ -845,7 +845,7 @@ 
      */
     public function forceCacheClean()
     {
-        require_once __DIR__ . '/lite.php';
+        require_once __DIR__.'/lite.php';
         $Cache_Lite = new references_Cache_Lite($this->cacheOptions);
         $Cache_Lite->clean();
     }

class/references_handlers.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
     {
         $handlersNames = array('references_articles', 'references_categories');
         foreach ($handlersNames as $handlerName) {
-            $internalName        = 'h_' . $handlerName;
+            $internalName        = 'h_'.$handlerName;
             $this->$internalName = xoops_getModuleHandler($handlerName, REFERENCES_DIRNAME);
         }
     }

class/registryfile.php

Spacing +5 added lines, -5 removed lines

@@ -21,7 +21,7 @@ 
  */
 class references_registryfile
 {
-    public $filename;    // Nom du fichier � traiter
+    public $filename; // Nom du fichier � traiter
 
     /**
      * Access the only instance of this class
@@ -49,7 +49,7 @@ 
     public function setfile($fichier = null)
     {
         if ($fichier) {
-            $this->filename = XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . $fichier;
+            $this->filename = XOOPS_UPLOAD_PATH.DIRECTORY_SEPARATOR.$fichier;
         }
     }
 
@@ -59,7 +59,7 @@ 
         if (!$fichier) {
             $fw = $this->filename;
         } else {
-            $fw = XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . $fichier;
+            $fw = XOOPS_UPLOAD_PATH.DIRECTORY_SEPARATOR.$fichier;
         }
         if (file_exists($fw)) {
             return file_get_contents($fw);
@@ -74,12 +74,12 @@ 
         if (!$fichier) {
             $fw = $this->filename;
         } else {
-            $fw = XOOPS_UPLOAD_PATH . DIRECTORY_SEPARATOR . $fichier;
+            $fw = XOOPS_UPLOAD_PATH.DIRECTORY_SEPARATOR.$fichier;
         }
         if (file_exists($fw)) {
             @unlink($fw);
         }
-        $fp = fopen($fw, 'w') || exit('Error, impossible to create the file ' . $this->filename);
+        $fp = fopen($fw, 'w') || exit('Error, impossible to create the file '.$this->filename);
         fwrite($fp, $content);
         fclose($fp);
 

class/PEAR.php

Spacing +16 added lines, -16 removed lines

@@ -763,7 +763,7 @@ 
                 $suffix = '.so';
             }
 
-            return @dl('php_' . $ext . $suffix) || @dl($ext . $suffix);
+            return @dl('php_'.$ext.$suffix) || @dl($ext.$suffix);
         }
 
         return true;
@@ -877,7 +877,7 @@ 
                 unset($this->backtrace[0]['object']);
             }
         }
-        if ($mode & references_PEAR_ERROR_CALLBACK) {
+        if ($mode&references_PEAR_ERROR_CALLBACK) {
             $this->level    = E_USER_NOTICE;
             $this->callback = $options;
         } else {
@@ -887,7 +887,7 @@ 
             $this->level    = $options;
             $this->callback = null;
         }
-        if ($this->mode & references_PEAR_ERROR_PRINT) {
+        if ($this->mode&references_PEAR_ERROR_PRINT) {
             if (is_null($options) || is_int($options)) {
                 $format = '%s';
             } else {
@@ -895,10 +895,10 @@ 
             }
             printf($format, $this->getMessage());
         }
-        if ($this->mode & references_PEAR_ERROR_TRIGGER) {
+        if ($this->mode&references_PEAR_ERROR_TRIGGER) {
             trigger_error($this->getMessage(), $this->level);
         }
-        if ($this->mode & references_PEAR_ERROR_DIE) {
+        if ($this->mode&references_PEAR_ERROR_DIE) {
             $msg = $this->getMessage();
             if (is_null($options) || is_int($options)) {
                 $format = '%s';
@@ -910,12 +910,12 @@ 
             }
             die(sprintf($format, $msg));
         }
-        if ($this->mode & references_PEAR_ERROR_CALLBACK) {
+        if ($this->mode&references_PEAR_ERROR_CALLBACK) {
             if (is_callable($this->callback)) {
                 call_user_func($this->callback, $this);
             }
         }
-        if ($this->mode & references_PEAR_ERROR_EXCEPTION) {
+        if ($this->mode&references_PEAR_ERROR_EXCEPTION) {
             trigger_error('references_PEAR_ERROR_EXCEPTION is obsolete, use class PEAR_Exception for exceptions', E_USER_WARNING);
             eval('$e = new Exception($this->message, $this->code);throw($e);');
         }
@@ -960,7 +960,7 @@ 
      */
     public function getMessage()
     {
-        return ($this->error_message_prefix . $this->message);
+        return ($this->error_message_prefix.$this->message);
     }
 
     // }}}
@@ -1071,29 +1071,29 @@ 
             E_USER_WARNING => 'warning',
             E_USER_ERROR   => 'error'
         );
-        if ($this->mode & references_PEAR_ERROR_CALLBACK) {
+        if ($this->mode&references_PEAR_ERROR_CALLBACK) {
             if (is_array($this->callback)) {
-                $callback = (is_object($this->callback[0]) ? strtolower(get_class($this->callback[0])) : $this->callback[0]) . '::' . $this->callback[1];
+                $callback = (is_object($this->callback[0]) ? strtolower(get_class($this->callback[0])) : $this->callback[0]).'::'.$this->callback[1];
             } else {
                 $callback = $this->callback;
             }
 
-            return sprintf('[%s: message="%s" code=%d mode=callback ' . 'callback=%s prefix="%s" info="%s"]', strtolower(get_class($this)), $this->message, $this->code, $callback, $this->error_message_prefix, $this->userinfo);
+            return sprintf('[%s: message="%s" code=%d mode=callback '.'callback=%s prefix="%s" info="%s"]', strtolower(get_class($this)), $this->message, $this->code, $callback, $this->error_message_prefix, $this->userinfo);
         }
-        if ($this->mode & references_PEAR_ERROR_PRINT) {
+        if ($this->mode&references_PEAR_ERROR_PRINT) {
             $modes[] = 'print';
         }
-        if ($this->mode & references_PEAR_ERROR_TRIGGER) {
+        if ($this->mode&references_PEAR_ERROR_TRIGGER) {
             $modes[] = 'trigger';
         }
-        if ($this->mode & references_PEAR_ERROR_DIE) {
+        if ($this->mode&references_PEAR_ERROR_DIE) {
             $modes[] = 'die';
         }
-        if ($this->mode & references_PEAR_ERROR_RETURN) {
+        if ($this->mode&references_PEAR_ERROR_RETURN) {
             $modes[] = 'return';
         }
 
-        return sprintf('[%s: message="%s" code=%d mode=%s level=%s ' . 'prefix="%s" info="%s"]', strtolower(get_class($this)), $this->message, $this->code, implode('|', $modes), $levels[$this->level], $this->error_message_prefix, $this->userinfo);
+        return sprintf('[%s: message="%s" code=%d mode=%s level=%s '.'prefix="%s" info="%s"]', strtolower(get_class($this)), $this->message, $this->code, implode('|', $modes), $levels[$this->level], $this->error_message_prefix, $this->userinfo);
     }
 
     // }}}