From 8d2cdddf4e423ddb9fa61eaf35d9db01a61cae89 Mon Sep 17 00:00:00 2001
From: Tijn Kuyper <moc@mochosting.nl>
Date: Mon, 11 Feb 2013 16:44:35 +0100
Subject: [PATCH] Log plugin - Code clean-up and $frm enhancements
---
e107_plugins/log/admin_config.php | 100 ++++++------------
.../log/languages/English_admin_log.php | 4 +-
2 files changed, 36 insertions(+), 68 deletions(-)
diff --git a/e107_plugins/log/admin_config.php b/e107_plugins/log/admin_config.php
index 983bb1412..2f38a89ce 100644
--- a/e107_plugins/log/admin_config.php
+++ b/e107_plugins/log/admin_config.php
@@ -22,7 +22,6 @@ if (!getperms('P') || !e107::isInstalled('log'))
require_once(e_ADMIN.'auth.php');
require_once(e_HANDLER.'userclass_class.php');
-
$frm = e107::getForm();
$mes = e107::getMessage();
@@ -241,16 +240,8 @@ if (isset($_POST['updatesettings']))
save_prefs();
file_put_contents(e_LOG.LogFlagFile, "<?php\n\$logEnable={$pref['statActivate']};\n?>\n"); // Logging task uses to see if logging enabled
$admin_log->log_event('STAT_02',ADSTAT_L82.$logStr,'');
- //$message = ADSTAT_L17;
- //$mes->addSuccess(LAN_SETSAVED); // replaced by save_prefs();
}
-/*
-if (isset($message))
-{
- $ns->tablerender('', "<div style='text-align:center'><b>".$message."</b></div>");
-}
-*/
$ns->tablerender($caption, $mes->render() . $text);
function gen_select($prompt,$name,$value)
@@ -290,79 +281,56 @@ switch ($action)
</colgroup>
<tr>
- <td>".ADSTAT_L4."</td>
- <td>
- <input type='radio' name='statActivate' value='1'".($pref['statActivate'] ? " checked='checked'" : "")." /> ".ADSTAT_ON."
- <input type='radio' name='statActivate' value='0'".(!$pref['statActivate'] ? " checked='checked'" : "")." /> ".ADSTAT_OFF."
- </td>
+ <td>".ADSTAT_L4."</td>
+ <td>".$frm->radio_switch('statActivate', $pref['statActivate'])."</td>
</tr>
-
<tr>
<td>".ADSTAT_L18."</td>
<td>".r_userclass("statUserclass", $pref['statUserclass'],'off','public, member, admin, classes')."</td>
</tr>
-
<tr>
- <td>".ADSTAT_L20."</td>
- <td>
- <input type='radio' name='statCountAdmin' value='1'".($pref['statCountAdmin'] ? " checked='checked'" : "")." /> ".ADSTAT_ON."
- <input type='radio' name='statCountAdmin' value='0'".(!$pref['statCountAdmin'] ? " checked='checked'" : "")." /> ".ADSTAT_OFF."
+ <td>".ADSTAT_L20."</td>
+ <td>".$frm->radio_switch('statCountAdmin', $pref['statCountAdmin'])."</td>
+ </tr>
+ <tr>
+ <td>".ADSTAT_L21."</td>
+ <td><input class='tbox' type='text' name='statDisplayNumber' size='8' value='".$pref['statDisplayNumber']."' maxlength='3' /></td>
+ </tr>
+ <tr>
+ <td>".ADSTAT_L5."</td>
+ <td>
+ ".gen_select(ADSTAT_L6, 'statBrowser',$pref['statBrowser'])
+ .gen_select(ADSTAT_L7, 'statOs',$pref['statOs'])
+ .gen_select(ADSTAT_L8, 'statScreen',$pref['statScreen'])
+ .gen_select(ADSTAT_L9, 'statDomain',$pref['statDomain'])
+ .gen_select(ADSTAT_L10, 'statRefer',$pref['statRefer'])
+ .gen_select(ADSTAT_L11, 'statQuery',$pref['statQuery'])
+ .ADSTAT_L19."
+ ".$frm->radio_switch('statRecent', $pref['statRecent'])."
</td>
</tr>
- <tr>
- <td>".ADSTAT_L21."</td>
- <td>
- <input class='tbox' type='text' name='statDisplayNumber' size='8' value='".$pref['statDisplayNumber']."' maxlength='3' />
- </td>
- </tr>
-
- <tr>
- <td>".ADSTAT_L5."</td>
- <td>
- ".gen_select(ADSTAT_L6, 'statBrowser',$pref['statBrowser'])
- .gen_select(ADSTAT_L7, 'statOs',$pref['statOs'])
- .gen_select(ADSTAT_L8, 'statScreen',$pref['statScreen'])
- .gen_select(ADSTAT_L9, 'statDomain',$pref['statDomain'])
- .gen_select(ADSTAT_L10, 'statRefer',$pref['statRefer'])
- .gen_select(ADSTAT_L11, 'statQuery',$pref['statQuery'])
- .ADSTAT_L19."
- <input type='radio' name='statRecent' value='1'".($pref['statRecent'] ? " checked='checked'" : "")." /> ".ADSTAT_ON."
- <input type='radio' name='statRecent' value='0'".(!$pref['statRecent'] ? " checked='checked'" : "")." /> ".ADSTAT_OFF."<br />
-
- </td>
- </tr>
-
<tr>
<td>".ADSTAT_L78."</td>
+ <td>".$frm->checkbox('statPrevMonth', 1, varset($pref['statPrevMonth'],0))."<span class='field-help'>".ADSTAT_L79."</span></td>
+ </tr>
+ <tr>
+ <td>".ADSTAT_L12."</td>
<td>
- ".$frm->checkbox('statPrevMonth', 1, varset($pref['statPrevMonth'],0))."<span class='field-help'>".ADSTAT_L79."</span>
+ ".$frm->checkbox('wipe[statWipePage]', 1)." ".ADSTAT_L14."<br />
+ ".$frm->checkbox('wipe[statWipeBrowser]', 1)." ".ADSTAT_L6."<br />
+ ".$frm->checkbox('wipe[statWipeOs]', 1)." ".ADSTAT_L7."<br />
+ ".$frm->checkbox('wipe[statWipeScreen]', 1)." ".ADSTAT_L8."<br />
+ ".$frm->checkbox('wipe[statWipeDomain]', 1)." ".ADSTAT_L9."<br />
+ ".$frm->checkbox('wipe[statWipeRefer]', 1)." ".ADSTAT_L10."<br />
+ ".$frm->checkbox('wipe[statWipeQuery]', 1)." ".ADSTAT_L11."<br />
+ <br />
+ ".$frm->admin_button('wipeSubmit', LAN_RESET, 'delete')."<span class='field-help'>".ADSTAT_L13."</span>
</td>
</tr>
-
- <tr>
- <td>".ADSTAT_L12."</td>
- <td>
- ".$frm->checkbox('wipe[statWipePage]', 1)." ".ADSTAT_L14."<br />
- ".$frm->checkbox('wipe[statWipeBrowser]', 1)." ".ADSTAT_L6."<br />
- ".$frm->checkbox('wipe[statWipeOs]', 1)." ".ADSTAT_L7."<br />
- ".$frm->checkbox('wipe[statWipeScreen]', 1)." ".ADSTAT_L8."<br />
- ".$frm->checkbox('wipe[statWipeDomain]', 1)." ".ADSTAT_L9."<br />
- ".$frm->checkbox('wipe[statWipeRefer]', 1)." ".ADSTAT_L10."<br />
- ".$frm->checkbox('wipe[statWipeQuery]', 1)." ".ADSTAT_L11."<br />
- <br />
- ".$frm->admin_button('wipeSubmit', LAN_RESET, 'delete')."<span class='field-help'>".ADSTAT_L13."</span>
- </td>
- </tr>
-
<tr>
<td>".ADSTAT_L26."</td>
- <td><input class='button' type='submit' name='openRemPageD' value='".ADSTAT_L28."' /><span class='field-help'>".ADSTAT_L27."</span>
- </td>
- </tr>
- ";
-
- $text .= "
+ <td>".$frm->admin_button('openRemPageD', ADSTAT_L28, 'other')."<span class='field-help'>".ADSTAT_L27."</span> </td>
</tr>
</table>
<div class='buttons-bar center'>
diff --git a/e107_plugins/log/languages/English_admin_log.php b/e107_plugins/log/languages/English_admin_log.php
index 6249725e1..bf2cf356d 100644
--- a/e107_plugins/log/languages/English_admin_log.php
+++ b/e107_plugins/log/languages/English_admin_log.php
@@ -10,8 +10,8 @@
* $Id$
*/
-define("ADSTAT_ON", "On");
-define("ADSTAT_OFF", "Off");
+//define("ADSTAT_ON", "On");
+//define("ADSTAT_OFF", "Off");
define("ADSTAT_L1", "This plugin will log all visits to your site, and build detailed statistic screens based on the information gathered.");
define("ADSTAT_L2", "The statistics logger has been successfully installed. To activate, please go to the config screen and click Activate.<br /><b>You must set the permissions of the e107_plugins/log/logs folder to 777 (chmod 777)</b>");
define("ADSTAT_L3", "Statistic Logging");