diff --git a/e107_admin/header.php b/e107_admin/header.php
index 1615e89d1..2f25ebe74 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -12,8 +12,8 @@
| GNU General Public License (http://gnu.org).
|
| $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
-| $Revision: 1.25 $
-| $Date: 2008-12-20 10:39:14 $
+| $Revision: 1.26 $
+| $Date: 2008-12-23 15:18:31 $
| $Author: secretr $
+---------------------------------------------------------------+
*/
@@ -596,7 +596,7 @@ function admin_update($update, $type = 'update', $success = false, $failed = fal
$emessage = &eMessage::getInstance();
if (($type == 'update' && $update) || ($type == 'insert' && $update !== false)) {
- $emessage->add(($success ? $success : LAN_UPDATED), E_MESSAGE_SUCCESS);
+ $emessage->add(($success ? $success : ($type == 'update' ? LAN_UPDATED : LAN_CREATED)), E_MESSAGE_SUCCESS);
}
elseif ($type == 'delete' && $update)
{
@@ -615,7 +615,19 @@ function admin_update($update, $type = 'update', $success = false, $failed = fal
}
else
{
- $text = ($failed ? $failed : LAN_UPDATED_FAILED." - ".LAN_TRY_AGAIN)."
".LAN_ERROR." ".mysql_errno().": ".mysql_error();
+ switch ($type) {
+ case 'insert':
+ $msg = LAN_CREATED_FAILED;
+ break;
+ case 'delete':
+ $msg = LAN_DELETED_FAILED;
+ break;
+ default:
+ $msg = LAN_UPDATED_FAILED;
+ break;
+ }
+
+ $text = ($failed ? $failed : $msg." - ".LAN_TRY_AGAIN)."
".LAN_ERROR." ".mysql_errno().": ".mysql_error();
$emessage->add($text, E_MESSAGE_ERROR);
}
diff --git a/e107_languages/English/admin/lan_banlist.php b/e107_languages/English/admin/lan_banlist.php
index 56e90a4ec..2ff0286ad 100644
--- a/e107_languages/English/admin/lan_banlist.php
+++ b/e107_languages/English/admin/lan_banlist.php
@@ -4,9 +4,9 @@
| e107 website system - Language File.
|
| $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_banlist.php,v $
-| $Revision: 1.7 $
-| $Date: 2008-01-13 10:51:42 $
-| $Author: e107steved $
+| $Revision: 1.8 $
+| $Date: 2008-12-23 15:18:31 $
+| $Author: secretr $
+----------------------------------------------------------------------------+
*/
define("BANLAN_1", "Ban removed.");
@@ -55,7 +55,7 @@ define('BANLAN_44','Use expiry date/time from import');
define('BANLAN_45','Import');
define('BANLAN_46','Import File');
define('BANLAN_47','File upload error');
-define('BANLAN_48','Error importing file');
+//define('BANLAN_48','Error importing file');
define('BANLAN_49','CSV import: Unbalanced quotes in line ');
define('BANLAN_50','CSV import: Error writing banlist record at line ');
define('BANLAN_51','CSV import: Success, --NUM-- lines imported from file ');
@@ -84,12 +84,12 @@ define('BANLAN_73','This will restart the ban period if a banned user accesses t
define('BANLAN_74','Banlist Maintenance');
define('BANLAN_75','Remove expired bans from list');
define('BANLAN_76','Execute');
-define('BANLAN_77','');
+define('BANLAN_77','Messages/Ban Periods');
define('BANLAN_78','');
define('BANLAN_79','');
define('BANLAN_80','');
-// Ban types - block reserved 100-109
+// Ban types - block reserved 100-109
define('BANLAN_100', 'Unknown');
define('BANLAN_101','Manual');
define('BANLAN_102','Flood');
@@ -102,7 +102,7 @@ define('BANLAN_108', 'Unknown');
define('BANLAN_109', 'Old');
// Detailed explanations for ban types - block reserved 110-119
-define('BANLAN_110', 'Most likely a ban that was imposed before E107 was upgraded to 0.8');
+define('BANLAN_110', 'Most likely a ban that was imposed before e107 was upgraded to 0.8');
define('BANLAN_111', 'Entered by an admin');
define('BANLAN_112', 'Attempts to update the site too fast');
define('BANLAN_113', 'Attempts to access the site too frequently from the same address');
diff --git a/e107_themes/_blank/admin_style.css b/e107_themes/_blank/admin_style.css
index d26c4c8ff..ba153e1d1 100644
--- a/e107_themes/_blank/admin_style.css
+++ b/e107_themes/_blank/admin_style.css
@@ -18,6 +18,7 @@
.clear-l { clear: right }
.clear-r { clear: left }
.smalltext { font-size: 11px; }
+.nowrap { white-space:nowrap; }
/* Core Icons */
img.icon { border: 0 }
@@ -119,6 +120,11 @@ input.radio { margin-right: 3px; }
label { cursor: pointer; }
.checkbox { margin-right: 5px; }
+
+.field-help { width: 280px; line-height: 1.4em; padding-top: 3px; color:#333333; font-size: 11px; }
+.label-note { font-style: italic; }
+.form-note { font-style: italic; }
+
/* Related JS functionality - .autocheck together with .auto-toggle-area (see admin/image.php) */
.auto-toggle-area { width: 280px; cursor: pointer; }
@@ -143,8 +149,6 @@ label { cursor: pointer; }
.adminform td.label { }
.adminform td.control { }
-.field-help { width: 280px; line-height: 1.4em; padding-top: 3px; color:#333333; font-size: 11px; }
-.label-note { font-style: italic; }
/* form used for content edit */
.adminedit { width:100%; border:1px solid #ddd;}