From 0f377629538c07b87fad1a5172d25fdb2cc3bf4b Mon Sep 17 00:00:00 2001
From: Tijn Kuyper <moc@mochosting.nl>
Date: Sat, 2 Feb 2013 20:01:53 +0100
Subject: [PATCH] LAN and GUI optimization on PM plugin

---
 e107_languages/English/admin/lan_admin.php    |  1 +
 .../pm/languages/English_admin_pm.php         | 12 ++++----
 e107_plugins/pm/pm_conf.php                   | 29 ++++++++++---------
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index 4310f5c6e..0a4176db9 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -220,6 +220,7 @@ define("LAN_DELETE","Delete");
 define("LAN_CREATE","Create");
 define("LAN_MANAGE","Manage");
 define("LAN_UPDATE","Update");
+define("LAN_ADD", "Add");
 define("LAN_SAVE","Save");
 define("LAN_SAVED","Saved");
 define('LAN_SETSAVED','Your settings have been saved');
diff --git a/e107_plugins/pm/languages/English_admin_pm.php b/e107_plugins/pm/languages/English_admin_pm.php
index 43cd0290e..b2776ff3e 100755
--- a/e107_plugins/pm/languages/English_admin_pm.php
+++ b/e107_plugins/pm/languages/English_admin_pm.php
@@ -31,18 +31,18 @@ define('ADLAN_PM_28', "Maximum attachment size");
 define('ADLAN_PM_29', "Allow sending to all members");
 define('ADLAN_PM_30', "Allow sending to multiple recipients");
 define('ADLAN_PM_31', 'Userclass allowed to send to userclass');
-define('ADLAN_PM_32', "Update Settings");
+//define('ADLAN_PM_32', "Update Settings");
 define('ADLAN_PM_33', "Inactive (no limits)");
 define('ADLAN_PM_34', "PM counts");
 define('ADLAN_PM_35', "PM box sizes");
 define('ADLAN_PM_36', "Userclass");
 define('ADLAN_PM_37', "Count limits");
 define('ADLAN_PM_38', "Size limits (in KB)");
-define('ADLAN_PM_39', "Inbox: ");
-define('ADLAN_PM_40', "Outbox: ");
+define('ADLAN_PM_39', "Inbox");
+define('ADLAN_PM_40', "Outbox");
 define('ADLAN_PM_41', "There are currently no limits set.");
-define('ADLAN_PM_42', "Update Limits");
-define('ADLAN_PM_43', "Add New Limit");
+//define('ADLAN_PM_42', "Update Limits");
+//define('ADLAN_PM_43', "Add New Limit");
 define('ADLAN_PM_44', "seconds");
 define('ADLAN_PM_45', "Limit PM By: ");
 
@@ -74,7 +74,7 @@ define('ADLAN_PM_78', 'Check attachments');
 define('ADLAN_PM_79', '--ORPHANS-- unused attachments deleted. --MISSING-- missing attachments noted');
 define('ADLAN_PM_80', 'Preference formats updated');
 define('ADLAN_PM_81', 'Maximum number of PMs to send immediately');
-define('ADLAN_PM_82', 'If sending more than this, they are added to a queue, and sent out using the cron task');
+define('ADLAN_PM_82', 'If sending more than this, they are added to a queue and sent out using the cron task');
 
 define('ADLAN_PM_URL_DEFAULT_LABEL', 'Default');
 define('ADLAN_PM_URL_DEFAULT_DESCR', 'Example: http://yoursite.com/e107_plugins/pm/pm.php');
diff --git a/e107_plugins/pm/pm_conf.php b/e107_plugins/pm/pm_conf.php
index 04caf4dc7..3b75ffeaa 100755
--- a/e107_plugins/pm/pm_conf.php
+++ b/e107_plugins/pm/pm_conf.php
@@ -300,6 +300,7 @@ function yes_no($fname, $curval = '')
 
 function show_options($pm_prefs)
 {
+	$frm    = e107::getForm();
 	$txt = "
 	<fieldset id='plugin-pm-prefs'>
 	<form method='post' action='".e_SELF."'>
@@ -375,12 +376,12 @@ function show_options($pm_prefs)
 	</tr>
 	<tr>
 		<td>".ADLAN_PM_81."</td>
-		<td>".form::form_text('pm_option-pm_max_send', 5, $pm_prefs['pm_max_send'], 5)."<span style='field-help'>".ADLAN_PM_82."</span></td>
+		<td>".form::form_text('pm_option-pm_max_send', 5, $pm_prefs['pm_max_send'], 5)."<span class='field-help'>".ADLAN_PM_82."</span></td>
 	</tr>
 	</tbody>
 	</table>
 	<div class='buttons-bar center'>
-	".e107::getForm()->admin_button('update_prefs','no-value','update',ADLAN_PM_32)."
+		".$frm->admin_button('update_prefs','no-value','update', LAN_UPDATE)."
 	</div>
 	</form>
 	</fieldset>
@@ -445,19 +446,19 @@ function show_limits($pm_prefs)
 	";
 
 	if (isset($limitList)) 
-	{
+	{ 
 		foreach($limitList as $row)
 		{
 			$txt .= "
 			<tr>
 			<td>".e107::getUserClass()->uc_get_classname($row['limit_classnum'])."</td>
 			<td>
-			".ADLAN_PM_39."<input type='text' class='tbox' size='5' name='inbox_count[{$row['limit_id']}]' value='{$row['inbox_count']}' /> 
-			".ADLAN_PM_40."<input type='text' class='tbox' size='5' name='outbox_count[{$row['limit_id']}]' value='{$row['outbox_count']}' /> 
+			".ADLAN_PM_39.": <input type='text' class='tbox' size='5' name='inbox_count[{$row['limit_id']}]' value='{$row['inbox_count']}' /> <br />
+			".ADLAN_PM_40.": <input type='text' class='tbox' size='5' name='outbox_count[{$row['limit_id']}]' value='{$row['outbox_count']}' /> 
 			</td>
 			<td>
-			".ADLAN_PM_39."<input type='text' class='tbox' size='5' name='inbox_size[{$row['limit_id']}]' value='{$row['inbox_size']}' /> 
-			".ADLAN_PM_40."<input type='text' class='tbox' size='5' name='outbox_size[{$row['limit_id']}]' value='{$row['outbox_size']}' /> 
+			".ADLAN_PM_39.": <input type='text' class='tbox' size='5' name='inbox_size[{$row['limit_id']}]' value='{$row['inbox_size']}' /> <br />
+			".ADLAN_PM_40.": <input type='text' class='tbox' size='5' name='outbox_size[{$row['limit_id']}]' value='{$row['outbox_size']}' /> 
 			</td>
 			</tr>
 			";
@@ -476,7 +477,7 @@ function show_limits($pm_prefs)
 	</tbody>
 	</table>
 	<div class="buttons-bar center">
-	'.$frm->admin_button('updatelimits','no-value','update',ADLAN_PM_42).'
+	'.$frm->admin_button('updatelimits','no-value','update', LAN_UPDATE).'
 	</div>
 	</form>
 	</fieldset>';
@@ -521,12 +522,12 @@ function add_limit($pm_prefs)
 	<tr>
 	<td>".e107::getUserClass()->uc_dropdown('newlimit_class', 0, 'guest,member,admin,classes')."</td>
 	<td>
-		".ADLAN_PM_39."<input type='text' class='tbox' size='5' name='new_inbox_count' value='' /> 
-		".ADLAN_PM_40."<input type='text' class='tbox' size='5' name='new_outbox_count' value='' /> 
+		".ADLAN_PM_39.": <input type='text' class='tbox' size='5' name='new_inbox_count' value='' /> <br />
+		".ADLAN_PM_40.": <input type='text' class='tbox' size='5' name='new_outbox_count' value='' /> 
 	</td>
 	<td>
-		".ADLAN_PM_39."<input type='text' class='tbox' size='5' name='new_inbox_size' value='' /> 
-		".ADLAN_PM_40."<input type='text' class='tbox' size='5' name='new_outbox_size' value='' /> 
+		".ADLAN_PM_39.": <input type='text' class='tbox' size='5' name='new_inbox_size' value='' /> <br />
+		".ADLAN_PM_40.": <input type='text' class='tbox' size='5' name='new_outbox_size' value='' /> 
 	</td>
 	</tr>
 
@@ -536,7 +537,7 @@ function add_limit($pm_prefs)
 	</tbody>
 	</table>
 	<div class="buttons-bar center">
-	'.$frm->admin_button('addlimit','no-value','update',ADLAN_PM_43).'
+	'.$frm->admin_button('addlimit','no-value','update', LAN_ADD).'
 	</div>
 	</form>
 	</fieldset>';
@@ -589,7 +590,7 @@ function show_maint($pmPrefs)
 	</tbody>
 	</table>
 	<div class='buttons-bar center'>
-	".e107::getForm()->admin_button('pm_maint_execute','no-value','delete',ADLAN_PM_61)."
+	".e107::getForm()->admin_button('pm_maint_execute','no-value','delete', LAN_EXECUTE)."
 	</div>
 	</form>
 	</fieldset>