From 31564ee3ca9204f68a37cb68ae15bfd96213eda7 Mon Sep 17 00:00:00 2001
From: Tijn Kuyper <moc@mochosting.nl>
Date: Fri, 22 Feb 2013 11:51:16 +0100
Subject: [PATCH] Log plugin - minor styling and code/LAN clean-up

---
 e107_plugins/log/admin_config.php             | 31 +++++++++----------
 .../log/languages/English_admin_log.php       |  2 +-
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/e107_plugins/log/admin_config.php b/e107_plugins/log/admin_config.php
index 2f38a89ce..e21d24593 100644
--- a/e107_plugins/log/admin_config.php
+++ b/e107_plugins/log/admin_config.php
@@ -246,7 +246,7 @@ $ns->tablerender($caption, $mes->render() . $text);
 
 function gen_select($prompt,$name,$value)
 {
-  $ret = "<div style='padding-bottom: 4px'>".$prompt."&nbsp;&nbsp;"."<select name='{$name}' class='tbox'>\n
+  $ret = "<div style='padding-bottom: 4px'>".$prompt."&nbsp;&nbsp;"."<select name='{$name}' class='tbox e-select'>\n
 		<option value='0' ".($value == 0 ? " selected='selected'" : "").">".ADSTAT_L50."</option>\n
 		<option value='1' ".($value == 1 ? " selected='selected'" : "").">".ADSTAT_L49."</option>\n
 		<option value='2' ".($value == 2 ? " selected='selected'" : "").">".ADSTAT_L48."</option>\n
@@ -258,7 +258,7 @@ function gen_select($prompt,$name,$value)
 function data_type_select($name,$value)
 {
   global $stats_list;
-  $ret = "<select name='{$name}' class='tbox'  onchange=\"settypebox(this.value);\">\n
+  $ret = "<select name='{$name}' class='tbox e-select'  onchange=\"settypebox(this.value);\">\n
 		<option value='page' ".($value == 'page' ? " selected='selected'" : "").">".ADSTAT_L52."</option>\n";
   foreach ($stats_list as $k=>$v)
   {
@@ -381,7 +381,7 @@ switch ($action)
 
 	// Period selection type for page data
 	$text .= "<tr><td>".ADSTAT_L41."</td><td>\n
-	<select class='tbox' name='export_date' id='export_date' onchange=\"setdatebox(this.value);\" ".($export_type=='page' ? "" : "style='display:none'" ).">\n
+	<select class='tbox e-select' name='export_date' id='export_date' onchange=\"setdatebox(this.value);\" ".($export_type=='page' ? "" : "style='display:none'" ).">\n
 	<option value='1'".($export_date==1 ? " selected='selected'" : "").">".ADSTAT_L42."</option>\n
 	<option value='2'".($export_date==2 ? " selected='selected'" : "").">".ADSTAT_L43."</option>\n
 	<option value='3'".($export_date==3 ? " selected='selected'" : "").">".ADSTAT_L44."</option>\n
@@ -391,7 +391,7 @@ switch ($action)
 	
 	// Period selection type for non-page data
 	$text .= "
-	<select class='tbox' name='export2_date' id='export2_date' onchange=\"setdatebox(this.value);\"  ".($export_type=='page' ? "style='display:none'" : "").">\n
+	<select class='tbox e-select' name='export2_date' id='export2_date' onchange=\"setdatebox(this.value);\"  ".($export_type=='page' ? "style='display:none'" : "").">\n
 	<option value='3'".($export2_date==3 ? " selected='selected'" : "").">".ADSTAT_L44."</option>\n
 	<option value='4'".($export2_date==4 ? " selected='selected'" : "").">".ADSTAT_L45."</option>\n
 	</select>";
@@ -405,7 +405,7 @@ switch ($action)
 	
 	// Now put the various dropdowns - their visibility is controlled by the export_type dropdown
 
-	$text .= "<select class='tbox' name='export_day' id='export_day'>\n";
+	$text .= "<select class='tbox e-select' name='export_day' id='export_day'>\n";
 	for ($i = 1; $i < 32; $i++) 
 	{ 
 	  $selected = $export_day == $i ? " selected='selected'" : "";
@@ -414,7 +414,7 @@ switch ($action)
 	$text .= "</select>\n&nbsp;&nbsp;&nbsp;";
 
 
-	$text .= "<select class='tbox' name='export_month' id='export_month'>\n";
+	$text .= "<select class='tbox e-select' name='export_month' id='export_month'>\n";
 	for ($i = 1; $i < 13; $i++) 
 	{ 
 	  $selected = $export_month == $i ? " selected='selected'" : "";
@@ -423,7 +423,7 @@ switch ($action)
 	$text .= "</select>\n&nbsp;&nbsp;&nbsp;";
 		
 	$this_year = date("Y");
-	$text .= "<select class='tbox' name='export_year' id='export_year'>\n";
+	$text .= "<select class='tbox e-select' name='export_year' id='export_year'>\n";
 	for ($i = $this_year; $i > $this_year - 6; $i--) 
 	{ 
 	  $selected = $export_year == $i ? " selected='selected'" : "";
@@ -440,13 +440,13 @@ switch ($action)
 	{
 	// Separators, quotes
 	$text .= "<tr><td>".ADSTAT_L59."</td><td>\n
-			<select class='tbox' name='export_char'>";
+			<select class='tbox e-select' name='export_char'>";
 	foreach ($separator_list as $k=>$v)
 	{
 	  $selected = $export_char == $k ? " selected='selected'" : "";
 	  $text .= "<option value='{$k}'{$selected}>{$v}</option>\n";
 	}
-	$text .= "</select>\n&nbsp;&nbsp;&nbsp;&nbsp;<select class='tbox' name='export_quote'>\n";
+	$text .= "</select>\n&nbsp;&nbsp;&nbsp;&nbsp;<select class='tbox e-select' name='export_quote'>\n";
 	foreach ($quote_list as $k=>$v)
 	{
 	  $selected = $export_quote == $k ? " selected='selected'" : "";
@@ -455,11 +455,8 @@ switch ($action)
 	$text .= "</select>\n</td></tr>";
 
 	$text .= "<tr>
-	<td>".ADSTAT_L60."<br /></td>
-	<td >
-	<input type='checkbox' name='export_stripurl' value='1' ".($export_stripurl == 1 ? " checked='checked'" : "")."/>
-	<span class='field-help'>".ADSTAT_L61."</span>
-	</td>
+	<td>".ADSTAT_L60."</td>
+	<td>".$frm->checkbox('export_stripurl', 1)."<span class='field-help'>".ADSTAT_L61."</span></td>
 	</tr>";
 	}
 
@@ -479,7 +476,7 @@ switch ($action)
 	$text .= "
 	</table>
 		<div class='buttons-bar center'>
-	".$frm->admin_button('create_export', ($action == 'export' ? ADSTAT_L37 : ADSTAT_L66), 'update')."
+	".$frm->admin_button('create_export', ($action == 'export' ? LAN_CREATE : ADSTAT_L66), 'update')."
 	</div>
 	</form>
 	</div>";
@@ -531,7 +528,7 @@ switch ($action)
 			$admin_log->log_event('STAT_04',ADSTAT_L83.$logStr,'');
 		  }
 		$text .= "<tr><td>".ADSTAT_L70."</td>";
-		$text .= "<td><select class='tbox' name='delete_month'>\n";
+		$text .= "<td><select class='tbox e-select' name='delete_month'>\n";
 		$match_month = date("n");
 		for ($i = 1; $i < 13; $i++) 
 		{ 
@@ -541,7 +538,7 @@ switch ($action)
 		$text .= "</select>\n&nbsp;&nbsp;&nbsp;";
 			
 		$this_year = date("Y");
-		$text .= "<select class='tbox' name='delete_year' id='export_year'>\n";
+		$text .= "<select class='tbox e-select' name='delete_year' id='export_year'>\n";
 		for ($i = $this_year; $i > $this_year - 6; $i--) 
 		{ 
 		  $selected = ($this_year - 2) == $i ? " selected='selected'" : "";
diff --git a/e107_plugins/log/languages/English_admin_log.php b/e107_plugins/log/languages/English_admin_log.php
index bf2cf356d..d3029767a 100644
--- a/e107_plugins/log/languages/English_admin_log.php
+++ b/e107_plugins/log/languages/English_admin_log.php
@@ -48,7 +48,7 @@ define("ADSTAT_L32", "Page Tidy");
 // define("ADSTAT_L34", "Site Stats");
 define ('ADSTAT_L35', 'Options');
 define ('ADSTAT_L36', 'Data Export');
-define ('ADSTAT_L37', 'Create export file');
+//define ('ADSTAT_L37', 'Create export file');
 define ('ADSTAT_L38', "You must set the e107_plugins/log/logs folder to be writable");
 define ('ADSTAT_L39', 'Stats Logging Functions');
 define ('ADSTAT_L40', 'Export log data');