[xoops-svn] SF.net SVN: xoops-svn:[11214] XoopsModules/userlog/trunk/userlog

[<ir...@us...>]

Revision: 11214
          http://sourceforge.net/p/xoops/svn/11214
Author:   irmtfan
Date:     2013-03-12 11:32:50 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
fix bugs:
1- post method for confirm request var
2- sort/order for views
3- filesize to $fileHandler->size()

Modified Paths:
--------------
    XoopsModules/userlog/trunk/userlog/admin/file.php
    XoopsModules/userlog/trunk/userlog/blocks/views.php
    XoopsModules/userlog/trunk/userlog/class/log.php

Modified: XoopsModules/userlog/trunk/userlog/admin/file.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/admin/file.php	2013-03-12 10:39:59 UTC (rev 11213)
+++ XoopsModules/userlog/trunk/userlog/admin/file.php	2013-03-12 11:32:50 UTC (rev 11214)
@@ -32,7 +32,7 @@
 $file = UserlogRequest::getArray('file', $Userlog->getConfig("file"));
 $opentry = UserlogRequest::getString('op', '');
 $filename = UserlogRequest::getString('filename', '');
-$confirm = UserlogRequest::getString('confirm',0);
+$confirm = UserlogRequest::getString('confirm',0, 'post');
 $totalFiles = count($file);
 if(!empty($opentry) && ($confirm == 0 || $totalFiles == 0)) {
 	redirect_header("file.php", 5, sprintf(_AM_USERLOG_ERROR,""));

Modified: XoopsModules/userlog/trunk/userlog/blocks/views.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/blocks/views.php	2013-03-12 10:39:59 UTC (rev 11213)
+++ XoopsModules/userlog/trunk/userlog/blocks/views.php	2013-03-12 11:32:50 UTC (rev 11214)
@@ -105,11 +105,14 @@
 		$criteria->add($criteriaGroup);
 	}
     $criteria->setLimit($options[0]);
+    $criteria->setSort(($options[5] == "views") ? "count" : "module");
+    $criteria->setOrder($options[6]);
 	$fields = array("uid","groups","pagetitle","module","script","item_name","item_id");
 	$criteria->setGroupby("module,script,item_name,item_id");
 	
     list($loglogsObj, $itemViews) = $Userlog->getHandler('log')->getLogsCounts($criteria,$fields);
 	$criteria->setGroupby("module");
+    $criteria->setSort(($options[5] == "module_views") ? "count" : "module");
 	$moduleViews = $Userlog->getHandler('log')->getCounts($criteria);
 	$modules = $Userlog->getModules(array_keys($moduleViews));
 	foreach($modules as $module) {

Modified: XoopsModules/userlog/trunk/userlog/class/log.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/class/log.php	2013-03-12 10:39:59 UTC (rev 11213)
+++ XoopsModules/userlog/trunk/userlog/class/log.php	2013-03-12 11:32:50 UTC (rev 11214)
@@ -150,17 +150,17 @@
     public function storeFile($tolog)
 	{
 		$log_file = $this->userlog->getWorkingFile();
-		$log_file_name = $this->userlog->getConfig('logfilepath') .'/'. USERLOG_DIRNAME . '/' . $this->userlog->getConfig('logfilename');
-		if (filesize($log_file) > $this->userlog->getConfig('maxlogfilesize')) {
+		// file create/open/write
+		$fileHandler = XoopsFile::getHandler();
+		$fileHandler->XoopsFileHandler($log_file, false);		
+		if ($fileHandler->size() > $this->userlog->getConfig('maxlogfilesize')) {
+			$log_file_name = $this->userlog->getConfig('logfilepath') .'/'. USERLOG_DIRNAME . '/' . $this->userlog->getConfig('logfilename');
 			$old_file = $log_file_name ."_".date('Y-m-d_H-i-s') . "." . $this->userlog->logext;
 			if(!$result=rename($log_file, $old_file)) {
 				$this->setErrors("ERROR renaming ({$log_file})");
 				return false;
 			}
 		}
-		// file create/open/write
-		$fileHandler = XoopsFile::getHandler();
-		$fileHandler->XoopsFileHandler($log_file, false);		
 		// force to create file if not exist
 		if(!$fileHandler->exists()) {
 			$fileHandler->XoopsFileHandler($log_file, true); // create file and folder
@@ -623,6 +623,9 @@
             if ($groupby = $criteria->getGroupby()) {
                 $sql .= $groupby;
             }
+            if ($sort = $criteria->getSort()) {
+                $sql .= " ORDER BY {$sort} " . $criteria->getOrder();
+            }
             $limit = $criteria->getLimit();
             $start = $criteria->getStart();
         }