XOOPS / XoopsCore25

htdocs/modules/system/class/fineuploadhandler.php

Spacing +14 added lines, -14 removed lines

@@ -107,7 +107,7 @@ 
         }
         $target = fopen($targetPath, 'wb');
 
-        for ($i=0; $i<$totalParts; $i++) {
+        for ($i = 0; $i < $totalParts; $i++) {
             $chunk = fopen($targetFolder.DIRECTORY_SEPARATOR.$i, "rb");
             stream_copy_to_stream($chunk, $target);
             fclose($chunk);
@@ -116,7 +116,7 @@ 
         // Success
         fclose($target);
 
-        for ($i=0; $i<$totalParts; $i++) {
+        for ($i = 0; $i < $totalParts; $i++) {
             unlink($targetFolder.DIRECTORY_SEPARATOR.$i);
         }
 
@@ -141,7 +141,7 @@ 
     public function handleUpload($uploadDirectory, $name = null)
     {
         if (is_writable($this->chunksFolder) &&
-            1 == mt_rand(1, 1/$this->chunksCleanupProbability)) {
+            1 == mt_rand(1, 1 / $this->chunksCleanupProbability)) {
             // Run garbage collection
             $this->cleanupChunks();
         }
@@ -150,7 +150,7 @@ 
         // exceed size allowed by server config
         if ($this->toBytes(ini_get('post_max_size')) < $this->sizeLimit ||
             $this->toBytes(ini_get('upload_max_filesize')) < $this->sizeLimit) {
-            $neededRequestSize = max(1, $this->sizeLimit / 1024 / 1024) . 'M';
+            $neededRequestSize = max(1, $this->sizeLimit / 1024 / 1024).'M';
             return array(
                 'error'=>"Server error. Increase post_max_size and upload_max_filesize to ".$neededRequestSize
             );
@@ -211,7 +211,7 @@ 
             && !in_array(strtolower($ext), array_map("strtolower", $this->allowedExtensions))) {
             $these = implode(', ', $this->allowedExtensions);
             return array(
-                'error' => 'File has an invalid extension, it should be one of '. $these . '.',
+                'error' => 'File has an invalid extension, it should be one of '.$these.'.',
                 'preventRetry' => true
             );
         }
@@ -264,7 +264,7 @@ 
                 }
             }
 
-            return array('error'=> 'Could not save uploaded file.' .
+            return array('error'=> 'Could not save uploaded file.'.
                 'The upload was cancelled, or server error encountered');
         }
     }
@@ -301,7 +301,7 @@ 
         if ($method == "DELETE") {
             $url = parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH);
             $tokens = explode('/', $url);
-            $uuid = $tokens[sizeof($tokens)-1];
+            $uuid = $tokens[sizeof($tokens) - 1];
         } elseif ($method == "POST") {
             $uuid = $_REQUEST['qquuid'];
         } else {
@@ -345,19 +345,19 @@ 
         $pathinfo = pathinfo($filename);
         $base = $pathinfo['filename'];
         $ext = isset($pathinfo['extension']) ? $pathinfo['extension'] : '';
-        $ext = $ext == '' ? $ext : '.' . $ext;
+        $ext = $ext == '' ? $ext : '.'.$ext;
 
         $unique = $base;
         $suffix = 0;
 
         // Get unique file name for the file, by appending random suffix.
 
-        while (file_exists($uploadDirectory . DIRECTORY_SEPARATOR . $unique . $ext)) {
+        while (file_exists($uploadDirectory.DIRECTORY_SEPARATOR.$unique.$ext)) {
             $suffix += rand(1, 999);
             $unique = $base.'-'.$suffix;
         }
 
-        $result =  $uploadDirectory . DIRECTORY_SEPARATOR . $unique . $ext;
+        $result = $uploadDirectory.DIRECTORY_SEPARATOR.$unique.$ext;
 
         // Create an empty target file
         if (!touch($result)) {
@@ -426,11 +426,11 @@ 
     protected function toBytes($str)
     {
         $str = trim($str);
-        $last = strtolower($str[strlen($str)-1]);
-        if(is_numeric($last)) {
-            $val = (int) $str;
+        $last = strtolower($str[strlen($str) - 1]);
+        if (is_numeric($last)) {
+            $val = (int)$str;
         } else {
-            $val = (int) substr($str, 0, -1);
+            $val = (int)substr($str, 0, -1);
         }
         switch ($last) {
             case 'g':

htdocs/modules/system/class/cpanel.php

Spacing +7 added lines, -7 removed lines

@@ -57,9 +57,9 @@ 
     public function loadGui($gui)
     {
         if (!empty($gui)) {
-            $class = 'XoopsGui' . ucfirst($gui);
+            $class = 'XoopsGui'.ucfirst($gui);
             if (!class_exists($class)) {
-                include_once XOOPS_ADMINTHEME_PATH . '/' . $gui . '/' . $gui . '.php';
+                include_once XOOPS_ADMINTHEME_PATH.'/'.$gui.'/'.$gui.'.php';
             }
             if (class_exists($class)) {
                 if (call_user_func(array($class, 'validate'))) {
@@ -69,7 +69,7 @@ 
             }
         }
         if (!isset($this->gui)) {
-            if (file_exists($file = XOOPS_ADMINTHEME_PATH . '/transition/transition.php')) {
+            if (file_exists($file = XOOPS_ADMINTHEME_PATH.'/transition/transition.php')) {
                 include_once $file;
                 $this->gui             = new XoopsGuiTransition();
                 $this->gui->foldername = 'transition';
@@ -88,9 +88,9 @@ 
         xoops_load('XoopsLists');
         $lists = XoopsLists::getDirListAsArray(XOOPS_ADMINTHEME_PATH);
         foreach (array_keys($lists) as $gui) {
-            if (file_exists($file = XOOPS_ADMINTHEME_PATH . '/' . $gui . '/' . $gui . '.php')) {
+            if (file_exists($file = XOOPS_ADMINTHEME_PATH.'/'.$gui.'/'.$gui.'.php')) {
                 include_once $file;
-                if (class_exists($class = 'XoopsGui' . ucfirst($gui))) {
+                if (class_exists($class = 'XoopsGui'.ucfirst($gui))) {
                     if (call_user_func(array($class, 'validate'))) {
                         $guis[$gui] = $gui;
                     }
@@ -109,9 +109,9 @@ 
     {
         $guis = XoopsSystemCpanel::getGuis();
         foreach ($guis as $gui) {
-            if ($file = XOOPS_ADMINTHEME_PATH . '/' . $gui . '/' . $gui . '.php') {
+            if ($file = XOOPS_ADMINTHEME_PATH.'/'.$gui.'/'.$gui.'.php') {
                 include_once $file;
-                if (class_exists($class = 'XoopsGui' . ucfirst($gui))) {
+                if (class_exists($class = 'XoopsGui'.ucfirst($gui))) {
                     call_user_func(array($class, 'flush'));
                 }
             }

htdocs/modules/system/class/smilies.php

Spacing +4 added lines, -4 removed lines

@@ -63,16 +63,16 @@
         $form->addElement(new XoopsFormText(_AM_SYSTEM_SMILIES_DESCRIPTION, 'emotion', 50, 50, $this->getVar('emotion')), true);
 
         $imgtray_img     = new XoopsFormElementTray(_AM_SYSTEM_SMILIES_FILE, '<br>');
-        $imgpath_img     = sprintf(_AM_SYSTEM_SMILIES_IMAGE_PATH, XOOPS_UPLOAD_PATH . '/smilies/');
+        $imgpath_img     = sprintf(_AM_SYSTEM_SMILIES_IMAGE_PATH, XOOPS_UPLOAD_PATH.'/smilies/');
         $imageselect_img = new XoopsFormSelect($imgpath_img, 'smile_url', $blank_img);
-        $image_array_img = XoopsLists::getImgListAsArray(XOOPS_UPLOAD_PATH . '/smilies');
+        $image_array_img = XoopsLists::getImgListAsArray(XOOPS_UPLOAD_PATH.'/smilies');
         $imageselect_img->addOption("$blank_img", $blank_img);
         foreach ($image_array_img as $image_img) {
             $imageselect_img->addOption("$image_img", $image_img);
         }
-        $imageselect_img->setExtra('onchange="showImgSelected(\'xo-smilies-img\', \'smile_url\', \'smilies\', \'\', \'' . XOOPS_UPLOAD_URL . '\' )"');
+        $imageselect_img->setExtra('onchange="showImgSelected(\'xo-smilies-img\', \'smile_url\', \'smilies\', \'\', \''.XOOPS_UPLOAD_URL.'\' )"');
         $imgtray_img->addElement($imageselect_img, false);
-        $imgtray_img->addElement(new XoopsFormLabel('', "<br><img src='" . XOOPS_UPLOAD_URL . '/smilies/' . $blank_img . "' name='image_img' id='xo-smilies-img' alt='' />"));
+        $imgtray_img->addElement(new XoopsFormLabel('', "<br><img src='".XOOPS_UPLOAD_URL.'/smilies/'.$blank_img."' name='image_img' id='xo-smilies-img' alt='' />"));
 
         $fileseltray_img = new XoopsFormElementTray('<br>', '<br><br>');
         $fileseltray_img->addElement(new XoopsFormFile(_AM_SYSTEM_SMILIES_UPLOADS, 'smile_url', 500000), false);

htdocs/modules/system/class/avatar.php

Spacing +8 added lines, -8 removed lines

@@ -54,20 +54,20 @@ 
         // Name
         $form->addElement(new XoopsFormText(_IMAGENAME, 'avatar_name', 50, 255, $this->getVar('avatar_name', 'e')), true);
         // Name description
-        $maxpixel = '<div>' . _US_MAXPIXEL . '&nbsp;:&nbsp;' . $xoopsConfigUser['avatar_width'] . ' x ' . $xoopsConfigUser['avatar_height'] . '</div>';
-        $maxsize  = '<div>' . _US_MAXIMGSZ . '&nbsp;:&nbsp;' . $xoopsConfigUser['avatar_maxsize'] . '</div>';
+        $maxpixel = '<div>'._US_MAXPIXEL.'&nbsp;:&nbsp;'.$xoopsConfigUser['avatar_width'].' x '.$xoopsConfigUser['avatar_height'].'</div>';
+        $maxsize  = '<div>'._US_MAXIMGSZ.'&nbsp;:&nbsp;'.$xoopsConfigUser['avatar_maxsize'].'</div>';
         // Upload part
         $imgtray_img = new XoopsFormElementTray(_IMAGEFILE, '<br>');
-        $imgtray_img->setDescription($maxpixel . $maxsize);
-        $imageselect_img = new XoopsFormSelect(sprintf(_AM_SYSTEM_AVATAR_USE_FILE, XOOPS_UPLOAD_PATH . '/avatars/'), 'avatar_file', $blank_img);
-        $image_array_img = XoopsLists::getImgListAsArray(XOOPS_UPLOAD_PATH . '/avatars');
+        $imgtray_img->setDescription($maxpixel.$maxsize);
+        $imageselect_img = new XoopsFormSelect(sprintf(_AM_SYSTEM_AVATAR_USE_FILE, XOOPS_UPLOAD_PATH.'/avatars/'), 'avatar_file', $blank_img);
+        $image_array_img = XoopsLists::getImgListAsArray(XOOPS_UPLOAD_PATH.'/avatars');
         $imageselect_img->addOption("$blank_img", $blank_img);
         foreach ($image_array_img as $image_img) {
             $imageselect_img->addOption("$image_img", $image_img);
         }
-        $imageselect_img->setExtra("onchange='showImgSelected(\"xo-avatar-img\", \"avatar_file\", \"avatars\", \"\", \"" . XOOPS_UPLOAD_URL . "\")'");
+        $imageselect_img->setExtra("onchange='showImgSelected(\"xo-avatar-img\", \"avatar_file\", \"avatars\", \"\", \"".XOOPS_UPLOAD_URL."\")'");
         $imgtray_img->addElement($imageselect_img, false);
-        $imgtray_img->addElement(new XoopsFormLabel('', "<br><img src='" . XOOPS_UPLOAD_URL . '/avatars/' . $blank_img . "' name='image_img' id='xo-avatar-img' alt='' />"));
+        $imgtray_img->addElement(new XoopsFormLabel('', "<br><img src='".XOOPS_UPLOAD_URL.'/avatars/'.$blank_img."' name='image_img' id='xo-avatar-img' alt='' />"));
         $fileseltray_img = new XoopsFormElementTray('<br>', '<br><br>');
         $fileseltray_img->addElement(new XoopsFormFile(_AM_SYSTEM_AVATAR_UPLOAD, 'avatar_file', 500000), false);
         $imgtray_img->addElement($fileseltray_img);
@@ -138,7 +138,7 @@ 
         $avatar = false;
         $id     = (int)$id;
         if ($id > 0) {
-            $sql = 'SELECT * FROM ' . $this->db->prefix('avatar') . ' WHERE avatar_id=' . $id;
+            $sql = 'SELECT * FROM '.$this->db->prefix('avatar').' WHERE avatar_id='.$id;
             if (!$result = $this->db->query($sql)) {
                 return false;
             }

htdocs/modules/system/class/maintenance.php

Spacing +50 added lines, -50 removed lines

@@ -36,7 +36,7 @@ 
         /* @var $db XoopsMySQLDatabase */
         $db           = XoopsDatabaseFactory::getDatabaseConnection();
         $this->db     = $db;
-        $this->prefix = $this->db->prefix . '_';
+        $this->prefix = $this->db->prefix.'_';
     }
 
     /**
@@ -56,7 +56,7 @@ 
             $value          = substr($value[0], strlen(XOOPS_DB_PREFIX) + 1);
             $tables[$value] = $value;
         }
-        if (true === (bool) $array) {
+        if (true === (bool)$array) {
             return $tables;
         } else {
             return implode(',', $tables);
@@ -70,7 +70,7 @@ 
      */
     public function CleanSession()
     {
-        $result = $this->db->queryF('TRUNCATE TABLE ' . $this->db->prefix('session'));
+        $result = $this->db->queryF('TRUNCATE TABLE '.$this->db->prefix('session'));
 
         return true;
     }
@@ -86,16 +86,16 @@ 
      */
     public function CleanAvatar()
     {
-        $result = $this->db->queryF('SELECT avatar_id, avatar_file FROM ' . $this->db->prefix('avatar') . " WHERE avatar_type='C' AND avatar_id IN (" . 'SELECT t1.avatar_id FROM ' . $this->db->prefix('avatar_user_link') . ' AS t1 ' . 'LEFT JOIN ' . $this->db->prefix('users') . ' AS t2 ON t2.uid=t1.user_id ' . 'WHERE t2.uid IS NULL)');
+        $result = $this->db->queryF('SELECT avatar_id, avatar_file FROM '.$this->db->prefix('avatar')." WHERE avatar_type='C' AND avatar_id IN (".'SELECT t1.avatar_id FROM '.$this->db->prefix('avatar_user_link').' AS t1 '.'LEFT JOIN '.$this->db->prefix('users').' AS t2 ON t2.uid=t1.user_id '.'WHERE t2.uid IS NULL)');
 
         while (false !== ($myrow = $this->db->fetchArray($result))) {
             //delete file
-            @unlink(XOOPS_UPLOAD_PATH . '/' . $myrow['avatar_file']);
+            @unlink(XOOPS_UPLOAD_PATH.'/'.$myrow['avatar_file']);
             //clean avatar table
-            $result1 = $this->db->queryF('DELETE FROM ' . $this->db->prefix('avatar') . ' WHERE avatar_id=' . $myrow['avatar_id']);
+            $result1 = $this->db->queryF('DELETE FROM '.$this->db->prefix('avatar').' WHERE avatar_id='.$myrow['avatar_id']);
         }
         //clean any deleted users from avatar_user_link table
-        $result2 = $this->db->queryF('DELETE FROM ' . $this->db->prefix('avatar_user_link') . ' WHERE user_id NOT IN (SELECT uid FROM ' . $this->db->prefix('users') . ')');
+        $result2 = $this->db->queryF('DELETE FROM '.$this->db->prefix('avatar_user_link').' WHERE user_id NOT IN (SELECT uid FROM '.$this->db->prefix('users').')');
 
         return true;
     }
@@ -112,8 +112,8 @@ 
         if (is_dir($dir)) {
             if ($dirHandle = opendir($dir)) {
                 while (($file = readdir($dirHandle)) !== false) {
-                    if (filetype($dir . $file) === 'file' && $file !== 'index.html') {
-                        unlink($dir . $file);
+                    if (filetype($dir.$file) === 'file' && $file !== 'index.html') {
+                        unlink($dir.$file);
                     }
                 }
                 closedir($dirHandle);
@@ -135,13 +135,13 @@ 
         foreach ($cacheList as $cache) {
             switch ($cache) {
                 case 1:
-                    $this->clearDirectory(XOOPS_VAR_PATH . '/caches/smarty_cache/');
+                    $this->clearDirectory(XOOPS_VAR_PATH.'/caches/smarty_cache/');
                     break;
                 case 2:
-                    $this->clearDirectory(XOOPS_VAR_PATH . '/caches/smarty_compile/');
+                    $this->clearDirectory(XOOPS_VAR_PATH.'/caches/smarty_compile/');
                     break;
                 case 3:
-                    $this->clearDirectory(XOOPS_VAR_PATH . '/caches/xoops_cache/');
+                    $this->clearDirectory(XOOPS_VAR_PATH.'/caches/xoops_cache/');
                     break;
                 default:
                     return false;
@@ -160,7 +160,7 @@ 
      */
     public function CheckRepairAnalyzeOptimizeQueries($tables, $maintenance)
     {
-        $ret = '<table class="outer"><th>' . _AM_SYSTEM_MAINTENANCE_TABLES1 . '</th><th>' . _AM_SYSTEM_MAINTENANCE_TABLES_OPTIMIZE . '</th><th>' . _AM_SYSTEM_MAINTENANCE_TABLES_CHECK . '</th><th>' . _AM_SYSTEM_MAINTENANCE_TABLES_REPAIR . '</th><th>' . _AM_SYSTEM_MAINTENANCE_TABLES_ANALYZE . '</th>';
+        $ret = '<table class="outer"><th>'._AM_SYSTEM_MAINTENANCE_TABLES1.'</th><th>'._AM_SYSTEM_MAINTENANCE_TABLES_OPTIMIZE.'</th><th>'._AM_SYSTEM_MAINTENANCE_TABLES_CHECK.'</th><th>'._AM_SYSTEM_MAINTENANCE_TABLES_REPAIR.'</th><th>'._AM_SYSTEM_MAINTENANCE_TABLES_ANALYZE.'</th>';
         $tab = array();
         for ($i = 0; $i < 4; ++$i) {
             $tab[$i] = $i + 1;
@@ -177,39 +177,39 @@ 
         $class       = 'odd';
         $tablesCount = count($tables);
         for ($i = 0; $i < $tablesCount; ++$i) {
-            $ret .= '<tr class="' . $class . '"><td align="center">' . $this->prefix . $tables[$i] . '</td>';
+            $ret .= '<tr class="'.$class.'"><td align="center">'.$this->prefix.$tables[$i].'</td>';
             for ($j = 0; $j < 4; ++$j) {
                 if ($tab1[$j] == 1) {
                     // Optimize
-                    $result = $this->db->queryF('OPTIMIZE TABLE ' . $this->prefix . $tables[$i]);
+                    $result = $this->db->queryF('OPTIMIZE TABLE '.$this->prefix.$tables[$i]);
                     if ($result) {
-                        $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('success.png') . '" /></td>';
+                        $ret .= '<td class="xo-actions txtcenter"><img src="'.system_AdminIcons('success.png').'" /></td>';
                     } else {
-                        $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('cancel.png') . '" /></td>';
+                        $ret .= '<td class="xo-actions txtcenter"><img src="'.system_AdminIcons('cancel.png').'" /></td>';
                     }
                 } elseif ($tab1[$j] == 2) {
                     // Check tables
-                    $result = $this->db->queryF('CHECK TABLE ' . $this->prefix . $tables[$i]);
+                    $result = $this->db->queryF('CHECK TABLE '.$this->prefix.$tables[$i]);
                     if ($result) {
-                        $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('success.png') . '" /></td>';
+                        $ret .= '<td class="xo-actions txtcenter"><img src="'.system_AdminIcons('success.png').'" /></td>';
                     } else {
-                        $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('cancel.png') . '" /></td>';
+                        $ret .= '<td class="xo-actions txtcenter"><img src="'.system_AdminIcons('cancel.png').'" /></td>';
                     }
                 } elseif ($tab1[$j] == 3) {
                     // Repair
-                    $result = $this->db->queryF('REPAIR TABLE ' . $this->prefix . $tables[$i]);
+                    $result = $this->db->queryF('REPAIR TABLE '.$this->prefix.$tables[$i]);
                     if ($result) {
-                        $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('success.png') . '" /></td>';
+                        $ret .= '<td class="xo-actions txtcenter"><img src="'.system_AdminIcons('success.png').'" /></td>';
                     } else {
-                        $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('cancel.png') . '" /></td>';
+                        $ret .= '<td class="xo-actions txtcenter"><img src="'.system_AdminIcons('cancel.png').'" /></td>';
                     }
                 } elseif ($tab1[$j] == 4) {
                     // Analyze
-                    $result = $this->db->queryF('ANALYZE TABLE ' . $this->prefix . $tables[$i]);
+                    $result = $this->db->queryF('ANALYZE TABLE '.$this->prefix.$tables[$i]);
                     if ($result) {
-                        $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('success.png') . '" /></td>';
+                        $ret .= '<td class="xo-actions txtcenter"><img src="'.system_AdminIcons('success.png').'" /></td>';
                     } else {
-                        $ret .= '<td class="xo-actions txtcenter"><img src="' . system_AdminIcons('cancel.png') . '" /></td>';
+                        $ret .= '<td class="xo-actions txtcenter"><img src="'.system_AdminIcons('cancel.png').'" /></td>';
                     }
                 } else {
                     $ret .= '<td>&nbsp;</td>';
@@ -235,15 +235,15 @@ 
         $ret    = array();
         $ret[0] = "# \n";
         $ret[0] .= "# Dump SQL, Generate by Xoops \n";
-        $ret[0] .= '# Date : ' . date('d-m-Y - H:i') . " \n";
-        $ret[1]      = '<table class="outer"><tr><th width="30%">' . _AM_SYSTEM_MAINTENANCE_DUMP_TABLES . '</th><th width="35%">' . _AM_SYSTEM_MAINTENANCE_DUMP_STRUCTURES . '</th><th  width="35%">' . _AM_SYSTEM_MAINTENANCE_DUMP_NB_RECORDS . '</th></tr>';
+        $ret[0] .= '# Date : '.date('d-m-Y - H:i')." \n";
+        $ret[1]      = '<table class="outer"><tr><th width="30%">'._AM_SYSTEM_MAINTENANCE_DUMP_TABLES.'</th><th width="35%">'._AM_SYSTEM_MAINTENANCE_DUMP_STRUCTURES.'</th><th  width="35%">'._AM_SYSTEM_MAINTENANCE_DUMP_NB_RECORDS.'</th></tr>';
         $class       = 'odd';
         $tablesCount = count($tables);
         for ($i = 0; $i < $tablesCount; ++$i) {
             //structure
-            $ret = $this->dump_table_structure($ret, $this->prefix . $tables[$i], $drop, $class);
+            $ret = $this->dump_table_structure($ret, $this->prefix.$tables[$i], $drop, $class);
             //data
-            $ret   = $this->dump_table_datas($ret, $this->prefix . $tables[$i]);
+            $ret   = $this->dump_table_datas($ret, $this->prefix.$tables[$i]);
             $class = ($class === 'even') ? 'odd' : 'even';
         }
         $ret = $this->dump_write($ret);
@@ -264,27 +264,27 @@ 
         $ret    = array();
         $ret[0] = "# \n";
         $ret[0] .= "# Dump SQL, Generate by Xoops \n";
-        $ret[0] .= '# Date : ' . date('d-m-Y - H:i') . " \n";
+        $ret[0] .= '# Date : '.date('d-m-Y - H:i')." \n";
         $ret[0] .= "# \n\n";
-        $ret[1]       = '<table class="outer"><tr><th width="30%">' . _AM_SYSTEM_MAINTENANCE_DUMP_TABLES . '</th><th width="35%">' . _AM_SYSTEM_MAINTENANCE_DUMP_STRUCTURES . '</th><th  width="35%">' . _AM_SYSTEM_MAINTENANCE_DUMP_NB_RECORDS . '</th></tr>';
+        $ret[1]       = '<table class="outer"><tr><th width="30%">'._AM_SYSTEM_MAINTENANCE_DUMP_TABLES.'</th><th width="35%">'._AM_SYSTEM_MAINTENANCE_DUMP_STRUCTURES.'</th><th  width="35%">'._AM_SYSTEM_MAINTENANCE_DUMP_NB_RECORDS.'</th></tr>';
         $class        = 'odd';
         $modulesCount = count($modules);
         for ($i = 0; $i < $modulesCount; ++$i) {
             /* @var $module_handler XoopsModuleHandler */
             $module_handler = xoops_getHandler('module');
             $module         = $module_handler->getByDirname($modules[$i]);
-            $ret[1] .= '<tr><th colspan="3" align="left">' . ucfirst($modules[$i]) . '</th></tr>';
+            $ret[1] .= '<tr><th colspan="3" align="left">'.ucfirst($modules[$i]).'</th></tr>';
             $modtables = $module->getInfo('tables');
             if ($modtables !== false && is_array($modtables)) {
                 foreach ($modtables as $table) {
                     //structure
-                    $ret = $this->dump_table_structure($ret, $this->prefix . $table, $drop, $class);
+                    $ret = $this->dump_table_structure($ret, $this->prefix.$table, $drop, $class);
                     //data
-                    $ret   = $this->dump_table_datas($ret, $this->prefix . $table);
+                    $ret   = $this->dump_table_datas($ret, $this->prefix.$table);
                     $class = ($class === 'even') ? 'odd' : 'even';
                 }
             } else {
-                $ret[1] .= '<tr><td colspan="3" align="center">' . _AM_SYSTEM_MAINTENANCE_DUMP_NO_TABLES . '</td></tr>';
+                $ret[1] .= '<tr><td colspan="3" align="center">'._AM_SYSTEM_MAINTENANCE_DUMP_NO_TABLES.'</td></tr>';
             }
         }
         $ret[1] .= '</table>';
@@ -305,19 +305,19 @@ 
     public function dump_table_structure($ret, $table, $drop, $class)
     {
         $verif  = false;
-        $result = $this->db->queryF('SHOW create table `' . $table . '`;');
+        $result = $this->db->queryF('SHOW create table `'.$table.'`;');
         if ($result) {
             if ($row = $this->db->fetchArray($result)) {
-                $ret[0] .= '# Table structure for table `' . $table . "` \n\n";
+                $ret[0] .= '# Table structure for table `'.$table."` \n\n";
                 if ($drop == 1) {
-                    $ret[0] .= 'DROP TABLE IF EXISTS `' . $table . "`;\n\n";
+                    $ret[0] .= 'DROP TABLE IF EXISTS `'.$table."`;\n\n";
                 }
                 $verif = true;
-                $ret[0] .= $row['Create Table'] . ";\n\n";
+                $ret[0] .= $row['Create Table'].";\n\n";
             }
         }
-        $ret[1] .= '<tr class="' . $class . '"><td align="center">' . $table . '</td><td class="xo-actions txtcenter">';
-        $ret[1] .= ($verif === true) ? '<img src="' . system_AdminIcons('success.png') . '" />' : '<img src="' . system_AdminIcons('cancel.png') . '" />';
+        $ret[1] .= '<tr class="'.$class.'"><td align="center">'.$table.'</td><td class="xo-actions txtcenter">';
+        $ret[1] .= ($verif === true) ? '<img src="'.system_AdminIcons('success.png').'" />' : '<img src="'.system_AdminIcons('cancel.png').'" />';
         $ret[1] .= '</td>';
         $this->db->freeRecordSet($result);
 
@@ -334,7 +334,7 @@ 
     public function dump_table_datas($ret, $table)
     {
         $count  = 0;
-        $result = $this->db->queryF('SELECT * FROM ' . $table . ';');
+        $result = $this->db->queryF('SELECT * FROM '.$table.';');
         if ($result) {
             $num_rows   = $this->db->getRowsNum($result);
             $num_fields = $this->db->getFieldsNum($result);
@@ -348,7 +348,7 @@ 
                     ++$i;
                 }
 
-                $ret[0] .= 'INSERT INTO `' . $table . "` values\n";
+                $ret[0] .= 'INSERT INTO `'.$table."` values\n";
                 $index = 0;
                 while ($row = $this->db->fetchRow($result)) {
                     ++$count;
@@ -362,7 +362,7 @@ 
                                     $ret[0] .= $row[$i];
                                     break;
                                 default:
-                                    $ret[0] .= "'" . $this->db->escape($row[$i]) . "'";
+                                    $ret[0] .= "'".$this->db->escape($row[$i])."'";
                             }
                         }
                         if ($i < $num_fields - 1) {
@@ -382,7 +382,7 @@ 
             }
         }
         $ret[1] .= '<td align="center">';
-        $ret[1] .= $count . '&nbsp;' . _AM_SYSTEM_MAINTENANCE_DUMP_RECORDS . '</td></tr>';
+        $ret[1] .= $count.'&nbsp;'._AM_SYSTEM_MAINTENANCE_DUMP_RECORDS.'</td></tr>';
         $ret[0] .= "\n";
         $this->db->freeRecordSet($result);
         $ret[0] .= "\n";
@@ -398,12 +398,12 @@ 
      */
     public function dump_write($ret)
     {
-        $file_name = 'dump_' . date('Y.m.d') . '_' . date('H.i.s') . '.sql';
-        $path_file = './admin/maintenance/dump/' . $file_name;
+        $file_name = 'dump_'.date('Y.m.d').'_'.date('H.i.s').'.sql';
+        $path_file = './admin/maintenance/dump/'.$file_name;
         if (file_put_contents($path_file, $ret[0])) {
-            $ret[1] .= '<table class="outer"><tr><th colspan="2" align="center">' . _AM_SYSTEM_MAINTENANCE_DUMP_FILE_CREATED . '</th><th>' . _AM_SYSTEM_MAINTENANCE_DUMP_RESULT . '</th></tr><tr><td colspan="2" align="center"><a href="' . XOOPS_URL . '/modules/system/admin/maintenance/dump/' . $file_name . '">' . $file_name . '</a></td><td  class="xo-actions txtcenter"><img src="' . system_AdminIcons('success.png') . '" /></td><tr></table>';
+            $ret[1] .= '<table class="outer"><tr><th colspan="2" align="center">'._AM_SYSTEM_MAINTENANCE_DUMP_FILE_CREATED.'</th><th>'._AM_SYSTEM_MAINTENANCE_DUMP_RESULT.'</th></tr><tr><td colspan="2" align="center"><a href="'.XOOPS_URL.'/modules/system/admin/maintenance/dump/'.$file_name.'">'.$file_name.'</a></td><td  class="xo-actions txtcenter"><img src="'.system_AdminIcons('success.png').'" /></td><tr></table>';
         } else {
-            $ret[1] .= '<table class="outer"><tr><th colspan="2" align="center">' . _AM_SYSTEM_MAINTENANCE_DUMP_FILE_CREATED . '</th><th>' . _AM_SYSTEM_MAINTENANCE_DUMP_RESULT . '</th></tr><tr><td colspan="2" class="xo-actions txtcenter">' . $file_name . '</td><td  class="xo-actions txtcenter"><img src="' . system_AdminIcons('cancel.png') . '" /></td><tr></table>';
+            $ret[1] .= '<table class="outer"><tr><th colspan="2" align="center">'._AM_SYSTEM_MAINTENANCE_DUMP_FILE_CREATED.'</th><th>'._AM_SYSTEM_MAINTENANCE_DUMP_RESULT.'</th></tr><tr><td colspan="2" class="xo-actions txtcenter">'.$file_name.'</td><td  class="xo-actions txtcenter"><img src="'.system_AdminIcons('cancel.png').'" /></td><tr></table>';
         }
 
         return $ret;

htdocs/modules/system/blocks/system_blocks.php

Spacing +79 added lines, -79 removed lines

@@ -54,7 +54,7 @@ 
         $members = '';
         for ($i = 0; $i < $total; ++$i) {
             if ($onlines[$i]['online_uid'] > 0) {
-                $members .= ' <a href="' . XOOPS_URL . '/userinfo.php?uid=' . $onlines[$i]['online_uid'] . '" title="' . $onlines[$i]['online_uname'] . '">' . $onlines[$i]['online_uname'] . '</a>,';
+                $members .= ' <a href="'.XOOPS_URL.'/userinfo.php?uid='.$onlines[$i]['online_uid'].'" title="'.$onlines[$i]['online_uname'].'">'.$onlines[$i]['online_uname'].'</a>,';
             } else {
                 ++$guests;
             }
@@ -62,7 +62,7 @@ 
         $block['online_total'] = sprintf(_ONLINEPHRASE, $total);
         if (is_object($xoopsModule)) {
             $mytotal = $online_handler->getCount(new Criteria('online_module', $xoopsModule->getVar('mid')));
-            $block['online_total'] .= ' (' . sprintf(_ONLINEPHRASEX, $mytotal, $xoopsModule->getVar('name')) . ')';
+            $block['online_total'] .= ' ('.sprintf(_ONLINEPHRASEX, $mytotal, $xoopsModule->getVar('name')).')';
         }
         $block['lang_members']   = _MEMBERS;
         $block['lang_guests']    = _GUESTS;
@@ -93,7 +93,7 @@ 
         $block['lang_registernow'] = _MB_SYSTEM_RNOW;
         //$block['lang_rememberme'] = _MB_SYSTEM_REMEMBERME;
         if ($xoopsConfig['use_ssl'] == 1 && $xoopsConfig['sslloginlink'] != '') {
-            $block['sslloginlink'] = "<a href=\"javascript:openWithSelfMain('" . $xoopsConfig['sslloginlink'] . "', 'ssllogin', 300, 200);\">" . _MB_SYSTEM_SECURE . '</a>';
+            $block['sslloginlink'] = "<a href=\"javascript:openWithSelfMain('".$xoopsConfig['sslloginlink']."', 'ssllogin', 300, 200);\">"._MB_SYSTEM_SECURE.'</a>';
         } elseif ($GLOBALS['xoopsConfig']['usercookie']) {
             $block['lang_rememberme'] = _MB_SYSTEM_REMEMBERME;
         }
@@ -139,7 +139,7 @@ 
                 foreach ($sublinks as $sublink) {
                     $block['modules'][$i]['sublinks'][] = array(
                         'name' => $sublink['name'],
-                        'url'  => XOOPS_URL . '/modules/' . $modules[$i]->getVar('dirname') . '/' . $sublink['url']);
+                        'url'  => XOOPS_URL.'/modules/'.$modules[$i]->getVar('dirname').'/'.$sublink['url']);
                 }
             } else {
                 $block['modules'][$i]['sublinks'] = array();
@@ -208,9 +208,9 @@ 
 
     // waiting content for news
     if (xoops_isActiveModule('news') && $module_handler->getCount(new Criteria('dirname', 'news'))) {
-        $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('stories') . ' WHERE published=0');
+        $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('stories').' WHERE published=0');
         if ($result) {
-            $block['modules'][0]['adminlink'] = XOOPS_URL . '/modules/news/admin/index.php?op=newarticle';
+            $block['modules'][0]['adminlink'] = XOOPS_URL.'/modules/news/admin/index.php?op=newarticle';
             list($block['modules'][0]['pendingnum']) = $xoopsDB->fetchRow($result);
             $block['modules'][0]['lang_linkname'] = _MB_SYSTEM_SUBMS;
         }
@@ -218,21 +218,21 @@ 
 
     // waiting content for mylinks
     if (xoops_isActiveModule('mylinks') && $module_handler->getCount(new Criteria('dirname', 'mylinks'))) {
-        $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('mylinks_links') . ' WHERE status=0');
+        $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('mylinks_links').' WHERE status=0');
         if ($result) {
-            $block['modules'][1]['adminlink'] = XOOPS_URL . '/modules/mylinks/admin/index.php?op=listNewLinks';
+            $block['modules'][1]['adminlink'] = XOOPS_URL.'/modules/mylinks/admin/index.php?op=listNewLinks';
             list($block['modules'][1]['pendingnum']) = $xoopsDB->fetchRow($result);
             $block['modules'][1]['lang_linkname'] = _MB_SYSTEM_WLNKS;
         }
-        $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('mylinks_broken'));
+        $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('mylinks_broken'));
         if ($result) {
-            $block['modules'][2]['adminlink'] = XOOPS_URL . '/modules/mylinks/admin/index.php?op=listBrokenLinks';
+            $block['modules'][2]['adminlink'] = XOOPS_URL.'/modules/mylinks/admin/index.php?op=listBrokenLinks';
             list($block['modules'][2]['pendingnum']) = $xoopsDB->fetchRow($result);
             $block['modules'][2]['lang_linkname'] = _MB_SYSTEM_BLNK;
         }
-        $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('mylinks_mod'));
+        $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('mylinks_mod'));
         if ($result) {
-            $block['modules'][3]['adminlink'] = XOOPS_URL . '/modules/mylinks/admin/index.php?op=listModReq';
+            $block['modules'][3]['adminlink'] = XOOPS_URL.'/modules/mylinks/admin/index.php?op=listModReq';
             list($block['modules'][3]['pendingnum']) = $xoopsDB->fetchRow($result);
             $block['modules'][3]['lang_linkname'] = _MB_SYSTEM_MLNKS;
         }
@@ -240,39 +240,39 @@ 
 
     // waiting content for mydownloads
     if (xoops_isActiveModule('mydownloads') && $module_handler->getCount(new Criteria('dirname', 'mydownloads'))) {
-        $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('mydownloads_downloads') . ' WHERE status=0');
+        $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('mydownloads_downloads').' WHERE status=0');
         if ($result) {
-            $block['modules'][4]['adminlink'] = XOOPS_URL . '/modules/mydownloads/admin/index.php?op=listNewDownloads';
+            $block['modules'][4]['adminlink'] = XOOPS_URL.'/modules/mydownloads/admin/index.php?op=listNewDownloads';
             list($block['modules'][4]['pendingnum']) = $xoopsDB->fetchRow($result);
             $block['modules'][4]['lang_linkname'] = _MB_SYSTEM_WDLS;
         }
-        $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('mydownloads_broken') . '');
+        $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('mydownloads_broken').'');
         if ($result) {
-            $block['modules'][5]['adminlink'] = XOOPS_URL . '/modules/mydownloads/admin/index.php?op=listBrokenDownloads';
+            $block['modules'][5]['adminlink'] = XOOPS_URL.'/modules/mydownloads/admin/index.php?op=listBrokenDownloads';
             list($block['modules'][5]['pendingnum']) = $xoopsDB->fetchRow($result);
             $block['modules'][5]['lang_linkname'] = _MB_SYSTEM_BFLS;
         }
-        $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('mydownloads_mod') . '');
+        $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('mydownloads_mod').'');
         if ($result) {
-            $block['modules'][6]['adminlink'] = XOOPS_URL . '/modules/mydownloads/admin/index.php?op=listModReq';
+            $block['modules'][6]['adminlink'] = XOOPS_URL.'/modules/mydownloads/admin/index.php?op=listModReq';
             list($block['modules'][6]['pendingnum']) = $xoopsDB->fetchRow($result);
             $block['modules'][6]['lang_linkname'] = _MB_SYSTEM_MFLS;
         }
     }
 
     // waiting content for xoops comments
-    $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('xoopscomments') . ' WHERE com_status=1');
+    $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('xoopscomments').' WHERE com_status=1');
     if ($result) {
-        $block['modules'][7]['adminlink'] = XOOPS_URL . '/modules/system/admin.php?module=0&amp;status=1&fct=comments';
+        $block['modules'][7]['adminlink'] = XOOPS_URL.'/modules/system/admin.php?module=0&amp;status=1&fct=comments';
         list($block['modules'][7]['pendingnum']) = $xoopsDB->fetchRow($result);
         $block['modules'][7]['lang_linkname'] = _MB_SYSTEM_COMPEND;
     }
 
     // waiting content for TDMDownloads
     if (xoops_isActiveModule('TDMdownloads') && $module_handler->getCount(new Criteria('dirname', 'TDMDownloads'))) {
-        $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('tdmdownloads_downloads') . ' WHERE status=0');
+        $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('tdmdownloads_downloads').' WHERE status=0');
         if ($result) {
-            $block['modules'][8]['adminlink'] = XOOPS_URL . '/modules/TDMDownloads/admin/downloads.php?op=list&statut_display=0';
+            $block['modules'][8]['adminlink'] = XOOPS_URL.'/modules/TDMDownloads/admin/downloads.php?op=list&statut_display=0';
             list($block['modules'][8]['pendingnum']) = $xoopsDB->fetchRow($result);
             $block['modules'][8]['lang_linkname'] = _MB_SYSTEM_TDMDOWNLOADS;
         }
@@ -280,9 +280,9 @@ 
 
     // waiting content for extgallery
     if (xoops_isActiveModule('extgallery') && $module_handler->getCount(new Criteria('dirname', 'extgallery'))) {
-        $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('extgallery_publicphoto') . ' WHERE photo_approved=0');
+        $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('extgallery_publicphoto').' WHERE photo_approved=0');
         if ($result) {
-            $block['modules'][9]['adminlink'] = XOOPS_URL . '/modules/extgallery/admin/photo.php#pending-photo';
+            $block['modules'][9]['adminlink'] = XOOPS_URL.'/modules/extgallery/admin/photo.php#pending-photo';
             list($block['modules'][9]['pendingnum']) = $xoopsDB->fetchRow($result);
             $block['modules'][9]['lang_linkname'] = _MB_SYSTEM_EXTGALLERY;
         }
@@ -290,9 +290,9 @@ 
 
     // waiting content for smartsection
     if (xoops_isActiveModule('smartsection') && $module_handler->getCount(new Criteria('dirname', 'smartsection'))) {
-        $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('smartsection_items') . ' WHERE status=1');
+        $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('smartsection_items').' WHERE status=1');
         if ($result) {
-            $block['modules'][10]['adminlink'] = XOOPS_URL . '/modules/smartsection/admin/item.php';
+            $block['modules'][10]['adminlink'] = XOOPS_URL.'/modules/smartsection/admin/item.php';
             list($block['modules'][10]['pendingnum']) = $xoopsDB->fetchRow($result);
             $block['modules'][10]['lang_linkname'] = _MB_SYSTEM_SMARTSECTION;
         }
@@ -314,7 +314,7 @@ 
     $block   = array();
     if (!empty($options[3])) {
         $block['showgroups'] = true;
-        $result              = $xoopsDB->query('SELECT u.uid, u.uname, u.email, u.user_viewemail, u.user_avatar, g.name AS groupname FROM ' . $xoopsDB->prefix('groups_users_link') . ' l LEFT JOIN ' . $xoopsDB->prefix('users') . ' u ON l.uid=u.uid LEFT JOIN ' . $xoopsDB->prefix('groups') . " g ON l.groupid=g.groupid WHERE g.group_type='Admin' ORDER BY l.groupid, u.uid");
+        $result              = $xoopsDB->query('SELECT u.uid, u.uname, u.email, u.user_viewemail, u.user_avatar, g.name AS groupname FROM '.$xoopsDB->prefix('groups_users_link').' l LEFT JOIN '.$xoopsDB->prefix('users').' u ON l.uid=u.uid LEFT JOIN '.$xoopsDB->prefix('groups')." g ON l.groupid=g.groupid WHERE g.group_type='Admin' ORDER BY l.groupid, u.uid");
         if ($xoopsDB->getRowsNum($result) > 0) {
             $prev_caption = '';
             $i            = 0;
@@ -327,21 +327,21 @@ 
                     $block['groups'][$i]['users'][] = array(
                         'id'      => $userinfo['uid'],
                         'name'    => $myts->htmlspecialchars($userinfo['uname']),
-                        'msglink' => "<a href=\"javascript:openWithSelfMain('" . XOOPS_URL . '/pmlite.php?send2=1&amp;to_userid=' . $userinfo['uid'] . "','pmlite',565,500);\"><img src=\"" . XOOPS_URL . "/images/icons/pm_small.gif\" border=\"0\" width=\"27\" height=\"17\" alt=\"\" /></a>",
-                        'avatar'  => XOOPS_UPLOAD_URL . '/' . $userinfo['user_avatar']);
+                        'msglink' => "<a href=\"javascript:openWithSelfMain('".XOOPS_URL.'/pmlite.php?send2=1&amp;to_userid='.$userinfo['uid']."','pmlite',565,500);\"><img src=\"".XOOPS_URL."/images/icons/pm_small.gif\" border=\"0\" width=\"27\" height=\"17\" alt=\"\" /></a>",
+                        'avatar'  => XOOPS_UPLOAD_URL.'/'.$userinfo['user_avatar']);
                 } else {
                     if ($userinfo['user_viewemail']) {
                         $block['groups'][$i]['users'][] = array(
                             'id'      => $userinfo['uid'],
                             'name'    => $myts->htmlspecialchars($userinfo['uname']),
-                            'msglink' => '<a href="mailto:' . $userinfo['email'] . '"><img src="' . XOOPS_URL . '/images/icons/em_small.gif" border="0" width="16" height="14" alt="" /></a>',
-                            'avatar'  => XOOPS_UPLOAD_URL . '/' . $userinfo['user_avatar']);
+                            'msglink' => '<a href="mailto:'.$userinfo['email'].'"><img src="'.XOOPS_URL.'/images/icons/em_small.gif" border="0" width="16" height="14" alt="" /></a>',
+                            'avatar'  => XOOPS_UPLOAD_URL.'/'.$userinfo['user_avatar']);
                     } else {
                         $block['groups'][$i]['users'][] = array(
                             'id'      => $userinfo['uid'],
                             'name'    => $myts->htmlspecialchars($userinfo['uname']),
                             'msglink' => '&nbsp;',
-                            'avatar'  => XOOPS_UPLOAD_URL . '/' . $userinfo['user_avatar']);
+                            'avatar'  => XOOPS_UPLOAD_URL.'/'.$userinfo['user_avatar']);
                     }
                 }
                 ++$i;
@@ -350,8 +350,8 @@ 
     } else {
         $block['showgroups'] = false;
     }
-    $block['logourl']       = XOOPS_URL . '/images/' . $options[2];
-    $block['recommendlink'] = "<a href=\"javascript:openWithSelfMain('" . XOOPS_URL . '/misc.php?action=showpopups&amp;type=friend&amp;op=sendform&amp;t=' . time() . "','friend'," . $options[0] . ',' . $options[1] . ")\">" . _MB_SYSTEM_RECO . '</a>';
+    $block['logourl']       = XOOPS_URL.'/images/'.$options[2];
+    $block['recommendlink'] = "<a href=\"javascript:openWithSelfMain('".XOOPS_URL.'/misc.php?action=showpopups&amp;type=friend&amp;op=sendform&amp;t='.time()."','friend',".$options[0].','.$options[1].")\">"._MB_SYSTEM_RECO.'</a>';
 
     return $block;
 }
@@ -375,7 +375,7 @@ 
     $count          = count($newmembers);
     for ($i = 0; $i < $count; ++$i) {
         if ($options[1] == 1) {
-            $block['users'][$i]['avatar'] = $newmembers[$i]->getVar('user_avatar') !== 'blank.gif' ? XOOPS_UPLOAD_URL . '/' . $newmembers[$i]->getVar('user_avatar') : '';
+            $block['users'][$i]['avatar'] = $newmembers[$i]->getVar('user_avatar') !== 'blank.gif' ? XOOPS_UPLOAD_URL . '/'.$newmembers[$i]->getVar('user_avatar') : '';
         } else {
             $block['users'][$i]['avatar'] = '';
         }
@@ -412,7 +412,7 @@ 
     for ($i = 0; $i < $count; ++$i) {
         $block['users'][$i]['rank'] = $i + 1;
         if ($options[1] == 1) {
-            $block['users'][$i]['avatar'] = $topposters[$i]->getVar('user_avatar') !== 'blank.gif' ? XOOPS_UPLOAD_URL . '/' . $topposters[$i]->getVar('user_avatar') : '';
+            $block['users'][$i]['avatar'] = $topposters[$i]->getVar('user_avatar') !== 'blank.gif' ? XOOPS_UPLOAD_URL . '/'.$topposters[$i]->getVar('user_avatar') : '';
         } else {
             $block['users'][$i]['avatar'] = '';
         }
@@ -432,7 +432,7 @@ 
 function b_system_comments_show($options)
 {
     $block = array();
-    include_once XOOPS_ROOT_PATH . '/include/comment_constants.php';
+    include_once XOOPS_ROOT_PATH.'/include/comment_constants.php';
     $comment_handler = xoops_getHandler('comment');
     $criteria        = new CriteriaCompo(new Criteria('com_status', XOOPS_COMMENT_ACTIVE));
     $criteria->setLimit((int)$options[0]);
@@ -444,7 +444,7 @@ 
     $moduleperm_handler = xoops_getHandler('groupperm');
     $gperm_groupid      = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(XOOPS_GROUP_ANONYMOUS);
     $criteria1          = new CriteriaCompo(new Criteria('gperm_name', 'module_read', '='));
-    $criteria1->add(new Criteria('gperm_groupid', '(' . implode(',', $gperm_groupid) . ')', 'IN'));
+    $criteria1->add(new Criteria('gperm_groupid', '('.implode(',', $gperm_groupid).')', 'IN'));
     $perms  = $moduleperm_handler->getObjects($criteria1, true);
     $modIds = array();
     foreach ($perms as $item) {
@@ -452,7 +452,7 @@ 
     }
     if (count($modIds) > 0) {
         $modIds = array_unique($modIds);
-        $criteria->add(new Criteria('com_modid', '(' . implode(',', $modIds) . ')', 'IN'));
+        $criteria->add(new Criteria('com_modid', '('.implode(',', $modIds).')', 'IN'));
     }
     // Check modules permissions
 
@@ -465,26 +465,26 @@ 
     $comment_config = array();
     foreach (array_keys($comments) as $i) {
         $mid           = $comments[$i]->getVar('com_modid');
-        $com['module'] = '<a href="' . XOOPS_URL . '/modules/' . $modules[$mid]->getVar('dirname') . '/">' . $modules[$mid]->getVar('name') . '</a>';
+        $com['module'] = '<a href="'.XOOPS_URL.'/modules/'.$modules[$mid]->getVar('dirname').'/">'.$modules[$mid]->getVar('name').'</a>';
         if (!isset($comment_config[$mid])) {
             $comment_config[$mid] = $modules[$mid]->getInfo('comments');
         }
         $com['id']    = $i;
-        $com['title'] = '<a href="' . XOOPS_URL . '/modules/' . $modules[$mid]->getVar('dirname') . '/' . $comment_config[$mid]['pageName'] . '?' . $comment_config[$mid]['itemName'] . '=' . $comments[$i]->getVar('com_itemid') . '&amp;com_id=' . $i . '&amp;com_rootid=' . $comments[$i]->getVar('com_rootid') . '&amp;' . htmlspecialchars($comments[$i]->getVar('com_exparams')) . '#comment' . $i . '">' . $comments[$i]->getVar('com_title') . '</a>';
+        $com['title'] = '<a href="'.XOOPS_URL.'/modules/'.$modules[$mid]->getVar('dirname').'/'.$comment_config[$mid]['pageName'].'?'.$comment_config[$mid]['itemName'].'='.$comments[$i]->getVar('com_itemid').'&amp;com_id='.$i.'&amp;com_rootid='.$comments[$i]->getVar('com_rootid').'&amp;'.htmlspecialchars($comments[$i]->getVar('com_exparams')).'#comment'.$i.'">'.$comments[$i]->getVar('com_title').'</a>';
         $com['icon']  = htmlspecialchars($comments[$i]->getVar('com_icon'), ENT_QUOTES);
         $com['icon']  = ($com['icon'] != '') ? $com['icon'] : 'icon1.gif';
         $com['time']  = formatTimestamp($comments[$i]->getVar('com_created'), 'm');
         if ($comments[$i]->getVar('com_uid') > 0) {
             $poster = $member_handler->getUser($comments[$i]->getVar('com_uid'));
             if (is_object($poster)) {
-                $com['poster'] = '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $comments[$i]->getVar('com_uid') . '">' . $poster->getVar('uname') . '</a>';
+                $com['poster'] = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$comments[$i]->getVar('com_uid').'">'.$poster->getVar('uname').'</a>';
             } else {
                 $com['poster'] = $GLOBALS['xoopsConfig']['anonymous'];
             }
         } else {
             $com['poster'] = $GLOBALS['xoopsConfig']['anonymous'];
         }
-        $block['comments'][] =& $com;
+        $block['comments'][] = & $com;
         unset($com);
     }
 
@@ -498,8 +498,8 @@ 
 function b_system_notification_show()
 {
     global $xoopsConfig, $xoopsUser, $xoopsModule;
-    include_once XOOPS_ROOT_PATH . '/include/notification_functions.php';
-    include_once XOOPS_ROOT_PATH . '/language/' . $xoopsConfig['language'] . '/notification.php';
+    include_once XOOPS_ROOT_PATH.'/include/notification_functions.php';
+    include_once XOOPS_ROOT_PATH.'/language/'.$xoopsConfig['language'].'/notification.php';
     // Notification must be enabled, and user must be logged in
     if (empty($xoopsUser) || !notificationEnabled('block')) {
         return false; // do not display block
@@ -508,7 +508,7 @@ 
     // Now build the a nested associative array of info to pass
     // to the block template.
     $block      = array();
-    $categories =& notificationSubscribableCategoryInfo();
+    $categories = & notificationSubscribableCategoryInfo();
     if (empty($categories)) {
         return false;
     }
@@ -552,7 +552,7 @@ 
  */
 function b_system_comments_edit($options)
 {
-    $inputtag = "<input type='text' name='options[]' value='" . (int)$options[0] . "' />";
+    $inputtag = "<input type='text' name='options[]' value='".(int)$options[0]."' />";
     $form     = sprintf(_MB_SYSTEM_DISPLAYC, $inputtag);
 
     return $form;
@@ -565,19 +565,19 @@ 
  */
 function b_system_topposters_edit($options)
 {
-    include_once XOOPS_ROOT_PATH . '/class/xoopslists.php';
-    $inputtag = "<input type='text' name='options[]' value='" . (int)$options[0] . "' />";
+    include_once XOOPS_ROOT_PATH.'/class/xoopslists.php';
+    $inputtag = "<input type='text' name='options[]' value='".(int)$options[0]."' />";
     $form     = sprintf(_MB_SYSTEM_DISPLAY, $inputtag);
-    $form .= '<br>' . _MB_SYSTEM_DISPLAYA . "&nbsp;<input type='radio' id='options[]' name='options[]' value='1'";
+    $form .= '<br>'._MB_SYSTEM_DISPLAYA."&nbsp;<input type='radio' id='options[]' name='options[]' value='1'";
     if ($options[1] == 1) {
         $form .= " checked";
     }
-    $form .= ' />&nbsp;' . _YES . "<input type='radio' id='options[]' name='options[]' value='0'";
+    $form .= ' />&nbsp;'._YES."<input type='radio' id='options[]' name='options[]' value='0'";
     if ($options[1] == 0) {
         $form .= " checked";
     }
-    $form .= ' />&nbsp;' . _NO . '';
-    $form .= '<br>' . _MB_SYSTEM_NODISPGR . "<br><select id='options[]' name='options[]' multiple='multiple'>";
+    $form .= ' />&nbsp;'._NO.'';
+    $form .= '<br>'._MB_SYSTEM_NODISPGR."<br><select id='options[]' name='options[]' multiple='multiple'>";
     $ranks = XoopsLists::getUserRankList();
     $size  = count($options);
     foreach ($ranks as $k => $v) {
@@ -601,17 +601,17 @@ 
  */
 function b_system_newmembers_edit($options)
 {
-    $inputtag = "<input type='text' name='options[]' value='" . $options[0] . "' />";
+    $inputtag = "<input type='text' name='options[]' value='".$options[0]."' />";
     $form     = sprintf(_MB_SYSTEM_DISPLAY, $inputtag);
-    $form .= '<br>' . _MB_SYSTEM_DISPLAYA . "&nbsp;<input type='radio' id='options[]' name='options[]' value='1'";
+    $form .= '<br>'._MB_SYSTEM_DISPLAYA."&nbsp;<input type='radio' id='options[]' name='options[]' value='1'";
     if ($options[1] == 1) {
         $form .= " checked";
     }
-    $form .= ' />&nbsp;' . _YES . "<input type='radio' id='options[]' name='options[]' value='0'";
+    $form .= ' />&nbsp;'._YES."<input type='radio' id='options[]' name='options[]' value='0'";
     if ($options[1] == 0) {
         $form .= " checked";
     }
-    $form .= ' />&nbsp;' . _NO . '';
+    $form .= ' />&nbsp;'._NO.'';
 
     return $form;
 }
@@ -623,23 +623,23 @@ 
  */
 function b_system_info_edit($options)
 {
-    $form = _MB_SYSTEM_PWWIDTH . '&nbsp;';
-    $form .= "<input type='text' name='options[]' value='" . $options[0] . "' />";
-    $form .= '<br>' . _MB_SYSTEM_PWHEIGHT . '&nbsp;';
-    $form .= "<input type='text' name='options[]' value='" . $options[1] . "' />";
-    $form .= '<br>' . sprintf(_MB_SYSTEM_LOGO, XOOPS_URL . '/images/') . '&nbsp;';
-    $form .= "<input type='text' name='options[]' value='" . $options[2] . "' />";
+    $form = _MB_SYSTEM_PWWIDTH.'&nbsp;';
+    $form .= "<input type='text' name='options[]' value='".$options[0]."' />";
+    $form .= '<br>'._MB_SYSTEM_PWHEIGHT.'&nbsp;';
+    $form .= "<input type='text' name='options[]' value='".$options[1]."' />";
+    $form .= '<br>'.sprintf(_MB_SYSTEM_LOGO, XOOPS_URL.'/images/').'&nbsp;';
+    $form .= "<input type='text' name='options[]' value='".$options[2]."' />";
     $chk = '';
-    $form .= '<br>' . _MB_SYSTEM_SADMIN . '&nbsp;';
+    $form .= '<br>'._MB_SYSTEM_SADMIN.'&nbsp;';
     if ($options[3] == 1) {
         $chk = " checked";
     }
-    $form .= "<input type='radio' name='options[3]' value='1'" . $chk . ' />&nbsp;' . _YES . '';
+    $form .= "<input type='radio' name='options[3]' value='1'".$chk.' />&nbsp;'._YES.'';
     $chk = '';
     if ($options[3] == 0) {
         $chk = " checked";
     }
-    $form .= "&nbsp;<input type='radio' name='options[3]' value='0'" . $chk . ' />' . _NO . '';
+    $form .= "&nbsp;<input type='radio' name='options[3]' value='0'".$chk.' />'._NO.'';
 
     return $form;
 }
@@ -657,7 +657,7 @@ 
     if (!isset($options[2])) {
         $options[2] = 3; // this was the fixed value pre 2.5.8
     }
-    $selectSize = ($options[0] == 1) ? 1 : (int) $options[2];
+    $selectSize = ($options[0] == 1) ? 1 : (int)$options[2];
     $select = new XoopsFormSelect('', 'xoops_theme_select', $xoopsConfig['theme_set'], $selectSize);
     foreach ($xoopsConfig['theme_set_allowed'] as $theme) {
         $select->addOption($theme, $theme);
@@ -665,11 +665,11 @@ 
 
     if ($options[0] == 1) {
         $themeSelect = '<img vspace="2" id="xoops_theme_img" src="'
-            . XOOPS_THEME_URL . '/' . $xoopsConfig['theme_set'] . '/shot.gif" '
-            . ' alt="screenshot" width="' . (int)$options[1] . '" />'
+            . XOOPS_THEME_URL.'/'.$xoopsConfig['theme_set'].'/shot.gif" '
+            . ' alt="screenshot" width="'.(int)$options[1].'" />'
             . '<br>';
         $select->setExtra(' onchange="showImgSelected(\'xoops_theme_img\', \'xoops_theme_select\', \'themes\', \'/shot.gif\', '
-            .  '\'' . XOOPS_URL . '\');" ');
+            .  '\''.XOOPS_URL.'\');" ');
         $selectTray = new XoopsFormElementTray('');
         $selectTray->addElement($select);
         $selectTray->addElement(new XoopsFormButton('', 'submit', _GO, 'submit'));
@@ -681,8 +681,8 @@ 
         $themeSelect = $select->render();
     }
 
-    $block['theme_select'] = $themeSelect . '<br>(' . sprintf(_MB_SYSTEM_NUMTHEME, '<strong>'
-            . count($xoopsConfig['theme_set_allowed']) . '</strong>') . ')<br>';
+    $block['theme_select'] = $themeSelect.'<br>('.sprintf(_MB_SYSTEM_NUMTHEME, '<strong>'
+            . count($xoopsConfig['theme_set_allowed']).'</strong>').')<br>';
 
     return $block;
 }
@@ -695,23 +695,23 @@ 
 function b_system_themes_edit($options)
 {
     $chk  = '';
-    $form = _MB_SYSTEM_THSHOW . '&nbsp;';
+    $form = _MB_SYSTEM_THSHOW.'&nbsp;';
     if (!isset($options[2])) {
         $options[2] = 3; // this was the fixed value pre 2.5.8
     }
     if ($options[0] == 1) {
         $chk = " checked";
     }
-    $form .= "<input type='radio' name='options[0]' value='1'" . $chk . ' />&nbsp;' . _YES;
+    $form .= "<input type='radio' name='options[0]' value='1'".$chk.' />&nbsp;'._YES;
     $chk = '';
     if ($options[0] == 0) {
         $chk = ' checked';
     }
-    $form .= '&nbsp;<input type="radio" name="options[0]" value="0"' . $chk . ' />' . _NO;
-    $form .= '<br>' . _MB_SYSTEM_THWIDTH . '&nbsp;';
-    $form .= "<input type='text' name='options[1]' value='" . $options[1] . "' />";
-    $form .= '<br>' . _MB_SYSTEM_BLOCK_HEIGHT . '&nbsp;';
-    $form .= "<input type='text' name='options[2]' value='" . $options[2] . "' />";
+    $form .= '&nbsp;<input type="radio" name="options[0]" value="0"'.$chk.' />'._NO;
+    $form .= '<br>'._MB_SYSTEM_THWIDTH.'&nbsp;';
+    $form .= "<input type='text' name='options[1]' value='".$options[1]."' />";
+    $form .= '<br>'._MB_SYSTEM_BLOCK_HEIGHT.'&nbsp;';
+    $form .= "<input type='text' name='options[2]' value='".$options[2]."' />";
 
     return $form;
 }

htdocs/modules/system/admin/blocksadmin/main.php

Indentation +3 added lines, -3 removed lines

@@ -432,9 +432,9 @@
             xoops_cp_header();
             // Display Question
             xoops_confirm(array(
-                              'op'  => 'delete_ok',
-                              'fct' => 'blocksadmin',
-                              'bid' => $block->getVar('bid')), 'admin.php', sprintf(_AM_SYSTEM_BLOCKS_RUSUREDEL, $block->getVar('title')));
+                                'op'  => 'delete_ok',
+                                'fct' => 'blocksadmin',
+                                'bid' => $block->getVar('bid')), 'admin.php', sprintf(_AM_SYSTEM_BLOCKS_RUSUREDEL, $block->getVar('title')));
             // Call Footer
             xoops_cp_footer();
         }

Switch Indentation +355 added lines, -355 removed lines

@@ -56,253 +56,253 @@ 
 
 switch ($op) {
 
-    case 'list':
-        // Define main template
-        $GLOBALS['xoopsOption']['template_main'] = 'system_blocks.tpl';
-        // Call Header
-        xoops_cp_header();
-        // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        // Define scripts
-        $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
-        $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-        $xoTheme->addScript('modules/system/js/admin.js');
-        $xoTheme->addScript('modules/system/js/blocks.js');
-        // Define Breadcrumb and tips
-        $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_ADMIN, system_adminVersion('blocksadmin', 'adminpath'));
-        $xoBreadCrumb->addHelp(system_adminVersion('blocksadmin', 'help'));
-        $xoBreadCrumb->addTips(sprintf(_AM_SYSTEM_BLOCKS_TIPS, system_AdminIcons('block.png'), system_AdminIcons('success.png'), system_AdminIcons('cancel.png')));
-        $xoBreadCrumb->render();
-
-        // Initialize module handler
-        /* @var $module_handler XoopsModuleHandler */
-        $module_handler = xoops_getHandler('module');
-        $modules        = $module_handler->getObjects(null, true);
-        $criteria       = new CriteriaCompo(new Criteria('hasmain', 1));
-
-        $criteria->add(new Criteria('isactive', 1));
-        // Modules for blocks to be visible in
-        $display_list = $module_handler->getList($criteria);
-        unset($criteria);
-        // Initialize blocks handler
-        /* @var $block_handler SystemBlockHandler */
-        $block_handler = xoops_getModuleHandler('block');
-        // Initialize module handler
-        /* @var $module_handler XoopsModuleHandler */
-        $module_handler = xoops_getHandler('module');
-        $modules        = $module_handler->getObjects(null, true);
-
-        $filterform = new XoopsThemeForm('', 'filterform', 'admin.php', 'get');
-        $filterform->addElement(new XoopsFormHidden('fct', 'blocksadmin'));
-        $filterform->addElement(new XoopsFormHidden('op', 'list'));
-        $filterform->addElement(new XoopsFormHidden('filter', 1));
-        $sel_gen = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_GENERATOR, 'selgen', $selgen);
-        $sel_gen->setExtra("onchange='submit()'");
-        $sel_gen->addOption(-1, _AM_SYSTEM_BLOCKS_TYPES);
-        $sel_gen->addOption(0, _AM_SYSTEM_BLOCKS_CUSTOM);
-        foreach ($modules as $list) {
-            $sel_gen->addOption($list->getVar('mid'), $list->getVar('name'));
-        }
-        $filterform->addElement($sel_gen);
-
-        $sel_mod = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_SVISIBLEIN, 'selmod', $selmod);
-        $sel_mod->setExtra("onchange='submit()'");
-        ksort($display_list);
-        $display_list_spec[0]  = _AM_SYSTEM_BLOCKS_ALLPAGES;
-        $display_list_spec[-1] = _AM_SYSTEM_BLOCKS_TOPPAGE;
-        $display_list_spec[-2] = _AM_SYSTEM_BLOCKS_TYPES;
-        $display_list          = $display_list_spec + $display_list;
-        foreach ($display_list as $k => $v) {
-            $sel_mod->addOption($k, $v);
-        }
-        $filterform->addElement($sel_mod);
-
-        // For selection of group access
-        $sel_grp = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_GROUP, 'selgrp', $selgrp);
-        $sel_grp->setExtra("onchange='submit()'");
-        /* @var $member_handler XoopsMemberHandler */
-        $member_handler = xoops_getHandler('member');
-        $group_list     = $member_handler->getGroupList();
-        $sel_grp->addOption(-1, _AM_SYSTEM_BLOCKS_TYPES);
-        $sel_grp->addOption(0, _AM_SYSTEM_BLOCKS_UNASSIGNED);
-        foreach ($group_list as $k => $v) {
-            $sel_grp->addOption($k, $v);
-        }
-        $filterform->addElement($sel_grp);
+        case 'list':
+            // Define main template
+            $GLOBALS['xoopsOption']['template_main'] = 'system_blocks.tpl';
+            // Call Header
+            xoops_cp_header();
+            // Define Stylesheet
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+            // Define scripts
+            $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+            $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+            $xoTheme->addScript('modules/system/js/admin.js');
+            $xoTheme->addScript('modules/system/js/blocks.js');
+            // Define Breadcrumb and tips
+            $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_ADMIN, system_adminVersion('blocksadmin', 'adminpath'));
+            $xoBreadCrumb->addHelp(system_adminVersion('blocksadmin', 'help'));
+            $xoBreadCrumb->addTips(sprintf(_AM_SYSTEM_BLOCKS_TIPS, system_AdminIcons('block.png'), system_AdminIcons('success.png'), system_AdminIcons('cancel.png')));
+            $xoBreadCrumb->render();
 
-        $sel_vis = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_VISIBLE, 'selvis', $selvis);
-        $sel_vis->setExtra("onchange='submit()'");
-        $sel_vis->addOption(-1, _AM_SYSTEM_BLOCKS_TYPES);
-        $sel_vis->addOption(0, _NO);
-        $sel_vis->addOption(1, _YES);
+            // Initialize module handler
+            /* @var $module_handler XoopsModuleHandler */
+            $module_handler = xoops_getHandler('module');
+            $modules        = $module_handler->getObjects(null, true);
+            $criteria       = new CriteriaCompo(new Criteria('hasmain', 1));
+
+            $criteria->add(new Criteria('isactive', 1));
+            // Modules for blocks to be visible in
+            $display_list = $module_handler->getList($criteria);
+            unset($criteria);
+            // Initialize blocks handler
+            /* @var $block_handler SystemBlockHandler */
+            $block_handler = xoops_getModuleHandler('block');
+            // Initialize module handler
+            /* @var $module_handler XoopsModuleHandler */
+            $module_handler = xoops_getHandler('module');
+            $modules        = $module_handler->getObjects(null, true);
+
+            $filterform = new XoopsThemeForm('', 'filterform', 'admin.php', 'get');
+            $filterform->addElement(new XoopsFormHidden('fct', 'blocksadmin'));
+            $filterform->addElement(new XoopsFormHidden('op', 'list'));
+            $filterform->addElement(new XoopsFormHidden('filter', 1));
+            $sel_gen = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_GENERATOR, 'selgen', $selgen);
+            $sel_gen->setExtra("onchange='submit()'");
+            $sel_gen->addOption(-1, _AM_SYSTEM_BLOCKS_TYPES);
+            $sel_gen->addOption(0, _AM_SYSTEM_BLOCKS_CUSTOM);
+            foreach ($modules as $list) {
+                $sel_gen->addOption($list->getVar('mid'), $list->getVar('name'));
+            }
+            $filterform->addElement($sel_gen);
+
+            $sel_mod = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_SVISIBLEIN, 'selmod', $selmod);
+            $sel_mod->setExtra("onchange='submit()'");
+            ksort($display_list);
+            $display_list_spec[0]  = _AM_SYSTEM_BLOCKS_ALLPAGES;
+            $display_list_spec[-1] = _AM_SYSTEM_BLOCKS_TOPPAGE;
+            $display_list_spec[-2] = _AM_SYSTEM_BLOCKS_TYPES;
+            $display_list          = $display_list_spec + $display_list;
+            foreach ($display_list as $k => $v) {
+                $sel_mod->addOption($k, $v);
+            }
+            $filterform->addElement($sel_mod);
+
+            // For selection of group access
+            $sel_grp = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_GROUP, 'selgrp', $selgrp);
+            $sel_grp->setExtra("onchange='submit()'");
+            /* @var $member_handler XoopsMemberHandler */
+            $member_handler = xoops_getHandler('member');
+            $group_list     = $member_handler->getGroupList();
+            $sel_grp->addOption(-1, _AM_SYSTEM_BLOCKS_TYPES);
+            $sel_grp->addOption(0, _AM_SYSTEM_BLOCKS_UNASSIGNED);
+            foreach ($group_list as $k => $v) {
+                $sel_grp->addOption($k, $v);
+            }
+            $filterform->addElement($sel_grp);
 
-        $filterform->addElement($sel_vis);
+            $sel_vis = new XoopsFormSelect(_AM_SYSTEM_BLOCKS_VISIBLE, 'selvis', $selvis);
+            $sel_vis->setExtra("onchange='submit()'");
+            $sel_vis->addOption(-1, _AM_SYSTEM_BLOCKS_TYPES);
+            $sel_vis->addOption(0, _NO);
+            $sel_vis->addOption(1, _YES);
 
-        $filterform->assign($xoopsTpl);
+            $filterform->addElement($sel_vis);
 
-        /* Get blocks */
-        $selvis      = ($selvis == -1) ? null : $selvis;
-        $selmod      = ($selmod == -2) ? null : $selmod;
-        $order_block = (isset($selvis) ? '' : 'b.visible DESC, ') . 'b.side,b.weight,b.bid';
+            $filterform->assign($xoopsTpl);
 
-        if ($selgrp == 0) {
-            // get blocks that are not assigned to any groups
-            $blocks_arr = $block_handler->getNonGroupedBlocks($selmod, $toponlyblock = false, $selvis, $order_block);
-        } else {
-            $blocks_arr = $block_handler->getAllByGroupModule($selgrp, $selmod, $toponlyblock = false, $selvis, $order_block);
-        }
+            /* Get blocks */
+            $selvis      = ($selvis == -1) ? null : $selvis;
+            $selmod      = ($selmod == -2) ? null : $selmod;
+            $order_block = (isset($selvis) ? '' : 'b.visible DESC, ') . 'b.side,b.weight,b.bid';
 
-        if ($selgen >= 0) {
-            foreach (array_keys($blocks_arr) as $bid) {
-                if ($blocks_arr[$bid]->getVar('mid') != $selgen) {
-                    unset($blocks_arr[$bid]);
-                }
+            if ($selgrp == 0) {
+                // get blocks that are not assigned to any groups
+                $blocks_arr = $block_handler->getNonGroupedBlocks($selmod, $toponlyblock = false, $selvis, $order_block);
+            } else {
+                $blocks_arr = $block_handler->getAllByGroupModule($selgrp, $selmod, $toponlyblock = false, $selvis, $order_block);
             }
-        }
 
-        $arr = array();
-        foreach (array_keys($blocks_arr) as $i) {
-            $arr[$i] = $blocks_arr[$i]->toArray();
-            $xoopsTpl->append_by_ref('blocks', $arr[$i]);
-        }
-        $block     = $block_handler->create();
-        $blockform = $block->getForm();
-        $xoopsTpl->assign('blockform', $blockform->render());
-        // Call Footer
-        xoops_cp_footer();
-        break;
-
-    case 'add':
-        // Define main template
-        $GLOBALS['xoopsOption']['template_main'] = 'system_blocks.tpl';
-        // Call Header
-        xoops_cp_header();
-        // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
-        // Define scripts
-        $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
-        $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-        $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.form.js');
-        $xoTheme->addScript('modules/system/js/admin.js');
-        $xoTheme->addScript('modules/system/js/blocks.js');
-        // Define Breadcrumb and tips
-        $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_ADMIN, system_adminVersion('blocksadmin', 'adminpath'));
-        $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_ADDBLOCK);
-        $xoBreadCrumb->render();
-        // Initialize blocks handler
-        $block_handler = xoops_getModuleHandler('block');
-        /* @var  $block SystemBlock */
-        $block         = $block_handler->create();
-        $blockform     = $block->getForm();
-        $xoopsTpl->assign('blockform', $blockform->render());
-        // Call Footer
-        xoops_cp_footer();
-        break;
-
-    case 'display':
-        // Initialize blocks handler
-        /* @var $block_handler SystemBlockHandler */
-        $block_handler = xoops_getModuleHandler('block');
-        // Get variable
-        $block_id = system_CleanVars($_POST, 'bid', 0, 'int');
-        $visible  = system_CleanVars($_POST, 'visible', 0, 'int');
-        if ($block_id > 0) {
-            $block = $block_handler->get($block_id);
-            $block->setVar('visible', $visible);
-            if (!$block_handler->insert($block)) {
-                $error = true;
+            if ($selgen >= 0) {
+                foreach (array_keys($blocks_arr) as $bid) {
+                    if ($blocks_arr[$bid]->getVar('mid') != $selgen) {
+                        unset($blocks_arr[$bid]);
+                    }
+                }
             }
-        }
-        break;
 
-    case 'drag':
-        // Initialize blocks handler
-        $block_handler = xoops_getModuleHandler('block');
-        // Get variable
-        $block_id = system_CleanVars($_POST, 'bid', 0, 'int');
-        $side     = system_CleanVars($_POST, 'side', 0, 'int');
-        if ($block_id > 0) {
-            $block = $block_handler->get($block_id);
-            $block->setVar('side', $side);
-            if (!$block_handler->insert($block)) {
-                $error = true;
+            $arr = array();
+            foreach (array_keys($blocks_arr) as $i) {
+                $arr[$i] = $blocks_arr[$i]->toArray();
+                $xoopsTpl->append_by_ref('blocks', $arr[$i]);
             }
-        }
-        break;
+            $block     = $block_handler->create();
+            $blockform = $block->getForm();
+            $xoopsTpl->assign('blockform', $blockform->render());
+            // Call Footer
+            xoops_cp_footer();
+            break;
 
-    case 'order':
-        // Initialize blocks handler
-        $block_handler = xoops_getModuleHandler('block');
-        if (isset($_POST['blk'])) {
-            $i = 0;
-            foreach ($_POST['blk'] as $order) {
-                if ($order > 0) {
-                    $block = $block_handler->get($order);
-                    $block->setVar('weight', $i);
-                    if (!$block_handler->insert($block)) {
-                        $error = true;
+        case 'add':
+            // Define main template
+            $GLOBALS['xoopsOption']['template_main'] = 'system_blocks.tpl';
+            // Call Header
+            xoops_cp_header();
+            // Define Stylesheet
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+            // Define scripts
+            $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+            $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+            $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.form.js');
+            $xoTheme->addScript('modules/system/js/admin.js');
+            $xoTheme->addScript('modules/system/js/blocks.js');
+            // Define Breadcrumb and tips
+            $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_ADMIN, system_adminVersion('blocksadmin', 'adminpath'));
+            $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_ADDBLOCK);
+            $xoBreadCrumb->render();
+            // Initialize blocks handler
+            $block_handler = xoops_getModuleHandler('block');
+            /* @var  $block SystemBlock */
+            $block         = $block_handler->create();
+            $blockform     = $block->getForm();
+            $xoopsTpl->assign('blockform', $blockform->render());
+            // Call Footer
+            xoops_cp_footer();
+            break;
+
+        case 'display':
+            // Initialize blocks handler
+            /* @var $block_handler SystemBlockHandler */
+            $block_handler = xoops_getModuleHandler('block');
+            // Get variable
+            $block_id = system_CleanVars($_POST, 'bid', 0, 'int');
+            $visible  = system_CleanVars($_POST, 'visible', 0, 'int');
+            if ($block_id > 0) {
+                $block = $block_handler->get($block_id);
+                $block->setVar('visible', $visible);
+                if (!$block_handler->insert($block)) {
+                    $error = true;
+                }
+            }
+            break;
+
+        case 'drag':
+            // Initialize blocks handler
+            $block_handler = xoops_getModuleHandler('block');
+            // Get variable
+            $block_id = system_CleanVars($_POST, 'bid', 0, 'int');
+            $side     = system_CleanVars($_POST, 'side', 0, 'int');
+            if ($block_id > 0) {
+                $block = $block_handler->get($block_id);
+                $block->setVar('side', $side);
+                if (!$block_handler->insert($block)) {
+                    $error = true;
+                }
+            }
+            break;
+
+        case 'order':
+            // Initialize blocks handler
+            $block_handler = xoops_getModuleHandler('block');
+            if (isset($_POST['blk'])) {
+                $i = 0;
+                foreach ($_POST['blk'] as $order) {
+                    if ($order > 0) {
+                        $block = $block_handler->get($order);
+                        $block->setVar('weight', $i);
+                        if (!$block_handler->insert($block)) {
+                            $error = true;
+                        }
+                        ++$i;
                     }
-                    ++$i;
                 }
             }
-        }
-        exit;
-        break;
-
-    case 'preview':
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header('admin.php?fct=blocksadmin', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        // Initialize blocks handler
-        /* @var $block_handler XoopsBlockHandler */
-        $block_handler = xoops_getModuleHandler('block');
-        $block         = $block_handler->create();
-        $block->setVars($_POST);
-        $content = isset($_POST['content_block']) ? $_POST['content_block'] : '';
-        $block->setVar('content', $content);
-        $myts = MyTextSanitizer::getInstance();
-        echo '<div id="xo-preview-dialog" title="' . $block->getVar('title', 's') . '">' . $block->getContent('s', $block->getVar('c_type')) . '</div>';
-        break;
+            exit;
+            break;
 
-    case 'save':
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header('admin.php?fct=blocksadmin', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        // Initialize blocks handler
-        $block_handler = xoops_getModuleHandler('block');
-        // Get avatar id
-        $block_id = system_CleanVars($_POST, 'bid', 0, 'int');
-        if ($block_id > 0) {
-            $block = $block_handler->get($block_id);
-        } else {
-            $block = $block_handler->create();
-        }
-        $block_type = system_CleanVars($_POST, 'block_type', '', 'string');
-        $block->setVar('block_type', $block_type);
-
-        if (!$block->isCustom()) {
+        case 'preview':
+            if (!$GLOBALS['xoopsSecurity']->check()) {
+                redirect_header('admin.php?fct=blocksadmin', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            }
+            // Initialize blocks handler
+            /* @var $block_handler XoopsBlockHandler */
+            $block_handler = xoops_getModuleHandler('block');
+            $block         = $block_handler->create();
             $block->setVars($_POST);
-            $type = $block->getVar('block_type');
-            $name = $block->getVar('name');
-            // Save block options
-            $options = $_POST['options'];
-            if (isset($options)) {
-                $options_count = count($options);
-                if ($options_count > 0) {
-                    //Convert array values to comma-separated
-                    for ($i = 0; $i < $options_count; ++$i) {
-                        if (is_array($options[$i])) {
-                            $options[$i] = implode(',', $options[$i]);
+            $content = isset($_POST['content_block']) ? $_POST['content_block'] : '';
+            $block->setVar('content', $content);
+            $myts = MyTextSanitizer::getInstance();
+            echo '<div id="xo-preview-dialog" title="' . $block->getVar('title', 's') . '">' . $block->getContent('s', $block->getVar('c_type')) . '</div>';
+            break;
+
+        case 'save':
+            if (!$GLOBALS['xoopsSecurity']->check()) {
+                redirect_header('admin.php?fct=blocksadmin', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            }
+            // Initialize blocks handler
+            $block_handler = xoops_getModuleHandler('block');
+            // Get avatar id
+            $block_id = system_CleanVars($_POST, 'bid', 0, 'int');
+            if ($block_id > 0) {
+                $block = $block_handler->get($block_id);
+            } else {
+                $block = $block_handler->create();
+            }
+            $block_type = system_CleanVars($_POST, 'block_type', '', 'string');
+            $block->setVar('block_type', $block_type);
+
+            if (!$block->isCustom()) {
+                $block->setVars($_POST);
+                $type = $block->getVar('block_type');
+                $name = $block->getVar('name');
+                // Save block options
+                $options = $_POST['options'];
+                if (isset($options)) {
+                    $options_count = count($options);
+                    if ($options_count > 0) {
+                        //Convert array values to comma-separated
+                        for ($i = 0; $i < $options_count; ++$i) {
+                            if (is_array($options[$i])) {
+                                $options[$i] = implode(',', $options[$i]);
+                            }
                         }
+                        $options = implode('|', $options);
+                        $block->setVar('options', $options);
                     }
-                    $options = implode('|', $options);
-                    $block->setVar('options', $options);
                 }
-            }
-        } else {
-            $block->setVars($_POST);
-            switch ($block->getVar('c_type')) {
+            } else {
+                $block->setVars($_POST);
+                switch ($block->getVar('c_type')) {
                 case 'H':
                     $name = _AM_SYSTEM_BLOCKS_CUSTOMHTML;
                     break;
@@ -315,7 +315,7 @@ 
                 default:
                     $name = _AM_SYSTEM_BLOCKS_CUSTOMNOSMILE;
                     break;
-            }
+                }
         }
         $block->setVar('name', $name);
         $block->setVar('isactive', 1);
@@ -374,138 +374,138 @@ 
         redirect_header('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_BLOCKS_DBUPDATED);
         break;
 
-    case 'edit':
-        // Initialize blocks handler
-        $block_handler = xoops_getModuleHandler('block');
-        // Get avatar id
-        $block_id = system_CleanVars($_REQUEST, 'bid', 0, 'int');
-        if ($block_id > 0) {
-            // Define main template
-            $GLOBALS['xoopsOption']['template_main'] = 'system_blocks.tpl';
-            // Call Header
-            xoops_cp_header();
-            // Define Stylesheet
-            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
-            // Define scripts
-            $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
-            $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-            $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.form.js');
-            $xoTheme->addScript('modules/system/js/admin.js');
-            // Define Breadcrumb and tips
-            $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_ADMIN, system_adminVersion('blocksadmin', 'adminpath'));
-            $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_EDITBLOCK);
-            $xoBreadCrumb->render();
-
-            $block     = $block_handler->get($block_id);
-            $blockform = $block->getForm();
-            $xoopsTpl->assign('blockform', $blockform->render());
-            // Call Footer
-            xoops_cp_footer();
-        } else {
-            redirect_header('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_DBERROR);
-        }
-        break;
-
-    case 'delete':
-        // Initialize blocks handler
-        /* @var $block_handler SystemBlockHandler */
-        $block_handler = xoops_getModuleHandler('block');
-        // Get avatar id
-        $block_id = system_CleanVars($_REQUEST, 'bid', 0, 'int');
-        if ($block_id > 0) {
-            $block = $block_handler->get($block_id);
-            if ($block->getVar('block_type') === 'S') {
-                redirect_header('admin.php?fct=blocksadmin', 4, _AM_SYSTEM_BLOCKS_SYSTEMCANT);
-            } elseif ($block->getVar('block_type') === 'M') {
-                // Fix for duplicated blocks created in 2.0.9 module update
-                // A module block can be deleted if there is more than 1 that
-                // has the same func_num/show_func which is mostly likely
-                // be the one that was duplicated in 2.0.9
-                if (1 >= $count = $block_handler->countSimilarBlocks($block->getVar('mid'), $block->getVar('func_num'), $block->getVar('show_func'))) {
-                    redirect_header('admin.php?fct=blocksadmin', 4, _AM_SYSTEM_BLOCKS_MODULECANT);
+        case 'edit':
+            // Initialize blocks handler
+            $block_handler = xoops_getModuleHandler('block');
+            // Get avatar id
+            $block_id = system_CleanVars($_REQUEST, 'bid', 0, 'int');
+            if ($block_id > 0) {
+                // Define main template
+                $GLOBALS['xoopsOption']['template_main'] = 'system_blocks.tpl';
+                // Call Header
+                xoops_cp_header();
+                // Define Stylesheet
+                $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+                $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+                // Define scripts
+                $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+                $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+                $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.form.js');
+                $xoTheme->addScript('modules/system/js/admin.js');
+                // Define Breadcrumb and tips
+                $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_ADMIN, system_adminVersion('blocksadmin', 'adminpath'));
+                $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_EDITBLOCK);
+                $xoBreadCrumb->render();
+
+                $block     = $block_handler->get($block_id);
+                $blockform = $block->getForm();
+                $xoopsTpl->assign('blockform', $blockform->render());
+                // Call Footer
+                xoops_cp_footer();
+            } else {
+                redirect_header('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_DBERROR);
+            }
+            break;
+
+        case 'delete':
+            // Initialize blocks handler
+            /* @var $block_handler SystemBlockHandler */
+            $block_handler = xoops_getModuleHandler('block');
+            // Get avatar id
+            $block_id = system_CleanVars($_REQUEST, 'bid', 0, 'int');
+            if ($block_id > 0) {
+                $block = $block_handler->get($block_id);
+                if ($block->getVar('block_type') === 'S') {
+                    redirect_header('admin.php?fct=blocksadmin', 4, _AM_SYSTEM_BLOCKS_SYSTEMCANT);
+                } elseif ($block->getVar('block_type') === 'M') {
+                    // Fix for duplicated blocks created in 2.0.9 module update
+                    // A module block can be deleted if there is more than 1 that
+                    // has the same func_num/show_func which is mostly likely
+                    // be the one that was duplicated in 2.0.9
+                    if (1 >= $count = $block_handler->countSimilarBlocks($block->getVar('mid'), $block->getVar('func_num'), $block->getVar('show_func'))) {
+                        redirect_header('admin.php?fct=blocksadmin', 4, _AM_SYSTEM_BLOCKS_MODULECANT);
+                    }
                 }
+                // Define main template
+                $GLOBALS['xoopsOption']['template_main'] = 'system_header.tpl';
+                // Call Header
+                xoops_cp_header();
+                // Display Question
+                xoops_confirm(array(
+                                  'op'  => 'delete_ok',
+                                  'fct' => 'blocksadmin',
+                                  'bid' => $block->getVar('bid')), 'admin.php', sprintf(_AM_SYSTEM_BLOCKS_RUSUREDEL, $block->getVar('title')));
+                // Call Footer
+                xoops_cp_footer();
             }
-            // Define main template
-            $GLOBALS['xoopsOption']['template_main'] = 'system_header.tpl';
-            // Call Header
-            xoops_cp_header();
-            // Display Question
-            xoops_confirm(array(
-                              'op'  => 'delete_ok',
-                              'fct' => 'blocksadmin',
-                              'bid' => $block->getVar('bid')), 'admin.php', sprintf(_AM_SYSTEM_BLOCKS_RUSUREDEL, $block->getVar('title')));
-            // Call Footer
-            xoops_cp_footer();
-        }
-        break;
+            break;
 
-    case 'delete_ok':
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header('admin.php?fct=blocksadmin', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        // Initialize blocks handler
-        $block_handler = xoops_getModuleHandler('block');
-        // Get avatar id
-        $block_id = system_CleanVars($_POST, 'bid', 0, 'int');
-        if ($block_id > 0) {
-            $block = $block_handler->get($block_id);
-            if ($block_handler->delete($block)) {
-                // Delete Group link
-                $blocklinkmodule_handler = xoops_getModuleHandler('blocklinkmodule');
-                $blocklinkmodule         = $blocklinkmodule_handler->getObjects(new CriteriaCompo(new Criteria('block_id', $block_id)));
-                foreach ($blocklinkmodule as $link) {
-                    $blocklinkmodule_handler->delete($link, true);
-                }
-                // Delete Group permission
-                /* @var  $groupperm_handler XoopsGroupPermHandler */
-                $groupperm_handler = xoops_getHandler('groupperm');
-                $criteria          = new CriteriaCompo(new Criteria('gperm_name', 'block_read'));
-                $criteria->add(new Criteria('gperm_itemid', $block_id));
-                $groupperm = $groupperm_handler->getObjects($criteria);
-                foreach ($groupperm as $perm) {
-                    $groupperm_handler->delete($perm, true);
-                }
-                // Delete template
-                if ($block->getVar('template') != '') {
-                    $tplfile_handler = xoops_getHandler('tplfile');
-                    $btemplate       = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block_id);
-                    if (count($btemplate) > 0) {
-                        $tplfile_handler->delete($btemplate[0]);
+        case 'delete_ok':
+            if (!$GLOBALS['xoopsSecurity']->check()) {
+                redirect_header('admin.php?fct=blocksadmin', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            }
+            // Initialize blocks handler
+            $block_handler = xoops_getModuleHandler('block');
+            // Get avatar id
+            $block_id = system_CleanVars($_POST, 'bid', 0, 'int');
+            if ($block_id > 0) {
+                $block = $block_handler->get($block_id);
+                if ($block_handler->delete($block)) {
+                    // Delete Group link
+                    $blocklinkmodule_handler = xoops_getModuleHandler('blocklinkmodule');
+                    $blocklinkmodule         = $blocklinkmodule_handler->getObjects(new CriteriaCompo(new Criteria('block_id', $block_id)));
+                    foreach ($blocklinkmodule as $link) {
+                        $blocklinkmodule_handler->delete($link, true);
+                    }
+                    // Delete Group permission
+                    /* @var  $groupperm_handler XoopsGroupPermHandler */
+                    $groupperm_handler = xoops_getHandler('groupperm');
+                    $criteria          = new CriteriaCompo(new Criteria('gperm_name', 'block_read'));
+                    $criteria->add(new Criteria('gperm_itemid', $block_id));
+                    $groupperm = $groupperm_handler->getObjects($criteria);
+                    foreach ($groupperm as $perm) {
+                        $groupperm_handler->delete($perm, true);
                     }
+                    // Delete template
+                    if ($block->getVar('template') != '') {
+                        $tplfile_handler = xoops_getHandler('tplfile');
+                        $btemplate       = $tplfile_handler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block_id);
+                        if (count($btemplate) > 0) {
+                            $tplfile_handler->delete($btemplate[0]);
+                        }
+                    }
+                    redirect_header('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_BLOCKS_DBUPDATED);
                 }
-                redirect_header('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_BLOCKS_DBUPDATED);
+            } else {
+                redirect_header('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_DBERROR);
             }
-        } else {
-            redirect_header('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_DBERROR);
-        }
-        break;
-
-    case 'clone':
-        // Initialize blocks handler
-        $block_handler = xoops_getModuleHandler('block');
-        // Get avatar id
-        $block_id = system_CleanVars($_REQUEST, 'bid', 0, 'int');
-        if ($block_id > 0) {
-            // Define main template
-            $GLOBALS['xoopsOption']['template_main'] = 'system_blocks.tpl';
-            // Call Header
-            xoops_cp_header();
-            // Define Stylesheet
-            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-            // Define Breadcrumb and tips
-            $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_ADMIN, system_adminVersion('blocksadmin', 'adminpath'));
-            $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_CLONEBLOCK);
-            $xoBreadCrumb->render();
-            /* @var $block XoopsBlock */
-            $block     = $block_handler->get($block_id);
-            $blockform = $block->getForm('clone');
-            $xoopsTpl->assign('blockform', $blockform->render());
-            // Call Footer
-            xoops_cp_footer();
-        } else {
-            redirect_header('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_DBERROR);
-        }
-        break;
+            break;
+
+        case 'clone':
+            // Initialize blocks handler
+            $block_handler = xoops_getModuleHandler('block');
+            // Get avatar id
+            $block_id = system_CleanVars($_REQUEST, 'bid', 0, 'int');
+            if ($block_id > 0) {
+                // Define main template
+                $GLOBALS['xoopsOption']['template_main'] = 'system_blocks.tpl';
+                // Call Header
+                xoops_cp_header();
+                // Define Stylesheet
+                $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+                // Define Breadcrumb and tips
+                $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_ADMIN, system_adminVersion('blocksadmin', 'adminpath'));
+                $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_CLONEBLOCK);
+                $xoBreadCrumb->render();
+                /* @var $block XoopsBlock */
+                $block     = $block_handler->get($block_id);
+                $blockform = $block->getForm('clone');
+                $xoopsTpl->assign('blockform', $blockform->render());
+                // Call Footer
+                xoops_cp_footer();
+            } else {
+                redirect_header('admin.php?fct=blocksadmin', 1, _AM_SYSTEM_DBERROR);
+            }
+            break;
 
 }

Spacing +8 added lines, -8 removed lines

@@ -62,7 +62,7 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define scripts
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
         $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
@@ -143,7 +143,7 @@ 
         /* Get blocks */
         $selvis      = ($selvis == -1) ? null : $selvis;
         $selmod      = ($selmod == -2) ? null : $selmod;
-        $order_block = (isset($selvis) ? '' : 'b.visible DESC, ') . 'b.side,b.weight,b.bid';
+        $order_block = (isset($selvis) ? '' : 'b.visible DESC, ').'b.side,b.weight,b.bid';
 
         if ($selgrp == 0) {
             // get blocks that are not assigned to any groups
@@ -178,8 +178,8 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/ui/'.xoops_getModuleOption('jquery_theme', 'system').'/ui.all.css');
         // Define scripts
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
         $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
@@ -262,7 +262,7 @@ 
         $content = isset($_POST['content_block']) ? $_POST['content_block'] : '';
         $block->setVar('content', $content);
         $myts = MyTextSanitizer::getInstance();
-        echo '<div id="xo-preview-dialog" title="' . $block->getVar('title', 's') . '">' . $block->getContent('s', $block->getVar('c_type')) . '</div>';
+        echo '<div id="xo-preview-dialog" title="'.$block->getVar('title', 's').'">'.$block->getContent('s', $block->getVar('c_type')).'</div>';
         break;
 
     case 'save':
@@ -385,8 +385,8 @@ 
             // Call Header
             xoops_cp_header();
             // Define Stylesheet
-            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+            $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
+            $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/ui/'.xoops_getModuleOption('jquery_theme', 'system').'/ui.all.css');
             // Define scripts
             $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
             $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
@@ -492,7 +492,7 @@ 
             // Call Header
             xoops_cp_header();
             // Define Stylesheet
-            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+            $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
             // Define Breadcrumb and tips
             $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_ADMIN, system_adminVersion('blocksadmin', 'adminpath'));
             $xoBreadCrumb->addLink(_AM_SYSTEM_BLOCKS_CLONEBLOCK);

htdocs/modules/system/admin/images/main.php

Switch Indentation +653 added lines, -653 removed lines

@@ -76,61 +76,187 @@ 
 
 switch ($op) {
 
-    case 'list':
-        // Define main template
-        $GLOBALS['xoopsOption']['template_main'] = 'system_images.tpl';
-        // Call Header
-        xoops_cp_header();
-        // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/lightbox.css');
-        // Define scripts
-        $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
-        $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-        $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
-        $xoTheme->addScript('modules/system/js/admin.js');
-        // Define Breadcrumb and tips
-        $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath'));
-        $xoBreadCrumb->addHelp(system_adminVersion('images', 'help'));
-        $xoBreadCrumb->addTips(_AM_SYSTEM_IMAGES_TIPS);
-        $xoBreadCrumb->render();
-
-        $imgcat_handler = xoops_getHandler('imagecategory');
-        $imagecategorys = $imgcat_handler->getObjects();
-
-        $catcount      = count($imagecategorys);
-        /* @var  $image_handler XoopsImageHandler */
-        $image_handler = xoops_getHandler('image');
-
-        foreach (array_keys($imagecategorys) as $i) {
-            $imgcat_read  = $gperm_handler->checkRight('imgcat_read', $imagecategorys[$i]->getVar('imgcat_id'), $groups, $xoopsModule->mid());
-            $imgcat_write = $gperm_handler->checkRight('imgcat_write', $imagecategorys[$i]->getVar('imgcat_id'), $groups, $xoopsModule->mid());
-            if ($imgcat_read || $imgcat_write) {
-                $count = $image_handler->getCount(new Criteria('imgcat_id', $imagecategorys[$i]->getVar('imgcat_id')));
-
-                $cat_images['id']        = $imagecategorys[$i]->getVar('imgcat_id');
-                $cat_images['name']      = $imagecategorys[$i]->getVar('imgcat_name');
-                $cat_images['count']     = $count;
-                $cat_images['size']      = $count;
-                $cat_images['maxsize']   = $imagecategorys[$i]->getVar('imgcat_maxsize');
-                $cat_images['maxwidth']  = $imagecategorys[$i]->getVar('imgcat_maxwidth');
-                $cat_images['maxheight'] = $imagecategorys[$i]->getVar('imgcat_maxheight');
-                $cat_images['display']   = $imagecategorys[$i]->getVar('imgcat_display');
-                $cat_images['weight']    = $imagecategorys[$i]->getVar('imgcat_weight');
-                $cat_images['type']      = $imagecategorys[$i]->getVar('imgcat_type');
-                $cat_images['store']     = $imagecategorys[$i]->getVar('imgcat_storetype');
-
-                $xoopsTpl->append_by_ref('cat_img', $cat_images);
-                unset($cat_images);
-            }
-        }
-        // Image Form
-        if (!empty($catcount)) {
+        case 'list':
+            // Define main template
+            $GLOBALS['xoopsOption']['template_main'] = 'system_images.tpl';
+            // Call Header
+            xoops_cp_header();
+            // Define Stylesheet
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/lightbox.css');
+            // Define scripts
+            $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+            $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+            $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
+            $xoTheme->addScript('modules/system/js/admin.js');
+            // Define Breadcrumb and tips
+            $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath'));
+            $xoBreadCrumb->addHelp(system_adminVersion('images', 'help'));
+            $xoBreadCrumb->addTips(_AM_SYSTEM_IMAGES_TIPS);
+            $xoBreadCrumb->render();
+
+            $imgcat_handler = xoops_getHandler('imagecategory');
+            $imagecategorys = $imgcat_handler->getObjects();
+
+            $catcount      = count($imagecategorys);
+            /* @var  $image_handler XoopsImageHandler */
+            $image_handler = xoops_getHandler('image');
+
+            foreach (array_keys($imagecategorys) as $i) {
+                $imgcat_read  = $gperm_handler->checkRight('imgcat_read', $imagecategorys[$i]->getVar('imgcat_id'), $groups, $xoopsModule->mid());
+                $imgcat_write = $gperm_handler->checkRight('imgcat_write', $imagecategorys[$i]->getVar('imgcat_id'), $groups, $xoopsModule->mid());
+                if ($imgcat_read || $imgcat_write) {
+                    $count = $image_handler->getCount(new Criteria('imgcat_id', $imagecategorys[$i]->getVar('imgcat_id')));
+
+                    $cat_images['id']        = $imagecategorys[$i]->getVar('imgcat_id');
+                    $cat_images['name']      = $imagecategorys[$i]->getVar('imgcat_name');
+                    $cat_images['count']     = $count;
+                    $cat_images['size']      = $count;
+                    $cat_images['maxsize']   = $imagecategorys[$i]->getVar('imgcat_maxsize');
+                    $cat_images['maxwidth']  = $imagecategorys[$i]->getVar('imgcat_maxwidth');
+                    $cat_images['maxheight'] = $imagecategorys[$i]->getVar('imgcat_maxheight');
+                    $cat_images['display']   = $imagecategorys[$i]->getVar('imgcat_display');
+                    $cat_images['weight']    = $imagecategorys[$i]->getVar('imgcat_weight');
+                    $cat_images['type']      = $imagecategorys[$i]->getVar('imgcat_type');
+                    $cat_images['store']     = $imagecategorys[$i]->getVar('imgcat_storetype');
+
+                    $xoopsTpl->append_by_ref('cat_img', $cat_images);
+                    unset($cat_images);
+                }
+            }
+            // Image Form
+            if (!empty($catcount)) {
+                $form = new XoopsThemeForm(_ADDIMAGE, 'image_form', 'admin.php', 'post', true);
+                $form->setExtra('enctype="multipart/form-data"');
+                $form->addElement(new XoopsFormText(_IMAGENAME, 'image_nicename', 50, 255), true);
+                $select = new XoopsFormSelect(_IMAGECAT, 'imgcat_id');
+                $select->addOptionArray($imgcat_handler->getList($groups, 'imgcat_write'));
+                $form->addElement($select, true);
+                $form->addElement(new XoopsFormFile(_IMAGEFILE, 'image_file', 5000000));
+                $form->addElement(new XoopsFormText(_IMGWEIGHT, 'image_weight', 3, 4, 0));
+                $form->addElement(new XoopsFormRadioYN(_IMGDISPLAY, 'image_display', 1, _YES, _NO));
+                $form->addElement(new XoopsFormHidden('op', 'addfile'));
+                $form->addElement(new XoopsFormHidden('fct', 'images'));
+                $form->addElement(new XoopsFormButton('', 'img_button', _SUBMIT, 'submit'));
+                $form->assign($xoopsTpl);
+            }
+            // Category Form
+            if ($xoopsUser->isAdmin($xoopsModule->mid())) {
+                $form = new XoopsThemeForm(_AM_SYSTEM_IMAGES_ADDCAT, 'imagecat_form', 'admin.php', 'post', true);
+                $form->addElement(new XoopsFormText(_AM_SYSTEM_IMAGES_IMGCATNAME, 'imgcat_name', 50, 255), true);
+                $form->addElement(new XoopsFormSelectGroup(_AM_SYSTEM_IMAGES_IMGCATRGRP, 'readgroup', true, XOOPS_GROUP_ADMIN, 5, true));
+                $form->addElement(new XoopsFormSelectGroup(_AM_SYSTEM_IMAGES_IMGCATWGRP, 'writegroup', true, XOOPS_GROUP_ADMIN, 5, true));
+                $form->addElement(new XoopsFormText(_IMGMAXSIZE, 'imgcat_maxsize', 10, 10, 1000000));
+                $form->addElement(new XoopsFormText(_IMGMAXWIDTH, 'imgcat_maxwidth', 3, 4, 800));
+                $form->addElement(new XoopsFormText(_IMGMAXHEIGHT, 'imgcat_maxheight', 3, 4, 600));
+                $form->addElement(new XoopsFormText(_AM_SYSTEM_IMAGES_IMGCATWEIGHT, 'imgcat_weight', 3, 4, 0));
+                $form->addElement(new XoopsFormRadioYN(_AM_SYSTEM_IMAGES_IMGCATDISPLAY, 'imgcat_display', 1, _YES, _NO));
+
+                $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('imgcat_storetype', 'file'));
+                $form->addElement(new XoopsFormHidden('op', 'addcat'));
+                $form->addElement(new XoopsFormHidden('fct', 'images'));
+                $form->addElement(new XoopsFormButton('', 'imgcat_button', _SUBMIT, 'submit'));
+                $form->assign($xoopsTpl);
+            }
+            // Call Footer
+            xoops_cp_footer();
+            break;
+
+        case 'display_cat':
+            // Get Image Category handler
+            $imgcat_handler = xoops_getHandler('imagecategory');
+            // Get category id
+            $imgcat_id = system_CleanVars($_POST, 'imgcat_id', 0, 'int');
+            if ($imgcat_id > 0) {
+                $imgcat = $imgcat_handler->get($imgcat_id);
+                $old    = $imgcat->getVar('imgcat_display');
+                $imgcat->setVar('imgcat_display', !$old);
+                if (!$imgcat_handler->insert($imgcat)) {
+                    $error = true;
+                }
+            }
+            break;
+
+        case 'listimg':
+            // Get category id
+            $imgcat_id = system_CleanVars($_REQUEST, 'imgcat_id', 0, 'int');
+            if ($imgcat_id <= 0) {
+                redirect_header('admin.php?fct=images', 1);
+            }
+            // Get rights
+            $imgcat_write = $gperm_handler->checkRight('imgcat_write', $imgcat_id, $groups, $xoopsModule->mid());
+            // Get category handler
+            $imgcat_handler = xoops_getHandler('imagecategory');
+
+            $imagecategory = $imgcat_handler->get($imgcat_id);
+            if (!is_object($imagecategory)) {
+                redirect_header('admin.php?fct=images', 1);
+            }
+            // Get image handler
+            $image_handler = xoops_getHandler('image');
+            // Define main template
+            $GLOBALS['xoopsOption']['template_main'] = 'system_images.tpl';
+            // Call header
+            xoops_cp_header();
+            // Define Stylesheet
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/lightbox.css');
+            // Define scripts
+            $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+            $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+            $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
+            $xoTheme->addScript('modules/system/js/admin.js');
+
+            // Define Breadcrumb and tips
+            $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath'));
+            $xoBreadCrumb->addLink($imagecategory->getVar('imgcat_name'));
+            $xoBreadCrumb->addHelp(system_adminVersion('images', 'help') . '#cat');
+            $xoBreadCrumb->addTips(_AM_SYSTEM_IMAGES_TIPS);
+            $xoBreadCrumb->render();
+
+            $criteria = new CriteriaCompo(new Criteria('imgcat_id', $imgcat_id));
+            $criteria->setSort('image_weight ASC, image_id');
+            $criteria->setOrder('DESC');
+            $imgcount = $image_handler->getCount($criteria);
+            $start    = isset($_GET['start']) ? (int)$_GET['start'] : 0;
+            $criteria->setStart($start);
+            $criteria->setLimit(xoops_getModuleOption('images_pager', 'system'));
+            $images = $image_handler->getObjects($criteria, true, false);
+
+            if ($imagecategory->getVar('imgcat_storetype') === 'db') {
+                $xoopsTpl->assign('db_store', 1);
+            }
+
+            foreach ($images as $listImage) {
+                $xoopsTpl->append('images', $listImage->toArray());
+            }
+            if ($imgcount > 0) {
+                if ($imgcount > xoops_getModuleOption('images_pager', 'system')) {
+                    //include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+                    $nav = new XoopsPageNav($imgcount, xoops_getModuleOption('images_pager', 'system'), $start, 'start', 'fct=images&amp;op=listimg&amp;imgcat_id=' . $imgcat_id);
+                    $xoopsTpl->assign('nav_menu', $nav->renderNav(4));
+                }
+            }
+
+            if (file_exists(XOOPS_ROOT_PATH . '/modules/system/language/' . $GLOBALS['xoopsConfig']['language'] . '/images/lightbox-btn-close.gif')) {
+                $xoopsTpl->assign('xoops_language', $GLOBALS['xoopsConfig']['language']);
+            } else {
+                $xoopsTpl->assign('xoops_language', 'english');
+            }
+            $xoopsTpl->assign('listimg', true);
+            $xoopsTpl->assign('imgcat_id', $imgcat_id);        
+
+            // Image Form
             $form = new XoopsThemeForm(_ADDIMAGE, 'image_form', 'admin.php', 'post', true);
             $form->setExtra('enctype="multipart/form-data"');
             $form->addElement(new XoopsFormText(_IMAGENAME, 'image_nicename', 50, 255), true);
-            $select = new XoopsFormSelect(_IMAGECAT, 'imgcat_id');
+            $select = new XoopsFormSelect(_IMAGECAT, 'imgcat_id', $imgcat_id);
             $select->addOptionArray($imgcat_handler->getList($groups, 'imgcat_write'));
             $form->addElement($select, true);
             $form->addElement(new XoopsFormFile(_IMAGEFILE, 'image_file', 5000000));
@@ -140,625 +266,499 @@ 
             $form->addElement(new XoopsFormHidden('fct', 'images'));
             $form->addElement(new XoopsFormButton('', 'img_button', _SUBMIT, 'submit'));
             $form->assign($xoopsTpl);
-        }
-        // Category Form
-        if ($xoopsUser->isAdmin($xoopsModule->mid())) {
-            $form = new XoopsThemeForm(_AM_SYSTEM_IMAGES_ADDCAT, 'imagecat_form', 'admin.php', 'post', true);
-            $form->addElement(new XoopsFormText(_AM_SYSTEM_IMAGES_IMGCATNAME, 'imgcat_name', 50, 255), true);
-            $form->addElement(new XoopsFormSelectGroup(_AM_SYSTEM_IMAGES_IMGCATRGRP, 'readgroup', true, XOOPS_GROUP_ADMIN, 5, true));
-            $form->addElement(new XoopsFormSelectGroup(_AM_SYSTEM_IMAGES_IMGCATWGRP, 'writegroup', true, XOOPS_GROUP_ADMIN, 5, true));
-            $form->addElement(new XoopsFormText(_IMGMAXSIZE, 'imgcat_maxsize', 10, 10, 1000000));
-            $form->addElement(new XoopsFormText(_IMGMAXWIDTH, 'imgcat_maxwidth', 3, 4, 800));
-            $form->addElement(new XoopsFormText(_IMGMAXHEIGHT, 'imgcat_maxheight', 3, 4, 600));
-            $form->addElement(new XoopsFormText(_AM_SYSTEM_IMAGES_IMGCATWEIGHT, 'imgcat_weight', 3, 4, 0));
-            $form->addElement(new XoopsFormRadioYN(_AM_SYSTEM_IMAGES_IMGCATDISPLAY, 'imgcat_display', 1, _YES, _NO));
-
-            $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('imgcat_storetype', 'file'));
-            $form->addElement(new XoopsFormHidden('op', 'addcat'));
-            $form->addElement(new XoopsFormHidden('fct', 'images'));
-            $form->addElement(new XoopsFormButton('', 'imgcat_button', _SUBMIT, 'submit'));
-            $form->assign($xoopsTpl);
-        }
-        // Call Footer
-        xoops_cp_footer();
-        break;
-
-    case 'display_cat':
-        // Get Image Category handler
-        $imgcat_handler = xoops_getHandler('imagecategory');
-        // Get category id
-        $imgcat_id = system_CleanVars($_POST, 'imgcat_id', 0, 'int');
-        if ($imgcat_id > 0) {
-            $imgcat = $imgcat_handler->get($imgcat_id);
-            $old    = $imgcat->getVar('imgcat_display');
-            $imgcat->setVar('imgcat_display', !$old);
-            if (!$imgcat_handler->insert($imgcat)) {
-                $error = true;
-            }
-        }
-        break;
-
-    case 'listimg':
-        // Get category id
-        $imgcat_id = system_CleanVars($_REQUEST, 'imgcat_id', 0, 'int');
-        if ($imgcat_id <= 0) {
-            redirect_header('admin.php?fct=images', 1);
-        }
-        // Get rights
-        $imgcat_write = $gperm_handler->checkRight('imgcat_write', $imgcat_id, $groups, $xoopsModule->mid());
-        // Get category handler
-        $imgcat_handler = xoops_getHandler('imagecategory');
-
-        $imagecategory = $imgcat_handler->get($imgcat_id);
-        if (!is_object($imagecategory)) {
-            redirect_header('admin.php?fct=images', 1);
-        }
-        // Get image handler
-        $image_handler = xoops_getHandler('image');
-        // Define main template
-        $GLOBALS['xoopsOption']['template_main'] = 'system_images.tpl';
-        // Call header
-        xoops_cp_header();
-        // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/lightbox.css');
-        // Define scripts
-        $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
-        $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-        $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
-        $xoTheme->addScript('modules/system/js/admin.js');
-
-        // Define Breadcrumb and tips
-        $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath'));
-        $xoBreadCrumb->addLink($imagecategory->getVar('imgcat_name'));
-        $xoBreadCrumb->addHelp(system_adminVersion('images', 'help') . '#cat');
-        $xoBreadCrumb->addTips(_AM_SYSTEM_IMAGES_TIPS);
-        $xoBreadCrumb->render();
-
-        $criteria = new CriteriaCompo(new Criteria('imgcat_id', $imgcat_id));
-        $criteria->setSort('image_weight ASC, image_id');
-        $criteria->setOrder('DESC');
-        $imgcount = $image_handler->getCount($criteria);
-        $start    = isset($_GET['start']) ? (int)$_GET['start'] : 0;
-        $criteria->setStart($start);
-        $criteria->setLimit(xoops_getModuleOption('images_pager', 'system'));
-        $images = $image_handler->getObjects($criteria, true, false);
-
-        if ($imagecategory->getVar('imgcat_storetype') === 'db') {
-            $xoopsTpl->assign('db_store', 1);
-        }
-
-        foreach ($images as $listImage) {
-            $xoopsTpl->append('images', $listImage->toArray());
-        }
-        if ($imgcount > 0) {
-            if ($imgcount > xoops_getModuleOption('images_pager', 'system')) {
-                //include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
-                $nav = new XoopsPageNav($imgcount, xoops_getModuleOption('images_pager', 'system'), $start, 'start', 'fct=images&amp;op=listimg&amp;imgcat_id=' . $imgcat_id);
-                $xoopsTpl->assign('nav_menu', $nav->renderNav(4));
-            }
-        }
-
-        if (file_exists(XOOPS_ROOT_PATH . '/modules/system/language/' . $GLOBALS['xoopsConfig']['language'] . '/images/lightbox-btn-close.gif')) {
-            $xoopsTpl->assign('xoops_language', $GLOBALS['xoopsConfig']['language']);
-        } else {
-            $xoopsTpl->assign('xoops_language', 'english');
-        }
-        $xoopsTpl->assign('listimg', true);
-        $xoopsTpl->assign('imgcat_id', $imgcat_id);        
-
-        // Image Form
-        $form = new XoopsThemeForm(_ADDIMAGE, 'image_form', 'admin.php', 'post', true);
-        $form->setExtra('enctype="multipart/form-data"');
-        $form->addElement(new XoopsFormText(_IMAGENAME, 'image_nicename', 50, 255), true);
-        $select = new XoopsFormSelect(_IMAGECAT, 'imgcat_id', $imgcat_id);
-        $select->addOptionArray($imgcat_handler->getList($groups, 'imgcat_write'));
-        $form->addElement($select, true);
-        $form->addElement(new XoopsFormFile(_IMAGEFILE, 'image_file', 5000000));
-        $form->addElement(new XoopsFormText(_IMGWEIGHT, 'image_weight', 3, 4, 0));
-        $form->addElement(new XoopsFormRadioYN(_IMGDISPLAY, 'image_display', 1, _YES, _NO));
-        $form->addElement(new XoopsFormHidden('op', 'addfile'));
-        $form->addElement(new XoopsFormHidden('fct', 'images'));
-        $form->addElement(new XoopsFormButton('', 'img_button', _SUBMIT, 'submit'));
-        $form->assign($xoopsTpl);
-
-        // Call Footer
-        xoops_cp_footer();
-        break;
-
-    case 'display_img':
-        // Get image handler
-        $image_handler = xoops_getHandler('image');
-        // Get image id
-        $image_id = system_CleanVars($_POST, 'image_id', 0, 'int');
-        if ($image_id > 0) {
-            $img = $image_handler->get($image_id);
-            $old = $img->getVar('image_display');
-            $img->setVar('image_display', !$old);
-            if (!$image_handler->insert($img)) {
-                $error = true;
-            }
-        }
-        break;
-
-    case 'editimg':
-        // Define main template
-        $GLOBALS['xoopsOption']['template_main'] = 'system_images.tpl';
-        // Call Header
-        xoops_cp_header();
-        // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/lightbox.css');
-        // Define scripts
-        $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
-        $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-        $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
-        $xoTheme->addScript('modules/system/js/admin.js');
-        // Get image handler
-        $image_handler  = xoops_getHandler('image');
-        $imgcat_handler = xoops_getHandler('imagecategory');
-        // Get image id
-        $image_id = system_CleanVars($_REQUEST, 'image_id', 0, 'int');
-        if ($image_id > 0) {
-            $image     = $image_handler->get($image_id);
-            $image_cat = $imgcat_handler->get($image->getVar('imgcat_id'));
-            // Define Breadcrumb and tips
-            $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath'));
-            $xoBreadCrumb->addLink($image_cat->getVar('imgcat_name'), system_adminVersion('images', 'adminpath') . '&amp;op=listimg&amp;imgcat_id=' . $image->getVar('imgcat_id'));
-            $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_EDITIMG);
-            $xoBreadCrumb->render();
-            $msg = '<div class="txtcenter"><img class="tooltip" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '&amp;width=120&amp;height=120" alt="' . $image->getVar('image_nicename') . '" title="' . $image->getVar('image_nicename') . '" style="max-width:120px; max-height:120px;"/></div>';
 
-            $xoopsTpl->assign('edit_thumbs', $msg);
+            // Call Footer
+            xoops_cp_footer();
+            break;
+
+        case 'display_img':
+            // Get image handler
+            $image_handler = xoops_getHandler('image');
+            // Get image id
+            $image_id = system_CleanVars($_POST, 'image_id', 0, 'int');
+            if ($image_id > 0) {
+                $img = $image_handler->get($image_id);
+                $old = $img->getVar('image_display');
+                $img->setVar('image_display', !$old);
+                if (!$image_handler->insert($img)) {
+                    $error = true;
+                }
+            }
+            break;
 
-            $form = new XoopsThemeForm(_AM_SYSTEM_IMAGES_EDITIMG, 'edit_form', 'admin.php', 'post', true);
-            $form->setExtra('enctype="multipart/form-data"');
-            $form->addElement(new XoopsFormText(_IMAGENAME, 'image_nicename', 50, 255, $image->getVar('image_nicename')), true);
-            $select = new XoopsFormSelect(_IMAGECAT, 'imgcat_id', $image->getVar('imgcat_id'));
-            $select->addOptionArray($imgcat_handler->getList($groups, 'imgcat_write', $image->getVar('imgcat_write')));
-            $form->addElement($select, true);
-            //$form->addElement(new XoopsFormFile( _IMAGEFILE, 'image_file', 5000000) );
-            $form->addElement(new XoopsFormText(_IMGWEIGHT, 'image_weight', 3, 4, $image->getVar('image_weight')));
-            $form->addElement(new XoopsFormRadioYN(_IMGDISPLAY, 'image_display', $image->getVar('image_display'), _YES, _NO));
-            $form->addElement(new XoopsFormHidden('image_id', $image_id));
-            $form->addElement(new XoopsFormHidden('op', 'save'));
-            $form->addElement(new XoopsFormHidden('fct', 'images'));
-            //$form->addElement(new XoopsFormButton( '', 'img_button', _SUBMIT, 'submit' ) );
-            $form->addElement(new XoopsFormButtonTray('', _SUBMIT, 'submit', '', false));
-            $form->assign($xoopsTpl);
-        } else {
-            redirect_header('admin.php?fct=images', 1, _AM_SYSTEM_DBERROR);
-        }
-        // Call Footer
-        xoops_cp_footer();
-        break;
-
-    case 'delfile':
-        // Get image handler
-        $image_handler  = xoops_getHandler('image');
-        $imgcat_handler = xoops_getHandler('imagecategory');
-        // Call Header
-        xoops_cp_header();
-        // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/lightbox.css');
-        // Define scripts
-        $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
-        $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-        $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
-        $xoTheme->addScript('modules/system/js/admin.js');
-        // Get image id
-        $image_id = system_CleanVars($_REQUEST, 'image_id', 0, 'int');
-        if ($image_id > 0) {
-            $image     = $image_handler->get($image_id);
-            $image_cat = $imgcat_handler->get($image->getVar('imgcat_id'));
-            if ($image_cat->getVar('imgcat_storetype') === 'db') {
-                $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '&width=120&height=120" alt="" title="" style="max-width:120px; max-height:120px;"/></div>';
+        case 'editimg':
+            // Define main template
+            $GLOBALS['xoopsOption']['template_main'] = 'system_images.tpl';
+            // Call Header
+            xoops_cp_header();
+            // Define Stylesheet
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/lightbox.css');
+            // Define scripts
+            $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+            $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+            $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
+            $xoTheme->addScript('modules/system/js/admin.js');
+            // Get image handler
+            $image_handler  = xoops_getHandler('image');
+            $imgcat_handler = xoops_getHandler('imagecategory');
+            // Get image id
+            $image_id = system_CleanVars($_REQUEST, 'image_id', 0, 'int');
+            if ($image_id > 0) {
+                $image     = $image_handler->get($image_id);
+                $image_cat = $imgcat_handler->get($image->getVar('imgcat_id'));
+                // Define Breadcrumb and tips
+                $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath'));
+                $xoBreadCrumb->addLink($image_cat->getVar('imgcat_name'), system_adminVersion('images', 'adminpath') . '&amp;op=listimg&amp;imgcat_id=' . $image->getVar('imgcat_id'));
+                $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_EDITIMG);
+                $xoBreadCrumb->render();
+                $msg = '<div class="txtcenter"><img class="tooltip" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '&amp;width=120&amp;height=120" alt="' . $image->getVar('image_nicename') . '" title="' . $image->getVar('image_nicename') . '" style="max-width:120px; max-height:120px;"/></div>';
+
+                $xoopsTpl->assign('edit_thumbs', $msg);
+
+                $form = new XoopsThemeForm(_AM_SYSTEM_IMAGES_EDITIMG, 'edit_form', 'admin.php', 'post', true);
+                $form->setExtra('enctype="multipart/form-data"');
+                $form->addElement(new XoopsFormText(_IMAGENAME, 'image_nicename', 50, 255, $image->getVar('image_nicename')), true);
+                $select = new XoopsFormSelect(_IMAGECAT, 'imgcat_id', $image->getVar('imgcat_id'));
+                $select->addOptionArray($imgcat_handler->getList($groups, 'imgcat_write', $image->getVar('imgcat_write')));
+                $form->addElement($select, true);
+                //$form->addElement(new XoopsFormFile( _IMAGEFILE, 'image_file', 5000000) );
+                $form->addElement(new XoopsFormText(_IMGWEIGHT, 'image_weight', 3, 4, $image->getVar('image_weight')));
+                $form->addElement(new XoopsFormRadioYN(_IMGDISPLAY, 'image_display', $image->getVar('image_display'), _YES, _NO));
+                $form->addElement(new XoopsFormHidden('image_id', $image_id));
+                $form->addElement(new XoopsFormHidden('op', 'save'));
+                $form->addElement(new XoopsFormHidden('fct', 'images'));
+                //$form->addElement(new XoopsFormButton( '', 'img_button', _SUBMIT, 'submit' ) );
+                $form->addElement(new XoopsFormButtonTray('', _SUBMIT, 'submit', '', false));
+                $form->assign($xoopsTpl);
             } else {
-                $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '&width=120&height=120" alt="" title="" style="max-width:120px; max-height:120px;"/></div>';
-            }
-            $msg .= '<div class="spacer">' . $image->getVar('image_nicename') . '</div>';
-            $msg .= '<div class="spacer">' . _AM_SYSTEM_IMAGES_RUDELIMG . '</div>';
-            xoops_confirm(array('op' => 'delfileok', 'image_id' => $image_id, 'fct' => 'images'), 'admin.php', $msg, _DELETE);
-        } else {
-            redirect_header('admin.php?fct=images', 1, _AM_SYSTEM_DBERROR);
-        }
-        // Call Footer
-        xoops_cp_footer();
-        break;
-
-    case 'delfileok':
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header('admin.php?fct=images', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        // Get image id
-        $image_id = system_CleanVars($_POST, 'image_id', 0, 'int');
-        if ($image_id <= 0) {
-            redirect_header('admin.php?fct=images', 1);
-        }
-        $image_handler = xoops_getHandler('image');
-        $image         = $image_handler->get($image_id);
-        if (!is_object($image)) {
-            redirect_header('admin.php?fct=images', 1);
-        }
-        if (!$image_handler->delete($image)) {
+                redirect_header('admin.php?fct=images', 1, _AM_SYSTEM_DBERROR);
+            }
+            // Call Footer
+            xoops_cp_footer();
+            break;
+
+        case 'delfile':
+            // Get image handler
+            $image_handler  = xoops_getHandler('image');
+            $imgcat_handler = xoops_getHandler('imagecategory');
+            // Call Header
             xoops_cp_header();
-            xoops_error(sprintf(_AM_SYSTEM_IMAGES_FAILDEL, $image->getVar('image_id')));
+            // Define Stylesheet
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/lightbox.css');
+            // Define scripts
+            $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+            $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+            $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
+            $xoTheme->addScript('modules/system/js/admin.js');
+            // Get image id
+            $image_id = system_CleanVars($_REQUEST, 'image_id', 0, 'int');
+            if ($image_id > 0) {
+                $image     = $image_handler->get($image_id);
+                $image_cat = $imgcat_handler->get($image->getVar('imgcat_id'));
+                if ($image_cat->getVar('imgcat_storetype') === 'db') {
+                    $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '&width=120&height=120" alt="" title="" style="max-width:120px; max-height:120px;"/></div>';
+                } else {
+                    $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '&width=120&height=120" alt="" title="" style="max-width:120px; max-height:120px;"/></div>';
+                }
+                $msg .= '<div class="spacer">' . $image->getVar('image_nicename') . '</div>';
+                $msg .= '<div class="spacer">' . _AM_SYSTEM_IMAGES_RUDELIMG . '</div>';
+                xoops_confirm(array('op' => 'delfileok', 'image_id' => $image_id, 'fct' => 'images'), 'admin.php', $msg, _DELETE);
+            } else {
+                redirect_header('admin.php?fct=images', 1, _AM_SYSTEM_DBERROR);
+            }
+            // Call Footer
             xoops_cp_footer();
-            exit();
-        }
-        @unlink(XOOPS_UPLOAD_PATH . '/' . $image->getVar('image_name'));
-        redirect_header('admin.php?fct=images&op=listimg&imgcat_id=' . $image->getVar('imgcat_id'), 2, _AM_SYSTEM_DBUPDATED);
-        break;
-
-    case 'save':
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header('admin.php?fct=images', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        // Get image handler
-        $image_handler = xoops_getHandler('image');
-        // Call Header
-        xoops_cp_header();
-        // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        // Get image id
-        $image_id = system_CleanVars($_POST, 'image_id', 0, 'int');
-        if ($image_id > 0) {
-            $image = $image_handler->get($image_id);
-            $image->setVars($_POST);
-            if (!$image_handler->insert($image)) {
-                echo sprintf(_AM_SYSTEM_IMAGES_FAILSAVE, $avatar->getVar('avatar_name'));
+            break;
+
+        case 'delfileok':
+            if (!$GLOBALS['xoopsSecurity']->check()) {
+                redirect_header('admin.php?fct=images', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            }
+            // Get image id
+            $image_id = system_CleanVars($_POST, 'image_id', 0, 'int');
+            if ($image_id <= 0) {
+                redirect_header('admin.php?fct=images', 1);
+            }
+            $image_handler = xoops_getHandler('image');
+            $image         = $image_handler->get($image_id);
+            if (!is_object($image)) {
+                redirect_header('admin.php?fct=images', 1);
+            }
+            if (!$image_handler->delete($image)) {
+                xoops_cp_header();
+                xoops_error(sprintf(_AM_SYSTEM_IMAGES_FAILDEL, $image->getVar('image_id')));
                 xoops_cp_footer();
-                exit;
+                exit();
             }
+            @unlink(XOOPS_UPLOAD_PATH . '/' . $image->getVar('image_name'));
             redirect_header('admin.php?fct=images&op=listimg&imgcat_id=' . $image->getVar('imgcat_id'), 2, _AM_SYSTEM_DBUPDATED);
-        }
-
-        // Call Footer
-        xoops_cp_footer();
-        break;
-
-    case 'addfile':
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header('admin.php?fct=images', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        $imgcat_handler = xoops_getHandler('imagecategory');
-        $imagecategory  = $imgcat_handler->get((int)$imgcat_id);
-        if (!is_object($imagecategory)) {
-            redirect_header('admin.php?fct=images', 1);
-        }
-        xoops_load('xoopsmediauploader');
-        $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH . '/images', array(
-            'image/gif',
-            'image/jpeg',
-            'image/pjpeg',
-            'image/x-png',
-            'image/png',
-            'image/bmp'), $imagecategory->getVar('imgcat_maxsize'), $imagecategory->getVar('imgcat_maxwidth'), $imagecategory->getVar('imgcat_maxheight'));
-        $uploader->setPrefix('img');
-        $err    = array();
-        $ucount = count($_POST['xoops_upload_file']);
-        for ($i = 0; $i < $ucount; ++$i) {
-            if ($uploader->fetchMedia($_POST['xoops_upload_file'][$i])) {
-                if (!$uploader->upload()) {
-                    $err[] =& $uploader->getErrors();
-                } else {
-                    $image_handler = xoops_getHandler('image');
-                    $image         = $image_handler->create();
-                    $image->setVar('image_name', 'images/' . $uploader->getSavedFileName());
-                    $image->setVar('image_nicename', $image_nicename);
-                    $image->setVar('image_mimetype', $uploader->getMediaType());
-                    $image->setVar('image_created', time());
-                    $image_display = empty($image_display) ? 0 : 1;
-                    $image->setVar('image_display', $image_display);
-                    $image->setVar('image_weight', $image_weight);
-                    $image->setVar('imgcat_id', $imgcat_id);
-                    if ($imagecategory->getVar('imgcat_storetype') === 'db') {
-                        $fp      = @fopen($uploader->getSavedDestination(), 'rb');
-                        $fbinary = @fread($fp, filesize($uploader->getSavedDestination()));
-                        @fclose($fp);
-                        $image->setVar('image_body', $fbinary, true);
-                        @unlink($uploader->getSavedDestination());
-                    }
-                    if (!$image_handler->insert($image)) {
-                        $err[] = sprintf(_FAILSAVEIMG, $image->getVar('image_nicename'));
+            break;
+
+        case 'save':
+            if (!$GLOBALS['xoopsSecurity']->check()) {
+                redirect_header('admin.php?fct=images', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            }
+            // Get image handler
+            $image_handler = xoops_getHandler('image');
+            // Call Header
+            xoops_cp_header();
+            // Define Stylesheet
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+            // Get image id
+            $image_id = system_CleanVars($_POST, 'image_id', 0, 'int');
+            if ($image_id > 0) {
+                $image = $image_handler->get($image_id);
+                $image->setVars($_POST);
+                if (!$image_handler->insert($image)) {
+                    echo sprintf(_AM_SYSTEM_IMAGES_FAILSAVE, $avatar->getVar('avatar_name'));
+                    xoops_cp_footer();
+                    exit;
+                }
+                redirect_header('admin.php?fct=images&op=listimg&imgcat_id=' . $image->getVar('imgcat_id'), 2, _AM_SYSTEM_DBUPDATED);
+            }
+
+            // Call Footer
+            xoops_cp_footer();
+            break;
+
+        case 'addfile':
+            if (!$GLOBALS['xoopsSecurity']->check()) {
+                redirect_header('admin.php?fct=images', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            }
+            $imgcat_handler = xoops_getHandler('imagecategory');
+            $imagecategory  = $imgcat_handler->get((int)$imgcat_id);
+            if (!is_object($imagecategory)) {
+                redirect_header('admin.php?fct=images', 1);
+            }
+            xoops_load('xoopsmediauploader');
+            $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH . '/images', array(
+                'image/gif',
+                'image/jpeg',
+                'image/pjpeg',
+                'image/x-png',
+                'image/png',
+                'image/bmp'), $imagecategory->getVar('imgcat_maxsize'), $imagecategory->getVar('imgcat_maxwidth'), $imagecategory->getVar('imgcat_maxheight'));
+            $uploader->setPrefix('img');
+            $err    = array();
+            $ucount = count($_POST['xoops_upload_file']);
+            for ($i = 0; $i < $ucount; ++$i) {
+                if ($uploader->fetchMedia($_POST['xoops_upload_file'][$i])) {
+                    if (!$uploader->upload()) {
+                        $err[] =& $uploader->getErrors();
+                    } else {
+                        $image_handler = xoops_getHandler('image');
+                        $image         = $image_handler->create();
+                        $image->setVar('image_name', 'images/' . $uploader->getSavedFileName());
+                        $image->setVar('image_nicename', $image_nicename);
+                        $image->setVar('image_mimetype', $uploader->getMediaType());
+                        $image->setVar('image_created', time());
+                        $image_display = empty($image_display) ? 0 : 1;
+                        $image->setVar('image_display', $image_display);
+                        $image->setVar('image_weight', $image_weight);
+                        $image->setVar('imgcat_id', $imgcat_id);
+                        if ($imagecategory->getVar('imgcat_storetype') === 'db') {
+                            $fp      = @fopen($uploader->getSavedDestination(), 'rb');
+                            $fbinary = @fread($fp, filesize($uploader->getSavedDestination()));
+                            @fclose($fp);
+                            $image->setVar('image_body', $fbinary, true);
+                            @unlink($uploader->getSavedDestination());
+                        }
+                        if (!$image_handler->insert($image)) {
+                            $err[] = sprintf(_FAILSAVEIMG, $image->getVar('image_nicename'));
+                        }
                     }
+                } else {
+                    $err[] = sprintf(_FAILFETCHIMG, $i);
+                    $err   = array_merge($err, $uploader->getErrors(false));
                 }
-            } else {
-                $err[] = sprintf(_FAILFETCHIMG, $i);
-                $err   = array_merge($err, $uploader->getErrors(false));
             }
-        }
-        if (count($err) > 0) {
+            if (count($err) > 0) {
+                xoops_cp_header();
+                xoops_error($err);
+                xoops_cp_footer();
+                exit();
+            }
+            redirect_header('admin.php?fct=images&op=listimg&imgcat_id=' . $image->getVar('imgcat_id'), 2, _AM_SYSTEM_DBUPDATED);
+            break;
+
+        case 'addcat':
+            if (!$GLOBALS['xoopsSecurity']->check()) {
+                redirect_header('admin.php?fct=images', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            }
+            $imgcat_handler = xoops_getHandler('imagecategory');
+            $imagecategory  = $imgcat_handler->create();
+            $imagecategory->setVar('imgcat_name', $imgcat_name);
+            $imagecategory->setVar('imgcat_maxsize', $imgcat_maxsize);
+            $imagecategory->setVar('imgcat_maxwidth', $imgcat_maxwidth);
+            $imagecategory->setVar('imgcat_maxheight', $imgcat_maxheight);
+            $imgcat_display = empty($imgcat_display) ? 0 : 1;
+            $imagecategory->setVar('imgcat_display', $imgcat_display);
+            $imagecategory->setVar('imgcat_weight', $imgcat_weight);
+            $imagecategory->setVar('imgcat_storetype', $imgcat_storetype);
+            $imagecategory->setVar('imgcat_type', 'C');
+            if (!$imgcat_handler->insert($imagecategory)) {
+                exit();
+            }
+            $newid                     = $imagecategory->getVar('imgcat_id');
+            /* @var  $imagecategoryperm_handler XoopsGroupPermHandler */
+            $imagecategoryperm_handler = xoops_getHandler('groupperm');
+            if (!isset($readgroup)) {
+                $readgroup = array();
+            }
+            if (!in_array(XOOPS_GROUP_ADMIN, $readgroup)) {
+                $readgroup[] = XOOPS_GROUP_ADMIN;
+            }
+            foreach ($readgroup as $rgroup) {
+                $imagecategoryperm = $imagecategoryperm_handler->create();
+                $imagecategoryperm->setVar('gperm_groupid', $rgroup);
+                $imagecategoryperm->setVar('gperm_itemid', $newid);
+                $imagecategoryperm->setVar('gperm_name', 'imgcat_read');
+                $imagecategoryperm->setVar('gperm_modid', 1);
+                $imagecategoryperm_handler->insert($imagecategoryperm);
+                unset($imagecategoryperm);
+            }
+            if (!isset($writegroup)) {
+                $writegroup = array();
+            }
+            if (!in_array(XOOPS_GROUP_ADMIN, $writegroup)) {
+                $writegroup[] = XOOPS_GROUP_ADMIN;
+            }
+            foreach ($writegroup as $wgroup) {
+                $imagecategoryperm = $imagecategoryperm_handler->create();
+                $imagecategoryperm->setVar('gperm_groupid', $wgroup);
+                $imagecategoryperm->setVar('gperm_itemid', $newid);
+                $imagecategoryperm->setVar('gperm_name', 'imgcat_write');
+                $imagecategoryperm->setVar('gperm_modid', 1);
+                $imagecategoryperm_handler->insert($imagecategoryperm);
+                unset($imagecategoryperm);
+            }
+
+            redirect_header('admin.php?fct=images', 2, _AM_SYSTEM_DBUPDATED);
+            break;
+
+        case 'editcat':
+            if ($imgcat_id <= 0) {
+                redirect_header('admin.php?fct=images', 1);
+            }
+            $imgcat_handler = xoops_getHandler('imagecategory');
+            $imagecategory  = $imgcat_handler->get($imgcat_id);
+            if (!is_object($imagecategory)) {
+                redirect_header('admin.php?fct=images', 1);
+            }
+
+            $imagecategoryperm_handler = xoops_getHandler('groupperm');
+            $form                      = new XoopsThemeForm(_AM_SYSTEM_IMAGES_EDITIMG, 'imagecat_form', 'admin.php', 'post', true);
+            $form->addElement(new XoopsFormText(_AM_SYSTEM_IMAGES_IMGCATNAME, 'imgcat_name', 50, 255, $imagecategory->getVar('imgcat_name')), true);
+            $form->addElement(new XoopsFormSelectGroup(_AM_SYSTEM_IMAGES_IMGCATRGRP, 'readgroup', true, $imagecategoryperm_handler->getGroupIds('imgcat_read', $imgcat_id), 5, true));
+            $form->addElement(new XoopsFormSelectGroup(_AM_SYSTEM_IMAGES_IMGCATWGRP, 'writegroup', true, $imagecategoryperm_handler->getGroupIds('imgcat_write', $imgcat_id), 5, true));
+            $form->addElement(new XoopsFormText(_IMGMAXSIZE, 'imgcat_maxsize', 10, 10, $imagecategory->getVar('imgcat_maxsize')));
+            $form->addElement(new XoopsFormText(_IMGMAXWIDTH, 'imgcat_maxwidth', 3, 4, $imagecategory->getVar('imgcat_maxwidth')));
+            $form->addElement(new XoopsFormText(_IMGMAXHEIGHT, 'imgcat_maxheight', 3, 4, $imagecategory->getVar('imgcat_maxheight')));
+            $form->addElement(new XoopsFormText(_AM_SYSTEM_IMAGES_IMGCATWEIGHT, 'imgcat_weight', 3, 4, $imagecategory->getVar('imgcat_weight')));
+            $form->addElement(new XoopsFormRadioYN(_AM_SYSTEM_IMAGES_IMGCATDISPLAY, 'imgcat_display', $imagecategory->getVar('imgcat_display'), _YES, _NO));
+            $storetype = array('db' => _AM_SYSTEM_IMAGES_INDB, 'file' => _AM_SYSTEM_IMAGES_ASFILE);
+            $form->addElement(new XoopsFormLabel(_AM_SYSTEM_IMAGES_IMGCATSTRTYPE, $storetype[$imagecategory->getVar('imgcat_storetype')]));
+            $form->addElement(new XoopsFormHidden('imgcat_id', $imgcat_id));
+            $form->addElement(new XoopsFormHidden('op', 'updatecat'));
+            $form->addElement(new XoopsFormHidden('fct', 'images'));
+            //$form->addElement(new XoopsFormButton('', 'imgcat_button', _SUBMIT, 'submit'));
+            $form->addElement(new XoopsFormButtonTray('imgcat_button', _SUBMIT, 'submit', '', false));
+            // Define main template
+            $GLOBALS['xoopsOption']['template_main'] = 'system_header.tpl';
+            // Call Header
             xoops_cp_header();
-            xoops_error($err);
+            // Define Stylesheet
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/lightbox.css');
+            // Define scripts
+            $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+            $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+            $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
+            $xoTheme->addScript('modules/system/js/admin.js');
+            // Define Breadcrumb and tips
+            $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath'));
+            $xoBreadCrumb->addLink($imagecategory->getVar('imgcat_name'), '');
+            $xoBreadCrumb->render();
+            echo '<br>';
+            $form->display();
+            // Call Footer
             xoops_cp_footer();
             exit();
-        }
-        redirect_header('admin.php?fct=images&op=listimg&imgcat_id=' . $image->getVar('imgcat_id'), 2, _AM_SYSTEM_DBUPDATED);
-        break;
-
-    case 'addcat':
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header('admin.php?fct=images', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        $imgcat_handler = xoops_getHandler('imagecategory');
-        $imagecategory  = $imgcat_handler->create();
-        $imagecategory->setVar('imgcat_name', $imgcat_name);
-        $imagecategory->setVar('imgcat_maxsize', $imgcat_maxsize);
-        $imagecategory->setVar('imgcat_maxwidth', $imgcat_maxwidth);
-        $imagecategory->setVar('imgcat_maxheight', $imgcat_maxheight);
-        $imgcat_display = empty($imgcat_display) ? 0 : 1;
-        $imagecategory->setVar('imgcat_display', $imgcat_display);
-        $imagecategory->setVar('imgcat_weight', $imgcat_weight);
-        $imagecategory->setVar('imgcat_storetype', $imgcat_storetype);
-        $imagecategory->setVar('imgcat_type', 'C');
-        if (!$imgcat_handler->insert($imagecategory)) {
-            exit();
-        }
-        $newid                     = $imagecategory->getVar('imgcat_id');
-        /* @var  $imagecategoryperm_handler XoopsGroupPermHandler */
-        $imagecategoryperm_handler = xoops_getHandler('groupperm');
-        if (!isset($readgroup)) {
-            $readgroup = array();
-        }
-        if (!in_array(XOOPS_GROUP_ADMIN, $readgroup)) {
-            $readgroup[] = XOOPS_GROUP_ADMIN;
-        }
-        foreach ($readgroup as $rgroup) {
-            $imagecategoryperm = $imagecategoryperm_handler->create();
-            $imagecategoryperm->setVar('gperm_groupid', $rgroup);
-            $imagecategoryperm->setVar('gperm_itemid', $newid);
-            $imagecategoryperm->setVar('gperm_name', 'imgcat_read');
-            $imagecategoryperm->setVar('gperm_modid', 1);
-            $imagecategoryperm_handler->insert($imagecategoryperm);
-            unset($imagecategoryperm);
-        }
-        if (!isset($writegroup)) {
-            $writegroup = array();
-        }
-        if (!in_array(XOOPS_GROUP_ADMIN, $writegroup)) {
-            $writegroup[] = XOOPS_GROUP_ADMIN;
-        }
-        foreach ($writegroup as $wgroup) {
-            $imagecategoryperm = $imagecategoryperm_handler->create();
-            $imagecategoryperm->setVar('gperm_groupid', $wgroup);
-            $imagecategoryperm->setVar('gperm_itemid', $newid);
-            $imagecategoryperm->setVar('gperm_name', 'imgcat_write');
-            $imagecategoryperm->setVar('gperm_modid', 1);
-            $imagecategoryperm_handler->insert($imagecategoryperm);
-            unset($imagecategoryperm);
-        }
-
-        redirect_header('admin.php?fct=images', 2, _AM_SYSTEM_DBUPDATED);
-        break;
-
-    case 'editcat':
-        if ($imgcat_id <= 0) {
-            redirect_header('admin.php?fct=images', 1);
-        }
-        $imgcat_handler = xoops_getHandler('imagecategory');
-        $imagecategory  = $imgcat_handler->get($imgcat_id);
-        if (!is_object($imagecategory)) {
-            redirect_header('admin.php?fct=images', 1);
-        }
-
-        $imagecategoryperm_handler = xoops_getHandler('groupperm');
-        $form                      = new XoopsThemeForm(_AM_SYSTEM_IMAGES_EDITIMG, 'imagecat_form', 'admin.php', 'post', true);
-        $form->addElement(new XoopsFormText(_AM_SYSTEM_IMAGES_IMGCATNAME, 'imgcat_name', 50, 255, $imagecategory->getVar('imgcat_name')), true);
-        $form->addElement(new XoopsFormSelectGroup(_AM_SYSTEM_IMAGES_IMGCATRGRP, 'readgroup', true, $imagecategoryperm_handler->getGroupIds('imgcat_read', $imgcat_id), 5, true));
-        $form->addElement(new XoopsFormSelectGroup(_AM_SYSTEM_IMAGES_IMGCATWGRP, 'writegroup', true, $imagecategoryperm_handler->getGroupIds('imgcat_write', $imgcat_id), 5, true));
-        $form->addElement(new XoopsFormText(_IMGMAXSIZE, 'imgcat_maxsize', 10, 10, $imagecategory->getVar('imgcat_maxsize')));
-        $form->addElement(new XoopsFormText(_IMGMAXWIDTH, 'imgcat_maxwidth', 3, 4, $imagecategory->getVar('imgcat_maxwidth')));
-        $form->addElement(new XoopsFormText(_IMGMAXHEIGHT, 'imgcat_maxheight', 3, 4, $imagecategory->getVar('imgcat_maxheight')));
-        $form->addElement(new XoopsFormText(_AM_SYSTEM_IMAGES_IMGCATWEIGHT, 'imgcat_weight', 3, 4, $imagecategory->getVar('imgcat_weight')));
-        $form->addElement(new XoopsFormRadioYN(_AM_SYSTEM_IMAGES_IMGCATDISPLAY, 'imgcat_display', $imagecategory->getVar('imgcat_display'), _YES, _NO));
-        $storetype = array('db' => _AM_SYSTEM_IMAGES_INDB, 'file' => _AM_SYSTEM_IMAGES_ASFILE);
-        $form->addElement(new XoopsFormLabel(_AM_SYSTEM_IMAGES_IMGCATSTRTYPE, $storetype[$imagecategory->getVar('imgcat_storetype')]));
-        $form->addElement(new XoopsFormHidden('imgcat_id', $imgcat_id));
-        $form->addElement(new XoopsFormHidden('op', 'updatecat'));
-        $form->addElement(new XoopsFormHidden('fct', 'images'));
-        //$form->addElement(new XoopsFormButton('', 'imgcat_button', _SUBMIT, 'submit'));
-        $form->addElement(new XoopsFormButtonTray('imgcat_button', _SUBMIT, 'submit', '', false));
-        // Define main template
-        $GLOBALS['xoopsOption']['template_main'] = 'system_header.tpl';
-        // Call Header
-        xoops_cp_header();
-        // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/lightbox.css');
-        // Define scripts
-        $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
-        $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-        $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.lightbox.js');
-        $xoTheme->addScript('modules/system/js/admin.js');
-        // Define Breadcrumb and tips
-        $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath'));
-        $xoBreadCrumb->addLink($imagecategory->getVar('imgcat_name'), '');
-        $xoBreadCrumb->render();
-        echo '<br>';
-        $form->display();
-        // Call Footer
-        xoops_cp_footer();
-        exit();
-
-    case 'updatecat':
-        if (!$GLOBALS['xoopsSecurity']->check() || $imgcat_id <= 0) {
-            redirect_header('admin.php?fct=images', 1, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        $imgcat_handler = xoops_getHandler('imagecategory');
-        $imagecategory  = $imgcat_handler->get($imgcat_id);
-        if (!is_object($imagecategory)) {
-            redirect_header('admin.php?fct=images', 1);
-        }
-        $imagecategory->setVar('imgcat_name', $imgcat_name);
-        $imgcat_display = empty($imgcat_display) ? 0 : 1;
-        $imagecategory->setVar('imgcat_display', $imgcat_display);
-        $imagecategory->setVar('imgcat_maxsize', $imgcat_maxsize);
-        $imagecategory->setVar('imgcat_maxwidth', $imgcat_maxwidth);
-        $imagecategory->setVar('imgcat_maxheight', $imgcat_maxheight);
-        $imagecategory->setVar('imgcat_weight', $imgcat_weight);
-        if (!$imgcat_handler->insert($imagecategory)) {
-            exit();
-        }
-        $imagecategoryperm_handler = xoops_getHandler('groupperm');
-        $criteria                  = new CriteriaCompo(new Criteria('gperm_itemid', $imgcat_id));
-        $criteria->add(new Criteria('gperm_modid', 1));
-        $criteria2 = new CriteriaCompo(new Criteria('gperm_name', 'imgcat_write'));
-        $criteria2->add(new Criteria('gperm_name', 'imgcat_read'), 'OR');
-        $criteria->add($criteria2);
-        $imagecategoryperm_handler->deleteAll($criteria);
-        if (!isset($readgroup)) {
-            $readgroup = array();
-        }
-        if (!in_array(XOOPS_GROUP_ADMIN, $readgroup)) {
-            $readgroup[] = XOOPS_GROUP_ADMIN;
-        }
-        foreach ($readgroup as $rgroup) {
-            $imagecategoryperm = $imagecategoryperm_handler->create();
-            $imagecategoryperm->setVar('gperm_groupid', $rgroup);
-            $imagecategoryperm->setVar('gperm_itemid', $imgcat_id);
-            $imagecategoryperm->setVar('gperm_name', 'imgcat_read');
-            $imagecategoryperm->setVar('gperm_modid', 1);
-            $imagecategoryperm_handler->insert($imagecategoryperm);
-            unset($imagecategoryperm);
-        }
-        if (!isset($writegroup)) {
-            $writegroup = array();
-        }
-        if (!in_array(XOOPS_GROUP_ADMIN, $writegroup)) {
-            $writegroup[] = XOOPS_GROUP_ADMIN;
-        }
-        foreach ($writegroup as $wgroup) {
-            $imagecategoryperm = $imagecategoryperm_handler->create();
-            $imagecategoryperm->setVar('gperm_groupid', $wgroup);
-            $imagecategoryperm->setVar('gperm_itemid', $imgcat_id);
-            $imagecategoryperm->setVar('gperm_name', 'imgcat_write');
-            $imagecategoryperm->setVar('gperm_modid', 1);
-            $imagecategoryperm_handler->insert($imagecategoryperm);
-            unset($imagecategoryperm);
-        }
-        redirect_header('admin.php?fct=images', 2, _AM_SYSTEM_DBUPDATED);
-        break;
-
-    case 'delcat':
-        // Call Header
-        xoops_cp_header();
-        // Display message
-        xoops_confirm(array('op' => 'delcatok', 'imgcat_id' => $imgcat_id, 'fct' => 'images'), 'admin.php', _AM_SYSTEM_IMAGES_RUDELIMGCAT);
-        // Call Footer
-        xoops_cp_footer();
-        break;
-
-    case 'delcatok':
-        if (!$GLOBALS['xoopsSecurity']->check()) {
-            redirect_header('admin.php?fct=images', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
-        }
-        $imgcat_id = (int)$imgcat_id;
-        if ($imgcat_id <= 0) {
-            redirect_header('admin.php?fct=images', 1);
-        }
-        $imgcat_handler = xoops_getHandler('imagecategory');
-        $imagecategory  = $imgcat_handler->get($imgcat_id);
-        if (!is_object($imagecategory)) {
-            redirect_header('admin.php?fct=images', 1);
-        }
-        if ($imagecategory->getVar('imgcat_type') !== 'C') {
+
+        case 'updatecat':
+            if (!$GLOBALS['xoopsSecurity']->check() || $imgcat_id <= 0) {
+                redirect_header('admin.php?fct=images', 1, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            }
+            $imgcat_handler = xoops_getHandler('imagecategory');
+            $imagecategory  = $imgcat_handler->get($imgcat_id);
+            if (!is_object($imagecategory)) {
+                redirect_header('admin.php?fct=images', 1);
+            }
+            $imagecategory->setVar('imgcat_name', $imgcat_name);
+            $imgcat_display = empty($imgcat_display) ? 0 : 1;
+            $imagecategory->setVar('imgcat_display', $imgcat_display);
+            $imagecategory->setVar('imgcat_maxsize', $imgcat_maxsize);
+            $imagecategory->setVar('imgcat_maxwidth', $imgcat_maxwidth);
+            $imagecategory->setVar('imgcat_maxheight', $imgcat_maxheight);
+            $imagecategory->setVar('imgcat_weight', $imgcat_weight);
+            if (!$imgcat_handler->insert($imagecategory)) {
+                exit();
+            }
+            $imagecategoryperm_handler = xoops_getHandler('groupperm');
+            $criteria                  = new CriteriaCompo(new Criteria('gperm_itemid', $imgcat_id));
+            $criteria->add(new Criteria('gperm_modid', 1));
+            $criteria2 = new CriteriaCompo(new Criteria('gperm_name', 'imgcat_write'));
+            $criteria2->add(new Criteria('gperm_name', 'imgcat_read'), 'OR');
+            $criteria->add($criteria2);
+            $imagecategoryperm_handler->deleteAll($criteria);
+            if (!isset($readgroup)) {
+                $readgroup = array();
+            }
+            if (!in_array(XOOPS_GROUP_ADMIN, $readgroup)) {
+                $readgroup[] = XOOPS_GROUP_ADMIN;
+            }
+            foreach ($readgroup as $rgroup) {
+                $imagecategoryperm = $imagecategoryperm_handler->create();
+                $imagecategoryperm->setVar('gperm_groupid', $rgroup);
+                $imagecategoryperm->setVar('gperm_itemid', $imgcat_id);
+                $imagecategoryperm->setVar('gperm_name', 'imgcat_read');
+                $imagecategoryperm->setVar('gperm_modid', 1);
+                $imagecategoryperm_handler->insert($imagecategoryperm);
+                unset($imagecategoryperm);
+            }
+            if (!isset($writegroup)) {
+                $writegroup = array();
+            }
+            if (!in_array(XOOPS_GROUP_ADMIN, $writegroup)) {
+                $writegroup[] = XOOPS_GROUP_ADMIN;
+            }
+            foreach ($writegroup as $wgroup) {
+                $imagecategoryperm = $imagecategoryperm_handler->create();
+                $imagecategoryperm->setVar('gperm_groupid', $wgroup);
+                $imagecategoryperm->setVar('gperm_itemid', $imgcat_id);
+                $imagecategoryperm->setVar('gperm_name', 'imgcat_write');
+                $imagecategoryperm->setVar('gperm_modid', 1);
+                $imagecategoryperm_handler->insert($imagecategoryperm);
+                unset($imagecategoryperm);
+            }
+            redirect_header('admin.php?fct=images', 2, _AM_SYSTEM_DBUPDATED);
+            break;
+
+        case 'delcat':
+            // Call Header
             xoops_cp_header();
-            xoops_error(_MD_SCATDELNG);
+            // Display message
+            xoops_confirm(array('op' => 'delcatok', 'imgcat_id' => $imgcat_id, 'fct' => 'images'), 'admin.php', _AM_SYSTEM_IMAGES_RUDELIMGCAT);
+            // Call Footer
             xoops_cp_footer();
-            exit();
-        }
-        /* @var  $image_handler XoopsImageHandler */
-        $image_handler = xoops_getHandler('image');
-        $images        = $image_handler->getObjects(new Criteria('imgcat_id', $imgcat_id), true, false);
-        $errors        = array();
-        foreach (array_keys($images) as $i) {
-            if (!$image_handler->delete($images[$i])) {
-                $errors[] = sprintf(_AM_SYSTEM_IMAGES_FAILDEL, $i);
-            } else {
-                if (file_exists(XOOPS_UPLOAD_PATH . '/' . $images[$i]->getVar('image_name')) && !unlink(XOOPS_UPLOAD_PATH . '/' . $images[$i]->getVar('image_name'))) {
-                    $errors[] = sprintf(_AM_SYSTEM_IMAGES_FAILUNLINK, $i);
+            break;
+
+        case 'delcatok':
+            if (!$GLOBALS['xoopsSecurity']->check()) {
+                redirect_header('admin.php?fct=images', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+            }
+            $imgcat_id = (int)$imgcat_id;
+            if ($imgcat_id <= 0) {
+                redirect_header('admin.php?fct=images', 1);
+            }
+            $imgcat_handler = xoops_getHandler('imagecategory');
+            $imagecategory  = $imgcat_handler->get($imgcat_id);
+            if (!is_object($imagecategory)) {
+                redirect_header('admin.php?fct=images', 1);
+            }
+            if ($imagecategory->getVar('imgcat_type') !== 'C') {
+                xoops_cp_header();
+                xoops_error(_MD_SCATDELNG);
+                xoops_cp_footer();
+                exit();
+            }
+            /* @var  $image_handler XoopsImageHandler */
+            $image_handler = xoops_getHandler('image');
+            $images        = $image_handler->getObjects(new Criteria('imgcat_id', $imgcat_id), true, false);
+            $errors        = array();
+            foreach (array_keys($images) as $i) {
+                if (!$image_handler->delete($images[$i])) {
+                    $errors[] = sprintf(_AM_SYSTEM_IMAGES_FAILDEL, $i);
+                } else {
+                    if (file_exists(XOOPS_UPLOAD_PATH . '/' . $images[$i]->getVar('image_name')) && !unlink(XOOPS_UPLOAD_PATH . '/' . $images[$i]->getVar('image_name'))) {
+                        $errors[] = sprintf(_AM_SYSTEM_IMAGES_FAILUNLINK, $i);
+                    }
                 }
             }
-        }
-        if (!$imgcat_handler->delete($imagecategory)) {
-            $errors[] = sprintf(_AM_SYSTEM_IMAGES_FAILDELCAT, $imagecategory->getVar('imgcat_name'));
-        }
-        if (count($errors) > 0) {
+            if (!$imgcat_handler->delete($imagecategory)) {
+                $errors[] = sprintf(_AM_SYSTEM_IMAGES_FAILDELCAT, $imagecategory->getVar('imgcat_name'));
+            }
+            if (count($errors) > 0) {
+                xoops_cp_header();
+                xoops_error($errors);
+                xoops_cp_footer();
+                exit();
+            }
+            redirect_header('admin.php?fct=images', 2, _AM_SYSTEM_DBUPDATED);
+            break;
+
+        case 'multiupload':
+            // Get category id
+            $imgcat_id = system_CleanVars($_REQUEST, 'imgcat_id', 0, 'int');
+            if ($imgcat_id <= 0) {
+                redirect_header('admin.php?fct=images', 1);
+            }
+            // Get rights
+            $imgcat_write = $gperm_handler->checkRight('imgcat_write', $imgcat_id, $groups, $xoopsModule->mid());
+            // Get category handler
+            $imgcat_handler = xoops_getHandler('imagecategory');
+
+            $imagecategory = $imgcat_handler->get($imgcat_id);
+            if (!is_object($imagecategory)) {
+                redirect_header('admin.php?fct=images', 1);
+            }
+            // Get image handler
+            //$image_handler = xoops_getHandler('image');
+            // Define main template
+            $GLOBALS['xoopsOption']['template_main'] = 'system_images.tpl';
+            // Call header
             xoops_cp_header();
-            xoops_error($errors);
+            // Define Stylesheet
+            $xoTheme->addStylesheet(XOOPS_URL . '/media/fine-uploader/fine-uploader-new.css');
+            $xoTheme->addStylesheet(XOOPS_URL . '/media/fine-uploader/ManuallyTriggerUploads.css');
+            $xoTheme->addStylesheet(XOOPS_URL . '/media/font-awesome/css/font-awesome.min.css');        
+            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+            // Define scripts
+            $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+            $xoTheme->addScript('modules/system/js/admin.js');
+            $xoTheme->addScript('media/fine-uploader/fine-uploader.js');
+            // Define Breadcrumb and tips
+            $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath'));
+            $xoBreadCrumb->addLink($imagecategory->getVar('imgcat_name'), system_adminVersion('images', 'adminpath') . '&amp;op=listimg&amp;imgcat_id=' . $imgcat_id);
+            $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MULTIUPLOAD);
+            $xoBreadCrumb->render();
+
+            $xoopsTpl->assign('multiupload', true);
+            $xoopsTpl->assign('imgcat_maxsize', $imagecategory->getVar('imgcat_maxsize'));
+            $xoopsTpl->assign('imgcat_maxwidth', $imagecategory->getVar('imgcat_maxwidth'));
+            $xoopsTpl->assign('imgcat_maxheight', $imagecategory->getVar('imgcat_maxheight'));
+            $xoopsTpl->assign('imgcat_name', $imagecategory->getVar('imgcat_name'));
+            $payload = array(
+                'aud' => 'ajaxfineupload.php',
+                'cat' => $imgcat_id,
+                'uid' => $xoopsUser instanceof \XoopsUser ? $xoopsUser->id() : 0,
+                'handler' => 'fineimuploadhandler',
+                'moddir' => 'system',
+            );
+            $jwt = \Xmf\Jwt\TokenFactory::build('fineuploader', $payload, 60*30); // token good for 30 minutes
+            $xoopsTpl->assign('jwt', $jwt);
+            $fineup_debug = 'false';
+            if (($xoopsUser instanceof \XoopsUser ? $xoopsUser->isAdmin() : false)
+                && isset($_REQUEST['FINEUPLOADER_DEBUG']))
+            {
+                $fineup_debug = 'true';
+            }
+            $xoopsTpl->assign('fineup_debug', $fineup_debug);        
+            // Call footer
             xoops_cp_footer();
-            exit();
-        }
-        redirect_header('admin.php?fct=images', 2, _AM_SYSTEM_DBUPDATED);
-        break;
-
-    case 'multiupload':
-        // Get category id
-        $imgcat_id = system_CleanVars($_REQUEST, 'imgcat_id', 0, 'int');
-        if ($imgcat_id <= 0) {
-            redirect_header('admin.php?fct=images', 1);
-        }
-        // Get rights
-        $imgcat_write = $gperm_handler->checkRight('imgcat_write', $imgcat_id, $groups, $xoopsModule->mid());
-        // Get category handler
-        $imgcat_handler = xoops_getHandler('imagecategory');
-
-        $imagecategory = $imgcat_handler->get($imgcat_id);
-        if (!is_object($imagecategory)) {
-            redirect_header('admin.php?fct=images', 1);
-        }
-        // Get image handler
-        //$image_handler = xoops_getHandler('image');
-        // Define main template
-        $GLOBALS['xoopsOption']['template_main'] = 'system_images.tpl';
-        // Call header
-        xoops_cp_header();
-        // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/media/fine-uploader/fine-uploader-new.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/media/fine-uploader/ManuallyTriggerUploads.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/media/font-awesome/css/font-awesome.min.css');        
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        // Define scripts
-        $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
-        $xoTheme->addScript('modules/system/js/admin.js');
-        $xoTheme->addScript('media/fine-uploader/fine-uploader.js');
-        // Define Breadcrumb and tips
-        $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath'));
-        $xoBreadCrumb->addLink($imagecategory->getVar('imgcat_name'), system_adminVersion('images', 'adminpath') . '&amp;op=listimg&amp;imgcat_id=' . $imgcat_id);
-        $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MULTIUPLOAD);
-        $xoBreadCrumb->render();
-
-        $xoopsTpl->assign('multiupload', true);
-        $xoopsTpl->assign('imgcat_maxsize', $imagecategory->getVar('imgcat_maxsize'));
-        $xoopsTpl->assign('imgcat_maxwidth', $imagecategory->getVar('imgcat_maxwidth'));
-        $xoopsTpl->assign('imgcat_maxheight', $imagecategory->getVar('imgcat_maxheight'));
-        $xoopsTpl->assign('imgcat_name', $imagecategory->getVar('imgcat_name'));
-        $payload = array(
-            'aud' => 'ajaxfineupload.php',
-            'cat' => $imgcat_id,
-            'uid' => $xoopsUser instanceof \XoopsUser ? $xoopsUser->id() : 0,
-            'handler' => 'fineimuploadhandler',
-            'moddir' => 'system',
-        );
-        $jwt = \Xmf\Jwt\TokenFactory::build('fineuploader', $payload, 60*30); // token good for 30 minutes
-        $xoopsTpl->assign('jwt', $jwt);
-        $fineup_debug = 'false';
-        if (($xoopsUser instanceof \XoopsUser ? $xoopsUser->isAdmin() : false)
-            && isset($_REQUEST['FINEUPLOADER_DEBUG']))
-        {
-            $fineup_debug = 'true';
-        }
-        $xoopsTpl->assign('fineup_debug', $fineup_debug);        
-        // Call footer
-        xoops_cp_footer();
 }

Spacing +40 added lines, -40 removed lines

@@ -82,9 +82,9 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/lightbox.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/ui/'.xoops_getModuleOption('jquery_theme', 'system').'/ui.all.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/lightbox.css');
         // Define scripts
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
         $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
@@ -153,7 +153,7 @@ 
             $form->addElement(new XoopsFormText(_AM_SYSTEM_IMAGES_IMGCATWEIGHT, 'imgcat_weight', 3, 4, 0));
             $form->addElement(new XoopsFormRadioYN(_AM_SYSTEM_IMAGES_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);
 
@@ -204,9 +204,9 @@ 
         // Call header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/lightbox.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/ui/'.xoops_getModuleOption('jquery_theme', 'system').'/ui.all.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/lightbox.css');
         // Define scripts
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
         $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
@@ -216,7 +216,7 @@ 
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath'));
         $xoBreadCrumb->addLink($imagecategory->getVar('imgcat_name'));
-        $xoBreadCrumb->addHelp(system_adminVersion('images', 'help') . '#cat');
+        $xoBreadCrumb->addHelp(system_adminVersion('images', 'help').'#cat');
         $xoBreadCrumb->addTips(_AM_SYSTEM_IMAGES_TIPS);
         $xoBreadCrumb->render();
 
@@ -239,12 +239,12 @@ 
         if ($imgcount > 0) {
             if ($imgcount > xoops_getModuleOption('images_pager', 'system')) {
                 //include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
-                $nav = new XoopsPageNav($imgcount, xoops_getModuleOption('images_pager', 'system'), $start, 'start', 'fct=images&amp;op=listimg&amp;imgcat_id=' . $imgcat_id);
+                $nav = new XoopsPageNav($imgcount, xoops_getModuleOption('images_pager', 'system'), $start, 'start', 'fct=images&amp;op=listimg&amp;imgcat_id='.$imgcat_id);
                 $xoopsTpl->assign('nav_menu', $nav->renderNav(4));
             }
         }
 
-        if (file_exists(XOOPS_ROOT_PATH . '/modules/system/language/' . $GLOBALS['xoopsConfig']['language'] . '/images/lightbox-btn-close.gif')) {
+        if (file_exists(XOOPS_ROOT_PATH.'/modules/system/language/'.$GLOBALS['xoopsConfig']['language'].'/images/lightbox-btn-close.gif')) {
             $xoopsTpl->assign('xoops_language', $GLOBALS['xoopsConfig']['language']);
         } else {
             $xoopsTpl->assign('xoops_language', 'english');
@@ -292,9 +292,9 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/lightbox.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/ui/'.xoops_getModuleOption('jquery_theme', 'system').'/ui.all.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/lightbox.css');
         // Define scripts
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
         $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
@@ -310,10 +310,10 @@ 
             $image_cat = $imgcat_handler->get($image->getVar('imgcat_id'));
             // Define Breadcrumb and tips
             $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath'));
-            $xoBreadCrumb->addLink($image_cat->getVar('imgcat_name'), system_adminVersion('images', 'adminpath') . '&amp;op=listimg&amp;imgcat_id=' . $image->getVar('imgcat_id'));
+            $xoBreadCrumb->addLink($image_cat->getVar('imgcat_name'), system_adminVersion('images', 'adminpath').'&amp;op=listimg&amp;imgcat_id='.$image->getVar('imgcat_id'));
             $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_EDITIMG);
             $xoBreadCrumb->render();
-            $msg = '<div class="txtcenter"><img class="tooltip" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '&amp;width=120&amp;height=120" alt="' . $image->getVar('image_nicename') . '" title="' . $image->getVar('image_nicename') . '" style="max-width:120px; max-height:120px;"/></div>';
+            $msg = '<div class="txtcenter"><img class="tooltip" src="'.XOOPS_URL.'/image.php?id='.$image->getVar('image_id').'&amp;width=120&amp;height=120" alt="'.$image->getVar('image_nicename').'" title="'.$image->getVar('image_nicename').'" style="max-width:120px; max-height:120px;"/></div>';
 
             $xoopsTpl->assign('edit_thumbs', $msg);
 
@@ -346,9 +346,9 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/lightbox.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/ui/'.xoops_getModuleOption('jquery_theme', 'system').'/ui.all.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/lightbox.css');
         // Define scripts
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
         $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
@@ -360,12 +360,12 @@ 
             $image     = $image_handler->get($image_id);
             $image_cat = $imgcat_handler->get($image->getVar('imgcat_id'));
             if ($image_cat->getVar('imgcat_storetype') === 'db') {
-                $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '&width=120&height=120" alt="" title="" style="max-width:120px; max-height:120px;"/></div>';
+                $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="'.XOOPS_URL.'/image.php?id='.$image->getVar('image_id').'&width=120&height=120" alt="" title="" style="max-width:120px; max-height:120px;"/></div>';
             } else {
-                $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '&width=120&height=120" alt="" title="" style="max-width:120px; max-height:120px;"/></div>';
+                $msg = '<div style="width: 180px;margin:0 auto;"><img class="thumb" src="'.XOOPS_URL.'/image.php?id='.$image->getVar('image_id').'&width=120&height=120" alt="" title="" style="max-width:120px; max-height:120px;"/></div>';
             }
-            $msg .= '<div class="spacer">' . $image->getVar('image_nicename') . '</div>';
-            $msg .= '<div class="spacer">' . _AM_SYSTEM_IMAGES_RUDELIMG . '</div>';
+            $msg .= '<div class="spacer">'.$image->getVar('image_nicename').'</div>';
+            $msg .= '<div class="spacer">'._AM_SYSTEM_IMAGES_RUDELIMG.'</div>';
             xoops_confirm(array('op' => 'delfileok', 'image_id' => $image_id, 'fct' => 'images'), 'admin.php', $msg, _DELETE);
         } else {
             redirect_header('admin.php?fct=images', 1, _AM_SYSTEM_DBERROR);
@@ -394,8 +394,8 @@ 
             xoops_cp_footer();
             exit();
         }
-        @unlink(XOOPS_UPLOAD_PATH . '/' . $image->getVar('image_name'));
-        redirect_header('admin.php?fct=images&op=listimg&imgcat_id=' . $image->getVar('imgcat_id'), 2, _AM_SYSTEM_DBUPDATED);
+        @unlink(XOOPS_UPLOAD_PATH.'/'.$image->getVar('image_name'));
+        redirect_header('admin.php?fct=images&op=listimg&imgcat_id='.$image->getVar('imgcat_id'), 2, _AM_SYSTEM_DBUPDATED);
         break;
 
     case 'save':
@@ -407,7 +407,7 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Get image id
         $image_id = system_CleanVars($_POST, 'image_id', 0, 'int');
         if ($image_id > 0) {
@@ -418,7 +418,7 @@ 
                 xoops_cp_footer();
                 exit;
             }
-            redirect_header('admin.php?fct=images&op=listimg&imgcat_id=' . $image->getVar('imgcat_id'), 2, _AM_SYSTEM_DBUPDATED);
+            redirect_header('admin.php?fct=images&op=listimg&imgcat_id='.$image->getVar('imgcat_id'), 2, _AM_SYSTEM_DBUPDATED);
         }
 
         // Call Footer
@@ -435,7 +435,7 @@ 
             redirect_header('admin.php?fct=images', 1);
         }
         xoops_load('xoopsmediauploader');
-        $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH . '/images', array(
+        $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH.'/images', array(
             'image/gif',
             'image/jpeg',
             'image/pjpeg',
@@ -448,11 +448,11 @@ 
         for ($i = 0; $i < $ucount; ++$i) {
             if ($uploader->fetchMedia($_POST['xoops_upload_file'][$i])) {
                 if (!$uploader->upload()) {
-                    $err[] =& $uploader->getErrors();
+                    $err[] = & $uploader->getErrors();
                 } else {
                     $image_handler = xoops_getHandler('image');
                     $image         = $image_handler->create();
-                    $image->setVar('image_name', 'images/' . $uploader->getSavedFileName());
+                    $image->setVar('image_name', 'images/'.$uploader->getSavedFileName());
                     $image->setVar('image_nicename', $image_nicename);
                     $image->setVar('image_mimetype', $uploader->getMediaType());
                     $image->setVar('image_created', time());
@@ -482,7 +482,7 @@ 
             xoops_cp_footer();
             exit();
         }
-        redirect_header('admin.php?fct=images&op=listimg&imgcat_id=' . $image->getVar('imgcat_id'), 2, _AM_SYSTEM_DBUPDATED);
+        redirect_header('admin.php?fct=images&op=listimg&imgcat_id='.$image->getVar('imgcat_id'), 2, _AM_SYSTEM_DBUPDATED);
         break;
 
     case 'addcat':
@@ -572,9 +572,9 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/lightbox.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/ui/'.xoops_getModuleOption('jquery_theme', 'system').'/ui.all.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/lightbox.css');
         // Define scripts
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
         $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
@@ -685,7 +685,7 @@ 
             if (!$image_handler->delete($images[$i])) {
                 $errors[] = sprintf(_AM_SYSTEM_IMAGES_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(_AM_SYSTEM_IMAGES_FAILUNLINK, $i);
                 }
             }
@@ -724,17 +724,17 @@ 
         // Call header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/media/fine-uploader/fine-uploader-new.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/media/fine-uploader/ManuallyTriggerUploads.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/media/font-awesome/css/font-awesome.min.css');        
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/media/fine-uploader/fine-uploader-new.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/media/fine-uploader/ManuallyTriggerUploads.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/media/font-awesome/css/font-awesome.min.css');        
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define scripts
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
         $xoTheme->addScript('modules/system/js/admin.js');
         $xoTheme->addScript('media/fine-uploader/fine-uploader.js');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MANAGER, system_adminVersion('images', 'adminpath'));
-        $xoBreadCrumb->addLink($imagecategory->getVar('imgcat_name'), system_adminVersion('images', 'adminpath') . '&amp;op=listimg&amp;imgcat_id=' . $imgcat_id);
+        $xoBreadCrumb->addLink($imagecategory->getVar('imgcat_name'), system_adminVersion('images', 'adminpath').'&amp;op=listimg&amp;imgcat_id='.$imgcat_id);
         $xoBreadCrumb->addLink(_AM_SYSTEM_IMAGES_MULTIUPLOAD);
         $xoBreadCrumb->render();
 
@@ -750,7 +750,7 @@ 
             'handler' => 'fineimuploadhandler',
             'moddir' => 'system',
         );
-        $jwt = \Xmf\Jwt\TokenFactory::build('fineuploader', $payload, 60*30); // token good for 30 minutes
+        $jwt = \Xmf\Jwt\TokenFactory::build('fineuploader', $payload, 60 * 30); // token good for 30 minutes
         $xoopsTpl->assign('jwt', $jwt);
         $fineup_debug = 'false';
         if (($xoopsUser instanceof \XoopsUser ? $xoopsUser->isAdmin() : false)

htdocs/modules/system/admin/groups/main.php

Indentation +3 added lines, -3 removed lines

@@ -313,9 +313,9 @@
                 $xoBreadCrumb->render();
                 // Display message
                 xoops_confirm(array(
-                                  'ok' => 1,
-                                  'groups_id' => $_REQUEST['groups_id'],
-                                  'op' => 'groups_delete'), 'admin.php?fct=groups', sprintf(_AM_SYSTEM_GROUPS_SUREDEL) . '<br \>' . $obj->getVar('name') . '<br \>');
+                                    'ok' => 1,
+                                    'groups_id' => $_REQUEST['groups_id'],
+                                    'op' => 'groups_delete'), 'admin.php?fct=groups', sprintf(_AM_SYSTEM_GROUPS_SUREDEL) . '<br \>' . $obj->getVar('name') . '<br \>');
             }
         } else {
             redirect_header('admin.php?fct=groups', 1, _AM_SYSTEM_DBERROR);

Spacing +12 added lines, -12 removed lines

@@ -43,7 +43,7 @@ 
     case 'list':
     default:
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
         $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.tablesorter.js');
         $xoTheme->addScript('modules/system/js/admin.js');
@@ -79,12 +79,12 @@ 
                 } else {
                     $groups['nb_users_by_groups'] = '';
                 }
-                $edit_delete = '<a href="admin.php?fct=groups&amp;op=groups_edit&amp;groups_id=' . $groups_id . '">
-                                           <img src="./images/icons/edit.png" border="0" alt="' . _AM_SYSTEM_GROUPS_EDIT . '" title="' . _AM_SYSTEM_GROUPS_EDIT . '"></a>';
+                $edit_delete = '<a href="admin.php?fct=groups&amp;op=groups_edit&amp;groups_id='.$groups_id.'">
+                                           <img src="./images/icons/edit.png" border="0" alt="' . _AM_SYSTEM_GROUPS_EDIT.'" title="'._AM_SYSTEM_GROUPS_EDIT.'"></a>';
                 if (!in_array($groups_arr[$i]->getVar('groupid'), array(XOOPS_GROUP_ADMIN, XOOPS_GROUP_USERS, XOOPS_GROUP_ANONYMOUS))) {
                     $groups['delete'] = 1;
-                    $edit_delete .= '<a href="admin.php?fct=groups&amp;op=groups_delete&amp;groups_id=' . $groups_id . '">
-                                     <img src="./images/icons/delete.png" border="0" alt="' . _AM_SYSTEM_GROUPS_DELETE . '" title="' . _AM_SYSTEM_GROUPS_DELETE . '"></a>';
+                    $edit_delete .= '<a href="admin.php?fct=groups&amp;op=groups_delete&amp;groups_id='.$groups_id.'">
+                                     <img src="./images/icons/delete.png" border="0" alt="' . _AM_SYSTEM_GROUPS_DELETE.'" title="'._AM_SYSTEM_GROUPS_DELETE.'"></a>';
                 }
                 $groups['edit_delete'] = $edit_delete;
                 $xoopsTpl->append_by_ref('groups', $groups);
@@ -101,10 +101,10 @@ 
     //Add a group
     case 'groups_add':
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_GROUPS_NAV_ADD);
-        $xoBreadCrumb->addHelp(system_adminVersion('groups', 'help') . '#add');
+        $xoBreadCrumb->addHelp(system_adminVersion('groups', 'help').'#add');
         $xoBreadCrumb->addTips(_AM_SYSTEM_GROUPS_NAV_TIPS_2);
         $xoBreadCrumb->render();
         // Create form
@@ -117,10 +117,10 @@ 
     //Edit a group
     case 'groups_edit':
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_GROUPS_NAV_EDIT);
-        $xoBreadCrumb->addHelp(system_adminVersion('groups', 'help') . '#edit');
+        $xoBreadCrumb->addHelp(system_adminVersion('groups', 'help').'#edit');
         $xoBreadCrumb->addTips(_AM_SYSTEM_GROUPS_NAV_TIPS_2);
         $xoBreadCrumb->render();
         // Create form
@@ -306,16 +306,16 @@ 
                 }
             } else {
                 // Define Stylesheet
-                $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+                $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
                 // Define Breadcrumb and tips
                 $xoBreadCrumb->addLink(_AM_SYSTEM_GROUPS_NAV_DELETE);
-                $xoBreadCrumb->addHelp(system_adminVersion('groups', 'help') . '#edit');
+                $xoBreadCrumb->addHelp(system_adminVersion('groups', 'help').'#edit');
                 $xoBreadCrumb->render();
                 // Display message
                 xoops_confirm(array(
                                   'ok' => 1,
                                   'groups_id' => $_REQUEST['groups_id'],
-                                  'op' => 'groups_delete'), 'admin.php?fct=groups', sprintf(_AM_SYSTEM_GROUPS_SUREDEL) . '<br \>' . $obj->getVar('name') . '<br \>');
+                                  'op' => 'groups_delete'), 'admin.php?fct=groups', sprintf(_AM_SYSTEM_GROUPS_SUREDEL).'<br \>'.$obj->getVar('name').'<br \>');
             }
         } else {
             redirect_header('admin.php?fct=groups', 1, _AM_SYSTEM_DBERROR);