[xoops-svn] SF.net SVN: xoops-svn:[11606] XoopsModules/wfdownloads/trunk/wfdownloads

[<luc...@us...>]

Revision: 11606
          http://sourceforge.net/p/xoops/svn/11606
Author:   luciorota
Date:     2013-05-31 23:11:31 +0000 (Fri, 31 May 2013)
Log Message:
-----------
admin side: now mirrors manager uses templates
admin side: now reviewss manager uses templates
admin side: now votes manager uses templates

Modified Paths:
--------------
    XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
    XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php
    XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
    XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
    XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
    XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php
    XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php
    XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php
    XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
    XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
    XoopsModules/wfdownloads/trunk/wfdownloads/include/update.php
    XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_categorylist.html
    XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_reviewlist.html
    XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_votedatalist.html
    XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php

Added Paths:
-----------
    XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_mirrorlist.html

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php	2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/admin_header.php	2013-05-31 23:11:31 UTC (rev 11606)
@@ -18,34 +18,35 @@
  * @author          WF-Sections, Xoops Development Team, luciorota
  * @version         svn:$Id$
  */
-$path = dirname(dirname(dirname(dirname(__FILE__))));
-include_once $path . '/mainfile.php';
-include_once $path . '/include/cp_functions.php';
-require_once $path . '/include/cp_header.php';
+include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+$thisModuleDirname = basename(dirname(dirname( __FILE__ ) ));
 
-include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/functions.php');
-include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/common.php');
-
+// Include xoops admin header
+include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
 include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include_once XOOPS_ROOT_PATH . '/class/tree.php';
+include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+xoops_load ('XoopsUserUtility');
 
-$myts = &MyTextSanitizer::getInstance();
+$module_handler =& xoops_gethandler('module');
+$xoopsModule = & $module_handler->getByDirname($thisModuleDirname); 
 
-global $xoopsModule;
+$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
+$pathImageIcon = XOOPS_URL .'/'. $moduleInfo->getInfo('icons16');
+$pathImageAdmin = XOOPS_URL .'/'. $moduleInfo->getInfo('icons32');
+$pathImageModule = XOOPS_URL . '/modules/'. $thisModuleDirname .'/images';
 
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
-
-//if functions.php file exist
-//require_once dirname(dirname(__FILE__)) . '/include/functions.php';
-
-// Load language files
-xoops_loadLanguage('admin', $thisModuleDir);
-xoops_loadLanguage('modinfo', $thisModuleDir);
-xoops_loadLanguage('main', $thisModuleDir);
-
 $pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
 $pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
 $pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
 
+
+include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/functions.php');
+include_once(XOOPS_ROOT_PATH . '/modules/wfdownloads/include/common.php');
+
+$myts = &MyTextSanitizer::getInstance();
+
+
 $imagearray = array(
     'editimg' => "<img src='" . $pathIcon16 . '/edit.png'."'  alt='" . _AM_WFD_ICO_EDIT . "' title='" . _AM_WFD_ICO_EDIT . "' align='middle'>",
     'deleteimg' => "<img src='" . $pathIcon16 . '/delete.png'."' alt='" . _AM_WFD_ICO_DELETE . "' title='" . _AM_WFD_ICO_DELETE . "' align='middle'>",
@@ -69,7 +70,7 @@
 if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))){
     include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
 } else {
-    redirect_header("../../../admin.php", 5, _AM_BIRTHDAY_MODULEADMIN_MISSING, false);
+    redirect_header("../../../admin.php", 5, _AM_WFD_MODULEADMIN_MISSING, false);
 }
 
 if (!isset($xoopsTpl) || !is_object($xoopsTpl)) {
@@ -77,12 +78,18 @@
 	$xoopsTpl = new XoopsTpl();
 }
 
-$report_handler = xoops_getmodulehandler('report', $GLOBALS['xoopsModule']->getVar('dirname'));
-$review_handler = xoops_getmodulehandler('review', $GLOBALS['xoopsModule']->getVar('dirname'));
-$mirror_handler = xoops_getmodulehandler('mirror', $GLOBALS['xoopsModule']->getVar('dirname'));
-$modification_handler = xoops_getmodulehandler('modification', $GLOBALS['xoopsModule']->getVar('dirname'));
-$download_handler = xoops_getmodulehandler('download', $GLOBALS['xoopsModule']->getVar('dirname'));
-$category_handler = xoops_getmodulehandler('category', $GLOBALS['xoopsModule']->getVar('dirname'));
-$mime_handler = xoops_getmodulehandler('mimetype', $GLOBALS['xoopsModule']->getVar('dirname'));
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDirname);
+xoops_loadLanguage('modinfo', $thisModuleDirname);
+xoops_loadLanguage('main', $thisModuleDirname);
 
+// LOad handlers
+$report_handler = xoops_getmodulehandler('report', $thisModuleDirname);
+$review_handler = xoops_getmodulehandler('review', $thisModuleDirname);
+$mirror_handler = xoops_getmodulehandler('mirror', $thisModuleDirname);
+$modification_handler = xoops_getmodulehandler('modification', $thisModuleDirname);
+$download_handler = xoops_getmodulehandler('download', $thisModuleDirname);
+$category_handler = xoops_getmodulehandler('category', $thisModuleDirname);
+$mime_handler = xoops_getmodulehandler('mimetype', $thisModuleDirname);
+
 $member_handler = xoops_gethandler("member");
\ No newline at end of file

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php	2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/brokendown.php	2013-05-31 23:11:31 UTC (rev 11606)
@@ -18,6 +18,7 @@
  * @author          WF-Sections, Xoops Development Team, luciorota
  * @version         svn:$Id$
  */
+ $currentFile = basename(__FILE__);
 include 'admin_header.php';
 
 $op = '';

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php	2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/category.php	2013-05-31 23:11:31 UTC (rev 11606)
@@ -18,6 +18,7 @@
  * @author          WF-Sections, Xoops Development Team, luciorota
  * @version         svn:$Id$
  */
+$currentFile = basename(__FILE__);
 include 'admin_header.php';
 include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
 include_once XOOPS_ROOT_PATH . '/class/tree.php';
@@ -77,10 +78,10 @@
             $source = wfdownloads_CleanVars($_POST, 'source', 0, 'int');
             $target = wfdownloads_CleanVars($_POST, 'target', 0, 'int');
             if ($target == $source) {
-                redirect_header(WFDOWNLOADS_URL . "admin/category.php?op=category.move&amp;ok=0&amp;cid={$source}", 5, _AM_WFD_CCATEGORY_MODIFY_FAILED);
+                redirect_header($currentFile . "?op=category.move&amp;ok=0&amp;cid={$source}", 5, _AM_WFD_CCATEGORY_MODIFY_FAILED);
             }
             if (!$target) {
-                redirect_header(WFDOWNLOADS_URL . "admin/category.php?op=category.move&amp;ok=0&amp;cid={$source}", 5, _AM_WFD_CCATEGORY_MODIFY_FAILEDT);
+                redirect_header($currentFile . "?op=category.move&amp;ok=0&amp;cid={$source}", 5, _AM_WFD_CCATEGORY_MODIFY_FAILEDT);
             }
             $download_handler = xoops_getmodulehandler('download');
             $result = $download_handler->updateAll("cid", $target, new Criteria("cid", $source), true);
@@ -88,7 +89,7 @@
                 $error = _AM_WFD_DBERROR;
                 trigger_error($error, E_USER_ERROR);
             }
-            redirect_header(WFDOWNLOADS_URL . 'admin/category.php', 1, _AM_WFD_CCATEGORY_MODIFY_MOVED);
+            redirect_header($currentFile, 1, _AM_WFD_CCATEGORY_MODIFY_MOVED);
             exit();
         }
         break;
@@ -163,7 +164,7 @@
             wfd_save_Permissions($down_groups, $cid, 'WFDownCatPerm');
             wfd_save_Permissions($up_groups, $cid, 'WFUpCatPerm');
         }
-        redirect_header(WFDOWNLOADS_URL . 'admin/category.php', 1, $database_mess);
+        redirect_header($currentFile, 1, $database_mess);
         break;
 
     case "category.delete" :
@@ -212,11 +213,11 @@
                 xoops_groupperm_deletebymoditem ($xoopsModule -> getVar('mid'), 'WFUpCatPerm', $cid);
             }
 
-            redirect_header(WFDOWNLOADS_URL . 'admin/category.php', 1, _AM_WFD_CCATEGORY_DELETED);
+            redirect_header($currentFile, 1, _AM_WFD_CCATEGORY_DELETED);
             exit();
         } else {
             wfdownloads_xoops_cp_header();
-            xoops_confirm(array('op' => 'category.delete', 'cid' => $cid, 'ok' => true), 'category.php', _AM_WFD_CCATEGORY_AREUSURE);
+            xoops_confirm(array('op' => 'category.delete', 'cid' => $cid, 'ok' => true), $currentFile, _AM_WFD_CCATEGORY_AREUSURE);
             xoops_cp_footer();
         }
         break;
@@ -227,10 +228,10 @@
         $cid = wfdownloads_CleanVars($_REQUEST, 'cid', 0, 'int');
         wfdownloads_xoops_cp_header();
         $indexAdmin = new ModuleAdmin();
-        echo $indexAdmin->addNavigation('category.php');
+        echo $indexAdmin->addNavigation($currentFile);
         $adminMenu = new ModuleAdmin();
-        $adminMenu->addItemButton(_MI_WFD_BINDEX, 'category.php?op=categories.list', 'list');
-        $adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, 'category.php?op=category.add', 'add');
+        $adminMenu->addItemButton(_MI_WFD_BINDEX, "{$currentFile}?op=categories.list", 'list');
+        $adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, "{$currentFile}?op=category.add", 'add');
         echo $adminMenu->renderButton();
 
         createcat($cid);
@@ -242,11 +243,11 @@
     default :
         wfdownloads_xoops_cp_header();
         $indexAdmin = new ModuleAdmin();
-        echo $indexAdmin->addNavigation('category.php');
+        echo $indexAdmin->addNavigation($currentFile);
 
         $adminMenu = new ModuleAdmin();
-        $adminMenu->addItemButton(_MI_WFD_BINDEX, 'category.php?op=categories.list', 'list');
-        $adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, 'category.php?op=category.add', 'add');
+        $adminMenu->addItemButton(_MI_WFD_BINDEX, "{$currentFile}?op=categories.list", 'list');
+        $adminMenu->addItemButton(_AM_WFD_CCATEGORY_CREATENEW, "{$currentFile}?op=category.add", 'add');
         echo $adminMenu->renderButton();
 
         $totalCategories = wfd_totalcategory();
@@ -256,29 +257,30 @@
             $GLOBALS['xoopsTpl']->assign('token', $GLOBALS['xoopsSecurity']->getTokenHTML() );
             $GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_categorylist.html");
         } else {
-            redirect_header('category.php?op=category.add', 1, _AM_WFD_CCATEGORY_NOEXISTS);
+            redirect_header("{$currentFile}?op=category.add", 1, _AM_WFD_CCATEGORY_NOEXISTS);
         }
         include 'admin_footer.php';
         break;
         
-case 'categories.reorder' :
-    if (!$GLOBALS['xoopsSecurity']->check()) {
-        redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
-    }
-    $category_handler = xoops_getmodulehandler('category', 'wfdownloads');
-    if (isset($_POST['category_ids']) && count($_POST['category_ids']) > 0) {
-        $new_weights = $_POST['new_weights'];
-        $ids = array();
-        foreach ($new_weights as $cid => $new_weight ) {
-            $category = $category_handler->get($cid);
-            $category->setVar('weight', $new_weight);
-            if (!$category_handler->insert($category)) {
-                redirect_header('category.php', 3, $category->getErrors());
+    case 'categories.reorder' :
+        if (!$GLOBALS['xoopsSecurity']->check()) {
+            redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors() ));
+        }
+        
+        $category_handler = xoops_getmodulehandler('category', 'wfdownloads');
+        if (isset($_POST['new_weights']) && count($_POST['new_weights']) > 0) {
+            $new_weights = $_POST['new_weights'];
+            $ids = array();
+            foreach ($new_weights as $cid => $new_weight ) {
+                $category = $category_handler->get($cid);
+                $category->setVar('weight', $new_weight);
+                if (!$category_handler->insert($category)) {
+                    redirect_header($currentFile, 3, $category->getErrors());
+                }
+                unset($category);
             }
-            unset($category);
+            redirect_header($currentFile, 1, _AM_WFD_CATEGORIES_REORDERED);
+            exit();
         }
-        redirect_header('category.php?op=categories.list', 1, _AM_WFD_CATEGORIES_REORDERED);
-        exit();
-    }
-    break;
+        break;
 }
\ No newline at end of file

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php	2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/download.php	2013-05-31 23:11:31 UTC (rev 11606)
@@ -18,6 +18,7 @@
  * @author          WF-Sections, Xoops Development Team, luciorota
  * @version         svn:$Id$
  */
+$currentFile = basename(__FILE__);
 include 'admin_header.php';
 include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
 include_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
@@ -37,11 +38,11 @@
     if ($numrows) {
         wfdownloads_xoops_cp_header();
         $indexAdmin = new ModuleAdmin();
-        echo $indexAdmin->addNavigation('download.php');
+        echo $indexAdmin->addNavigation($currentFile);
 
         $adminMenu = new ModuleAdmin();
-        $adminMenu->addItemButton(_MI_WFD_BINDEX, 'download.php?op=downloads.list', 'list');
-        $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, 'download.php?op=download.add', 'add');
+        $adminMenu->addItemButton(_MI_WFD_BINDEX, "{$currentFile}?op=downloads.list", 'list');
+        $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, "{$currentFile}?op=download.add", 'add');
         echo $adminMenu->renderButton();
 
         // allowed mimetypes list
@@ -57,12 +58,12 @@
 
         if ($lid) {
             if (!$download = $download_handler->get($lid)) {
-                redirect_header('download.php', 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
+                redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
                 exit();
             }
             $cid = $download->getVar('cid');
             if(!$category = $category_handler->get($cid)) {
-                redirect_header('download.php', 4, _AM_WFD_DOWN_ERROR_CATEGORYNOTFOUND);
+                redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_CATEGORYNOTFOUND);
                 exit();
             }
             $title = preg_replace("/{category}/", $category->getVar('title'), _AM_WFD_FFS_EDITDOWNLOADTITLE);
@@ -106,7 +107,7 @@
         $sform->display();
         // changed - end - March 4 2006 - jpc
     } else {
-        redirect_header(WFDOWNLOADS_URL . 'admin/category.php?', 1, _AM_WFD_CCATEGORY_NOEXISTS);
+        redirect_header('category.php', 1, _AM_WFD_CCATEGORY_NOEXISTS);
         exit();
     }
 
@@ -177,7 +178,7 @@
                     <td class='even'>$uservotes</th>\n
                     <td class='even'>$formatted_date</th>\n
                     <td class='even'>\n
-                    <a href='" . WFDOWNLOADS_URL . "admin/download.php?op=vote.delete&amp;lid={$lid}&amp;rid=" . $regvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
+                    <a href='{$currentFile}?op=vote.delete&amp;lid={$lid}&amp;rid=" . $regvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
                     </th></tr>\n
                     ";
             }
@@ -218,7 +219,7 @@
                     <td class='even'>$uservotes</th>\n
                     <td class='even'>$formatted_date</th>\n
                     <td class='even'>\n
-                    <a href='" . WFDOWNLOADS_URL . "admin/download.php?op=vote.delete&amp;lid=" . $lid . "&amp;rid=" . $anonvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
+                    <a href='{$currentFile}?op=vote.delete&amp;lid={$lid}&amp;rid=" . $anonvotes[$i]->getVar('ratingid') . "'>" . $imagearray['deleteimg'] . "</a>\n
                     </th></tr>\n
                     ";
             }
@@ -266,7 +267,7 @@
         $download->setVar('filename', $filename);
         $download->setVar('filetype', $filetype);
     } else {
-        $down = wfd_uploading($_FILES, $xoopsModuleConfig['uploaddir'], "", "download.php", 0, 0);
+        $down = wfd_uploading($_FILES, $xoopsModuleConfig['uploaddir'], "", $currentFile, 0, 0);
         $url = ($_POST["url"] != "http://") ? $_POST["url"] : '';
         $size = $down['size'];
         $title = $_FILES['userfile']['name'];
@@ -451,13 +452,13 @@
     if (!$lid) {
         $tags = array();
         $tags['FILE_NAME'] = $title;
-        $tags['FILE_URL'] = WFDOWNLOADS_URL . 'singlefile.php?cid=' . $cid . '&amp;lid=' . $newid;
+        $tags['FILE_URL'] = WFDOWNLOADS_URL . "singlefile.php?cid={$cid}&amp;lid={$newid}";
         // changed - start - March 4 2006 - jpc
         //$category_handler = xoops_getmodulehandler('category');
         //$category = $category_handler->get($cid);
         // changed - end - March 4 2006 - jpc
         $tags['CATEGORY_NAME'] = $category->getVar('title');
-        $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . 'viewcat.php?cid=' . $cid;
+        $tags['CATEGORY_URL'] = WFDOWNLOADS_URL . "viewcat.php?cid={$cid}";
         $notification_handler = & xoops_gethandler('notification');
         $notification_handler -> triggerEvent('global', 0, 'new_file', $tags);
         $notification_handler -> triggerEvent('category', $cid, 'new_file', $tags);
@@ -465,7 +466,7 @@
     if ($lid && $approved && $notifypub) {
         $tags = array();
         $tags['FILE_NAME'] = $title;
-        $tags['FILE_URL'] = WFDOWNLOADS_URL . 'singlefile.php?cid=' . $cid . '&amp;lid=' . $lid;
+        $tags['FILE_URL'] = WFDOWNLOADS_URL . "singlefile.php?cid={$cid}&amp;lid={$lid}";
         $category_handler = xoops_getmodulehandler('category');
         $category = $category_handler->get($cid);
         $tags['CATEGORY_NAME'] = $category->getVar('title');
@@ -478,7 +479,7 @@
     $message = (!$lid) ? _AM_WFD_FILE_NEWFILEUPLOAD : _AM_WFD_FILE_FILEMODIFIEDUPDATE ;
     $message = ($lid && !$_POST['was_published'] && $approved) ? _AM_WFD_FILE_FILEAPPROVED : $message;
 
-    redirect_header(WFDOWNLOADS_URL . 'admin/download.php', 1, $message);
+    redirect_header($currentFile, 1, $message);
 }
 
 
@@ -503,7 +504,7 @@
         $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
         $download_handler = xoops_getmodulehandler('download');
         if (!$download = $download_handler->get($lid)) {
-            redirect_header('download.php', 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
+            redirect_header($currentFile, 4, _AM_WFD_DOWN_ERROR_FILENOTFOUND);
             exit();
         }
         $title = $download->getVar('title');
@@ -514,11 +515,11 @@
                 @unlink($file);
             }
             $download_handler->delete($download);
-            redirect_header(WFDOWNLOADS_URL . 'admin/download.php', 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $title));
+            redirect_header($currentFile, 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $title));
             exit();
         } else {
             wfdownloads_xoops_cp_header();
-            xoops_confirm(array('op' => 'download.delete', 'lid' => $lid, 'ok' => true, 'title' => $title), 'download.php', _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $title, _DELETE);
+            xoops_confirm(array('op' => 'download.delete', 'lid' => $lid, 'ok' => true, 'title' => $title), $currentFile, _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $title, _DELETE);
             xoops_cp_footer();
         }
         break;
@@ -530,13 +531,13 @@
         if ($rating_handler->delete($rating, true)) {
             wfd_updaterating(intval($rating->getVar('lid')));
         }
-        redirect_header(WFDOWNLOADS_URL . 'admin/download.php', 1, _AM_WFD_VOTE_VOTEDELETED);
+        redirect_header($currentFile, 1, _AM_WFD_VOTE_VOTEDELETED);
         break;
 
     // added - start - March 4 2006 - jpc
     case "patch_formulize" :
         if(!isset($_POST['patch_formulize'])) {
-            print "<form action=\"download.php?op=patch_formulize\" method=post>";
+            print "<form action=\"{$currentFile}?op=patch_formulize\" method=post>";
             print "<input type = submit name=patch_formulize value=\"Apply Patch for Formulize\">";
             print "</form>";
         } else {
@@ -575,11 +576,11 @@
 
         wfdownloads_xoops_cp_header();
         $indexAdmin = new ModuleAdmin();
-        echo $indexAdmin->addNavigation('download.php');
+        echo $indexAdmin->addNavigation($currentFile);
 
         $adminMenu = new ModuleAdmin();
-        $adminMenu->addItemButton(_MI_WFD_BINDEX, 'download.php?op=list', 'list');
-        $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, 'download.php?op=Download', 'add');
+        $adminMenu->addItemButton(_MI_WFD_BINDEX, $currentFile . "?op=list", 'list');
+        $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, $currentFile . "?op=Download", 'add');
         echo $adminMenu->renderButton();
 
         if ($totaldownloads > 0) {

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php	2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php	2013-05-31 23:11:31 UTC (rev 11606)
@@ -18,6 +18,7 @@
  * @author          WF-Sections, Xoops Development Team, luciorota
  * @version         svn:$Id$
  */
+$currentFile = basename(__FILE__);
 include 'admin_header.php';
 
 $op = wfdownloads_CleanVars($_REQUEST, 'op', '', 'string');
@@ -121,7 +122,7 @@
         if (!$result) {
             trigger_error($error, E_USER_ERROR);
         }
-        redirect_header(WFDOWNLOADS_URL . "admin/mimetypes.php?start=" . intval($_GET['start']) . "", 0, _AM_WFD_MIME_MODIFIED);
+        redirect_header("{$currentFile}?start=" . intval($_GET['start']) . "", 0, _AM_WFD_MIME_MODIFIED);
         break;
 
     case 'mimetype.save':
@@ -139,7 +140,7 @@
             trigger_error($error, E_USER_ERROR);
         }
         $dbupted = ($mime_id == 0) ? _AM_WFD_MIME_CREATED : _AM_WFD_MIME_MODIFIED;
-        redirect_header('amimetypes.php', 1, $dbupted);
+        redirect_header($currentFile, 1, $dbupted);
         break;
 
     case 'saveall':
@@ -158,7 +159,7 @@
             $error = "Could not update mimetype information:";
             trigger_error($error, E_USER_ERROR);
         }
-        redirect_header(WFDOWNLOADS_URL.'admin/mimetypes.php', 1, _AM_WFD_MIME_MODIFIED);
+        redirect_header($currentFile, 1, _AM_WFD_MIME_MODIFIED);
         break;
 
     case "mimetype.delete":
@@ -168,7 +169,7 @@
         $mimetype = $mime_handler->get($mime_id);
         if ($ok == true) {
             if ($mime_handler->delete($mimetype)) {
-                redirect_header('mimetypes.php', 1, sprintf(_AM_WFD_MIME_MIMEDELETED, $mimetype->getVar('mime_name')));
+                redirect_header($currentFile, 1, sprintf(_AM_WFD_MIME_MIMEDELETED, $mimetype->getVar('mime_name')));
             } else {
                 $error = "" . _AM_WFD_EVENNEWS_DBERROR . ": <br /><br />" . $sql;
                 trigger_error($error, E_USER_ERROR);
@@ -176,7 +177,7 @@
             exit();
         } else {
             wfdownloads_xoops_cp_header();
-            xoops_confirm(array('op' => 'mimetype.delete', 'mime_id' => $mime_id, 'ok' => true), WFDOWNLOADS_URL . 'admin/mimetypes.php', _AM_WFD_MIME_DELETETHIS . "<br /><br>" . $mimetype->getVar('mime_name'), _AM_WFD_MIME_DELETE);
+            xoops_confirm(array('op' => 'mimetype.delete', 'mime_id' => $mime_id, 'ok' => true), $currentFile, _AM_WFD_MIME_DELETETHIS . "<br /><br>" . $mimetype->getVar('mime_name'), _AM_WFD_MIME_DELETE);
             xoops_cp_footer();
         }
         break;
@@ -202,7 +203,7 @@
 
         wfdownloads_xoops_cp_header();
         $indexAdmin = new ModuleAdmin();
-        echo $indexAdmin->addNavigation('mimetypes.php');
+        echo $indexAdmin->addNavigation($currentFile);
 
         echo "<fieldset><legend style='font-weight: bold; color: #900;'>" . _AM_WFD_MIME_MODIFYF . "</legend>\n";
         echo "<div style='padding: 8px;'>" . _AM_WFD_MIME_INFOTEXT . "</div>\n";
@@ -248,18 +249,18 @@
         echo "</tr>";
         foreach (array_keys($mimetypes) as $i) {
             echo "<tr>";
-            $image_array = array("<a href='".WFDOWNLOADS_URL . "admin/mimetypes.php?op=edit&amp;mime_id=" . $mimetypes[$i]->getVar('mime_id') . "'>" . $imagearray['editimg'] . "</a>
-                <a href='" . WFDOWNLOADS_URL . "admin/mimetypes.php?op=delete&amp;mime_id=" . $mimetypes[$i]->getVar('mime_id') . "'>" . $imagearray['deleteimg'] . "</a>");
+            $image_array = array("<a href='{$currentFile}?op=mimetype.edit&amp;mime_id=" . $mimetypes[$i]->getVar('mime_id') . "'>" . $imagearray['editimg'] . "</a>
+                <a href='{$currentFile}?op=mimetype.delete&amp;mime_id=" . $mimetypes[$i]->getVar('mime_id') . "'>" . $imagearray['deleteimg'] . "</a>");
             echo "<td align='center' class='head'>" . $mimetypes[$i]->getVar('mime_id') . "</td>";
             echo "<td class='even'>" . $mimetypes[$i]->getVar('mime_name') . "</td>";
             echo "<td align='center' class='even'>." . $mimetypes[$i]->getVar('mime_ext') . "</td>";
 
             $yes_admin_image = ($mimetypes[$i]->getVar('mime_admin')) ? $imagearray['online'] : $imagearray['offline'];
-            $image_admin = "<a href='" . WFDOWNLOADS_URL . "admin/mimetypes.php?op=update&amp;admin=1&amp;mime_id=" . $mimetypes[$i]->getVar('mime_id') . "&amp;start=" . $start . "'>" . $yes_admin_image . "</a>";
+            $image_admin = "<a href='{$currentFile}?op=update&amp;admin=1&amp;mime_id=" . $mimetypes[$i]->getVar('mime_id') . "&amp;start=" . $start . "'>" . $yes_admin_image . "</a>";
             echo "<td align='center' width='10%' class='even'>" . $image_admin . "</td>";
 
             $yes_user_image = ($mimetypes[$i]->getVar('mime_user')) ? $imagearray['online'] : $imagearray['offline'];
-            $image_user = "<a href='" . WFDOWNLOADS_URL . "admin/mimetypes.php?op=update&amp;user=1&amp;mime_id=" . $mimetypes[$i]->getVar('mime_id') . "&amp;start=" . $start . "'>" . $yes_user_image . "</a>";
+            $image_user = "<a href='{$currentFile}?op=update&amp;user=1&amp;mime_id=" . $mimetypes[$i]->getVar('mime_id') . "&amp;start=" . $start . "'>" . $yes_user_image . "</a>";
             echo "<td align='center' width='10%' class='even'>" . $image_user . "</td>";
             echo "<td align='center' class='even'>";
             foreach ($image_array as $images) {
@@ -272,12 +273,12 @@
         echo "<td class='even'></td>\n";
         echo "<td align='center' class='even'></td>\n";
 
-        $admin_imgon = "<a href='" . WFDOWNLOADS_URL . "admin/mimetypes.php?op=saveall&amp;admin=1&amp;type_all=1'>" . $imagearray['online'] . "</a>";
-        $admin_imgoff = "<a href='" . WFDOWNLOADS_URL . "admin/mimetypes.php?op=saveall&amp;admin=1&amp;type_all=0'>" . $imagearray['offline'] . "</a>";
+        $admin_imgon = "<a href='{$currentFile}?op=saveall&amp;admin=1&amp;type_all=1'>" . $imagearray['online'] . "</a>";
+        $admin_imgoff = "<a href='{$currentFile}?op=saveall&amp;admin=1&amp;type_all=0'>" . $imagearray['offline'] . "</a>";
         echo "<td align='center' width='10%' class='even'>" . $admin_imgon . " " . $admin_imgoff . "</td>";
 
-        $user_imgon = "<a href='" . WFDOWNLOADS_URL . "admin/mimetypes.php?op=saveall&amp;user=1&amp;type_all=1'>" . $imagearray['online'] . "</a>";
-        $user_imgoff = "<a href='" . WFDOWNLOADS_URL . "admin/mimetypes.php?op=saveall&amp;user=1&amp;type_all=0'>" . $imagearray['offline'] . "</a>";
+        $user_imgon = "<a href='{$currentFile}?op=saveall&amp;user=1&amp;type_all=1'>" . $imagearray['online'] . "</a>";
+        $user_imgoff = "<a href='{$currentFile}?op=saveall&amp;user=1&amp;type_all=0'>" . $imagearray['offline'] . "</a>";
         echo "<td align='center' width='10%' class='even'>" . $user_imgon . " " . $user_imgoff . "</td>\n";
         echo "<td align='center' class='even'>\n";
         echo "</td></tr>\n";

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php	2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mirror.php	2013-05-31 23:11:31 UTC (rev 11606)
@@ -18,96 +18,140 @@
  * @author          WF-Sections, Xoops Development Team, luciorota
  * @version         svn:$Id$
  */
+$currentFile = basename(__FILE__);
 include 'admin_header.php';
 
-$op = '';
+$op = wfdownloads_CleanVars($_REQUEST, 'op', 'mirrors.list', 'string');
+$lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
+ 
+switch ($op) {
+    case "mirror.delete" :
+        $mirror_id = wfdownloads_CleanVars($_REQUEST, 'mirror_id', 0, 'int');
+        $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
+        $mirror = $mirror_handler->get($mirror_id);
+        if ($ok = true) {
+            $mirror_handler->delete($mirror);
+            redirect_header($currentFile, 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $mirror->getVar('title')));
+            exit();
+        } else {
+            wfdownloads_xoops_cp_header();
+            xoops_confirm(array('op' => 'del_mirror', 'mirror_id' => $mirror_id, 'ok' => true), $currentFile, _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $mirror->getVar('title'), _AM_WFD_BDELETE);
+            xoops_cp_footer();
+        }
+        break;
 
-if (!isset($_POST['op']))
-{
-    $op = isset($_GET['op']) ? $_GET['op'] : 'mirrors';
-}
-else
-{
-    $op = $_POST['op'];
-}
+    case "mirror.approve" :
+        $mirror_id = wfdownloads_CleanVars($_REQUEST, 'mirror_id', 0, 'int');
+        $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
+        $mirror = $mirror_handler->get($mirror_id);
+        if ($ok == true) {
+            $mirror->setVar('submit', true);
+    		$mirror_handler->insert($mirror);
+            redirect_header($currentFile, 1, sprintf( _AM_WFD_MIRROR_MIRROR_UPDATED, $mirror->getVar('title')));
+            exit();
+        } else {
+            wfdownloads_xoops_cp_header();
+            xoops_confirm(array('op' => 'mirror.approve', 'mirror_id' => $mirror_id, 'ok' => true), $currentFile, _AM_WFD_MIRROR_APPROVETHIS . "<br /><br>" . $mirror->getVar('title'), _AM_WFD_MIRROR_APPROVETHIS);
+            xoops_cp_footer();
+        }
+        break; 
 
-$lid = (isset($_GET['lid'])) ? intval($_GET['lid']) : 0;
+    case "mirror.edit" :
+        $mirror_id = wfdownloads_CleanVars($_REQUEST, 'mirror_id', 0, 'int');
+        $ok = wfdownloads_CleanVars($_POST, 'ok', false, 'boolean');
+        $mirror = $mirror_handler->get($mirror_id);
+        if ($ok == true) {
+            $mirror->setVar('title', trim($_POST['title']));
+            $mirror->setVar('homeurl', formatURL(trim($_POST['homeurl'])));
+            $mirror->setVar('location', trim($_POST['location']));
+            $mirror->setVar('continent', trim($_POST['continent']));
+            $mirror->setVar('downurl', formatURL(trim($_POST['downurl'])));
+            $mirror->setVar('submit', intval($_POST['approve']));
+            $mirror_handler->insert($mirror);
+            redirect_header($currentFile, 1, _AM_WFD_MIRROR_MIRROR_UPDATED);
+            exit();
+        } else {
+            wfdownloads_xoops_cp_header();
+            $sform = $mirror->getForm();
+            $sform -> display();
+            xoops_cp_footer();
+        }
+        break;
 
-switch ($op)
-{
-    case "del_mirror":
+    case "mirrors.list" :
+    default:
+        $start_waiting = wfdownloads_CleanVars($_GET, 'start_waiting', 0, 'int');
+        $start_published = wfdownloads_CleanVars($_GET, 'start_published', 0, 'int');
 
-    $confirm = (isset($_REQUEST['confirm'])) ? 1 : 0;
-    $mirror_handler = xoops_getmodulehandler('mirror');
-    $mirror = $mirror_handler->get($_REQUEST['mirror_id']);
-    if ($confirm)
-    {
-        $mirror_handler->delete($mirror);
-        redirect_header(WFDOWNLOADS_URL.'admin/mirror.php?op=default', 1, sprintf(_AM_WFD_FILE_FILEWASDELETED, $mirror->getVar('title')));
-        exit();
-    }
-    else
-    {
-        wfdownloads_xoops_cp_header();
-        xoops_confirm(array('op' => 'del_mirror', 'mirror_id' => intval($mirror->getVar('mirror_id')), 'confirm' => 1), WFDOWNLOADS_URL.'admin/mirror.php?op=default', _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $mirror->getVar('title'), _AM_WFD_BDELETE);
-        xoops_cp_footer();
-    }
-    break;
+        $criteria_waiting = new Criteria("submit", false);
+        $num_waiting = $mirror_handler->getCount($criteria_waiting);
+        $criteria_waiting->setSort("date");
+        $criteria_waiting->setOrder("DESC");
+        $criteria_waiting->setLimit($xoopsModuleConfig['admin_perpage']);
+        $criteria_waiting->setStart($start_waiting);
+        $mirrors_waiting = $mirror_handler->getObjects($criteria_waiting);
 
-    case "approve_mirror":
+        $criteria_published = new Criteria("submit", true);
+        $num_published = $mirror_handler->getCount($criteria_published);
+        $criteria_published->setSort("date");
+        $criteria_published->setOrder("DESC");
+        $criteria_published->setLimit($xoopsModuleConfig['admin_perpage']);
+        $criteria_published->setStart($start_published);
+        $mirrors_published = $mirror_handler->getObjects($criteria_published);
 
-    $confirm = (isset($_REQUEST['confirm'])) ? 1 : 0;
-    $mirror_handler = xoops_getmodulehandler('mirror');
-    $mirror = $mirror_handler->get($_REQUEST['mirror_id']);
-    if ($confirm)
-    {
-        $mirror->setVar('submit', 1);
-		$mirror_handler->insert($mirror);
-        redirect_header(WFDOWNLOADS_URL.'admin/mirror.php?op=default', 1, sprintf( _AM_WFD_MIRROR_MIRROR_UPDATED, $mirror->getVar('title')));
-        exit();
-    }
-    else
-    {
         wfdownloads_xoops_cp_header();
-        xoops_confirm(array('op' => 'approve_mirror', 'mirror_id' => intval($mirror->getVar('mirror_id')), 'confirm' => 1), WFDOWNLOADS_URL.'admin/mirror.php?op=default', _AM_WFD_MIRROR_APPROVETHIS . "<br /><br>" . $mirror->getVar('title'), _AM_WFD_MIRROR_APPROVETHIS);
-        xoops_cp_footer();
-    }
-    break; 
+        $indexAdmin = new ModuleAdmin();
+        echo $indexAdmin->addNavigation($currentFile);
 
-    case "edit_mirror":
+        $GLOBALS['xoopsTpl']->assign('mirrors_waiting_count', $num_waiting);
+        $GLOBALS['xoopsTpl']->assign('mirrors_published_count', $num_published);
 
-    $confirm = (isset($_REQUEST['confirm'])) ? 1 : 0;
-    $mirror_handler = xoops_getmodulehandler('mirror');
-    $mirror = $mirror_handler->get($_REQUEST['mirror_id']);
-    if ($confirm)
-    {
-        $mirror->setVar('title', trim($_POST['title']));
-        $mirror->setVar('homeurl', formatURL(trim($_POST['homeurl'])));
-        $mirror->setVar('location', trim($_POST['location']));
-        $mirror->setVar('continent', trim($_POST['continent']));
-        $mirror->setVar('downurl', formatURL(trim($_POST['downurl'])));
-        $mirror->setVar('submit', intval($_POST['approve']));
-        $mirror_handler->insert($mirror);
-        redirect_header(WFDOWNLOADS_URL.'admin/mirror.php?op=default', 1, _AM_WFD_MIRROR_MIRROR_UPDATED);
-        exit();
-    }
-    else
-    {
-        wfdownloads_xoops_cp_header();
-        //wfdownloads_adminMenu(5, _AM_WFD_AMIRRORS);
+        if ($num_waiting > 0) {
+            foreach ($mirrors_waiting as $mirror_waiting) {
+                $lids_waiting[] = $mirror_waiting->getVar('lid');
+                $uids_waiting[] = $mirror_waiting->getVar('uid');
+            }
+            $downloads = $download_handler->getObjects(new Criteria("lid", "(" . implode(',', array_unique($lids_waiting)) . ")", "IN"), true, false);
+            $users = $member_handler->getUserList(new Criteria("uid", "(" . implode(',', $uids_waiting) . ")"));
+            foreach ($mirrors_waiting as $mirror_waiting) {
+                $mirror_waiting_array = $mirror_waiting->toArray();
+                $mirror_waiting_array['download_title'] = isset($downloads[$mirror_waiting->getVar('lid')]) ? $downloads[$mirror_waiting->getVar('lid')]['title'] : "";
+                $mirror_waiting_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($mirror_waiting->getVar('uid'));
+                $mirror_waiting_array['formatted_date'] = formatTimestamp($mirror_waiting->getVar('date'), _DATESTRING);
+                $GLOBALS['xoopsTpl']->append('mirrors_waiting', $mirror_waiting_array);
+            }
+            //Include page navigation
+            include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+            $pagenav_waiting = new XoopsPageNav($num_waiting, $xoopsModuleConfig['admin_perpage'] , $start_waiting, 'start_waiting');
+            $GLOBALS['xoopsTpl']->assign('mirrors_waiting_pagenav', $pagenav_waiting -> renderNav());
+        }
 
-        $sform = $mirror->getForm();
-        $sform -> display();
-        xoops_cp_footer();
-    }
-    break;
+        if ($num_published > 0) {
+            foreach ($mirrors_published as $mirror_published) {
+                $lids_published[] = $mirror_published->getVar('lid');
+                $uids_published[] = $mirror_published->getVar('uid');
+            }
+            $downloads = $download_handler->getObjects(new Criteria("lid", "(" . implode(',', array_unique($lids_published)) . ")", "IN"), true, false);
+            $users = $member_handler->getUserList(new Criteria("uid", "(" . implode(',', $uids_published) . ")"));
+            foreach ($mirrors_published as $mirror_published) {
+                $mirror_published_array = $mirror_published->toArray();
+                $mirror_published_array['download_title'] = isset($downloads[$mirror_published->getVar('lid')]) ? $downloads[$mirror_published->getVar('lid')]['title'] : "";
+                $mirror_published_array['submitter_uname'] = XoopsUserUtility::getUnameFromId($mirror_published->getVar('uid'));
+                $mirror_published_array['formatted_date'] = formatTimestamp($mirror_published->getVar('date'), _DATESTRING);
+                $GLOBALS['xoopsTpl']->append('mirrors_published', $mirror_published_array);
+            }
+            //Include page navigation
+            include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+            $pagenav_published = new XoopsPageNav($num_published, $xoopsModuleConfig['admin_perpage'] , $start_published, 'start_published');
+            $GLOBALS['xoopsTpl']->assign('mirrors_published_pagenav', $pagenav_published -> renderNav());
+        }
 
-	default:
-    case "mirrors":
-    case "default":
-    global $xoopsDB, $imagearray, $xoopsModule;
-    xoops_load('XoopsUserUtility');
+        $GLOBALS['xoopsTpl']->display("db:wfdownloads_admin_mirrorlist.html");
 
+        include_once "admin_footer.php";
+        break;
+}
+/*
     $start = isset($_GET['start']) ? intval($_GET['start']) : 0;
     $start2 = isset($_GET['start2']) ? intval($_GET['start2']) : 0;
 
@@ -155,15 +199,11 @@
 		<td class='bg3' align='center' width = '7%'><b>" . _AM_WFD_MIRROR_ACTION . "</b></td>\n
 		</tr>\n
 		";
-    if ($num > 0)
-    {
-        foreach (array_keys($mirrors) as $i)
-        {
+    if ($num > 0) {
+        foreach (array_keys($mirrors) as $i) {
             $lids[] = $mirrors[$i]->getVar('lid');
             $uids[] = $mirrors[$i]->getVar('uid');
         }
-        $download_handler = xoops_getmodulehandler('download');
-        $member_handler = xoops_gethandler("member");
 
         $downloads = $download_handler->getList(new Criteria("lid", "(".implode(',', $lids).")", "IN"));
         $users = $member_handler->getUserList(new Criteria("uid", "(".implode(',', $uids).")"));
@@ -186,9 +226,7 @@
             		</tr>\n
             		";
         }
-    }
-    else
-    {
+    } else {
         echo "<tr ><td align = 'center' class='head' colspan = '6'>" . _AM_WFD_MIRROR_NOWAITINGMIRRORS . "</td></tr>";
     }
     echo "</table>\n";
@@ -207,10 +245,8 @@
 		<td class='bg3' align='center' width = '7%'><b>" . _AM_WFD_MIRROR_ACTION . "</b></td>\n
 		</tr>\n
 		";
-    if ($num2 > 0)
-    {
-        foreach (array_keys($mirrors2) as $i2)
-        {
+    if ($num2 > 0) {
+        foreach (array_keys($mirrors2) as $i2) {
             $lids2[] = $mirrors2[$i2]->getVar('lid');
             $uids2[] = $mirrors2[$i2]->getVar('uid');
         }
@@ -239,9 +275,7 @@
             		</tr>\n
             		";
         }
-    }
-    else
-    {
+    } else {
         echo "<tr><td align = 'center' class='head' colspan = '6'>" . _AM_WFD_MIRROR_NOPUBLISHEDMIRRORS . "</td></tr>";
     }
     echo "</table>\n";
@@ -249,10 +283,7 @@
     include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
     $pagenav = new XoopsPageNav($num, $xoopsModuleConfig['admin_perpage'] , $start, 'start');
     echo "<div text-align='right'>" . $pagenav -> renderNav() . '</div>';
-//xoops_cp_footer();
-include_once "admin_footer.php";
+    include_once "admin_footer.php";
     break;
-
 }
-
-?>
\ No newline at end of file
+*/
\ No newline at end of file

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php	2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/review.php	2013-05-31 23:11:31 UTC (rev 11606)
@@ -18,8 +18,8 @@
  * @author          WF-Sections, Xoops Development Team, luciorota
  * @version         svn:$Id$
  */
+$currentFile = basename(__FILE__);
 include 'admin_header.php';
-$review_handler = xoops_getmodulehandler('review');
 
 $op = wfdownloads_CleanVars($_REQUEST, 'op', 'reviews.list', 'string');
 $lid = wfdownloads_CleanVars($_REQUEST, 'lid', 0, 'int');
@@ -35,7 +35,7 @@
             exit();
         } else {
             wfdownloads_xoops_cp_header();
-            xoops_confirm(array('op' => 'review.delete', 'review_id' => $review_id, 'ok' => true), 'review.php', _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $review->getVar('title'), _AM_WFD_BDELETE);
+            xoops_confirm(array('op' => 'review.delete', 'review_id' => $review_id, 'ok' => true), $currentFile, _AM_WFD_FILE_REALLYDELETEDTHIS . "<br /><br>" . $review->getVar('title'), _AM_WFD_BDELETE);
             xoops_cp_footer();
         }
         break;
@@ -47,11 +47,11 @@
         if ($ok == true) {
             $review->setVar('submit', 1);
     		$review_handler->insert($review);
-            redirect_header('review.php?op=default', 1, sprintf( _AM_WFD_REV_REVIEW_UPDATED, $review->getVar('title')));
+            redirect_header($currentFile, 1, sprintf( _AM_WFD_REV_REVIEW_UPDATED, $review->getVar('title')));
             exit();
         } else {
             wfdownloads_xoops_cp_header();
-            xoops_confirm(array('op' => 'review.approve', 'review_id' => $review->getVar('review_id'), 'ok' => true), 'review.php', _AM_WFD_REVIEW_APPROVETHIS . "<br /><br>" . $review->getVar('title'), _AM_WFD_REVIEW_APPROVETHIS);
+            xoops_confirm(array('op' => 'review.approve', 'review_id' => $review->getVar('review_id'), 'ok' => true), $currentFile, _AM_WFD_REVIEW_APPROVETHIS . "<br /><br>" . $review->getVar('title'), _AM_WFD_REVIEW_APPROVETHIS);
             xoops_cp_footer();
         }
         break;
@@ -66,12 +66,12 @@
             $review->setVar('rated', (int)$_POST['rated']);
             $review->setVar('submit', (int)$_POST['approve']);
             $review_handler->insert($review);
-            redirect_header('review.php', 1, _AM_WFD_REV_REVIEW_UPDATED);
+            redirect_header($currentFile, 1, _AM_WFD_REV_REVIEW_UPDATED);
             exit();
         } else {
             wfdownloads_xoops_cp_header();
             $indexAdmin = new ModuleAdmin();
-            echo $indexAdmin->addNavigation('review.php');
+            echo $indexAdmin->addNavigation($currentFile);
             $sform = $review->getForm();
             $sform -> display();
             xoops_cp_footer();
@@ -101,7 +101,7 @@
 
         wfdownloads_xoops_cp_header();
         $indexAdmin = new ModuleAdmin();
-        echo $indexAdmin->addNavigation('review.php');
+        echo $indexAdmin->addNavigation($currentFile);
 
         $GLOBALS['xoopsTpl']->assign('reviews_waiting_count', $num_waiting);
         $GLOBALS['xoopsTpl']->assign('reviews_published_count', $num_published);

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php	2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/votedata.php	2013-05-31 23:11:31 UTC (rev 11606)
@@ -18,6 +18,7 @@
  * @author          WF-Sections, Xoops Development Team, luciorota
  * @version         svn:$Id$
  */
+$currentFile = basename(__FILE__);
 include 'admin_header.php';
 $rating_handler = xoops_getmodulehandler('rating');
 
@@ -29,7 +30,7 @@
         $lid = wfdownloads_CleanVars($_GET, 'lid', null, 'int');
         $rating_handler->deleteAll(new Criteria("ratingid", $rid), true);
         wfd_updaterating($lid);
-        redirect_header(WFDOWNLOADS_URL . 'admin/votedata.php', 1, _AM_WFD_VOTEDELETED);
+        redirect_header($currentFile, 1, _AM_WFD_VOTEDELETED);
         break;
 
     case 'votes.list' :
@@ -51,9 +52,10 @@
 
         wfdownloads_xoops_cp_header();
         $indexAdmin = new ModuleAdmin();
-        echo $indexAdmin->addNavigation('votedata.php');
+        echo $indexAdmin->addNavigation($currentFile);
         
         $GLOBALS['xoopsTpl']->assign('votes', $votes);
+        $GLOBALS['xoopsTpl']->assign('votes', $votes);
         $GLOBALS['xoopsTpl']->assign('useravgrating', $useravgrating);
         if ($votes > 0) {
             foreach ($ratings as $rating) {

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php	2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/class/mimetype.php	2013-05-31 23:11:31 UTC (rev 11606)
@@ -38,6 +38,15 @@
         $this->initVar('mime_admin', XOBJ_DTYPE_INT, true); // boolean
         $this->initVar('mime_user', XOBJ_DTYPE_INT, false); // boolean
     }
+    
+    function getForm() {
+        include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+        $uid = !empty($xoopsUser) ? intval($xoopsUser->getVar('uid')) : 0;
+
+        $sform = new XoopsThemeForm(_AM_WFD_MIRROR_SNEWMNAMEDESC, "mirrorform", $_SERVER['REQUEST_URI']);
+// IN PROGRESS
+        return $sform;
+    }
 }
 
 class WfdownloadsMimetypeHandler extends XoopsPersistableObjectHandler {

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt	2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt	2013-05-31 23:11:31 UTC (rev 11606)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 (2013-05-25)</u></b>
+<b><u>=> Version 3.23 (2013-05-31)</u></b>
 - refactorized admin menu (luciorota)
 - added: sort subcategories by cid or title or weight (luciorota)
 - fixed: update procedure now updates also permissions (luciorota)

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/include/update.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/include/update.php	2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/include/update.php	2013-05-31 23:11:31 UTC (rev 11606)
@@ -32,6 +32,7 @@
         update_tables_to_322($module);
     if ($prev_version <= 323)
         update_permissions_to_323($module);
+        update_tables_to_323($module);
     $feedback = ob_get_clean();
     if (method_exists($module, "setMessage")) {
         $module->setMessage($feedback);
@@ -43,6 +44,56 @@
 }
 
 // =========================================================================================
+// This function updates any existing table of a 2.x version to the format used
+// in the release of WF-Downloads 3.00
+// =========================================================================================
+function update_tables_to_323($module) {
+    $ret = array();
+    global $xoopsDB;
+/* IN PROGRESS
+    $cat_handler = xoops_getmodulehandler('category', 'wfdownloads');
+    $result = $xoopsDB->query("SHOW COLUMNS FROM " . $cat_handler->table);
+    while ($existing_field = $xoopsDB->fetchArray($result)) {
+         $fields[$existing_field['Field']] = $existing_field['Type'];
+    }
+    if (in_array("nohtml", array_keys($fields))) {
+        $dbupdater = new WfdownloadsDbupdater();
+        //Invert column values
+        // alter options in wfdownloads_cat
+        $table = new WfdownloadsTable('wfdownloads_cat');
+        $table->addAlteredField('nohtml', "dohtml tinyint(1) NOT NULL DEFAULT '1'");
+        $table->addAlteredField('nosmiley', "dosmiley tinyint(1) NOT NULL DEFAULT '1'");
+        $table->addAlteredField('noxcodes', "doxcode tinyint(1) NOT NULL DEFAULT '1'");
+        $table->addAlteredField('noimages', "doimage tinyint(1) NOT NULL DEFAULT '1'");
+        $table->addAlteredField('nobreak', "dobr tinyint(1) NOT NULL DEFAULT '1'");
+
+        //inverting values no=1 <=> do=0
+        // have to store teporarly as value = 2 to
+        // avoid putting everithing to same value
+        // if you change 1 to 0, then 0 to one,
+        // every value will be 1, follow me?
+        $table->addUpdatedWhere('dohtml', 2,'=1');
+        $table->addUpdatedWhere('dohtml', 1,'=0');
+        $table->addUpdatedWhere('dohtml', 0,'=2');
+
+        $table->addUpdatedWhere('dosmiley', 2,'=1');
+        $table->addUpdatedWhere('dosmiley', 1,'=0');
+        $table->addUpdatedWhere('dosmiley', 0,'=2');
+
+        $table->addUpdatedWhere('doxcode', 2,'=1');
+        $table->addUpdatedWhere('doxcode', 1,'=0');
+        $table->addUpdatedWhere('doxcode', 0,'=2');
+
+        $table->addUpdatedWhere('doimage', 2,'=1');
+        $table->addUpdatedWhere('doimage', 1,'=0');
+        $table->addUpdatedWhere('doimage', 0,'=2');
+        $ret = $dbupdater->updateTable($table);
+    }
+*/
+    return $ret;
+}
+
+// =========================================================================================
 // This function updates permissions to WF-Downloads 3.23 permissions
 // add 'WFUpCatPerm' permission where is set 'WFDownCatPerm' permission
 // =========================================================================================

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_categorylist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_categorylist.html	2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_categorylist.html	2013-05-31 23:11:31 UTC (rev 11606)
@@ -18,9 +18,9 @@
             </td>
             <td><{$sorted_category.category.description}></td>
             <td>
-                <a href="category.php?op=category.edit&amp;cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
-                <a href="category.php?op=category.delete&amp;cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
-                <a href="category.php?op=category.move&amp;cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._AM_WFD_BMOVE}>"><img src="<{xoModuleIcons16 forward.png}>" title="<{$smarty.const._AM_WFD_BMOVE}>" alt="<{$smarty.const._AM_WFD_BMOVE}>" /></a>
+                <a href="?op=category.edit&amp;cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
+                <a href="?op=category.delete&amp;cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._DELETE}>"><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._DELETE}>" alt="<{$smarty.const._DELETE}>" /></a>
+                <a href="?op=category.move&amp;cid=<{$sorted_category.category.cid}>" title="<{$smarty.const._AM_WFD_BMOVE}>"><img src="<{xoModuleIcons16 forward.png}>" title="<{$smarty.const._AM_WFD_BMOVE}>" alt="<{$smarty.const._AM_WFD_BMOVE}>" /></a>
             </td>
         </tr>
     <{/foreach}>

Added: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_mirrorlist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_mirrorlist.html	                        (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_mirrorlist.html	2013-05-31 23:11:31 UTC (rev 11606)
@@ -0,0 +1,83 @@
+<fieldset>
+    <legend style='font-weight: bold;'><{$smarty.const._AM_WFD_AMIRRORS_INFO}></legend>
+        <p>
+            <{$smarty.const._AM_WFD_AMIRRORS_WAITING}>:&nbsp;<{$mirrors_waiting_count}>
+            <br />
+            <{$smarty.const._AM_WFD_MIRROR_MIRROR_TOTAL}>:&nbsp;<{$mirrors_published_count}>
+            <br />
+            <img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>" /> <{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>
+            <br />
+            <img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_EDIT}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_EDIT}>" /> <{$smarty.const._AM_WFD_AMIRRORS_EDIT}>
+            <br />
+            <img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_DELETE}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_DELETE}>" /> <{$smarty.const._AM_WFD_AMIRRORS_DELETE}>
+        </p>
+</fieldset>
+
+<br />
+
+<fieldset>
+    <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_MIRROR_MIRROR_WAITING}></legend>
+<{if ($mirrors_waiting_count == 0)}>
+    <{$smarty.const._AM_WFD_MIRROR_NOWAITINGMIRRORS}>
+<{else}>
+    <table class='outer'>
+        <tr>
+            <th><{$smarty.const._AM_WFD_MIRROR_ID}></th>
+            <th><{$smarty.const._AM_WFD_MIRROR_TITLE}></th>
+            <th><{$smarty.const._AM_WFD_MIRROR_POSTER}></th>
+            <th><{$smarty.const._AM_WFD_MIRROR_SUBMITDATE}></th>
+            <th><{$smarty.const._AM_WFD_REV_ACTION}></th>
+        </tr>
+    <{foreach item=mirror_waiting from=$mirrors_waiting}>
+        <tr class="<{cycle values='even, odd'}>">
+    		<td class='head'><{$mirror_waiting.mirror_id}></td>
+    		<td class='even'>
+                <a href='download.php?op=download.edit&amp;lid=<{$mirror_waiting.lid}>'><{$mirror_waiting.download_title}></a>
+            </td>
+    		<td class='even'><{$mirror_waiting.submitter_uname}></td>
+    		<td class='even'><{$mirror_waiting.formatted_date}></td>
+    		<td class='even'>
+                <a href='?op=mirror.approve&amp;mirror_id=<{$mirror_waiting.mirror_id}>'><img src="<{xoModuleIcons16 on.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_APPROVE}>" /></a>
+                <a href='?op=mirror.edit&amp;mirror_id=<{$mirror_waiting.mirror_id}>'><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_EDIT}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_EDIT}>" /></a>
+                <a href='?op=mirror.delete&amp;mirror_id=<{$mirror_waiting.mirror_id}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_DELETE}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_DELETE}>" /></a>
+            </td>
+        </tr>
+    <{/foreach}>
+    </table>
+    <{$mirrors_waiting_pagenav}>
+<{/if}>
+</fieldset>
+
+<br />
+
+<fieldset>
+    <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_MIRROR_MIRROR_PUBLISHED}></legend>
+<{if ($mirrors_published_count == 0)}>
+    <{$smarty.const._AM_WFD_MIRROR_NOPUBLISHEDMIRRORS}>
+<{else}>
+    <table class='outer'>
+        <tr>
+            <th><{$smarty.const._AM_WFD_MIRROR_ID}></th>
+            <th><{$smarty.const._AM_WFD_MIRROR_TITLE}></th>
+            <th><{$smarty.const._AM_WFD_MIRROR_POSTER}></th>
+            <th><{$smarty.const._AM_WFD_MIRROR_SUBMITDATE}></th>
+            <th><{$smarty.const._AM_WFD_REV_ACTION}></th>
+        </tr>
+    <{foreach item=mirror_published from=$mirrors_published}>
+        <tr class="<{cycle values='even, odd'}>">
+    		<td class='head'><{$mirror_published.mirror_id}></td>
+    		<td class='even'>
+                <a href='download.php?op=download.edit&amp;lid=<{$mirror_published.lid}>'><{$mirror_published.download_title}></a>
+            </td>
+    		<td class='even'><{$mirror_published.submitter_uname}></td>
+    		<td class='even'><{$mirror_published.formatted_date}></td>
+    		<td class='even'>
+                <a href='?op=mirror.edit&amp;mirror_id=<{$mirror_published.mirror_id}>'><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_EDIT}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_EDIT}>" /></a>
+                <a href='?op=mirror.delete&amp;mirror_id=<{$mirror_published.mirror_id}>'><img src="<{xoModuleIcons16 delete.png}>" title="<{$smarty.const._AM_WFD_AMIRRORS_DELETE}>" alt="<{$smarty.const._AM_WFD_AMIRRORS_DELETE}>" /></a>
+            </td>
+        </tr>
+    <{/foreach}>
+    </table>
+    <{$mirrors_published_pagenav}>
+<{/if}>
+</fieldset>

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_reviewlist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_reviewlist.html	2013-05-30 21:46:33 UTC (rev 11605)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/wfdownloads_admin_reviewlist.html	2013-05-31 23:11:31 UTC (rev 11606)
@@ -36,14 +36,14 @@
                 <a href='download.php?op=download.edit&amp;lid=<{$review_waiting.lid}>'><{$review_waiting.download_title}></a>
             </td>
     		<td class='even'>
-                <a href='review.php?op=review.edit&amp;review_id=<{$review_waiting.review_id}>'><{$review_waiting.title}></a>
+                <a href='?op=review.edit&amp;review_id=<{$review_waiting.review_id}>'><{$review_waiting.title}></a>
             </td>
     		<td class='even'><{$review_waiting.submitter_uname}></td>
     		<td class='even'><{$review_waiting.formatted_date}></td>
     		<td class='even'>
-...
 
[truncated message content]