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

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

Revision: 12065
          http://sourceforge.net/p/xoops/svn/12065
Author:   luciorota
Date:     2013-09-17 20:02:41 +0000 (Tue, 17 Sep 2013)
Log Message:
-----------
- added: ip_logs page uses templates (in progress)
- bugfix: admin/mimetypes.php shows all mimetypes/extensions
- removed old help admin link
- bugfix: file doesn't downloads after disclaimer confirmation

Modified Paths:
--------------
    XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
    XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
    XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
    XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
    XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
    XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
    XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
    XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
    XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php

Added Paths:
-----------
    XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.html

Removed Paths:
-------------
    XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php	2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/downloads.php	2013-09-17 20:02:41 UTC (rev 12065)
@@ -740,18 +740,69 @@
 
         include 'admin_footer.php';
         break;
-}
 
+    case "ip_logs.list" :
+        $lid = WfdownloadsRequest::getInt('lid', 0);
+        if(!$lid) {
+            header('Location index.php');
+        }
 
+        wfdownloads_xoops_cp_header();
+        $indexAdmin = new ModuleAdmin();
+        echo $indexAdmin->addNavigation($currentFile);
 
-function addDownload()
-{
+        $adminMenu = new ModuleAdmin();
+        $adminMenu->addItemButton(_MI_WFD_MENU_DOWNLOADS, $currentFile . "?op=downloads.list", 'list');
+        $adminMenu->addItemButton(_AM_WFD_FFS_DOWNLOADTITLE, $currentFile . "?op=download.add", 'add');
+        echo $adminMenu->renderButton();
 
-}
+        // Get ip logs
+        $criteria = new CriteriaCompo();
+        if ($lid != 0) {
+            $criteria->add(new Criteria('lid', $lid));
+        }
+        $criteria->setSort('date');
+        $criteria->setOrder('DESC');
+        $ip_logs = $wfdownloads->getHandler('ip_log')->getObjects($criteria);
+        $ip_logs_count = $wfdownloads->getHandler('ip_log')->count($criteria);
+        $GLOBALS['xoopsTpl']->assign('ip_logs_count', $ip_logs_count);
+        unset($criteria);
 
+        // Get download info
+        if ($lid != 0) {
+            $download = $wfdownloads->getHandler('download')->get($lid);
+            $downloadArray = $download->toArray();
+            $GLOBALS['xoopsTpl']->assign('download', $download->toArray());
+        }
+        
+        // Get all logged users
+        $uidArray = array();
+        foreach($ip_logs as $ip_log) {
+            if($ip_log->getVar('uid')!= 0 && $ip_log->getVar('uid') != '') {
+                $uidArray[] = $ip_log->getVar('uid');
+            }
+        }
+        $criteria = new CriteriaCompo();
+        if(!empty($uidArray)) {
+            $criteria->add(new Criteria('uid', '(' . implode(', ', $uidArray) . ')', 'IN'));
+        }
+        $userList = $member_handler->getUserList($criteria);
+        if(empty($ip_logs)){
+            // NOP
+        } else {
+            foreach($ip_logs as $ip_log){
+                $ip_log_array = $ip_log->toArray();
+            	if($ip_log_array['uid'] != 0 ) {
+            		$ip_log_array['uname'] = $userList[$ip_log_array['uid']];
+            	} else {
+            		$ip_log_array['uname'] = _AM_WFD_ANONYMOUS;
+            	}
+                $GLOBALS['xoopsTpl']->append('ip_logs', $ip_log_array);
+            }
+        }
 
+        $GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_ip_logslist.html");
 
-function saveDownload()
-{
-
+        include 'admin_footer.php';
+        break;
 }

Deleted: XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php	2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/ip_logs.php	2013-09-17 20:02:41 UTC (rev 12065)
@@ -1,75 +0,0 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-/**
- * WF-Downloads module
- *
- * @copyright       The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license         GNU GPL 2 or later (http://www.gnu.org/licenses/gpl-2.0.html)
- * @package         wfdownload
- * @since           3.23
- * @author          Xoops Development Team
- * @version         svn:$id$
- */
-$currentFile = basename(__FILE__);
-include_once dirname(__FILE__) . '/admin_header.php';
-
-$lid = isset($_GET['lid']) && $_GET['lid'] != '' ? $_GET['lid'] : 0;
-if(!$lid) {
-    header('Location index.php');
-}
-
-wfdownloads_xoops_cp_header();
-$indexAdmin = new ModuleAdmin();
-echo $indexAdmin->addNavigation($currentFile);
-
-$download = $wfdownloads->getHandler('download')->get($lid);
-$criteria = new CriteriaCompo();
-$criteria->add(new Criteria('lid', $lid));
-$criteria->setSort('date');
-$criteria->setOrder('DESC');
-
-$ip_logsObj = $wfdownloads->getHandler('ip_log')->getObjects($criteria);
-unset($criteria);
-$uidArray = array();
-foreach($ip_logsObj as $ip_logObj) {
-    if($ip_logObj->getVar('uid')!= 0 && $ip_logObj->getVar('uid') != '') {
-        $uidArray[] = $ip_logObj->getVar('uid');
-    }
-}
-$criteria = new CriteriaCompo();
-if(!empty($uidArray)) {
-    $criteria->add(new Criteria('uid', '(' . implode(', ', $uidArray) . ')', 'IN'));
-}
-$userList = $member_handler->getUserList($criteria);
-echo  "<a href='index.php'>" . _AM_WFD_BACK . "</a>";
-if(empty($ip_logsObj)){
-    echo  "<h2>" . _AM_WFD_EMPTY_LOG . "</h2>";
-} else {
-    echo "<h2>" . sprintf(_AM_WFD_LOG_FOR_LID, $download->getVar('title')) . "</h2>";
-    echo "<br/><table><tr><td width='20%'><b>" . _AM_WFD_IP_ADDRESS . "</b></td><td width='20%'><b>" . _AM_WFD_DATE . "</b></td><td width='20%'><b>" . _AM_WFD_USER . "</b></td></tr>";
-    foreach($ip_logsObj as $ip_logObj){
-    	echo "<tr><td>";
-    	echo $ip_logObj->getVar('ip_address');
-    	echo "</td><td>";
-    	echo formatTimestamp($ip_logObj->getVar('date'));
-    	echo "</td><td>";
-    	if($ip_logObj->getVar('uid') != 0 ) {
-    		$uname = $userList[$ip_logObj->getVar('uid')];
-    	} else {
-    		$uname = _AM_WFD_ANONYMOUS;
-    	}
-    	echo $uname;
-    	echo "</td></tr>";
-    }
-    echo "</table>";
-}
-
-include 'admin_footer.php';

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php	2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/menu.php	2013-09-17 20:02:41 UTC (rev 12065)
@@ -75,10 +75,6 @@
 $adminmenu[$i]['link'] = "admin/import.php";
 $adminmenu[$i]["icon"]  = '../../' . $module->getInfo('icons32') . '/add.png';
 $i++;
-$adminmenu[$i]['title'] = _MI_WFD_MENU_HELP_OLD;
-$adminmenu[$i]['link'] =  "docs/english/readme.html";
-$adminmenu[$i]["icon"]  = '../../' . $module->getInfo('icons32') . '/help.png';
-$i++;
 $adminmenu[$i]['title'] = _MI_WFD_MENU_ABOUT;
 $adminmenu[$i]['link'] =  "admin/about.php";
 $adminmenu[$i]["icon"]  = '../../' . $module->getInfo('icons32') . '/about.png';

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php	2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/admin/mimetypes.php	2013-09-17 20:02:41 UTC (rev 12065)
@@ -34,8 +34,8 @@
         }
         break;
 */
-    case "mimetype.edit":
-    case "mimetype.add":
+    case "mimetype.edit" :
+    case "mimetype.add" :
         wfdownloads_xoops_cp_header();
         $indexAdmin = new ModuleAdmin();
         echo $indexAdmin->addNavigation($currentFile);
@@ -59,7 +59,7 @@
         $form = $mimetype->getForm();
         $form->display();
 
-        $extform = new XoopsThemeForm(_AM_WFD_MIME_FINDMIMETYPE, "op", $_SERVER['REQUEST_URI']);
+        $extform = new XoopsThemeForm(_AM_WFD_MIME_FINDMIMETYPE, 'op', $_SERVER['REQUEST_URI']);
         
             $fileext_text = new XoopsFormText(_AM_WFD_MIME_EXTFIND, 'fileext', 5, 60, $mimetype->getVar('mime_ext'));
             $fileext_text->setDescription(_AM_WFD_MIME_EXTFIND_DESC);
@@ -75,7 +75,7 @@
         xoops_cp_footer();
         break;
 
-    case "mimetype.save":
+    case "mimetype.save" :
         $mime_id = WfdownloadsRequest::getInt('mime_id', 0, 'POST');
         if (!$mimetype = $wfdownloads->getHandler('mimetype')->get($mime_id)) {
             redirect_header($currentFile, 4, _AM_WFD_ERROR_MIMETYPENOTFOUND);
@@ -95,7 +95,7 @@
         redirect_header($currentFile, 1, $dbupted);
         break;
 
-    case "mimetype.update":
+    case "mimetype.update" :
         $mime_id = WfdownloadsRequest::getInt('mime_id', 0);
         if (!$mimetype = $wfdownloads->getHandler('mimetype')->get($mime_id)) {
             redirect_header($currentFile, 4, _AM_WFD_ERROR_MIMETYPENOTFOUND);
@@ -119,18 +119,18 @@
         if (!$wfdownloads->getHandler('mimetype')->insert($mimetype, true)) {
             trigger_error($error, E_USER_ERROR);
         }
-        redirect_header("{$currentFile}?start=" . intval($_GET['start']) . "", 0, _AM_WFD_MIME_MODIFIED);
+        redirect_header("{$currentFile}?start=" . (int)($_GET['start']) . "", 0, _AM_WFD_MIME_MODIFIED);
         break;
 
-    case "mimetypes.update":
-        $mime_admin = (isset($_GET['admin']) && $_GET['admin'] == true ) ? $_GET['admin'] : false;
-        $mime_user = (isset($_GET['user']) && $_GET['user'] == true) ? $_GET['user'] : false;
-        $type_all = intval($_GET['type_all']);
+    case "mimetypes.update" :
+        $mime_admin = WfdownloadsRequest::getBool('admin', false);
+        $mime_user = WfdownloadsRequest::getBool('user', false);
+        $type_all = (int)($_GET['type_all']);
 
         if ($mime_admin == true) {
-            $field = "mime_admin";
+            $field = 'mime_admin';
         } else {
-            $field = "mime_user";
+            $field = 'mime_user';
         }
         $criteria = new CriteriaCompo();
         $criteria->setStart($start);
@@ -139,10 +139,10 @@
             $error = "Could not update mimetype information";
             trigger_error($error, E_USER_ERROR);
         }
-        redirect_header("{$currentFile}?start=" . intval($_GET['start']) . "", 1, _AM_WFD_MIME_MODIFIED);
+        redirect_header("{$currentFile}?start=" . (int)($_GET['start']) . "", 1, _AM_WFD_MIME_MODIFIED);
         break;
 
-    case "mimetype.delete":
+    case "mimetype.delete" :
         $mime_id = WfdownloadsRequest::getInt('mime_id', 0);
         $ok = WfdownloadsRequest::getBool('ok', false, 'POST');
         if (!$mimetype = $wfdownloads->getHandler('mimetype')->get($mime_id)) {
@@ -167,16 +167,17 @@
         }
         break;
 
-    case "mimetypes.list":
-    default:
+    case "mimetypes.list" :
+    default :
         $start = WfdownloadsRequest::getInt('start', 0);
 
+        // Get mimetypes (20 per page)
         $criteria = new CriteriaCompo();
-        $criteria->setSort("mime_name");
+        $criteria->setSort('mime_name');
         $criteria->setStart($start);
         $criteria->setLimit(20);
         $mimetypes = $wfdownloads->getHandler('mimetype')->getObjects($criteria);
-        $mime_num = $wfdownloads->getHandler('mimetype')->getCount();
+        $mimetypes_count = $wfdownloads->getHandler('mimetype')->getCount();
 
         wfdownloads_xoops_cp_header();
         $indexAdmin = new ModuleAdmin();
@@ -187,30 +188,28 @@
         $adminMenu->addItemButton(_AM_WFD_MIME_CREATEF, "{$currentFile}?op=mimetype.add", 'add');
         echo $adminMenu->renderButton();
 
-        $GLOBALS['xoopsTpl']->assign('mimetypes_count', $mime_num);
+        $GLOBALS['xoopsTpl']->assign('mimetypes_count', $mimetypes_count);
         $GLOBALS['xoopsTpl']->assign('start', $start);
 
-        if ($mime_num > 0) {
+        if ($mimetypes_count > 0) {
             $allowAdminMimetypes = array();
             $allowUserMimetypes = array();
             foreach ($mimetypes as $mimetype) {
-                if ($mimetype->getVar('mime_admin') == true) {
-                    $allowAdminMimetypes[] = $mimetype->getVar('mime_ext');
-                }
-                if ($mimetype->getVar('mime_user') == true) {
-                    $allowUserMimetypes[] = $mimetype->getVar('mime_ext');
-                }
                 $mimetype_array = $mimetype->toArray();
                 $GLOBALS['xoopsTpl']->append('mimetypes', $mimetype_array);
             }
-            $GLOBALS['xoopsTpl']->assign('allowAdminMimetypes', $allowAdminMimetypes);
-            $GLOBALS['xoopsTpl']->assign('allowUserMimetypes', $allowUserMimetypes);
             //Include page navigation
             include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-            $pagenav = new XoopsPageNav($mime_num, 20, $start, 'start');
+            $pagenav = new XoopsPageNav($mimetypes_count, 20, $start, 'start');
             $GLOBALS['xoopsTpl']->assign('mimetypes_pagenav', $pagenav -> renderNav());
         }
-        
+
+        // Get allowed mimetypes/estensione
+        $allowAdminMimetypes = $wfdownloads->getHandler('mimetype')->getList(new Criteria('mime_admin', true));
+        $allowUserMimetypes = $wfdownloads->getHandler('mimetype')->getList(new Criteria('mime_user', true));
+        $GLOBALS['xoopsTpl']->assign('allowAdminMimetypes', $allowAdminMimetypes);
+        $GLOBALS['xoopsTpl']->assign('allowUserMimetypes', $allowUserMimetypes);
+
         $GLOBALS['xoopsTpl']->display("db:" . $wfdownloads->getModule()->dirname() . "_admin_mimetypeslist.html");
 
         include 'admin_footer.php';

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt	2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/docs/changelog.txt	2013-09-17 20:02:41 UTC (rev 12065)
@@ -1,4 +1,4 @@
-<b><u>=> Version 3.23 Beta (2013-09-16)</u></b>
+<b><u>=> Version 3.23 Beta (2013-09-17)</u></b>
 - module standardization: header.php, admin/admin_header.php, xoops_version.php
 - module standardization: standardize directories/files names/structures
 - module standardization: standardize code headers

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php	2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/language/english/admin.php	2013-09-17 20:02:41 UTC (rev 12065)
@@ -196,10 +196,10 @@
 define("_AM_WFD_MIME_EXTF","File extension");
 define("_AM_WFD_MIME_NAMEF","Application type/name");
 define("_AM_WFD_MIME_TYPEF","Mimetypes");
-define("_AM_WFD_MIME_ADMINF","Allowed admin mimetype");
-define("_AM_WFD_MIME_ADMINFINFO","<b>Mimetypes that are available for admin uploads</b>");
-define("_AM_WFD_MIME_USERF","Allowed user mimetype");
-define("_AM_WFD_MIME_USERFINFO","<b>Mimetypes that are available for user uploads</b>");
+define("_AM_WFD_MIME_ADMINF","Allowed admin mimetypes/extesions");
+define("_AM_WFD_MIME_ADMINFINFO","<b>Mimetypes/extesions that are available for admin uploads</b>");
+define("_AM_WFD_MIME_USERF","Allowed user mimetypes/extensions");
+define("_AM_WFD_MIME_USERFINFO","<b>Mimetypes/extesions that are available for user uploads</b>");
 define("_AM_WFD_MIME_NOMIMEINFO","No mimetypes selected");
 define("_AM_WFD_MIME_FINDMIMETYPE","Find mimetype informations");
 define("_AM_WFD_MIME_EXTFIND","Search file extension");

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/submit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/submit.php	2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/submit.php	2013-09-17 20:02:41 UTC (rev 12065)
@@ -21,8 +21,6 @@
 $currentFile = basename(__FILE__);
 include 'header.php';
 
-$categoriesTree = new WfdownloadsXoopsTree($xoopsDB->prefix('wfdownloads_cat'), 'cid', 'pid');
-
 // Check if submissions are allowed
 $submissionsAllowed = false;
 if (is_object($xoopsUser) && ($wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_DOWNLOAD || $wfdownloads->getConfig('submissions') == _WFD_SUBMISSIONS_BOTH)) {
@@ -51,7 +49,7 @@
 // Check posts if user is not an ADMIN
 if (is_object($xoopsUser) && !$xoopsUser->isAdmin()) {
     if ($xoopsUser->getVar('posts') < $wfdownloads->getConfig('upload_minposts')) {
-        redirect_header("index.php", 5, _MD_WFD_UPLOADMINPOSTS);
+        redirect_header('index.php', 5, _MD_WFD_UPLOADMINPOSTS);
     }
 }
 
@@ -63,7 +61,6 @@
 $op = WfdownloadsRequest::getString('op', 'download.form');
 $notify = WfdownloadsRequest::getBool('notify', false);
 
-
 if ($wfdownloads->getConfig('showdisclaimer') && ($op == 'download.form') && $agreed == false) {
     $op = 'download.disclaimer';
 }

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html	2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_downloadslist.html	2013-09-17 20:02:41 UTC (rev 12065)
@@ -81,7 +81,7 @@
             <{/if}>
             </td>
             <td>
-                <a href='ip_logs.php?lid=<{$download.lid}>' title="<{$smarty.const._AM_WFD_IP_LOGS}>"><{$smarty.const._AM_WFD_IP_LOGS}></a>
+                <a href='?op=ip_logs.list&amp;lid=<{$download.lid}>' title="<{$smarty.const._AM_WFD_IP_LOGS}>"><{$smarty.const._AM_WFD_IP_LOGS}></a>
             </td>
             <td align='center'>
                 <a href='?op=download.add&amp;lid=<{$download.lid}>' title="<{$smarty.const._EDIT}>"><img src="<{xoModuleIcons16 edit.png}>" title="<{$smarty.const._EDIT}>" alt="<{$smarty.const._EDIT}>" /></a>
@@ -287,8 +287,4 @@
     <{$offline_downloads_pagenav}>
 <{/if}>
 </fieldset>
-
-
-
-
 </form>
\ No newline at end of file

Added: XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.html
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.html	                        (rev 0)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/templates/admin/wfdownloads_admin_ip_logslist.html	2013-09-17 20:02:41 UTC (rev 12065)
@@ -0,0 +1,29 @@
+<input type='button' value='<{$smarty.const._AM_WFD_BACK}>' onclick='history.go(-1)'>
+// IN PROGRESS
+<fieldset>
+    <legend style='font-weight: bold; color: #900;'><{$smarty.const._AM_WFD_IP_LOGS}></legend>
+<{if ($ip_logs_count == 0)}>
+    <{$smarty.const._AM_WFD_EMPTY_LOG}>
+<{else}>
+
+    <h2>sprintf(_AM_WFD_LOG_FOR_LID, $download->getVar('title'))</h2>
+
+    <table class="outer">
+        <tr>
+            <th><{$smarty.const._AM_WFD_IP_ADDRESS}></th>
+            <th><{$smarty.const._AM_WFD_DATE}></th>
+            <th><{$smarty.const._AM_WFD_USER}></th>
+        </tr>
+
+    <{foreach item=ip_log from=$ip_logs}>
+        <tr class="<{cycle values='even, odd'}>">
+            <td><{$ip_log.ip_address}></td>
+            <td align='center'>formatTimestamp($ip_log->getVar('date'))</td>
+            <td align='center'><{$ip_logs.uname}></td>
+        </tr>
+    <{/foreach}>
+    </table>
+<{/if}>
+</fieldset>
+</form>
+<input type='button' value='<{$smarty.const._AM_WFD_BACK}>' onclick='history.go(-1)'>

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/visit.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/visit.php	2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/visit.php	2013-09-17 20:02:41 UTC (rev 12065)
@@ -30,19 +30,21 @@
     redirect_header(XOOPS_URL . '/user.php', 1, _MD_WFD_MUSTREGFIRST);
 }
 
-$agreed = WfdownloadsRequest::getInt('agreed', 0);
+
+
 $lid = WfdownloadsRequest::getInt('lid', 0);
-
-// Get download
 $download = $wfdownloads->getHandler('download')->get($lid);
+// Check if download exists
 if ($download->isNew()) {
     redirect_header('index.php', 1, _MD_WFD_NODOWNLOAD);
 }
+$cid = WfdownloadsRequest::getInt('cid', $download->getVar('cid'));
+$agreed = WfdownloadsRequest::getBool('agreed', false, 'POST');
+
 //Download not published, expired or taken offline - redirect
 if ($download->getVar('published') == 0 || $download->getVar('published') > time() || $download->getVar('offline') == true || ($download->getVar('expired') != 0 && $download->getVar('expired') < time()) || $download->getVar('status') == 0) {
     redirect_header('index.php', 3, _MD_WFD_NODOWNLOAD);
 }
-$cid = $download->getVar('cid');
 
 // Check permissions
 $groups = is_object($xoopsUser) ? $xoopsUser->getGroups() : array(0=>XOOPS_GROUP_ANONYMOUS);
@@ -75,45 +77,47 @@
 }
 
 if ($wfdownloads->getConfig('showDowndisclaimer') && $agreed == false) {
-        $xoopsOption['template_main'] = 'wfdownloads_disclaimer.html';
-        include XOOPS_ROOT_PATH . '/header.php';
+    $xoopsOption['template_main'] = 'wfdownloads_disclaimer.html';
+    include XOOPS_ROOT_PATH . '/header.php';
 
-        $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/module.css');
-        $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
-        $xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
+    $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/module.css');
+    $xoTheme->addStylesheet(WFDOWNLOADS_URL . '/thickbox.css');
+    $xoopsTpl->assign('wfdownloads_url', WFDOWNLOADS_URL . '/');
 
-        $catarray['imageheader'] = wfdownloads_headerImage();
-        $xoopsTpl->assign('catarray', $catarray);
+    $catarray['imageheader'] = wfdownloads_headerImage();
+    $xoopsTpl->assign('catarray', $catarray);
 
-        // Breadcrumb
-        $breadcrumb = new WfdownloadsBreadcrumb();
-        $breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
-        $breadcrumb->addLink(_MD_WFD_DOWNLOADNOW, '');
-        $xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
+    // Breadcrumb
+    $breadcrumb = new WfdownloadsBreadcrumb();
+    $breadcrumb->addLink($wfdownloads->getModule()->getVar('name'), WFDOWNLOADS_URL);
+    $breadcrumb->addLink(_MD_WFD_DOWNLOADNOW, '');
+    $xoopsTpl->assign('wfdownloads_breadcrumb', $breadcrumb->render());
 
-        $xoopsTpl->assign('image_header', wfdownloads_headerImage());
+    $xoopsTpl->assign('lid', $lid);
+    $xoopsTpl->assign('cid', $cid);
 
-        $xoopsTpl->assign('submission_disclaimer', false);
-        $xoopsTpl->assign('download_disclaimer', truee);
-        $xoopsTpl->assign('download_disclaimer_content', $myts->displayTarea($wfdownloads->getConfig('downdisclaimer'), true, true, true, true, true));
+    $xoopsTpl->assign('image_header', wfdownloads_headerImage());
 
-        $xoopsTpl->assign('down_disclaimer', true); // this definition is not removed for compatibility issues
-        $xoopsTpl->assign('downdisclaimer', $myts->displayTarea($wfdownloads->getConfig('downdisclaimer'), true, true, true, true, true)); // this definition is not removed for compatibility issues
-        $xoopsTpl->assign('cancel_location', WFDOWNLOADS_URL . '/index.php'); // this definition is not removed for compatibility issues
-        $xoopsTpl->assign('agree_location', WFDOWNLOADS_URL . "/{$currentFile}?agree=1&amp;lid={$lid}&amp;cid={$cid}");
+    $xoopsTpl->assign('submission_disclaimer', false);
+    $xoopsTpl->assign('download_disclaimer', truee);
+    $xoopsTpl->assign('download_disclaimer_content', $myts->displayTarea($wfdownloads->getConfig('downdisclaimer'), true, true, true, true, true));
 
+    $xoopsTpl->assign('down_disclaimer', true); // this definition is not removed for compatibility issues
+    $xoopsTpl->assign('downdisclaimer', $myts->displayTarea($wfdownloads->getConfig('downdisclaimer'), true, true, true, true, true)); // this definition is not removed for compatibility issues
+    $xoopsTpl->assign('cancel_location', WFDOWNLOADS_URL . '/index.php'); // this definition is not removed for compatibility issues
+    $xoopsTpl->assign('agree_location', WFDOWNLOADS_URL . "/{$currentFile}?agree=1&amp;lid={$lid}&amp;cid={$cid}");
     include 'footer.php';
 } else {
-    if (!$wfdownloads_isAdmin) {
+    if (!wfdownloads_userIsAdmin()) {
         $wfdownloads->getHandler('download')->incrementHits($lid);
     }
 
-    $ip_logObj = $wfdownloads->getHandler('ip_log')->create();
-    $ip_logObj->setVar('lid', $lid);
-    $ip_logObj->setVar('date', time());
-    $ip_logObj->setVar('ip_address', getenv('REMOTE_ADDR'));
-    $ip_logObj->setVar('uid', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : 0);
-    $wfdownloads->getHandler('ip_log')->insert($ip_logObj, true);
+    $ip_log = $wfdownloads->getHandler('ip_log')->create();
+    $ip_log->setVar('lid', $lid);
+    $ip_log->setVar('date', time());
+    $ip_log->setVar('ip_address', getenv('REMOTE_ADDR'));
+    $ip_log->setVar('uid', is_object($xoopsUser) ? $xoopsUser->getVar('uid') : 0);
+    $wfdownloads->getHandler('ip_log')->insert($ip_log, true);
 
     $full_name = trim($download->getVar('filename'));
     if ((!$download->getVar('url') == '' && !$download->getVar('url') == 'http://') || $full_name == '') {

Modified: XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php
===================================================================
--- XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php	2013-09-17 12:12:00 UTC (rev 12064)
+++ XoopsModules/wfdownloads/trunk/wfdownloads/xoops_version.php	2013-09-17 20:02:41 UTC (rev 12065)
@@ -47,9 +47,9 @@
 $modversion['onUpdate'] = 'include/module.php';
 $modversion['onUninstall'] = 'include/module.php';
 
-$modversion['date'] = '2013-09-16';
-$modversion['release_date'] = '2013/09/16';
-$modversion['releasedate'] = '2013-09-16';
+$modversion['date'] = '2013-09-17';
+$modversion['release_date'] = '2013/09/17';
+$modversion['releasedate'] = '2013-09-17';
 $modversion['status'] = 'BETA';
 $modversion['teammembers'] = "Bender, David, FrankBlack, Xpider, M0nty, Mithrandir, Marcan, felix[fx2024], Sudhaker, Jegelstaff";
 
@@ -286,6 +286,10 @@
 $modversion['templates'][$i]['type'] = 'admin';
 $modversion['templates'][$i]['description'] = '';
 $i++;
+$modversion['templates'][$i]['file'] = $modversion['dirname'] . '_admin_ip_logslist.html';
+$modversion['templates'][$i]['type'] = 'admin';
+$modversion['templates'][$i]['description'] = '';
+$i++;
 $modversion['templates'][$i]['file'] = $modversion['dirname'] . '_admin_reportsmodificationslist.html';
 $modversion['templates'][$i]['type'] = 'admin';
 $modversion['templates'][$i]['description'] = '';