[Xoops-svn] SF.net SVN: xoops-svn:[12976] XoopsModules/wfdownloads/branches/luciorota/ wfdownloads

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

Revision: 12976
          http://sourceforge.net/p/xoops/svn/12976
Author:   luciorota
Date:     2015-02-13 22:47:42 +0000 (Fri, 13 Feb 2015)
Log Message:
-----------
added: sort downloads by weight

Modified Paths:
--------------
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/download.php
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/modification.php
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/docs/changelog.txt
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/common.php
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/functions.php
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/language/english/main.php
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/submit.php
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/admin/wfdownloads_am_categorieslist.tpl
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/admin/wfdownloads_am_downloadslist.tpl
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/wfdownloads_viewcat.tpl
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/viewcat.php
    XoopsModules/wfdownloads/branches/luciorota/wfdownloads/xoops_version.php

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/downloads.php	2015-02-13 22:47:42 UTC (rev 12976)
@@ -346,6 +346,7 @@
         $downloadObj->setVar('version', $version);
         $downloadObj->setVar('url', $url);
         $downloadObj->setVar('cid', $cid);
+        $downloadObj->setVar('weight', $_POST['weight']);
         $downloadObj->setVar('title', $title);
         $downloadObj->setVar('status', $status);
         $downloadObj->setVar('size', $size);

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/admin/reportsmodifications.php	2015-02-13 22:47:42 UTC (rev 12976)
@@ -115,6 +115,7 @@
             switch ($key) {
                 case 'title':
                 case 'url':
+                case 'weight':
                     // NOP
                     break;
                 case 'size':

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/download.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/download.php	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/download.php	2015-02-13 22:47:42 UTC (rev 12976)
@@ -95,6 +95,7 @@
         $this->initVar('doxcode', XOBJ_DTYPE_INT, true); // boolean
         $this->initVar('doimage', XOBJ_DTYPE_INT, true); // boolean
         $this->initVar('dobr', XOBJ_DTYPE_INT, true); // boolean
+        $this->initVar('weight', XOBJ_DTYPE_INT, 0);
 
         if (isset($id)) {
             $item = $this->wfdownloads->getHandler('item')->get($id);
@@ -133,6 +134,8 @@
     {
         xoops_load('XoopsUserUtility');
 
+        $download = $this->toArray(); // as array
+
         $download['id']  = $this->getVar('lid');
         $download['cid'] = $this->getVar('cid');
 
@@ -456,14 +459,14 @@
             $userfile_file = new XoopsFormFile(_MD_WFDOWNLOADS_UPLOAD_FILEC, 'userfile', 0);
             // get max file size (setup and php.ini)
             $phpiniMaxFileSize = (min((int)(ini_get('upload_max_filesize')), (int)(ini_get('post_max_size')), (int)(ini_get('memory_limit')))) * 1024 * 1024; // bytes
-            $maxFileSize       = wfdownloads_bytesToSize1024(min($this->wfdownloads->getConfig('maxfilesize'), $phpiniMaxFileSize));
+            $maxFileSize = wfdownloads_bytesToSize1024(min($this->wfdownloads->getConfig('maxfilesize'), $phpiniMaxFileSize));
             // get allowed mimetypes
             if (wfdownloads_userIsAdmin()) {
-                $criteria = new Criteria('mime_admin', true);
+                $mimetypeCriteria = new Criteria('mime_admin', true);
             } else {
-                $criteria = new Criteria('mime_user', true);
+                $mimetypeCriteria = new Criteria('mime_user', true);
             }
-            $mimetypes         = $this->wfdownloads->getHandler('mimetype')->getList($criteria);
+            $mimetypes = $this->wfdownloads->getHandler('mimetype')->getList($mimetypeCriteria);
             $allowedExtensions = implode(' | ', $mimetypes);
             $userfile_file->setDescription(
                 sprintf(
@@ -490,6 +493,8 @@
             $categoryObjsTree = new XoopsObjectTree($categoryObjs, 'cid', 'pid');
             $sform->addElement(new XoopsFormLabel(_MD_WFDOWNLOADS_CATEGORYC, $categoryObjsTree->makeSelBox('cid', 'title', '-', $this->getVar('cid', 'e'))));
         }
+        // download: weight
+        $sform->addElement(new XoopsFormText(_MD_WFDOWNLOADS_WEIGHT, 'weight', 50, 255, $this->getVar('weight', 'e')), false);
 
         if (count($customArray) == 0) {
             // download: homepagetitle
@@ -641,7 +646,6 @@
                 $sform->addElement(new XoopsFormFile(_MD_WFDOWNLOADS_DUPLOADSCRSHOT, 'screenshot4', 0), false); // IN PROGRESS
             }
         }
-
         // download: notifypub
         $option_tray     = new XoopsFormElementTray(_MD_WFDOWNLOADS_OPTIONS, '<br />');
         $notify_checkbox = new XoopsFormCheckBox('', 'notifypub');
@@ -707,11 +711,7 @@
         // download: submitter
         if (!$this->isNew()) {
             $userCount = $member_handler->getUserCount();
-// IN PROGRESS
-// IN PROGRESS
-// IN PROGRESS
             if ($userCount > 200) {
-                //$sform -> addElement(new XoopsFormText(_AM_WFDOWNLOADS_FILE_SUBMITTERID, 'submitter', 10, 10, $this->getVar('submitter', 'e')), true);
                 $submitter_select = new XoopsFormSelectUser (
                     _AM_WFDOWNLOADS_FILE_SUBMITTER, 'submitter', false, $this->getVar(
                         'submitter',
@@ -742,10 +742,10 @@
         $userfile_file = new XoopsFormFile(_MD_WFDOWNLOADS_UPLOAD_FILEC, 'userfile', 0);
         // get max file size (setup and php.ini)
         $phpiniMaxFileSize = min((int)(ini_get('upload_max_filesize')), (int)(ini_get('post_max_size')), (int)(ini_get('memory_limit'))) * 1024 * 1024; // bytes
-        $maxFileSize       = wfdownloads_bytesToSize1024(min($this->wfdownloads->getConfig('maxfilesize'), $phpiniMaxFileSize));
+        $maxFileSize = wfdownloads_bytesToSize1024(min($this->wfdownloads->getConfig('maxfilesize'), $phpiniMaxFileSize));
         // get allowed mimetypes
-        $criteria          = new Criteria('mime_admin', true);
-        $mimetypes         = $this->wfdownloads->getHandler('mimetype')->getList($criteria);
+        $mimetypeCriteria = new Criteria('mime_admin', true);
+        $mimetypes = $this->wfdownloads->getHandler('mimetype')->getList($mimetypeCriteria);
         $allowedExtensions = implode(' | ', $mimetypes);
         $userfile_file->setDescription(
             sprintf(
@@ -759,11 +759,13 @@
         );
         $sform->addElement($userfile_file, false);
         // download: cid
-        $categoryObjs     = $this->wfdownloads->getHandler('category')->getObjects();
+        $categoryObjs = $this->wfdownloads->getHandler('category')->getObjects();
         $categoryObjsTree = new XoopsObjectTree($categoryObjs, 'cid', 'pid');
         $sform->addElement(
             new XoopsFormLabel(_AM_WFDOWNLOADS_FILE_CATEGORY, $categoryObjsTree->makeSelBox('cid', 'title', '-', $this->getVar('cid', 'e')))
         );
+        // download: weight
+        $sform->addElement(new XoopsFormText(_MD_WFDOWNLOADS_WEIGHT, 'weight', 50, 255, $this->getVar('weight', 'e')), false);
 // Formulize module support (2006/03/06, 2006/03/08) jpc - start
         if (count($customArray) == 0) {
             // download: homepagetitle
@@ -1222,17 +1224,17 @@
      *
      * @return array
      */
-    public function getActiveDownloads($crit = null)
+    public function getActiveDownloads($criteria = null)
     {
-        if (is_object($crit)) {
-            $criteria = $crit;
+        if (is_object($criteria)) {
+            $downloadsCriteria = $criteria;
         } else {
-            $criteria = new CriteriaCompo();
+            $downloadsCriteria = new CriteriaCompo();
         }
-        $active_crit = $this->getActiveCriteria();
-        $criteria->add($active_crit);
+        $activeDownloadsCriteria = $this->getActiveCriteria();
+        $downloadsCriteria->add($activeDownloadsCriteria);
 
-        return $this->getObjects($criteria);
+        return $this->getObjects($downloadsCriteria);
     }
 
     /**
@@ -1242,14 +1244,14 @@
      *
      * @return array/int
      */
-    public function getActiveCount($crit = null)
+    public function getActiveCount($criteria = null)
     {
-        $criteria = $this->getActiveCriteria();
-        if (is_object($crit)) {
-            $criteria->add($crit);
+        $activeDownloadsCriteria = $this->getActiveCriteria();
+        if (is_object($criteria)) {
+            $activeDownloadsCriteria->add($criteria);
         }
 
-        return $this->getCount($criteria);
+        return $this->getCount($activeDownloadsCriteria);
     }
 
     /**
@@ -1272,24 +1274,24 @@
      *
      * @return bool
      */
-    public function delete($download, $force = false)
+    public function delete($downloadsObj, $force = false)
     {
-        if (parent::delete($download, $force)) {
-            $criteria = new Criteria('lid', (int)$download->getVar('lid'));
-            $this->wfdownloads->getHandler('rating')->deleteAll($criteria);
-            $this->wfdownloads->getHandler('mirror')->deleteAll($criteria);
-            $this->wfdownloads->getHandler('review')->deleteAll($criteria);
-            $this->wfdownloads->getHandler('report')->deleteAll($criteria);
+        if (parent::delete($downloadsObj, $force)) {
+            $downloadsCriteria = new Criteria('lid', (int)$download->getVar('lid'));
+            $this->wfdownloads->getHandler('rating')->deleteAll($downloadsCriteria);
+            $this->wfdownloads->getHandler('mirror')->deleteAll($downloadsCriteria);
+            $this->wfdownloads->getHandler('review')->deleteAll($downloadsCriteria);
+            $this->wfdownloads->getHandler('report')->deleteAll($downloadsCriteria);
             // delete comments
-            xoops_comment_delete((int)$this->wfdownloads->getModule()->mid(), (int)$download->getVar('lid'));
+            xoops_comment_delete((int)$this->wfdownloads->getModule()->mid(), (int)$downloadsObj->getVar('lid'));
 
 // Formulize module support (2006/05/04) jpc - start
             if (wfdownloads_checkModule('formulize')) {
-                if (file_exists(XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php') && $download->getVar('formulize_idreq') > 0) {
+                if (file_exists(XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php') && $downloadsObj->getVar('formulize_idreq') > 0) {
                     include_once XOOPS_ROOT_PATH . '/modules/formulize/include/functions.php';
                     //deleteFormEntries(array($download->getVar('formulize_idreq')));
-                    $category = $this->wfdownloads->getHandler('category')->get($download->getVar('cid'));
-                    deleteFormEntries(array($download->getVar('formulize_idreq')), $category->getVar('formulize_fid'));
+                    $categoryObj = $this->wfdownloads->getHandler('category')->get($downloadsObj->getVar('cid'));
+                    deleteFormEntries(array($downloadsObj->getVar('formulize_idreq')), $categoryObj->getVar('formulize_fid'));
                 }
             }
 // Formulize module support (2006/05/04) jpc - end

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/modification.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/modification.php	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/class/modification.php	2015-02-13 22:47:42 UTC (rev 12976)
@@ -87,6 +87,7 @@
         $this->initVar('doxcode', XOBJ_DTYPE_INT, true); // boolean
         $this->initVar('doimage', XOBJ_DTYPE_INT, true); // boolean
         $this->initVar('dobr', XOBJ_DTYPE_INT, true); // boolean
+        $this->initVar('weight', XOBJ_DTYPE_INT, 0);
 
         //Obsolete
         unset($this->vars['ipaddress']);
@@ -163,7 +164,8 @@
             d.dosmiley = m.dosmiley,
             d.doxcode = m.doxcode,
             d.doimage = m.doimage,
-            d.dobr = m.dobr";
+            d.dobr = m.dobr,
+            d.weight = m.weight";
         $sql .= " WHERE d.lid = m.lid AND m.requestid='{$requestid}'";
         if ($this->db->query($sql)) {
             return $this->deleteAll(new Criteria('requestid', (int)$requestid));

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/docs/changelog.txt	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/docs/changelog.txt	2015-02-13 22:47:42 UTC (rev 12976)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 RC5 (2015-02-02)</u></b>
+<b><u>=> Version 3.23 RC5 (2015-02-13)</u></b>
 - fixed: use DateTime object instead of strtotime function (luciorota)
 - fixed: source code for HTML5/CSS3 (mamba)
 - fixed: jQuery bug in templates (luciorota)
@@ -14,6 +14,7 @@
 - fixed: deprecated XoopsTree (mamba)
 - fixed: English translations (mamba)
 - fixed: small changes based on testing tool feedback (mamba)
+- added: sort downloads by weight (luciorota)
 - added: directories check (luciorota)
 - added: no size limit for uploads by Admin (mamba)
 - added: preview for images, audio, video, pdf files (luciorota)

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/common.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/common.php	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/common.php	2015-02-13 22:47:42 UTC (rev 12976)
@@ -30,11 +30,13 @@
 xoops_loadLanguage('common', WFDOWNLOADS_DIRNAME);
 
 xoops_load('XoopsFormLoader');
-//include_once XOOPS_ROOT_PATH . '/class/tree.php';
 xoops_load('XoopsObjectTree');
 xoops_load('XoopsPageNav');
+xoops_load('XoopsUserUtility');
+xoops_load('XoopsLocal');
+xoops_load('XoopsRequest');
 
-include_once WFDOWNLOADS_ROOT_PATH . '/class/wfdownloads.php'; // WfdownloadsWfdownloads class
+xoops_load('Wfdownloads', WFDOWNLOADS_DIRNAME); // WfdownloadsWfdownloads class
 include_once WFDOWNLOADS_ROOT_PATH . '/include/functions.php';
 include_once WFDOWNLOADS_ROOT_PATH . '/include/constants.php';
 include_once WFDOWNLOADS_ROOT_PATH . '/class/common/session.php'; // WfdownloadsSession class
@@ -44,9 +46,6 @@
 include_once WFDOWNLOADS_ROOT_PATH . '/class/common/xoopstree.php'; // WfdownloadsXoopsTree class
 include_once WFDOWNLOADS_ROOT_PATH . '/class/multicolumnsthemeform.php'; // WfdownloadsMulticolumnsThemeForm class
 
-xoops_load('XoopsUserUtility');
-xoops_load('XoopsLocal');
-xoops_load('XoopsRequest');
 // MyTextSanitizer object
 $myts = MyTextSanitizer::getInstance();
 

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/functions.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/functions.php	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/functions.php	2015-02-13 22:47:42 UTC (rev 12976)
@@ -781,139 +781,146 @@
     return $icons;
 }
 
-if (!function_exists('convertorderbyin')) {
-    // Reusable Link Sorting Functions
-    /**
-     * convertorderbyin()
-     *
-     * @param   $orderby
-     *
-     * @return string
-     */
-    function convertorderbyin($orderby)
-    {
-        switch (trim($orderby)) {
-            case 'titleA':
-                $orderby = 'title ASC';
-                break;
-            case 'titleD':
-                $orderby = 'title DESC';
-                break;
-            case 'dateA':
-                $orderby = 'published ASC';
-                break;
-            case 'dateD':
-                $orderby = 'published DESC';
-                break;
-            case 'hitsA':
-                $orderby = 'hits ASC';
-                break;
-            case 'hitsD':
-                $orderby = 'hits DESC';
-                break;
-            case 'ratingA':
-                $orderby = 'rating ASC';
-                break;
-            case 'ratingD':
-                $orderby = 'rating DESC';
-                break;
-            case 'sizeD':
-                $orderby = 'size DESC';
-                break;
-            case 'sizeA':
-                $orderby = 'size ASC';
-                break;
-            default:
-                $orderby = 'published DESC';
-                break;
-        }
+/**
+ * wfdownloads_convertorderbyin()
+ *
+ * @param   $orderby
+ *
+ * @return string
+ */
+function wfdownloads_convertorderbyin($orderby)
+{
+    switch (trim($orderby)) {
+        case 'titleA':
+            $orderby = 'title ASC';
+            break;
+        case 'titleD':
+            $orderby = 'title DESC';
+            break;
+        case 'dateA':
+            $orderby = 'published ASC';
+            break;
+        case 'dateD':
+            $orderby = 'published DESC';
+            break;
+        case 'hitsA':
+            $orderby = 'hits ASC';
+            break;
+        case 'hitsD':
+            $orderby = 'hits DESC';
+            break;
+        case 'ratingA':
+            $orderby = 'rating ASC';
+            break;
+        case 'ratingD':
+            $orderby = 'rating DESC';
+            break;
+        case 'sizeD':
+            $orderby = 'size DESC';
+            break;
+        case 'sizeA':
+            $orderby = 'size ASC';
+            break;
+        case 'weightD':
+            $orderby = 'weight DESC';
+            break;
+        case 'weightA':
+            $orderby = 'weight ASC';
+            break;
+        default:
+            $orderby = 'published DESC';
+            break;
+    }
 
-        return $orderby;
-    }
+    return $orderby;
 }
 
-if (!function_exists('convertorderbytrans')) {
-    /**
-     * @param $orderby
-     *
-     * @return string
-     */
-    function convertorderbytrans($orderby)
-    {
-        if ($orderby == 'title ASC') {
-            $orderbyTrans = _MD_WFDOWNLOADS_TITLEATOZ;
-        }
-        if ($orderby == 'title DESC') {
-            $orderbyTrans = _MD_WFDOWNLOADS_TITLEZTOA;
-        }
-        if ($orderby == 'published ASC') {
-            $orderbyTrans = _MD_WFDOWNLOADS_DATEOLD;
-        }
-        if ($orderby == 'published DESC') {
-            $orderbyTrans = _MD_WFDOWNLOADS_DATENEW;
-        }
-        if ($orderby == 'hits ASC') {
-            $orderbyTrans = _MD_WFDOWNLOADS_POPULARITYLTOM;
-        }
-        if ($orderby == 'hits DESC') {
-            $orderbyTrans = _MD_WFDOWNLOADS_POPULARITYMTOL;
-        }
-        if ($orderby == 'rating ASC') {
-            $orderbyTrans = _MD_WFDOWNLOADS_RATINGLTOH;
-        }
-        if ($orderby == 'rating DESC') {
-            $orderbyTrans = _MD_WFDOWNLOADS_RATINGHTOL;
-        }
-        if ($orderby == 'size ASC') {
-            $orderbyTrans = _MD_WFDOWNLOADS_SIZELTOH;
-        }
-        if ($orderby == 'size DESC') {
-            $orderbyTrans = _MD_WFDOWNLOADS_SIZEHTOL;
-        }
-        return $orderbyTrans;
+/**
+ * @param $orderby
+ *
+ * @return string
+ */
+function wfdownloads_convertorderbytrans($orderby)
+{
+    if ($orderby == 'title ASC') {
+        $orderbyTrans = _MD_WFDOWNLOADS_TITLEATOZ;
     }
+    if ($orderby == 'title DESC') {
+        $orderbyTrans = _MD_WFDOWNLOADS_TITLEZTOA;
+    }
+    if ($orderby == 'published ASC') {
+        $orderbyTrans = _MD_WFDOWNLOADS_DATEOLD;
+    }
+    if ($orderby == 'published DESC') {
+        $orderbyTrans = _MD_WFDOWNLOADS_DATENEW;
+    }
+    if ($orderby == 'hits ASC') {
+        $orderbyTrans = _MD_WFDOWNLOADS_POPULARITYLTOM;
+    }
+    if ($orderby == 'hits DESC') {
+        $orderbyTrans = _MD_WFDOWNLOADS_POPULARITYMTOL;
+    }
+    if ($orderby == 'rating ASC') {
+        $orderbyTrans = _MD_WFDOWNLOADS_RATINGLTOH;
+    }
+    if ($orderby == 'rating DESC') {
+        $orderbyTrans = _MD_WFDOWNLOADS_RATINGHTOL;
+    }
+    if ($orderby == 'size ASC') {
+        $orderbyTrans = _MD_WFDOWNLOADS_SIZELTOH;
+    }
+    if ($orderby == 'size DESC') {
+        $orderbyTrans = _MD_WFDOWNLOADS_SIZEHTOL;
+    }
+    if ($orderby == 'weight ASC') {
+        $orderbyTrans = _MD_WFDOWNLOADS_WEIGHTLTOH;
+    }
+    if ($orderby == 'weight DESC') {
+        $orderbyTrans = _MD_WFDOWNLOADS_WEIGHTHTOL;
+    }
+
+    return $orderbyTrans;
 }
 
-if (!function_exists('convertorderbyout')) {
-    /**
-     * @param $orderby
-     *
-     * @return string
-     */
-    function convertorderbyout($orderby)
-    {
-        if ($orderby == 'title ASC') {
-            $orderby = 'titleA';
-        }
-        if ($orderby == 'title DESC') {
-            $orderby = 'titleD';
-        }
-        if ($orderby == 'published ASC') {
-            $orderby = 'dateA';
-        }
-        if ($orderby == 'published DESC') {
-            $orderby = 'dateD';
-        }
-        if ($orderby == 'hits ASC') {
-            $orderby = 'hitsA';
-        }
-        if ($orderby == 'hits DESC') {
-            $orderby = 'hitsD';
-        }
-        if ($orderby == 'rating ASC') {
-            $orderby = 'ratingA';
-        }
-        if ($orderby == 'rating DESC') {
-            $orderby = 'ratingD';
-        }
-        if ($orderby == 'size ASC') {
-            $orderby = 'sizeA';
-        }
-        if ($orderby == 'size DESC') {
-            $orderby = 'sizeD';
-        }
-        return $orderby;
+function wfdownloads_convertorderbyout($orderby)
+{
+    if ($orderby == 'title ASC') {
+        $orderby = 'titleA';
     }
+    if ($orderby == 'title DESC') {
+        $orderby = 'titleD';
+    }
+    if ($orderby == 'published ASC') {
+        $orderby = 'dateA';
+    }
+    if ($orderby == 'published DESC') {
+        $orderby = 'dateD';
+    }
+    if ($orderby == 'hits ASC') {
+        $orderby = 'hitsA';
+    }
+    if ($orderby == 'hits DESC') {
+        $orderby = 'hitsD';
+    }
+    if ($orderby == 'rating ASC') {
+        $orderby = 'ratingA';
+    }
+    if ($orderby == 'rating DESC') {
+        $orderby = 'ratingD';
+    }
+    if ($orderby == 'size ASC') {
+        $orderby = 'sizeA';
+    }
+    if ($orderby == 'size DESC') {
+        $orderby = 'sizeD';
+    }
+    if ($orderby == 'weight ASC') {
+        $orderby = 'weightA';
+    }
+    if ($orderby == 'weight DESC') {
+        $orderby = 'weightD';
+    }
+    return $orderby;
 }
 
 /**

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/include/onupdate.php	2015-02-13 22:47:42 UTC (rev 12976)
@@ -113,7 +113,8 @@
         "dosmiley"        => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
         "doxcode"         => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
         "doimage"         => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
-        "dobr"            => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true)
+        "dobr"            => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+        "weight"          => array("Type" => "int(11) NOT NULL default '0'", "Default" => true)
     );
     //$renamed_fields = array(
     //    "old_name" => "new_name"
@@ -197,7 +198,8 @@
         "dosmiley"        => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
         "doxcode"         => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
         "doimage"         => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
-        "dobr"            => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true)
+        "dobr"            => array("Type" => "tinyint(1) NOT NULL default '1'", "Default" => true),
+        "weight"          => array("Type" => "int(11) NOT NULL default '0'", "Default" => true)
     );
     //$renamed_fields = array(
     //    "old_name" => "new_name"

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/language/english/main.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/language/english/main.php	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/language/english/main.php	2015-02-13 22:47:42 UTC (rev 12976)
@@ -372,3 +372,8 @@
 define('_MD_WFDOWNLOADS_ERROR_CATIMAGEDIRNOTEXISTS', "Warning: contact the administrator, the upload directory does not exist");
 
 define('_MD_WFDOWNLOADS_FFS_SUBMIT1ST_STEP', "1st step: choose category");
+
+// class/download.php
+define('_MD_WFDOWNLOADS_WEIGHT', "Weight");
+define('_MD_WFDOWNLOADS_WEIGHTLTOH', "Weight (lowest to highest value)");
+define('_MD_WFDOWNLOADS_WEIGHTHTOL', "Weight (highest to lowest value)");

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/sql/mysql.sql	2015-02-13 22:47:42 UTC (rev 12976)
@@ -107,6 +107,7 @@
     doxcode                     tinyint(1) NOT NULL default '1',
     doimage                     tinyint(1) NOT NULL default '1',
     dobr                        tinyint(1) NOT NULL default '1',
+    weight                      int(11) NOT NULL default '0',
     PRIMARY KEY (lid),
     KEY cid (cid),
     KEY status (status),
@@ -350,6 +351,7 @@
     doxcode                     tinyint(1) NOT NULL default '1',
     doimage                     tinyint(1) NOT NULL default '1',
     dobr                        tinyint(1) NOT NULL default '1',
+    weight                      int(11) NOT NULL default '0',
     PRIMARY KEY (requestid)
 ) ENGINE=MyISAM;
 

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/submit.php	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/submit.php	2015-02-13 22:47:42 UTC (rev 12976)
@@ -381,6 +381,7 @@
         $downloadObj->setVar('title', $title);
         $downloadObj->setVar('url', $url);
         $downloadObj->setVar('cid', (int)$cid);
+        $downloadObj->setVar('weight', (int)$weight);
         $downloadObj->setVar('filename', $filename);
         $downloadObj->setVar('filetype', $filetype);
 

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/admin/wfdownloads_am_categorieslist.tpl
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/admin/wfdownloads_am_categorieslist.tpl	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/admin/wfdownloads_am_categorieslist.tpl	2015-02-13 22:47:42 UTC (rev 12976)
@@ -17,7 +17,6 @@
                         <a href='../viewcat.php?cid=<{$sorted_category.category.cid}>'><{$sorted_category.category.title}></a>
                     </td>
                     <td>
-                        <label for="new_weights[<{$sorted_category.category.cid}>]">Category:</label>
                         <input type="text" name="new_weights[<{$sorted_category.category.cid}>]" id="new_weights[<{$sorted_category.category.cid}>]" size="11" maxlength="11"
                                value="<{$sorted_category.category.weight}>"/>
                     </td>

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/admin/wfdownloads_am_downloadslist.tpl
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/admin/wfdownloads_am_downloadslist.tpl	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/admin/wfdownloads_am_downloadslist.tpl	2015-02-13 22:47:42 UTC (rev 12976)
@@ -10,6 +10,7 @@
                 <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ID}></th>
                 <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_TITLE}></th>
                 <th><{$smarty.const._AM_WFDOWNLOADS_FCATEGORY_TITLE}></th>
+                <th><{$smarty.const._MD_WFDOWNLOADS_WEIGHT}></th>
                 <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_POSTER}></th>
                 <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_SUBMITTED}></th>
                 <th><{$smarty.const._AM_WFDOWNLOADS_MINDEX_ONLINESTATUS}></th>
@@ -35,6 +36,7 @@
                         </select>
                         <input id='filter_category_title' type='text' value='<{$filter_category_title}>' maxlength='100' size='15' title='' name='filter_category_title'>
                     </td>
+                    <td>&nbsp;</td>
                     <td><{$filter_submitter_select}></td>
                     <td>
                         <{*
@@ -68,6 +70,7 @@
                     <td>
                         <a href='../viewcat.php?cid=<{$download.cid}>'><{$download.category_title}></a>
                     </td>
+                    <td><{$download.weight}></td>
                     <td><{$download.submitter_uname}></td>
                     <td><{$download.published_formatted}></td>
                     <td align='center'>

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/wfdownloads_viewcat.tpl
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/wfdownloads_viewcat.tpl	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/templates/wfdownloads_viewcat.tpl	2015-02-13 22:47:42 UTC (rev 12976)
@@ -245,6 +245,23 @@
                            title="<{$smarty.const._MD_WFDOWNLOADS_SIZEHTOL}>"><{$smarty.const._MD_WFDOWNLOADS_SIZE}>&nbsp;<img
                                     src="<{xoModuleIcons16 down.gif}>" alt="&darr;"></a>
                     <{/if}>
+                    |
+                    <{if ($orderby == "weightA")}>
+                        <span class='button_green' title="<{$smarty.const._MD_WFDOWNLOADS_WEIGHTLTOH}>"><{$smarty.const._MD_WFDOWNLOADS_WEIGHT}>&nbsp;<img
+                                    src="<{xoModuleIcons16 up.gif}>" alt="&uarr;"></span>
+                    <{else}>
+                        <a class='button_grey' href="viewcat.php?cid=<{$category_cid}>&amp;orderby=weightA"
+                           title="<{$smarty.const._MD_WFDOWNLOADS_WEIGHTLTOH}>"><{$smarty.const._MD_WFDOWNLOADS_WEIGHT}>&nbsp;<img
+                                    src="<{xoModuleIcons16 up.gif}>" alt="&uarr;"></a>
+                    <{/if}>
+                    <{if ($orderby == "weightD")}>
+                        <span class='button_green' title="<{$smarty.const._MD_WFDOWNLOADS_WEIGHTHTOL}>"><{$smarty.const._MD_WFDOWNLOADS_WEIGHT}>&nbsp;<img
+                                    src="<{xoModuleIcons16 down.gif}>" alt="&darr;"></span>
+                    <{else}>
+                        <a class='button_grey' href="viewcat.php?cid=<{$category_cid}>&amp;orderby=weightD"
+                           title="<{$smarty.const._MD_WFDOWNLOADS_WEIGHTHTOL}>"><{$smarty.const._MD_WFDOWNLOADS_WEIGHT}>&nbsp;<img
+                                    src="<{xoModuleIcons16 down.gif}>" alt="&darr;"></a>
+                    <{/if}>
                 </div>
             </div>
         <{/if}>

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/viewcat.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/viewcat.php	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/viewcat.php	2015-02-13 22:47:42 UTC (rev 12976)
@@ -25,7 +25,7 @@
 $start = XoopsRequest::getInt('start', 0);
 //$list = XoopsRequest::getString('list', null);
 //$orderby = XoopsRequest::getString('orderby', null);
-$orderby = isset($_GET['orderby']) ? convertorderbyin($_GET['orderby']) : $wfdownloads->getConfig('filexorder');
+$orderby = isset($_GET['orderby']) ? wfdownloads_convertorderbyin($_GET['orderby']) : $wfdownloads->getConfig('filexorder');
 
 $groups = is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getGroups() : array(0 => XOOPS_GROUP_ANONYMOUS);
 
@@ -297,10 +297,10 @@
     $xoopsTpl->assign('show_links', false);
     if ($downloads_count > 1 && $cid != 0) {
         $xoopsTpl->assign('show_links', true);
-        $orderbyTrans = convertorderbytrans($orderby);
-        $xoopsTpl->assign('orderby', convertorderbyout($orderby));
-        $xoopsTpl->assign('lang_cursortedby', sprintf(_MD_WFDOWNLOADS_CURSORTBY, convertorderbytrans($orderby)));
-        $orderby = convertorderbyout($orderby);
+        $orderbyTrans = wfdownloads_convertorderbytrans($orderby);
+        $xoopsTpl->assign('orderby', wfdownloads_convertorderbyout($orderby));
+        $xoopsTpl->assign('lang_cursortedby', sprintf(_MD_WFDOWNLOADS_CURSORTBY, wfdownloads_convertorderbytrans($orderby)));
+        $orderby = wfdownloads_convertorderbyout($orderby);
     }
     // Screenshots display
     $xoopsTpl->assign('show_screenshot', false);

Modified: XoopsModules/wfdownloads/branches/luciorota/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/branches/luciorota/wfdownloads/xoops_version.php	2015-02-11 21:44:09 UTC (rev 12975)
+++ XoopsModules/wfdownloads/branches/luciorota/wfdownloads/xoops_version.php	2015-02-13 22:47:42 UTC (rev 12976)
@@ -42,8 +42,8 @@
 $modversion['onUpdate']    = 'include/onupdate.php';
 $modversion['onUninstall'] = 'include/onuninstall.php';
 
-$modversion['date']         = '2015-02-03';
-$modversion['release_date'] = '2015-02-03';
+$modversion['date']         = '2015-02-13';
+$modversion['release_date'] = '2015-02-13';
 $modversion['status']       = 'RC5';
 $modversion['teammembers']  = 'Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff';
 
@@ -902,7 +902,9 @@
         _MI_WFDOWNLOADS_RATING . $qa     => 'rating ASC',
         _MI_WFDOWNLOADS_RATING . $qd     => 'rating DESC',
         _MI_WFDOWNLOADS_POPULARITY . $qa => 'hits ASC',
-        _MI_WFDOWNLOADS_POPULARITY . $qd => 'hits DESC'
+        _MI_WFDOWNLOADS_POPULARITY . $qd => 'hits DESC',
+        _MI_WFDOWNLOADS_WEIGHT . $qa => 'weight ASC',
+        _MI_WFDOWNLOADS_WEIGHT . $qd => 'weight DESC'
     ),
     'default'     => 'title ASC'
 );