mambax7 / references

class/references_utils.php

Spacing +198 added lines, -198 removed lines

@@ -107,7 +107,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;
         }
 
@@ -147,15 +147,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;
@@ -170,15 +170,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;
@@ -200,9 +200,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)."')\"";
         }
     }
 
@@ -282,7 +282,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,11 +295,11 @@ 
         if (function_exists('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 !
@@ -311,7 +311,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) {
@@ -322,16 +322,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);
         }
 
@@ -346,17 +346,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)) {
@@ -392,7 +392,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);
@@ -510,12 +510,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
     }
 
     /**
@@ -542,7 +542,7 @@ 
      */
     public static function timestampToMysqlDate($timestamp)
     {
-        return date('Y-m-d', (int)$timestamp);
+        return date('Y-m-d', (int) $timestamp);
     }
 
     /**
@@ -580,7 +580,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;
             }
         }
@@ -643,25 +643,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;
     }
 
     /**
@@ -676,135 +676,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;
     }
@@ -821,11 +821,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);
@@ -840,7 +840,7 @@ 
         $keywords = '';
         foreach ($words as $word) {
             if (strlen($word) >= $urw) {
-                $keywords .= '-' . trim($word);
+                $keywords .= '-'.trim($word);
             }
         }
         if (!$keywords) {
@@ -875,7 +875,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;
         }
@@ -923,7 +923,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 {
@@ -945,10 +945,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'];
@@ -972,7 +972,7 @@ 
                     if ($uploader->upload()) {
                         return true;
                     } else {
-                        return _ERRORS . ' ' . htmlentities($uploader->getErrors());
+                        return _ERRORS.' '.htmlentities($uploader->getErrors());
                     }
                 } else {
                     return htmlentities($uploader->getErrors());
@@ -1055,9 +1055,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) {
@@ -1096,7 +1096,7 @@ 
 
             $complete_tags = array_reverse($complete_tags);
             for ($i = 0; $i < count($complete_tags); ++$i) {
-                $string .= '</' . $complete_tags[$i] . '>';
+                $string .= '</'.$complete_tags[$i].'>';
             }
         }
 
@@ -1117,7 +1117,7 @@ 
                 $string = self::close_tags($string);
             }
 
-            return $string . $etc;
+            return $string.$etc;
         } else {
             return $string;
         }
@@ -1149,7 +1149,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);
@@ -1179,7 +1179,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);
             }
@@ -1217,7 +1217,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);
             }
@@ -1244,7 +1244,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;
         }
@@ -1284,7 +1284,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;
@@ -1305,7 +1305,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);
@@ -1326,10 +1326,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;
         }
     }
 
@@ -1367,10 +1367,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);
@@ -1410,7 +1410,7 @@ 
                     $selected = " selected = 'selected'";
                 }
             }
-            $ret[] = '<option value=0' . $selected . '>---</option>';
+            $ret[] = '<option value=0'.$selected.'>---</option>';
         }
 
         foreach ($array as $index => $label) {
@@ -1424,7 +1424,7 @@ 
                     $selected = " selected = 'selected'";
                 }
             }
-            $ret[] = "<option value=\"" . $index . "\"" . $selected . '>' . $label . '</option>';
+            $ret[] = "<option value=\"".$index."\"".$selected.'>'.$label.'</option>';
         }
 
         return implode("\n", $ret);
@@ -1446,14 +1446,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";
 
@@ -1528,16 +1528,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/PersistableObjectHandler.php

Spacing +56 added lines, -56 removed lines

@@ -127,7 +127,7 @@ 
      */
     protected function _getIdForCache($query, $start, $limit)
     {
-        $id = md5($query . '-' . (string)$start . '-' . (string)$limit);
+        $id = md5($query.'-'.(string) $start.'-'.(string) $limit);
 
         return $id;
     }
@@ -162,17 +162,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);
         if (count($obj_array) != 1) {
             $ret = null;
         } else {
-            $ret =& $obj_array[0];
+            $ret = & $obj_array[0];
         }
 
         return $ret;
@@ -191,19 +191,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();
@@ -239,11 +239,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();
@@ -256,9 +256,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();
@@ -284,20 +284,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();
@@ -327,26 +327,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();
@@ -387,7 +387,7 @@ 
         $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);
             }
@@ -408,17 +408,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();
             }
@@ -465,11 +465,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();
             }
@@ -510,13 +510,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 {
@@ -543,7 +543,7 @@ 
     {
         $object = $this->create(true);
         $object->setVars($vars);
-        $retval =& $this->insert($object, $force);
+        $retval = & $this->insert($object, $force);
         unset($object);
 
         // Clear cache
@@ -574,7 +574,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;
             }
@@ -593,7 +593,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 {
@@ -606,16 +606,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;
@@ -623,7 +623,7 @@ 
                 if (isset($notfirst)) {
                     $sql .= ',';
                 }
-                $sql .= ' ' . $key . ' = ' . $value;
+                $sql .= ' '.$key.' = '.$value;
                 $notfirst = true;
             }
             if (is_array($this->keyName)) {
@@ -633,12 +633,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) {
@@ -672,7 +672,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)) {
@@ -680,9 +680,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);
@@ -730,8 +730,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;
             }
@@ -777,15 +777,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);
@@ -843,7 +843,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();
     }