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

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

Revision: 11225
          http://sourceforge.net/p/xoops/svn/11225
Author:   irmtfan
Date:     2013-03-14 02:11:06 +0000 (Thu, 14 Mar 2013)
Log Message:
-----------
fix bugs:
1- notices when moduleViews is empty (no logs is exist) in admin/stats.php (Cesag)
2- Fatal error after installation in admin/menu.php (Cesag)
3- Warning: array_multisort() [function.array-multisort]: Argument #1 is expected to be an array or a sort flag in file. It is when no logs is exist (Cesag)

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

Modified: XoopsModules/userlog/trunk/userlog/admin/menu.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/admin/menu.php	2013-03-13 22:02:36 UTC (rev 11224)
+++ XoopsModules/userlog/trunk/userlog/admin/menu.php	2013-03-14 02:11:06 UTC (rev 11225)
@@ -61,6 +61,7 @@
 $adminmenu[$i]['link'] = "admin/about.php";
 $adminmenu[$i]["icon"] = '../../' . $pathIcon32 . '/about.png';
 // add js, css, toggle_cookie to admin pages
+include_once dirname(dirname(__FILE__)) . '/include/common.php'; // after installtion it will included before admin_header.php
 global $xoTheme;
 $Userlog = Userlog::getInstance(false);
 $xoTheme->addScript("modules/" . USERLOG_DIRNAME . "/templates/js/" . USERLOG_DIRNAME . ".js"); 

Modified: XoopsModules/userlog/trunk/userlog/admin/stats.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/admin/stats.php	2013-03-13 22:02:36 UTC (rev 11224)
+++ XoopsModules/userlog/trunk/userlog/admin/stats.php	2013-03-14 02:11:06 UTC (rev 11225)
@@ -47,17 +47,19 @@
 				$arr2["value"] ? 'GREEN' : 'RED');
 	}
 }
-$indexAdmin->addInfoBox(_AM_USERLOG_VIEW_MODULE);
 $criteria = new CriteriaCompo();
 $criteria->setGroupby("module");
 $moduleViews = $Userlog->getHandler('log')->getCounts($criteria);
-$modulesObj = $Userlog->getModules(array_keys($moduleViews));
-foreach($modulesObj as $mObj) {
-	$mDir = $mObj->dirname();
-	$indexAdmin->addInfoBoxLine(_AM_USERLOG_VIEW_MODULE,
-								$mObj->name() . ": %s",
-								$moduleViews[$mDir],
-								$moduleViews[$mDir]? 'GREEN' : 'RED');
+if (!empty($moduleViews)) {
+	$indexAdmin->addInfoBox(_AM_USERLOG_VIEW_MODULE);
+	$modulesObj = $Userlog->getModules(array_keys($moduleViews));
+	foreach($modulesObj as $mObj) {
+		$mDir = $mObj->dirname();
+		$indexAdmin->addInfoBoxLine(_AM_USERLOG_VIEW_MODULE,
+									$mObj->name() . ": %s",
+									$moduleViews[$mDir],
+									$moduleViews[$mDir]? 'GREEN' : 'RED');
+	}
 }
 $GLOBALS['xoopsTpl']->assign('stats_abstract',$indexAdmin->renderInfoBox());
 $GLOBALS['xoopsTpl']->assign('logo',$indexAdmin->addNavigation('stats.php'));

Modified: XoopsModules/userlog/trunk/userlog/blocks/views.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/blocks/views.php	2013-03-13 22:02:36 UTC (rev 11224)
+++ XoopsModules/userlog/trunk/userlog/blocks/views.php	2013-03-14 02:11:06 UTC (rev 11225)
@@ -136,7 +136,9 @@
 		$col1[$link]  = $item[$options[5]];
 		$col2[$link]  = $item["views"];//second sort by
 	}
-	array_multisort($col1, ($options[6] == "ASC") ? SORT_ASC : SORT_DESC ,$col2 ,SORT_DESC, $items);
+	if ( !empty($items) ) {
+		array_multisort($col1, ($options[6] == "ASC") ? SORT_ASC : SORT_DESC ,$col2 ,SORT_DESC, $items);
+	}
 	$block["items"] = $items;
 	$block["sort"] = $options[5];
 	unset($loglogsObj,$items);

Modified: XoopsModules/userlog/trunk/userlog/class/log.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/class/log.php	2013-03-13 22:02:36 UTC (rev 11224)
+++ XoopsModules/userlog/trunk/userlog/class/log.php	2013-03-14 02:11:06 UTC (rev 11225)
@@ -409,6 +409,7 @@
             $this->setErrors("Cannot read file ({$log_file})");
 			return false;
 		}
+		$fileHandler->close();		
 		$logs = explode("\n",$data); 
 		return $logs;
 	}
@@ -433,6 +434,7 @@
 			}
 			$deletedFiles++; 
 		}
+		$fileHandler->close();		
 		return $deletedFiles;
 	}
     public function renameFile($log_file = null, $newFileName = null)
@@ -464,6 +466,7 @@
 			$this->setErrors("Cannot rename ({$file})");
 			return false;
 		}
+		$fileHandler->close();		
 		return $newFile;
 	}
     public function copyFile($log_file = null, $newFileName = null)
@@ -492,9 +495,10 @@
 			return false;
 		}
 		if (!@copy($log_file, $newFile)) {
-			$this->setErrors("Cannot rename ({$file})");
+			$this->setErrors("Cannot copy ({$log_file})");
 			return false;
 		}
+		$fileHandler->close();		
 		return $newFile;
 	}
     public function zipFiles($log_files = array(), $zipFileName = null)
@@ -509,6 +513,7 @@
 				continue;
 			}
 		}
+		$fileHandler->close();		
 		if( ($totalFiles = count($log_files)) == 0) {
             $this->setErrors("No file to zip");
 			return false;
@@ -536,7 +541,10 @@
 				$this->setErrors("Cannot zip ({$file})");
 			}
 		}
-		$this->setErrors("Number of files operated in zipped file: ({$zip->numFiles})");
+		// if there are some files existed in zip file and/or some files overwritten
+		if($totalFiles != $zip->numFiles) {
+			$this->setErrors("Number of files operated in zipped file: ({$zip->numFiles})");
+		}	
 		//$this->setErrors("Zip file name: ({$zip->filename})");
 		$zip->close();
 		return $zipFile;