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

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

Revision: 11215
          http://sourceforge.net/p/xoops/svn/11215
Author:   irmtfan
Date:     2013-03-12 12:02:17 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
fix bug: $Userlog should be $this->userlog

Modified Paths:
--------------
    XoopsModules/userlog/trunk/userlog/admin/file.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 11:32:50 UTC (rev 11214)
+++ XoopsModules/userlog/trunk/userlog/admin/file.php	2013-03-12 12:02:17 UTC (rev 11215)
@@ -51,7 +51,7 @@
 			redirect_header("file.php", 5, sprintf(_AM_USERLOG_ERROR,_AM_USERLOG_FILE_SELECT_ONE));
 		}
 		if ($newFile = $loglogObj->renameFile($file[0], $filename)) {
-			redirect_header("file.php", 700, sprintf(_AM_USERLOG_FILE_RENAME_SUCCESS,$file[0], $newFile));
+			redirect_header("file.php", 5, sprintf(_AM_USERLOG_FILE_RENAME_SUCCESS,$file[0], $newFile));
 		}
 		redirect_header("file.php", 5, sprintf(_AM_USERLOG_ERROR,implode("<br\>",$loglogObj->getErrors())));
         break;
@@ -61,7 +61,7 @@
 			redirect_header("file.php", 5, sprintf(_AM_USERLOG_ERROR,_AM_USERLOG_FILE_SELECT_ONE));
 		}
 		if ($newFile = $loglogObj->copyFile($file[0], $filename)) {
-			redirect_header("file.php", 700, sprintf(_AM_USERLOG_FILE_COPY_SUCCESS,$file[0], $newFile));
+			redirect_header("file.php", 5, sprintf(_AM_USERLOG_FILE_COPY_SUCCESS,$file[0], $newFile));
 		}
 		redirect_header("file.php", 5, sprintf(_AM_USERLOG_ERROR,implode("<br\>",$loglogObj->getErrors())));
         break;
@@ -113,7 +113,7 @@
 $submitEl = new XoopsFormButton(_SUBMIT, 'submitfilemanager', _SUBMIT, 'submit');
 $form->addElement($submitEl);
 $confirmEl = new XoopsFormHidden("confirm",0);
-$confirmEl->customValidationCode[]="if(confirm('" . _AM_USERLOG_FILE_CONFIRM . "' + ' action=' + myform.op.value)) {myform.confirm.value = 1;} else {return false;};";
+$confirmEl->customValidationCode[]="if(confirm('" . _AM_USERLOG_FILE_CONFIRM . "' + ' action=' + myform.op.value + ' ' + myform.file.value)) {myform.confirm.value = 1;} else {return false;};";
 $form->addElement($confirmEl);
 $GLOBALS['xoopsTpl']->assign('form', $form->render());
 $GLOBALS['xoopsTpl']->assign('logo',$indexAdmin->addNavigation('file.php'));

Modified: XoopsModules/userlog/trunk/userlog/class/log.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/class/log.php	2013-03-12 11:32:50 UTC (rev 11214)
+++ XoopsModules/userlog/trunk/userlog/class/log.php	2013-03-12 12:02:17 UTC (rev 11215)
@@ -280,7 +280,7 @@
 				// if there is one value - deal with =, > ,<
 				if (count($val_arr) == 1) {
 					$val_int = $val_arr[0];
-					if($op == "log_time" || $op == "last_login") $val_int = time() - $Userlog->getSinceTime($val_int);
+					if($op == "log_time" || $op == "last_login") $val_int = time() - $this->userlog->getSinceTime($val_int);
 					// query is one int $t (=, < , >)
 					foreach ($logs as $id => $log) {
 						switch ($tt) {