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

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

Revision: 11154
          http://sourceforge.net/p/xoops/svn/11154
Author:   irmtfan
Date:     2013-03-05 02:40:49 +0000 (Tue, 05 Mar 2013)
Log Message:
-----------
add a default to preferences for viewing files in logs.php
fix some js issues

Modified Paths:
--------------
    XoopsModules/userlog/trunk/userlog/admin/logs.php
    XoopsModules/userlog/trunk/userlog/class/log.php
    XoopsModules/userlog/trunk/userlog/language/english/admin.php
    XoopsModules/userlog/trunk/userlog/language/english/modinfo.php
    XoopsModules/userlog/trunk/userlog/templates/userlog_admin_logs.html
    XoopsModules/userlog/trunk/userlog/xoops_version.php

Modified: XoopsModules/userlog/trunk/userlog/admin/logs.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/admin/logs.php	2013-03-04 22:36:47 UTC (rev 11153)
+++ XoopsModules/userlog/trunk/userlog/admin/logs.php	2013-03-05 02:40:49 UTC (rev 11154)
@@ -33,7 +33,7 @@
 
 $options = UserlogRequest::getArray("options");
 $engine = UserlogRequest::getString('engine',$Userlog->getConfig("engine"));
-$file = UserlogRequest::getArray('file', "all");
+$file = UserlogRequest::getArray('file', '');
 $opentry = UserlogRequest::getString('op');
  
 $logsetObj = UserlogSetting::getInstance();
@@ -178,8 +178,10 @@
 $engineEl = new XoopsFormSelect(_AM_USERLOG_ENGINE,"engine", $engine);
 $engineEl->addOption("db", _AM_USERLOG_ENGINE_DB);
 $engineEl->addOption("file",  _AM_USERLOG_ENGINE_FILE);
+$engineEl->setDescription(_AM_USERLOG_ENGINE_DSC);
 if ($engine == "file") {
 	$fileEl = $loglogObj->buildFileSelectEle($file, true);
+	$fileEl->setDescription(_AM_USERLOG_FILE_DSC);
 }
 $limitEl = new XoopsFormText(_AM_USERLOG_LOGS_PERPAGE, "limitentry", 10, 255, $limitentry);
 $limitEl->setDescription(sprintf(_AM_USERLOG_LOGS_PERPAGE_DSC, $Userlog->getConfig("logs_perpage")));

Modified: XoopsModules/userlog/trunk/userlog/class/log.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/class/log.php	2013-03-04 22:36:47 UTC (rev 11153)
+++ XoopsModules/userlog/trunk/userlog/class/log.php	2013-03-05 02:40:49 UTC (rev 11154)
@@ -296,7 +296,7 @@
 	}
     public function readFiles($log_files = array())
 	{
-		if(empty($log_files) || count($log_files) == 0) {
+		if(empty($log_files[0]) || count($log_files) == 0) {
 			return $this->readFile();
 		}
 		$logs = array();
@@ -351,6 +351,10 @@
     public function buildFileSelectEle($currentFile = null, $multi = false)
 	{
 		$logext = "log";
+		if (empty($currentFile[0])) {
+			$log_file_name = $this->userlog->getConfig('logfilepath') .'/'. USERLOG_DIRNAME . '/' . $this->userlog->getConfig('logfilename');
+			$currentFile = $log_file_name.".".$logext;
+		}
 		list($allFiles,$totalFiles) = $this->userlog->getAllLogFiles();
 		if (empty($totalFiles)) return false; 
 		$log_file_name = $this->userlog->getConfig('logfilename');

Modified: XoopsModules/userlog/trunk/userlog/language/english/admin.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/language/english/admin.php	2013-03-04 22:36:47 UTC (rev 11153)
+++ XoopsModules/userlog/trunk/userlog/language/english/admin.php	2013-03-05 02:40:49 UTC (rev 11154)
@@ -161,10 +161,12 @@
 define("_AM_USERLOG_LOGGER_FORM",_AM_USERLOG_TEXT_FORM);
 // END DO NOT TOUCH
 // logs.php engine
-define("_AM_USERLOG_ENGINE","Select the engine you want to get logs from:");
+define("_AM_USERLOG_ENGINE","Engine");
+define("_AM_USERLOG_ENGINE_DSC","Select the engine you want to get logs from.");
 define("_AM_USERLOG_ENGINE_FILE","FILE");
 define("_AM_USERLOG_ENGINE_DB","Database");
-define("_AM_USERLOG_FILE","Select files you want to get logs from:");
+define("_AM_USERLOG_FILE","Files");
+define("_AM_USERLOG_FILE_DSC","Select files you want to get logs from.");
 define("_AM_USERLOG_FILE_WORKING","Working file");
 
 // logs.php error

Modified: XoopsModules/userlog/trunk/userlog/language/english/modinfo.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/language/english/modinfo.php	2013-03-04 22:36:47 UTC (rev 11153)
+++ XoopsModules/userlog/trunk/userlog/language/english/modinfo.php	2013-03-05 02:40:49 UTC (rev 11154)
@@ -60,6 +60,9 @@
 define("_MI_USERLOG_LOGS_PERPAGE_DSC","The default value for viewing logs");
 define("_MI_USERLOG_ENGINE","Select the default engine for browsing logs");
 define("_MI_USERLOG_ENGINE_DSC","This will be the default engine in logs browsing.");
+define("_MI_USERLOG_FILE","Select the default files for browsing logs");
+define("_MI_USERLOG_FILE_DSC","This will be the default files in logs browsing.");
+
 // config logdb
 define("_MI_USERLOG_MAXLOGS","Maximum logs stored in database");
 define("_MI_USERLOG_MAXLOGS_DSC","Logs will be deleted from database after reaching this number");

Modified: XoopsModules/userlog/trunk/userlog/templates/userlog_admin_logs.html
===================================================================
--- XoopsModules/userlog/trunk/userlog/templates/userlog_admin_logs.html	2013-03-04 22:36:47 UTC (rev 11153)
+++ XoopsModules/userlog/trunk/userlog/templates/userlog_admin_logs.html	2013-03-05 02:40:49 UTC (rev 11154)
@@ -21,7 +21,7 @@
 <{if $logs}>
 <{assign var=widthC value=5}>
 <div class="outer">
-	<form name="delete" action="logs.php?op=del&amp;confirm=1<{if $query_page}>&amp;<{$query_page}><{/if}><{if $query_entry}><{$query_entry}><{/if}>" method="POST" onsubmit="javascript: if(window.document.delete.log_id[].value &lt; 1){return false;}">
+	<form name="delete" action="logs.php?op=del&amp;confirm=1<{if $query_page}>&amp;<{$query_page}><{/if}><{if $query_entry}><{$query_entry}><{/if}>" method="POST" onsubmit="javascript: if(isOneChecked('log_id[]')) {return confirm('<{$smarty.const._AM_USERLOG_LOG_DELETE_CONFIRM}>');} else {return false;}">
     <div class="head boxshadow1 border xx-small">
 		<div class="width1 floatleft center">
 			<{$smarty.const._ALL}>: <input type="checkbox" name="id_check" id="id_check" value="1" onclick="xoopsCheckAll('delete', 'id_check');" />
@@ -46,7 +46,7 @@
     </div>
     <{/foreach}>
 	<div class="floatleft">
-		<input onclick="return confirm('<{$smarty.const._AM_USERLOG_LOG_DELETE_CONFIRM}>');" id="submit" class="formButton" type="submit" name="submit" value="<{$smarty.const._AM_USERLOG_LOG_DELETE_SELECT}>" title="<{$smarty.const._AM_USERLOG_LOG_DELETE_SELECT}>"  /> 
+		<input id="submit" class="formButton" type="submit" name="submit" value="<{$smarty.const._AM_USERLOG_LOG_DELETE_SELECT}>" title="<{$smarty.const._AM_USERLOG_LOG_DELETE_SELECT}>"  /> 
 	</div>
 	<{if $pages gt 1}>
 	<div class="floatright xo-buttons">
@@ -60,4 +60,20 @@
 	</form>
 </div>
 <{/if}>
-<{$form}>
\ No newline at end of file
+<{$form}>
+<script type="text/javascript">
+function isOneChecked($name) {
+  // All <input> tags...
+  var chx = document.getElementsByName($name);
+  for (var i=0; i<chx.length; i++) {
+    // If you have more than one checkbox group, also check the name attribute
+    // for the one you want as in && chx[i].name == 'choose'
+    // Return true from the function on first match of a checked item
+    if (chx[i].type == 'checkbox' && chx[i].checked) {
+      return true;
+    } 
+  }
+  // End of the loop, return false
+  return false;
+}
+</script>
\ No newline at end of file

Modified: XoopsModules/userlog/trunk/userlog/xoops_version.php
===================================================================
--- XoopsModules/userlog/trunk/userlog/xoops_version.php	2013-03-04 22:36:47 UTC (rev 11153)
+++ XoopsModules/userlog/trunk/userlog/xoops_version.php	2013-03-05 02:40:49 UTC (rev 11154)
@@ -209,6 +209,16 @@
 $modversion['config'][$i]['category'] = 'pagenav';
 
 $i++;
+$modversion['config'][$i]['name'] = 'file';
+$modversion['config'][$i]['title'] = '_MI_USERLOG_FILE';
+$modversion['config'][$i]['description'] = '_MI_USERLOG_FILE_DSC';
+$modversion['config'][$i]['formtype'] = 'select';
+$modversion['config'][$i]['valuetype'] = 'text';
+$modversion['config'][$i]['default'] = '0';
+$modversion['config'][$i]['options'] = array(_AM_USERLOG_FILE_WORKING=>'0',_AM_USERLOG_STATS_FILEALL=>'all');
+$modversion['config'][$i]['category'] = 'pagenav';
+
+$i++;
 $modversion['config'][$i]['name'] = 'logdb';
 $modversion['config'][$i]['title'] = '_MI_USERLOG_CONFCAT_LOGDB';
 $modversion['config'][$i]['description'] = '_MI_USERLOG_CONFCAT_LOGDB_DSC';