XOOPS / XoopsCore25

htdocs/class/xoopseditor/xoopseditor.php

Spacing +14 added lines, -14 removed lines

@@ -52,8 +52,8 @@ 
         // TODO: switch to property_exists() as of PHP 5.1.0
         $vars = get_class_vars(__CLASS__);
         foreach ($configs as $key => $val) {
-            if (method_exists($this, 'set' . ucfirst($key))) {
-                $this->{'set' . ucfirst($key)}($val);
+            if (method_exists($this, 'set'.ucfirst($key))) {
+                $this->{'set'.ucfirst($key)}($val);
             } elseif (array_key_exists("_{$key}", $vars)) {
                 $this->{"_{$key}"} = $val;
             } elseif (array_key_exists($key, $vars)) {
@@ -98,7 +98,7 @@ 
      */
     public function __construct()
     {
-        $this->root_path = XOOPS_ROOT_PATH . '/class/xoopseditor';
+        $this->root_path = XOOPS_ROOT_PATH.'/class/xoopseditor';
     }
 
     /**
@@ -157,8 +157,8 @@ 
             $result = array_flip($editor_handler->getList());
         */
         if (!isset($this->root_path)) {
-            $this->root_path = XOOPS_ROOT_PATH . '/class/xoopseditor';
-            $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__ . '::' . __FUNCTION__ . '() should not be called statically.');
+            $this->root_path = XOOPS_ROOT_PATH.'/class/xoopseditor';
+            $GLOBALS['xoopsLogger']->addDeprecated(__CLASS__.'::'.__FUNCTION__.'() should not be called statically.');
         }
 
         xoops_load('XoopsCache');
@@ -167,14 +167,14 @@ 
             $list  = array();
             $order = array();
             xoops_load('XoopsLists');
-            $_list = XoopsLists::getDirListAsArray($this->root_path . '/');
+            $_list = XoopsLists::getDirListAsArray($this->root_path.'/');
             foreach ($_list as $item) {
-                if (file_exists($file = $this->root_path . '/' . $item . '/language/' . $GLOBALS['xoopsConfig']['language'] . '.php')) {
+                if (file_exists($file = $this->root_path.'/'.$item.'/language/'.$GLOBALS['xoopsConfig']['language'].'.php')) {
                     include_once $file;
-                } elseif (file_exists($file = $this->root_path . '/' . $item . '/language/english.php')) {
+                } elseif (file_exists($file = $this->root_path.'/'.$item.'/language/english.php')) {
                     include_once $file;
                 }
-                if (file_exists($file = $this->root_path . '/' . $item . '/editor_registry.php')) {
+                if (file_exists($file = $this->root_path.'/'.$item.'/editor_registry.php')) {
                     include $file;
                     if (empty($config['order'])) {
                         continue;
@@ -210,7 +210,7 @@ 
      */
     public function render($editor)
     {
-        trigger_error(__CLASS__ . '::' . __FUNCTION__ . '() deprecated', E_USER_WARNING);
+        trigger_error(__CLASS__.'::'.__FUNCTION__.'() deprecated', E_USER_WARNING);
 
         return $editor->render();
     }
@@ -246,13 +246,13 @@ 
         if (empty($name) || !array_key_exists($name, $this->getList())) {
             return $editor;
         }
-        $editor_path = $this->root_path . '/' . $name;
-        if (file_exists($file = $editor_path . '/language/' . $GLOBALS['xoopsConfig']['language'] . '.php')) {
+        $editor_path = $this->root_path.'/'.$name;
+        if (file_exists($file = $editor_path.'/language/'.$GLOBALS['xoopsConfig']['language'].'.php')) {
             include_once $file;
-        } elseif (file_exists($file = $editor_path . '/language/english.php')) {
+        } elseif (file_exists($file = $editor_path.'/language/english.php')) {
             include_once $file;
         }
-        if (file_exists($file = $editor_path . '/editor_registry.php')) {
+        if (file_exists($file = $editor_path.'/editor_registry.php')) {
             include $file;
         } else {
             return $editor;

htdocs/class/xoopseditor/dhtmltextarea/editor_registry.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 
 return $config = array(
     'class'  => 'FormDhtmlTextArea',
-    'file'   => XOOPS_ROOT_PATH . '/class/xoopseditor/dhtmltextarea/dhtmltextarea.php',
+    'file'   => XOOPS_ROOT_PATH.'/class/xoopseditor/dhtmltextarea/dhtmltextarea.php',
     'title'  => _XOOPS_EDITOR_DHTMLTEXTAREA,
     'order'  => 2,
     'nohtml' => 1);

htdocs/class/xoopseditor/dhtmltextarea/dhtmltextarea.php

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
     public function __construct($options = array())
     {
         parent::__construct($options);
-        $this->rootPath = '/class/xoopseditor/' . basename(__DIR__);
+        $this->rootPath = '/class/xoopseditor/'.basename(__DIR__);
         $hiddenText     = isset($this->configs['hiddenText']) ? $this->configs['hiddenText'] : $this->_hiddenText;
         xoops_load('XoopsFormDhtmlTextArea');
         $this->renderer = new XoopsFormDhtmlTextArea('', $this->getName(), $this->getValue(), $this->getRows(), $this->getCols(), $hiddenText, $this->configs);

htdocs/class/xoopseditor/tinymce/editor_registry.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 return $config = array(
     'name' => 'tinymce',
     'class' => 'XoopsFormTinymce',
-    'file' => XOOPS_ROOT_PATH . '/class/xoopseditor/tinymce/formtinymce.php',
+    'file' => XOOPS_ROOT_PATH.'/class/xoopseditor/tinymce/formtinymce.php',
     'title' => _XOOPS_EDITOR_TINYMCE,
     'order' => 5,
     'nohtml' => 0);

htdocs/class/xoopseditor/tinymce/include/xoopsemotions.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
 defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
-include_once XOOPS_ROOT_PATH . '/modules/system/constants.php';
+include_once XOOPS_ROOT_PATH.'/modules/system/constants.php';
 // Add your code here to check access by groups
 
 return true;

htdocs/class/xoopseditor/tinymce/tinymce.php

Spacing +35 added lines, -35 removed lines

@@ -36,7 +36,7 @@ 
     public function __construct($config)
     {
         $this->setConfig($config);
-        $this->rootpath                = $this->config['rootpath'] . '/tinymce/jscripts/tiny_mce';
+        $this->rootpath                = $this->config['rootpath'].'/tinymce/jscripts/tiny_mce';
         $this->xoopsPlugins            = $this->get_xoopsPlugins();
         self::$LastOfElementsTinymce   = $this->config['elements'];
         self::$ListOfElementsTinymce[] = self::$LastOfElementsTinymce;
@@ -79,11 +79,11 @@ 
 
         // Load default settings
         if (!($this->setting = @include($GLOBALS['xoops']->path('var/configs/tinymce.php')))) {
-            $this->setting = include __DIR__ . '/settings.php';
+            $this->setting = include __DIR__.'/settings.php';
         }
 
         // get editor language (from ...)
-        if (isset($this->config['language']) && is_readable(XOOPS_ROOT_PATH . $this->rootpath . '/langs/' . $this->config['language'] . '.js')) {
+        if (isset($this->config['language']) && is_readable(XOOPS_ROOT_PATH.$this->rootpath.'/langs/'.$this->config['language'].'.js')) {
             $this->setting['language'] = $this->config['language'];
             $configured[]              = 'language';
         }
@@ -91,7 +91,7 @@ 
         $this->setting['content_css'] = implode(',', $this->loadCss());
         $configured[]                 = 'content_css';
 
-        if (!empty($this->config['theme']) && is_dir(XOOPS_ROOT_PATH . $this->rootpath . '/themes/' . $this->config['theme'])) {
+        if (!empty($this->config['theme']) && is_dir(XOOPS_ROOT_PATH.$this->rootpath.'/themes/'.$this->config['theme'])) {
             $this->setting['theme'] = $this->config['theme'];
             $configured[]           = 'theme';
         }
@@ -121,60 +121,60 @@ 
             foreach ($this->config['buttons'] as $button) {
                 ++$i;
                 if (isset($button['before'])) {
-                    $this->setting['theme_' . $this->setting['theme'] . "_buttons{$i}_add_before"] = $button['before'];
+                    $this->setting['theme_'.$this->setting['theme']."_buttons{$i}_add_before"] = $button['before'];
                 }
                 if (isset($button['add'])) {
-                    $this->setting['theme_' . $this->setting['theme'] . "_buttons{$i}_add"] = $button['add'];
+                    $this->setting['theme_'.$this->setting['theme']."_buttons{$i}_add"] = $button['add'];
                 }
                 if (isset($button[''])) {
-                    $this->setting['theme_' . $this->setting['theme'] . "_buttons{$i}"] = $button[''];
+                    $this->setting['theme_'.$this->setting['theme']."_buttons{$i}"] = $button[''];
                 }
             }
             $configured[] = 'buttons';
 
             if (isset($this->config['toolbar_location'])) {
-                $this->setting['theme_' . $this->setting['theme'] . '_toolbar_location'] = $this->config['toolbar_location'];
+                $this->setting['theme_'.$this->setting['theme'].'_toolbar_location'] = $this->config['toolbar_location'];
                 $configured[]                                                            = 'toolbar_location';
             } else {
-                $this->setting['theme_' . $this->setting['theme'] . '_toolbar_location'] = 'top';
+                $this->setting['theme_'.$this->setting['theme'].'_toolbar_location'] = 'top';
             }
 
             if (isset($this->config['toolbar_align'])) {
-                $this->setting['theme_' . $this->setting['theme'] . '_toolbar_align'] = $this->config['toolbar_align'];
+                $this->setting['theme_'.$this->setting['theme'].'_toolbar_align'] = $this->config['toolbar_align'];
                 $configured[]                                                         = 'toolbar_align';
             } else {
-                $this->setting['theme_' . $this->setting['theme'] . '_toolbar_align'] = 'left';
+                $this->setting['theme_'.$this->setting['theme'].'_toolbar_align'] = 'left';
             }
 
             if (isset($this->config['statusbar_location'])) {
-                $this->setting['theme_' . $this->setting['theme'] . '_statusbar_location'] = $this->config['statusbar_location'];
+                $this->setting['theme_'.$this->setting['theme'].'_statusbar_location'] = $this->config['statusbar_location'];
                 $configured[]                                                              = 'statusbar_location';
             }
 
             if (isset($this->config['path_location'])) {
-                $this->setting['theme_' . $this->setting['theme'] . '_path_location'] = $this->config['path_location'];
+                $this->setting['theme_'.$this->setting['theme'].'_path_location'] = $this->config['path_location'];
                 $configured[]                                                         = 'path_location';
             }
 
             if (isset($this->config['resize_horizontal'])) {
-                $this->setting['theme_' . $this->setting['theme'] . '_resize_horizontal'] = $this->config['resize_horizontal'];
+                $this->setting['theme_'.$this->setting['theme'].'_resize_horizontal'] = $this->config['resize_horizontal'];
                 $configured[]                                                             = 'resize_horizontal';
             }
 
             if (isset($this->config['resizing'])) {
-                $this->setting['theme_' . $this->setting['theme'] . '_resizing'] = $this->config['resizing'];
+                $this->setting['theme_'.$this->setting['theme'].'_resizing'] = $this->config['resizing'];
                 $configured[]                                                    = 'resizing';
             }
 
             if (!empty($this->config['fonts'])) {
-                $this->setting['theme_' . $this->setting['theme'] . '_fonts'] = $this->config['fonts'];
+                $this->setting['theme_'.$this->setting['theme'].'_fonts'] = $this->config['fonts'];
                 $configured[]                                                 = 'fonts';
             }
 
             for ($i = 1; $i <= 4; ++$i) {
                 $buttons = array();
-                if (isset($this->setting['theme_' . $this->setting['theme'] . "_buttons{$i}"])) {
-                    $checklist = explode(',', $this->setting['theme_' . $this->setting['theme'] . "_buttons{$i}"]);
+                if (isset($this->setting['theme_'.$this->setting['theme']."_buttons{$i}"])) {
+                    $checklist = explode(',', $this->setting['theme_'.$this->setting['theme']."_buttons{$i}"]);
                     foreach ($checklist as $plugin) {
                         if (strpos(strtolower($plugin), 'xoops') != false) {
                             if (in_array($plugin, $this->xoopsPlugins)) {
@@ -184,7 +184,7 @@ 
                             $buttons[] = $plugin;
                         }
                     }
-                    $this->setting['theme_' . $this->setting['theme'] . "_buttons{$i}"] = implode(',', $buttons);
+                    $this->setting['theme_'.$this->setting['theme']."_buttons{$i}"] = implode(',', $buttons);
                 }
             }
         }
@@ -197,7 +197,7 @@ 
             $this->setting[$key] = $val;
         }
 
-        if (!is_dir(XOOPS_ROOT_PATH . $this->rootpath . '/themes/' . $this->setting['theme'] . '/docs/' . $this->setting['language'] . '/')) {
+        if (!is_dir(XOOPS_ROOT_PATH.$this->rootpath.'/themes/'.$this->setting['theme'].'/docs/'.$this->setting['language'].'/')) {
             $this->setting['docs_language'] = 'en';
         }
 
@@ -213,7 +213,7 @@ 
     public function loadPlugins()
     {
         $plugins      = array();
-        $plugins_list = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . $this->rootpath . '/plugins');
+        $plugins_list = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH.$this->rootpath.'/plugins');
         if (empty($this->setting['plugins'])) {
             $plugins = $plugins_list;
         } else {
@@ -236,10 +236,10 @@ 
     public function get_xoopsPlugins()
     {
         $xoopsPlugins = array();
-        $allplugins   = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH . $this->rootpath . '/plugins');
+        $allplugins   = XoopsLists::getDirListAsArray(XOOPS_ROOT_PATH.$this->rootpath.'/plugins');
         foreach ($allplugins as $plugin) {
-            if (strpos(strtolower($plugin), 'xoops') != false && file_exists(XOOPS_ROOT_PATH . $this->config['rootpath'] . "/include/$plugin.php")) {
-                if ($right = @include XOOPS_ROOT_PATH . $this->config['rootpath'] . "/include/$plugin.php") {
+            if (strpos(strtolower($plugin), 'xoops') != false && file_exists(XOOPS_ROOT_PATH.$this->config['rootpath']."/include/$plugin.php")) {
+                if ($right = @include XOOPS_ROOT_PATH.$this->config['rootpath']."/include/$plugin.php") {
                     $xoopsPlugins[$plugin] = $plugin;
                 }
             }
@@ -263,8 +263,8 @@ 
         }
 
         $css         = array();
-        $css[]       = $css_url . '/' . $css_file;
-        $css_content = file_get_contents($css_path . '/' . $css_file);
+        $css[]       = $css_url.'/'.$css_file;
+        $css_content = file_get_contents($css_path.'/'.$css_file);
 
         // get all import css files
         if (preg_match_all("~\@import url\((.*\.css)\);~sUi", $css_content, $matches, PREG_PATTERN_ORDER)) {
@@ -285,7 +285,7 @@ 
 
         $this->init();
         if (isset($this->setting['elements']) && self::$LastOfElementsTinymce != $this->setting['elements']) {
-            $ret = "\n<!-- 'tiny_mce.js' SCRIPT NOT YET " . $this->setting['elements'] . " -->\n"; //debug
+            $ret = "\n<!-- 'tiny_mce.js' SCRIPT NOT YET ".$this->setting['elements']." -->\n"; //debug
 
             return $ret;
         } else {
@@ -298,11 +298,11 @@ 
             $callback = '';
         }
         if (!empty($this->setting['file_browser_callback'])) {
-            $fbc_name = XOOPS_ROOT_PATH . '/class/xoopseditor/tinymce/include/' . $this->setting['file_browser_callback'] . '.js';
+            $fbc_name = XOOPS_ROOT_PATH.'/class/xoopseditor/tinymce/include/'.$this->setting['file_browser_callback'].'.js';
             //suis passé la /lesrevespossibles/x244/class/xoopseditor/tinymce/tinymce/jscripts/include/openFinder.js
-            $file_browser_callback = "MyXoopsUrl ='" . XOOPS_URL . "';\n";
+            $file_browser_callback = "MyXoopsUrl ='".XOOPS_URL."';\n";
             $file_browser_callback .= file_get_contents($fbc_name);
-            $file_browser_callback .= "\n//suis passé la " . $fbc_name;
+            $file_browser_callback .= "\n//suis passé la ".$fbc_name;
             //unset($this->setting["file_browser_callback"]);
         } else {
             $file_browser_callback = '//suis absent';
@@ -350,14 +350,14 @@ 
         if ($isTinyMceJsLoaded) {
             $ret .= "<!-- 'tiny_mce.js' SCRIPT IS ALREADY LOADED -->\n"; //debug
         } else {
-            $ret .= "<script type='text/javascript' src='" . XOOPS_URL . $this->rootpath . "/tiny_mce.js'></script>\n";
+            $ret .= "<script type='text/javascript' src='".XOOPS_URL.$this->rootpath."/tiny_mce.js'></script>\n";
             $isTinyMceJsLoaded = true;
         }
         $ret .= "<script type='text/javascript'>\n";
         $ret .= "tinyMCE.init({\n";
         // set options - start
         foreach ($this->setting as $key => $val) {
-            $ret .= $key . ':';
+            $ret .= $key.':';
             if ($val === true) {
                 $ret .= 'true,';
             } elseif ($val === false) {
@@ -370,11 +370,11 @@ 
         // set options - end
         $ret .= "tinymceload: true\n";
         $ret .= "});\n";
-        $ret .= $callback . "\n";
-        $ret .= $file_browser_callback . "\n";
+        $ret .= $callback."\n";
+        $ret .= $file_browser_callback."\n";
         //$ret .= "function toggleEditor(id) {tinyMCE.execCommand('mceToggleEditor',false, id);}\n";
         $ret .= "</script>\n";
-        $ret .= "<!-- End TinyMce Rendering -->\n";//debug
+        $ret .= "<!-- End TinyMce Rendering -->\n"; //debug
         // create returned string - end
         return $ret;
     }

htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsemotions/xoopsemotions.php

Spacing +14 added lines, -14 removed lines

@@ -18,7 +18,7 @@ 
     $current_path = str_replace(DIRECTORY_SEPARATOR, '/', $current_path);
 }
 $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), '/class/xoopseditor/tinymce/'));
-include_once $xoops_root_path . '/mainfile.php';
+include_once $xoops_root_path.'/mainfile.php';
 defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 // load mainfile.php - end
 
@@ -31,7 +31,7 @@ 
 xoops_loadLanguage('misc');
 
 // include system category definitions - start
-include_once XOOPS_ROOT_PATH . '/modules/system/constants.php';
+include_once XOOPS_ROOT_PATH.'/modules/system/constants.php';
 
 // check user/group
 $groups        = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
@@ -52,7 +52,7 @@ 
         redirect_header($current_file, 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
     }
     $db = XoopsDatabaseFactory::getDatabaseConnection();
-    include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+    include_once XOOPS_ROOT_PATH.'/class/uploader.php';
     $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH, array(
         'image/gif',
         'image/jpeg',
@@ -68,7 +68,7 @@ 
             $smile_code    = $myts->stripSlashesGPC($_POST['smile_code']);
             $smile_desc    = $myts->stripSlashesGPC($_POST['smile_desc']);
             $smile_display = (int)$_POST['smile_display'] > 0 ? 1 : 0;
-            $newid         = $db->genId($db->prefix('smilies') . '_id_seq');
+            $newid         = $db->genId($db->prefix('smilies').'_id_seq');
             $sql           = sprintf('INSERT INTO %s (id, code, smile_url, emotion, display) VALUES (%d, %s, %s, %s, %d)', $db->prefix('smiles'), $newid, $db->quoteString($smile_code), $db->quoteString($smile_url), $db->quoteString($smile_desc), $smile_display);
             if (!$db->query($sql)) {
                 $err = 'Failed storing smiley data into the database';
@@ -94,10 +94,10 @@ 
 
 //xoops_header(false);
 echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
-echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="' . _LANGCODE . '" lang="' . _LANGCODE . '">';
+echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'._LANGCODE.'" lang="'._LANGCODE.'">';
 echo '<head>';
-echo '<meta http-equiv="content-type" content="text/html; charset=' . _CHARSET . '" />';
-echo '<meta http-equiv="content-language" content="' . _LANGCODE . '" />';
+echo '<meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" />';
+echo '<meta http-equiv="content-language" content="'._LANGCODE.'" />';
 ?>
 <head>
     <title>{#xoopsemotions_dlg.title}</title>
@@ -141,22 +141,22 @@ 
     <div id="emotionsbrowser_panel" class="panel current" style="overflow:auto;">
         <?php
         if ($smiles = $_SESSION['XoopsEmotions']) {
-            echo '<div><strong>' . _MSC_CLICKASMILIE . '</strong></div>';
+            echo '<div><strong>'._MSC_CLICKASMILIE.'</strong></div>';
             echo "<div class='xoopsEmotions'>";
             $count = count($smiles);
 
             for ($i = 0; $i < $count; ++$i) {
                 if ($op == '') {
                     if ($smiles[$i]['display']) {
-                        echo '<img class="xoopsEmotions" onclick="XoopsemotionsDialog.insert(this);" src="' . XOOPS_UPLOAD_URL . '/' . $smiles[$i]['smile_url'] . '" alt="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" title="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" />';
+                        echo '<img class="xoopsEmotions" onclick="XoopsemotionsDialog.insert(this);" src="'.XOOPS_UPLOAD_URL.'/'.$smiles[$i]['smile_url'].'" alt="'.$myts->htmlspecialchars($smiles[$i]['emotion']).'" title="'.$myts->htmlspecialchars($smiles[$i]['emotion']).'" />';
                     }
                 } else {
-                    echo '<img class="xoopsEmotions" onclick="XoopsemotionsDialog.insert(this);" src="' . XOOPS_UPLOAD_URL . '/' . $smiles[$i]['smile_url'] . '" alt="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" title="' . $myts->htmlspecialchars($smiles[$i]['emotion']) . '" />';
+                    echo '<img class="xoopsEmotions" onclick="XoopsemotionsDialog.insert(this);" src="'.XOOPS_UPLOAD_URL.'/'.$smiles[$i]['smile_url'].'" alt="'.$myts->htmlspecialchars($smiles[$i]['emotion']).'" title="'.$myts->htmlspecialchars($smiles[$i]['emotion']).'" />';
                 }
             }
             if ($op == '') {
                 echo '<div class="xoopsEmotions">';
-                echo '<a class="xoopsEmotions" href="' . $current_file . '?op=' . _MORE . '">' . _MORE . '</a>';
+                echo '<a class="xoopsEmotions" href="'.$current_file.'?op='._MORE.'">'._MORE.'</a>';
                 echo '</div>';
             }
             echo '</div>';
@@ -172,15 +172,15 @@ 
     <div id="emotionsadmin_panel" class="panel" style="overflow:auto;">
         <?php
         if ($admin) {
-            include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+            include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
             $smile_form = new XoopsThemeForm(_AM_ADDSMILE, 'smileform', $current_file, 'post', true);
             $smile_form->setExtra('enctype="multipart/form-data"');
             $smile_form->addElement(new XoopsFormText(_AM_SMILECODE, 'smile_code', 26, 25, ''), true);
             $smile_form->addElement(new XoopsFormText(_AM_SMILEEMOTION, 'smile_desc', 26, 25, ''), true);
             $smile_select = new XoopsFormFile('', 'smile_url', 5000000);
-            $smile_label  = new XoopsFormLabel('', '<img src="' . XOOPS_UPLOAD_URL . '/blank.gif" alt="" />');
-            $smile_tray   = new XoopsFormElementTray(_IMAGEFILE . ':', '&nbsp;');
+            $smile_label  = new XoopsFormLabel('', '<img src="'.XOOPS_UPLOAD_URL.'/blank.gif" alt="" />');
+            $smile_tray   = new XoopsFormElementTray(_IMAGEFILE.':', '&nbsp;');
             $smile_tray->addElement($smile_select);
             $smile_tray->addElement($smile_label);
             $smile_form->addElement($smile_tray);

htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsmlcontent/xoopsmlcontent.php

Spacing +11 added lines, -11 removed lines

@@ -18,7 +18,7 @@ 
     $current_path = str_replace(DIRECTORY_SEPARATOR, '/', $current_path);
 }
 $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), '/class/xoopseditor/tinymce/'));
-include_once $xoops_root_path . '/mainfile.php';
+include_once $xoops_root_path.'/mainfile.php';
 defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 // load mainfile.php - end
 
@@ -28,21 +28,21 @@ 
 
     $time = time();
     if (!isset($_SESSION['XoopsMLcontent']) && @$_SESSION['XoopsMLcontent_expire'] < $time) {
-        include_once XOOPS_ROOT_PATH . '/kernel/module.php';
+        include_once XOOPS_ROOT_PATH.'/kernel/module.php';
         $xlanguage = XoopsModule::getByDirname('xlanguage');
         if (is_object($xlanguage) && $xlanguage->getVar('isactive')) {
-            include_once(XOOPS_ROOT_PATH . '/modules/xlanguage/include/vars.php');
-            include_once(XOOPS_ROOT_PATH . '/modules/xlanguage/include/functions.php');
+            include_once(XOOPS_ROOT_PATH.'/modules/xlanguage/include/vars.php');
+            include_once(XOOPS_ROOT_PATH.'/modules/xlanguage/include/functions.php');
             $xlanguage_handler = xoops_getModuleHandler('language', 'xlanguage');
             $xlanguage_handler->loadConfig();
-            $lang_list =& $xlanguage_handler->getAllList();
+            $lang_list = & $xlanguage_handler->getAllList();
 
             $content .= '<select name="mlanguages" id="mlanguages">';
             $content .= '<option value="">{#xoopsmlcontent_dlg.sellang}</option>';
             if (is_array($lang_list) && count($lang_list) > 0) {
                 foreach (array_keys($lang_list) as $lang_name) {
-                    $lang =& $lang_list[$lang_name];
-                    $content .= '<option value="' . $lang['base']->getVar('lang_code') . '">' . $lang['base']->getVar('lang_name') . '</option>';
+                    $lang = & $lang_list[$lang_name];
+                    $content .= '<option value="'.$lang['base']->getVar('lang_code').'">'.$lang['base']->getVar('lang_name').'</option>';
                 }
             }
             $content .= '</select>';
@@ -54,7 +54,7 @@ 
             $content .= '<select name="mlanguages" id="mlanguages">';
             $content .= '<option value="">{#xoopsmlcontent_dlg.sellang}</option>';
             foreach ($easiestml_langs as $l => $lang) {
-                $content .= '<option value="' . $lang . '">' . $langnames[$l] . '</option>';
+                $content .= '<option value="'.$lang.'">'.$langnames[$l].'</option>';
             }
             $content .= '</select>';
         } else {
@@ -68,10 +68,10 @@ 
 }
 
 echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
-echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="' . _LANGCODE . '" lang="' . _LANGCODE . '">';
+echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'._LANGCODE.'" lang="'._LANGCODE.'">';
 echo '<head>';
-echo '<meta http-equiv="content-type" content="text/html; charset=' . _CHARSET . '" />';
-echo '<meta http-equiv="content-language" content="' . _LANGCODE . '" />';
+echo '<meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" />';
+echo '<meta http-equiv="content-language" content="'._LANGCODE.'" />';
 ?>
 <title>{#xoopsmlcontent_dlg.title}</title>
 <script type="text/javascript" src="../../tiny_mce_popup.js"></script>

htdocs/class/xoopseditor/tinymce/tinymce/jscripts/tiny_mce/plugins/xoopsimagemanager/xoopsimagebrowser.php

Spacing +77 added lines, -77 removed lines

@@ -18,7 +18,7 @@ 
     $current_path = str_replace(DIRECTORY_SEPARATOR, '/', $current_path);
 }
 $xoops_root_path = substr($current_path, 0, strpos(strtolower($current_path), '/class/xoopseditor/tinymce/'));
-include_once $xoops_root_path . '/mainfile.php';
+include_once $xoops_root_path.'/mainfile.php';
 defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
 /**
@@ -41,8 +41,8 @@ 
 // include
 xoops_load('xoopsformloader');
 //xoops_load("xoopsmodule");
-include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-include_once XOOPS_ROOT_PATH . '/modules/system/constants.php';
+include_once XOOPS_ROOT_PATH.'/include/cp_functions.php';
+include_once XOOPS_ROOT_PATH.'/modules/system/constants.php';
 
 global $xoopsConfig;
 
@@ -55,11 +55,11 @@ 
 
 // check categories readability/writability
 $imgcat_handler = xoops_getHandler('imagecategory');
-$catreadlist    = $imgcat_handler->getList($groups, 'imgcat_read', 1);    // get readable categories
-$catwritelist   = $imgcat_handler->getList($groups, 'imgcat_write', 1);  // get writable categories
+$catreadlist    = $imgcat_handler->getList($groups, 'imgcat_read', 1); // get readable categories
+$catwritelist   = $imgcat_handler->getList($groups, 'imgcat_write', 1); // get writable categories
 
-$catreadcount  = count($catreadlist);        // count readable categories
-$catwritecount = count($catwritelist);      // count writable categories
+$catreadcount  = count($catreadlist); // count readable categories
+$catwritecount = count($catwritelist); // count writable categories
 
 // check/set parameters - start
 if (!isset($_REQUEST['target'])) {
@@ -94,7 +94,7 @@ 
     // Save Image modification - start
     if (!empty($_POST['op']) && $op === 'save') {
         if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header($current_file . '?target=' . $target, 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            redirect_header($current_file.'?target='.$target, 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
         }
         $count = count($image_id);
         if ($count > 0) {
@@ -116,23 +116,23 @@ 
                 }
             }
             if (count($error) > 0) {
-                redirect_header($current_file . '?target=' . $target, 3, xoops_error(implode('<br>', $error)));
+                redirect_header($current_file.'?target='.$target, 3, xoops_error(implode('<br>', $error)));
             }
         }
-        redirect_header($current_file . '?target=' . $target, 3, _AM_SYSTEM_DBUPDATED);
+        redirect_header($current_file.'?target='.$target, 3, _AM_SYSTEM_DBUPDATED);
     }
     // Save Image modification - end
 
     // Add new image - start
     if (!empty($_POST['op']) && $op === 'addfile') {
         if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header($current_file . '?target=' . $target, 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            redirect_header($current_file.'?target='.$target, 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
         }
         $imgcat = $imgcat_handler->get((int)$imgcat_id);
         if (!is_object($imgcat)) {
-            redirect_header($current_file . '?target=' . $target, 3);
+            redirect_header($current_file.'?target='.$target, 3);
         }
-        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
+        include_once XOOPS_ROOT_PATH.'/class/uploader.php';
 
         $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH, array(
             'image/gif',
@@ -176,16 +176,16 @@ 
             }
         }
         if (count($err) > 0) {
-            redirect_header($current_file . '?target=' . $target, 3, xoops_error(implode('<br>', $err)));
+            redirect_header($current_file.'?target='.$target, 3, xoops_error(implode('<br>', $err)));
         }
-        redirect_header($current_file . '?target=' . $target, 3, _AM_SYSTEM_DBUPDATED);
+        redirect_header($current_file.'?target='.$target, 3, _AM_SYSTEM_DBUPDATED);
     }
     // Add new image - end
 
     // Add new category - start
     if (!empty($_POST['op']) && $op === 'addcat') {
         if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header($current_file . '?target=' . $target, 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            redirect_header($current_file.'?target='.$target, 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
         }
         $imgcat_handler = xoops_getHandler('imagecategory');
         $imagecategory  = $imgcat_handler->create();
@@ -199,7 +199,7 @@ 
         $imagecategory->setVar('imgcat_storetype', $imgcat_storetype);
         $imagecategory->setVar('imgcat_type', 'C');
         if (!$imgcat_handler->insert($imagecategory)) {
-            redirect_header($current_file . '?target=' . $target, 3);
+            redirect_header($current_file.'?target='.$target, 3);
         }
         $newid                     = $imagecategory->getVar('imgcat_id');
         $imagecategoryperm_handler = xoops_getHandler('groupperm');
@@ -233,19 +233,19 @@ 
             $imagecategoryperm_handler->insert($imagecategoryperm);
             unset($imagecategoryperm);
         }
-        redirect_header($current_file . '?target=' . $target, 3, _AM_SYSTEM_DBUPDATED);
+        redirect_header($current_file.'?target='.$target, 3, _AM_SYSTEM_DBUPDATED);
     }
     // Add new category - end
 
     // Update categorie - start
     if (!empty($_POST['op']) && $op === 'updatecat') {
         if (!$GLOBALS['xoopsSecurity']->check() || $imgcat_id <= 0) {
-            redirect_header($current_file . '?target=' . $target, 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            redirect_header($current_file.'?target='.$target, 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
         }
         $imgcat_handler = xoops_getHandler('imagecategory');
         $imagecategory  = $imgcat_handler->get($imgcat_id);
         if (!is_object($imagecategory)) {
-            redirect_header($current_file . '?target=' . $target, 3);
+            redirect_header($current_file.'?target='.$target, 3);
         }
         $imagecategory->setVar('imgcat_name', $imgcat_name);
         $imgcat_display = empty($imgcat_display) ? 0 : 1;
@@ -255,7 +255,7 @@ 
         $imagecategory->setVar('imgcat_maxheight', $imgcat_maxheight);
         $imagecategory->setVar('imgcat_weight', $imgcat_weight);
         if (!$imgcat_handler->insert($imagecategory)) {
-            redirect_header($current_file . '?target=' . $target, 3);
+            redirect_header($current_file.'?target='.$target, 3);
         }
         $imagecategoryperm_handler = xoops_getHandler('groupperm');
         $criteria                  = new CriteriaCompo(new Criteria('gperm_itemid', $imgcat_id));
@@ -294,7 +294,7 @@ 
             $imagecategoryperm_handler->insert($imagecategoryperm);
             unset($imagecategoryperm);
         }
-        redirect_header($current_file . '?target=' . $target, 3, _AM_SYSTEM_DBUPDATED);
+        redirect_header($current_file.'?target='.$target, 3, _AM_SYSTEM_DBUPDATED);
     }
     // Update categorie - end
 
@@ -311,19 +311,19 @@ 
     // Delete categorie - start
     if (!empty($_POST['op']) && $op === 'delcatok') {
         if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header($current_file . '?target=' . $target, 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            redirect_header($current_file.'?target='.$target, 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
         }
         $imgcat_id = (int)$imgcat_id;
         if ($imgcat_id <= 0) {
-            redirect_header($current_file . '?target=' . $target, 3);
+            redirect_header($current_file.'?target='.$target, 3);
         }
         $imgcat_handler = xoops_getHandler('imagecategory');
         $imagecategory  = $imgcat_handler->get($imgcat_id);
         if (!is_object($imagecategory)) {
-            redirect_header($current_file . '?target=' . $target, 3);
+            redirect_header($current_file.'?target='.$target, 3);
         }
         if ($imagecategory->getVar('imgcat_type') !== 'C') {
-            redirect_header($current_file . '?target=' . $target, 3, _MD_SCATDELNG);
+            redirect_header($current_file.'?target='.$target, 3, _MD_SCATDELNG);
         }
         $image_handler = xoops_getHandler('image');
         $images        = $image_handler->getObjects(new Criteria('imgcat_id', $imgcat_id), true, false);
@@ -332,7 +332,7 @@ 
             if (!$image_handler->delete($images[$i])) {
                 $errors[] = sprintf(_MD_FAILDEL, $i);
             } else {
-                if (file_exists(XOOPS_UPLOAD_PATH . '/' . $images[$i]->getVar('image_name')) && !unlink(XOOPS_UPLOAD_PATH . '/' . $images[$i]->getVar('image_name'))) {
+                if (file_exists(XOOPS_UPLOAD_PATH.'/'.$images[$i]->getVar('image_name')) && !unlink(XOOPS_UPLOAD_PATH.'/'.$images[$i]->getVar('image_name'))) {
                     $errors[] = sprintf(_MD_FAILUNLINK, $i);
                 }
             }
@@ -341,9 +341,9 @@ 
             $errors[] = sprintf(_MD_FAILDELCAT, $imagecategory->getVar('imgcat_name'));
         }
         if (count($errors) > 0) {
-            redirect_header($current_file . '?target=' . $target, 3, xoops_error(implode('<br>', $error)));
+            redirect_header($current_file.'?target='.$target, 3, xoops_error(implode('<br>', $error)));
         }
-        redirect_header($current_file . '?target=' . $target, 3, _AM_SYSTEM_DBUPDATED);
+        redirect_header($current_file.'?target='.$target, 3, _AM_SYSTEM_DBUPDATED);
     }
     // Delete categorie - end
 
@@ -361,39 +361,39 @@ 
     // Delete file - start
     if ($op === 'delfileok') {
         if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header($current_file . '?target=' . $target, 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            redirect_header($current_file.'?target='.$target, 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
         }
         $image_id = (int)$image_id;
         if ($image_id <= 0) {
-            redirect_header($current_file . '?target=' . $target, 3);
+            redirect_header($current_file.'?target='.$target, 3);
         }
         $image_handler = xoops_getHandler('image');
         $image         = $image_handler->get($image_id);
         if (!is_object($image)) {
-            redirect_header($current_file . '?target=' . $target, 3);
+            redirect_header($current_file.'?target='.$target, 3);
         }
         if (!$image_handler->delete($image)) {
-            redirect_header($current_file . '?target=' . $target, 3, xoops_error(sprintf(_MD_FAILDEL, $image->getVar('image_id'))));
+            redirect_header($current_file.'?target='.$target, 3, xoops_error(sprintf(_MD_FAILDEL, $image->getVar('image_id'))));
         }
-        @unlink(XOOPS_UPLOAD_PATH . '/' . $image->getVar('image_name'));
-        redirect_header($current_file . '?target=' . $target, 3, _AM_SYSTEM_DBUPDATED);
+        @unlink(XOOPS_UPLOAD_PATH.'/'.$image->getVar('image_name'));
+        redirect_header($current_file.'?target='.$target, 3, _AM_SYSTEM_DBUPDATED);
     }
     // Delete file - end
     // ************************* NOT USED ************************************
 }
 
 echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">';
-echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="' . _LANGCODE . '" lang="' . _LANGCODE . '">';
+echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="'._LANGCODE.'" lang="'._LANGCODE.'">';
 echo '<head>';
-echo '<meta http-equiv="content-type" content="text/html; charset=' . _CHARSET . '" />';
-echo '<meta http-equiv="content-language" content="' . _LANGCODE . '" />';
+echo '<meta http-equiv="content-type" content="text/html; charset='._CHARSET.'" />';
+echo '<meta http-equiv="content-language" content="'._LANGCODE.'" />';
 echo '<title>{#xoopsimagebrowser_dlg.dialog_title}</title>';
 echo '<script type="text/javascript" src="../../tiny_mce_popup.js"></script>';
 echo '<script type="text/javascript" src="../../utils/mctabs.js"></script>';
 echo '<script type="text/javascript" src="../../utils/form_utils.js"></script>';
 echo '<script type="text/javascript" src="../../utils/validate.js"></script>';
 echo '<script type="text/javascript" src="js/xoopsimagebrowser.js"></script>';
-echo '<link href="' . xoops_getcss($xoopsConfig['theme_set']) . '" rel="stylesheet" type="text/css" />';
+echo '<link href="'.xoops_getcss($xoopsConfig['theme_set']).'" rel="stylesheet" type="text/css" />';
 echo '<link href="css/xoopsimagebrowser.css" rel="stylesheet" type="text/css" />';
 echo '<base target="_self" />';
 echo '</head>';
@@ -434,14 +434,14 @@ 
                 // count images stored in this category
                 $this_imgcat_id   = $imagecategories[$i]->getVar('imgcat_id');
                 $countimagesincat = $image_handler->getCount(new Criteria('imgcat_id', $this_imgcat_id));
-                echo $this_imgcat_id . ' - ' . $imagecategories[$i]->getVar('imgcat_name') . ' (' . sprintf(_NUMIMAGES, '<strong>' . $countimagesincat . '</strong>') . ')';
+                echo $this_imgcat_id.' - '.$imagecategories[$i]->getVar('imgcat_name').' ('.sprintf(_NUMIMAGES, '<strong>'.$countimagesincat.'</strong>').')';
                 echo '</td><td class="even">';
-                echo '&nbsp;[<a href="' . $current_file . '?target=' . $target . '&amp;op=listimg&amp;imgcat_id=' . $this_imgcat_id . '">' . _LIST . '</a>]';
+                echo '&nbsp;[<a href="'.$current_file.'?target='.$target.'&amp;op=listimg&amp;imgcat_id='.$this_imgcat_id.'">'._LIST.'</a>]';
                 if ($isadmin) {
-                    echo '&nbsp;[<a href="' . $current_file . '?target=' . $target . '&amp;op=editcat&amp;imgcat_id=' . $this_imgcat_id . '">' . _EDIT . '</a>]';
+                    echo '&nbsp;[<a href="'.$current_file.'?target='.$target.'&amp;op=editcat&amp;imgcat_id='.$this_imgcat_id.'">'._EDIT.'</a>]';
                 }
                 if ($isadmin && $imagecategories[$i]->getVar('imgcat_type') === 'C') {
-                    echo '&nbsp;[<a href="' . $current_file . '?target=' . $target . '&amp;op=delcat&amp;imgcat_id=' . $this_imgcat_id . '">' . _DELETE . '</a>]';
+                    echo '&nbsp;[<a href="'.$current_file.'?target='.$target.'&amp;op=delcat&amp;imgcat_id='.$this_imgcat_id.'">'._DELETE.'</a>]';
                 }
             }
             echo '</td></tr>';
@@ -455,12 +455,12 @@ 
 if ($op === 'listimg') {
     $imgcat_id = (int)$imgcat_id;
     if ($imgcat_id <= 0) {
-        redirect_header($current_file . '?target=' . $target, 1);
+        redirect_header($current_file.'?target='.$target, 1);
     }
     $imgcat_handler = xoops_getHandler('imagecategory');
     $imagecategory  = $imgcat_handler->get($imgcat_id);
     if (!is_object($imagecategory)) {
-        redirect_header($current_file . '?target=' . $target, 1);
+        redirect_header($current_file.'?target='.$target, 1);
     }
     $image_handler = xoops_getHandler('image');
 
@@ -473,69 +473,69 @@ 
     $criteria->setLimit(20);
     $images = $image_handler->getObjects($criteria, true, false);
 
-    echo '<a href="' . $current_file . '?target=' . $target . '">' . _MD_IMGMAIN . '</a>&nbsp;<span style="font-weight:bold;">&gt;</span>&nbsp;' . $imagecategory->getVar('imgcat_name');
+    echo '<a href="'.$current_file.'?target='.$target.'">'._MD_IMGMAIN.'</a>&nbsp;<span style="font-weight:bold;">&gt;</span>&nbsp;'.$imagecategory->getVar('imgcat_name');
     echo '<br><br><strong>{#xoopsimagebrowser_dlg.select_image}</strong>';
-    echo '<form action="' . $current_file . '?target=' . $target . '" method="post">';
+    echo '<form action="'.$current_file.'?target='.$target.'" method="post">';
     $rowspan = $catwritelist ? 5 : 2;
     foreach (array_keys($images) as $i) {
         $image_src = '';
         // check if image stored in db/as file - start
         if ($imagecategory->getVar('imgcat_storetype') === 'db') {
-            $image_src = '' . XOOPS_URL . '/image.php?id=' . $i . '';
-            if (ini_get('allow_url_fopen') == true){
+            $image_src = ''.XOOPS_URL.'/image.php?id='.$i.'';
+            if (ini_get('allow_url_fopen') == true) {
                 $image_info = true;
                 $image_size = getimagesize($image_src);
             } else {
                 $image_info = false;
             }
         } else {
-            $image_src = '' . XOOPS_UPLOAD_URL . '/' . $images[$i]->getVar('image_name') . '';
-            $image_size = getimagesize(XOOPS_ROOT_PATH . '/uploads/' . $images[$i]->getVar('image_name'));
+            $image_src = ''.XOOPS_UPLOAD_URL.'/'.$images[$i]->getVar('image_name').'';
+            $image_size = getimagesize(XOOPS_ROOT_PATH.'/uploads/'.$images[$i]->getVar('image_name'));
             $image_info = true;
         }
         
         // check if image stored in db/as file - end
         echo '<table width="100%" class="outer">';
         echo '<tr>';
-        echo '<td rowspan="' . $rowspan . '" class="xoopsimage">';
+        echo '<td rowspan="'.$rowspan.'" class="xoopsimage">';
 
-        echo '<img id="imageid' . $images[$i]->getVar('image_id') . '" src="' . $image_src . '" alt="' . $images[$i]->getVar('image_nicename', 'E') . '" title="' . $images[$i]->getVar('image_nicename', 'E') . '" onclick="XoopsimagebrowserDialog.insertAndClose(\'imageid' . $images[$i]->getVar('image_id') . '\');return false;"/>';
+        echo '<img id="imageid'.$images[$i]->getVar('image_id').'" src="'.$image_src.'" alt="'.$images[$i]->getVar('image_nicename', 'E').'" title="'.$images[$i]->getVar('image_nicename', 'E').'" onclick="XoopsimagebrowserDialog.insertAndClose(\'imageid'.$images[$i]->getVar('image_id').'\');return false;"/>';
         echo '<br>';
-        if ($image_info == true){
-            echo '' . $image_size[0] . 'x' . $image_size[1] . '';
+        if ($image_info == true) {
+            echo ''.$image_size[0].'x'.$image_size[1].'';
         }
         echo '</td>';
-        echo '<td class="head">' . _IMAGENAME, '</td>';
-        echo '<td class="even"><input type="hidden" name="image_id[]" value="' . $i . '" /><input type="text" name="image_nicename[]" value="' . $images[$i]->getVar('image_nicename', 'E') . '" size="20" maxlength="255" /></td>';
+        echo '<td class="head">'._IMAGENAME, '</td>';
+        echo '<td class="even"><input type="hidden" name="image_id[]" value="'.$i.'" /><input type="text" name="image_nicename[]" value="'.$images[$i]->getVar('image_nicename', 'E').'" size="20" maxlength="255" /></td>';
         echo '</tr>';
 
         echo '<tr>';
-        echo '<td class="head">' . _IMAGEMIME . '</td>';
-        echo '<td class="odd">' . $images[$i]->getVar('image_mimetype') . '</td>';
+        echo '<td class="head">'._IMAGEMIME.'</td>';
+        echo '<td class="odd">'.$images[$i]->getVar('image_mimetype').'</td>';
         echo '</tr>';
 
         if ($catwritelist) {
             echo '<tr>';
-            echo '<td class="head">' . _IMAGECAT . '</td>';
+            echo '<td class="head">'._IMAGECAT.'</td>';
             echo '<td class="even">';
             echo '<select name="imgcat_id[]" size="1">';
             $list = $imgcat_handler->getList($groups, null, null, $imagecategory->getVar('imgcat_storetype'));
             foreach ($list as $value => $name) {
-                echo '<option value="' . $value . '"' . (($value == $images[$i]->getVar('imgcat_id')) ? ' selected="selected"' : '') . '>' . $name . '</option>';
+                echo '<option value="'.$value.'"'.(($value == $images[$i]->getVar('imgcat_id')) ? ' selected="selected"' : '').'>'.$name.'</option>';
             }
             echo '</select>';
             echo '</td>';
             echo '</tr>';
 
             echo '<tr>';
-            echo '<td class="head">' . _IMGWEIGHT . '</td>';
-            echo '<td class="odd"><input type="text" name="image_weight[]" value="' . $images[$i]->getVar('image_weight') . '" size="3" maxlength="4" /></td>';
+            echo '<td class="head">'._IMGWEIGHT.'</td>';
+            echo '<td class="odd"><input type="text" name="image_weight[]" value="'.$images[$i]->getVar('image_weight').'" size="3" maxlength="4" /></td>';
             echo '</tr>';
 
             echo '<tr>';
-            echo '<td class="head">' . _IMGDISPLAY . '</td>';
+            echo '<td class="head">'._IMGDISPLAY.'</td>';
             echo '<td class="even">';
-            echo '<input type="checkbox" name="image_display[]" value="1"' . (($images[$i]->getVar('image_display') == 1) ? ' checked="checked"' : '') . ' />';
+            echo '<input type="checkbox" name="image_display[]" value="1"'.(($images[$i]->getVar('image_display') == 1) ? ' checked="checked"' : '').' />';
             echo '</td>';
             echo '</tr>';
         }
@@ -545,12 +545,12 @@ 
 
     if ($imgcount > 0) {
         if ($imgcount > 20) {
-            include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-            $nav = new XoopsPageNav($imgcount, 20, $start, 'start', 'op=listimg&amp;target=' . $target . '&amp;imgcat_id=' . $imgcat_id);
-            echo '<div text-align="right">' . $nav->renderNav() . '</div>';
+            include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+            $nav = new XoopsPageNav($imgcount, 20, $start, 'start', 'op=listimg&amp;target='.$target.'&amp;imgcat_id='.$imgcat_id);
+            echo '<div text-align="right">'.$nav->renderNav().'</div>';
         }
         if ($catwritelist) {
-            echo '<input type="hidden" name="op" value="save" />' . $GLOBALS['xoopsSecurity']->getTokenHTML() . '<input type="submit" name="submit" value="' . _SUBMIT . '" />';
+            echo '<input type="hidden" name="op" value="save" />'.$GLOBALS['xoopsSecurity']->getTokenHTML().'<input type="submit" name="submit" value="'._SUBMIT.'" />';
             echo '</form>';
         }
     }
@@ -560,16 +560,16 @@ 
 //edit category - start
 if ($op === 'editcat') {
     if ($imgcat_id <= 0) {
-        redirect_header($current_file . '?target=' . $target, 1);
+        redirect_header($current_file.'?target='.$target, 1);
     }
     $imgcat_handler = xoops_getHandler('imagecategory');
     $imagecategory  = $imgcat_handler->get($imgcat_id);
     if (!is_object($imagecategory)) {
-        redirect_header($current_file . '?target=' . $target, 1);
+        redirect_header($current_file.'?target='.$target, 1);
     }
-    include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+    include_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
     $imagecategoryperm_handler = xoops_getHandler('groupperm');
-    $form                      = new XoopsThemeForm(_MD_EDITIMGCAT, 'imagecat_form', '' . $current_file . '?target=' . $target . '', 'post', true);
+    $form                      = new XoopsThemeForm(_MD_EDITIMGCAT, 'imagecat_form', ''.$current_file.'?target='.$target.'', 'post', true);
     $form->addElement(new XoopsFormText(_MD_IMGCATNAME, 'imgcat_name', 50, 255, $imagecategory->getVar('imgcat_name')), true);
     $form->addElement(new XoopsFormSelectGroup(_MD_IMGCATRGRP, 'readgroup', true, $imagecategoryperm_handler->getGroupIds('imgcat_read', $imgcat_id), 5, true));
     $form->addElement(new XoopsFormSelectGroup(_MD_IMGCATWGRP, 'writegroup', true, $imagecategoryperm_handler->getGroupIds('imgcat_write', $imgcat_id), 5, true));
@@ -583,7 +583,7 @@ 
     $form->addElement(new XoopsFormHidden('imgcat_id', $imgcat_id));
     $form->addElement(new XoopsFormHidden('op', 'updatecat'));
     $form->addElement(new XoopsFormButton('', 'imgcat_button', _SUBMIT, 'submit'));
-    echo '<a href="' . $current_file . '?target=' . $target . '">' . _MD_IMGMAIN . '</a>&nbsp;<span style="font-weight:bold;">&gt;</span>&nbsp;' . $imagecategory->getVar('imgcat_name') . '<br><br>';
+    echo '<a href="'.$current_file.'?target='.$target.'">'._MD_IMGMAIN.'</a>&nbsp;<span style="font-weight:bold;">&gt;</span>&nbsp;'.$imagecategory->getVar('imgcat_name').'<br><br>';
     $form->display();
 }
 echo '<div class="mceActionPanel floatright" >';
@@ -595,7 +595,7 @@ 
 //create Image - start
 if ($isadmin || !empty($catwritelist)) {
     echo '<div id="loadimage_panel" class="panel" style="overflow:auto;">';
-    $form = new XoopsThemeForm(_ADDIMAGE, 'image_form', '' . $current_file . '?target=' . $target . '', 'post', true);
+    $form = new XoopsThemeForm(_ADDIMAGE, 'image_form', ''.$current_file.'?target='.$target.'', 'post', true);
     $form->setExtra('enctype="multipart/form-data"');
     $form->addElement(new XoopsFormText(_IMAGENAME, 'image_nicename', 50, 255), true);
     $select = new XoopsFormSelect(_IMAGECAT, 'imgcat_id');
@@ -621,7 +621,7 @@ 
 //create Category - start
 if ($isadmin) {
     echo '<div id="createcategory_panel" class="panel" style="overflow:auto;">';
-    $form = new XoopsThemeForm(_MD_ADDIMGCAT, 'imagecat_form', '' . $current_file . '?target=' . $target . '', 'post', true);
+    $form = new XoopsThemeForm(_MD_ADDIMGCAT, 'imagecat_form', ''.$current_file.'?target='.$target.'', 'post', true);
     $form->addElement(new XoopsFormText(_MD_IMGCATNAME, 'imgcat_name', 50, 255), true);
     $form->addElement(new XoopsFormSelectGroup(_MD_IMGCATRGRP, 'readgroup', true, XOOPS_GROUP_ADMIN, 5, true));
     $form->addElement(new XoopsFormSelectGroup(_MD_IMGCATWGRP, 'writegroup', true, XOOPS_GROUP_ADMIN, 5, true));
@@ -630,7 +630,7 @@ 
     $form->addElement(new XoopsFormText(_IMGMAXHEIGHT, 'imgcat_maxheight', 3, 4, 120));
     $form->addElement(new XoopsFormText(_MD_IMGCATWEIGHT, 'imgcat_weight', 3, 4, 0));
     $form->addElement(new XoopsFormRadioYN(_MD_IMGCATDISPLAY, 'imgcat_display', 1, _YES, _NO));
-    $storetype = new XoopsFormRadio(_MD_IMGCATSTRTYPE . '<br><span style="color:#ff0000;">' . _MD_STRTYOPENG . '</span>', 'imgcat_storetype', 'file');
+    $storetype = new XoopsFormRadio(_MD_IMGCATSTRTYPE.'<br><span style="color:#ff0000;">'._MD_STRTYOPENG.'</span>', 'imgcat_storetype', 'file');
     $storetype->addOptionArray(array('file' => _MD_ASFILE, 'db' => _MD_INDB));
     $form->addElement($storetype);
     $form->addElement(new XoopsFormHidden('op', 'addcat'));