-
-
-
- | ID |
- ".ADMSLAN_56." |
- ".ADMSLAN_18." |
- ".LAN_OPTIONS." |
-
";
+
+ ".$frm->hidden('del_administrator_confirm','1')."
+
+
+ ";
+ $e107->ns->tablerender(ADMSLAN_13, $emessage->render().$text);
}
-
-
-
function edit_administrator($row)
{
- global $sql,$tp,$ns,$pref;
+ global $sql, $e107, $pref, $frm;
$lanlist = explode(",",e_LANLIST);
$a_id = $row['user_id'];
$ad_name = $row['user_name'];
$a_perms = $row['user_perms'];
- $text = "
";
-
- $text .= "
";
- $ns->tablerender(ADMSLAN_52, $text);
+ $e107->ns->tablerender(ADMSLAN_52, $text);
}
-
-
-
require_once("footer.php");
@@ -304,23 +344,24 @@ require_once("footer.php");
-function checkb($arg, $perms)
+function checkb($arg, $perms, $label='')
{
- if (getperms($arg, $perms))
+ global $frm;
+ $par = "
";
+ $par .= $frm->checkbox('perms[]', $arg, getperms($arg, $perms));
+ if ($label)
{
- $par = "\n";
- }
- else
- {
- $par = "\n";
+ $par .= $frm->label($label,'perms[]', $arg);
}
+ $par .= "
";
+
return $par;
}
-function renderperms($perm,$id)
+function renderperms($perm, $id)
{
- global $pref,$sql,$pt;
+ global $pref, $pt, $e107;
if($perm == "0")
{
return ADMSLAN_58;
@@ -363,12 +404,12 @@ function renderperms($perm,$id)
$pt["M"] = ADMSLAN_46;
$pt["N"] = ADMSLAN_47;
$pt["Z"] = ADMSLAN_62;
-
+
$sql2->db_Select("plugin", "*", "plugin_installflag='1'");
while ($row2 = $sql2->db_Fetch())
{
- $pt[("P".$row2['plugin_id'])] = LAN_PLUGIN." - ".$row2['plugin_name'];
+ $pt[("P".$row2['plugin_id'])] = LAN_PLUGIN." - ".$e107->tp->toHTML($row2['plugin_name'], FALSE, 'RAWTEXT,defs');
}
}
@@ -393,14 +434,33 @@ function renderperms($perm,$id)
$ret = implode(" ",$permtxt);
if($pref['multilanguage'])
{
- $ret .= ", ". $langperm;
+ $ret .= $langperm;
}
- $text = "
{$ret}
-
".implode("
",$ptext)."
";
+ $text = "
+
{$ret}
+
+ ";
+
return $text;
-
-
}
-?>
+/**
+ * Handle page DOM within the page header
+ *
+ * @return string JS source
+ */
+function headerjs()
+{
+ require_once(e_HANDLER.'js_helper.php');
+ $ret = "
+
+
+ ";
+
+ return $ret;
+}
+?>
\ No newline at end of file
diff --git a/e107_files/e_url/core/user/main.php b/e107_files/e_url/core/user/main.php
index 88b1e43c3..3958f550d 100644
--- a/e107_files/e_url/core/user/main.php
+++ b/e107_files/e_url/core/user/main.php
@@ -2,7 +2,7 @@
function url_user_main($parms)
{
- switch($parms['func'])
+ switch(varsettrue($parms['func'], 'profile'))
{
case 'profile':
return e_HTTP.'user.php?id.'.$parms['id'];
diff --git a/e107_handlers/message_handler.php b/e107_handlers/message_handler.php
index e49118618..67b7b77ee 100644
--- a/e107_handlers/message_handler.php
+++ b/e107_handlers/message_handler.php
@@ -9,8 +9,8 @@
* Message Handler
*
* $Source: /cvs_backup/e107_0.8/e107_handlers/message_handler.php,v $
- * $Revision: 1.8 $
- * $Date: 2008-12-20 12:30:18 $
+ * $Revision: 1.9 $
+ * $Date: 2008-12-20 15:23:48 $
* $Author: secretr $
*
*/
@@ -24,6 +24,7 @@ define('E_MESSAGE_INFO', 'info');
define('E_MESSAGE_SUCCESS', 'success');
define('E_MESSAGE_WARNING', 'warning');
define('E_MESSAGE_ERROR', 'error');
+define('E_MESSAGE_DEBUG', 'debug');
//FIXME - language file! new?
diff --git a/e107_languages/English/admin/lan_admin.php b/e107_languages/English/admin/lan_admin.php
index c0e0ce866..324dd48ca 100644
--- a/e107_languages/English/admin/lan_admin.php
+++ b/e107_languages/English/admin/lan_admin.php
@@ -1,7 +1,7 @@
diff --git a/e107_languages/English/admin/lan_administrator.php b/e107_languages/English/admin/lan_administrator.php
index 88ec587da..c4aac2298 100644
--- a/e107_languages/English/admin/lan_administrator.php
+++ b/e107_languages/English/admin/lan_administrator.php
@@ -9,16 +9,16 @@
* Admin Language File
*
* $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_administrator.php,v $
- * $Revision: 1.5 $
- * $Date: 2008-12-02 00:32:30 $
+ * $Revision: 1.6 $
+ * $Date: 2008-12-20 15:23:48 $
* $Author: secretr $
*/
-define("ADMSLAN_0", "New user/admin entry created for");
-define("ADMSLAN_1", "now has admin status.");
-define("ADMSLAN_2", "updated in database.");
+//define("ADMSLAN_0", "New user/admin entry created for"); - no references found
+//define("ADMSLAN_1", "now has admin status."); - no references found
+
define("ADMSLAN_3", "is the main site administrator and cannot be edited.");
define("ADMSLAN_4", "Continue");
-define("ADMSLAN_5", "Error!");
+//define("ADMSLAN_5", "Error!"); - global admin LAN_ERROR
define("ADMSLAN_6", "is the main site administrator and cannot be deleted.");
define("ADMSLAN_13", "Existing Administrators");
@@ -57,8 +57,8 @@ define("ADMSLAN_45", "Schedule Tasks");
define("ADMSLAN_46", "Welcome message");
define("ADMSLAN_47", "Moderate submitted news");
-define("ADMSLAN_49", "Check All");
-define("ADMSLAN_51", "Uncheck All");
+//define("ADMSLAN_49", "Check All"); - global admin lan
+//define("ADMSLAN_51", "Uncheck All"); - global admin lan
define("ADMSLAN_52", "Update administrator");
define("ADMSLAN_53", "Add administrator");
define("ADMSLAN_54", "Site Administrators");
@@ -81,12 +81,15 @@ define("ADMSLAN_67", "Scan with file inspector");
define("ADMSLAN_68", "Configure email notification");
define("ADMSLAN_69", "is already an administrator and must be edited.");
+// 0.8
define("ADMSLAN_70", "Return to Administrator Listing");
-define("ADMSLAN_71", "Click here to display privileges");
+define("ADMSLAN_71", "Click here to display privileges");
define('ADMSLAN_72', 'Admin ID: --ID-- name: --NAME-- new permissions: ');
define('ADMSLAN_73', 'Admin ID: --ID-- name: --NAME--');
-define('ADMSLAN_74', '');
+
+define('ADMSLAN_74', 'General');
define('ADMSLAN_75', '');
+define("ADMSLAN_2", "Site Administrator
%s updated in database.");
?>
\ No newline at end of file
diff --git a/e107_themes/_blank/admin_style.css b/e107_themes/_blank/admin_style.css
index 36934acfe..d57fdeac2 100644
--- a/e107_themes/_blank/admin_style.css
+++ b/e107_themes/_blank/admin_style.css
@@ -85,13 +85,10 @@ ul,ol { list-style:none; }
/******** Decorate JS */
/* Admin List Table */
-.adminlist-table {} /* fieldset */
.adminlist { width:100%; border:1px solid #ddd;}
.adminlist th { padding: 5px; border-bottom:1px solid #ddd; border-right: 1px solid #ddd; font-weight: bold; white-space:nowrap; }
.adminlist td { padding: 5px; border-bottom:1px solid #ddd; border-right: 1px solid #ddd; }
-.adminlist td div.field-spacer { clear: both; margin-bottom: 3px; } /* multi-fields per row separator */
-
.adminlist th.last,
.adminlist td.last { border-right: 0px solid;}
.adminlist tr.last td{ border-bottom: 0px solid;}
@@ -137,7 +134,8 @@ label { cursor: pointer; }
.adminform td { padding: 5px; text-align: left}
-.adminform td div.field-spacer { clear: both; margin-bottom: 3px; } /* multi-fields per row separator */
+.adminform td div.field-spacer { margin-bottom: 3px; } /* multi-fields per row separator */
+.adminform td div.field-section { clear: both; margin-bottom: 10px; } /* multi-field sections per row - wrapper */
.adminform .select { width: 280px;}
.adminform .input-text { width: 274px;}
@@ -151,9 +149,10 @@ label { cursor: pointer; }
/* form used for content edit */
.adminedit { width:100%; border:1px solid #ddd;}
+.adminedit.options { } /* form used for content item options */
.adminedit td { padding: 5px; text-align: left}
-.adminedit td div.field-spacer { clear: both; margin-bottom: 3px; } /* multi-fields per row separator */
-
+.adminedit td div.field-spacer { clear: both; margin-bottom: 3px; } /* multi-fields per row - wrapper */
+.adminedit td div.field-section { clear: both; margin-bottom: 10px; } /* multi-field sections per row - wrapper */
.adminedit .select { width: 280px; }
.adminedit .input-text { width: 274px;}
.adminedit td.control textarea { width: 274px;}
@@ -314,7 +313,7 @@ input.action.edit {}
.element-loading-mask { background-repeat: no-repeat; background-position: 50% 50%; background-color: #f5f5f5; }
/********** Misc */
-.e-pointer { cursor: pointer; } /* Pointer Hand - cursor: pointer; cursor: hand */
+.e-pointer { cursor: pointer; } /* Pointer Hand */
.expand-container { padding: 10px; } /* Block with expandable items */
.nextprev-bar { clear: both; padding: 5px; font-size: 14px; margin: 5px; border:1px solid #ddd; } /* Page NextPrev nabigation block */
.imgselector-container { clear: both; } /* ImageSelector.sc */
@@ -407,15 +406,30 @@ ul.plugin-navigation ul.plugin-navigation-sub a.link-active {font-weight: bold;}
#core-banlist-transfer-export {}
#core-banlist-transfer-import {}
+/* banner.php */
+#core-banner-list {}
+#core-banner-edit {}
+#core-banner-menu {}
/* cache.php */
#core-cache-settings {} /* General cache settings - Default front page */
+/* cpage */
+#core-cpage-list {}
+#core-cpage-create {}
+#core-cpage-create-general {}
+#core-cpage-create-options {}
+#core-cpage-options {}
+
/* emoticon.php */
#core-emoticon-activate {} /* Emote activation - Default front page */
#core-emoticon-packages {} /* Installed packs - Default front page */
#core-emoticon-configure {} /* Configure an individual emote pack */
+/* eurl.php */
+#core-eurl-core {}
+#core-eurl-plugin {}
+
/* frontpage.php */
#core-frontpage-settings {} /* Display list of current settings - Default front page */
#core-frontpage-edit {} /* Add / Edit existing rule - form */
@@ -449,7 +463,6 @@ ul.plugin-navigation ul.plugin-navigation-sub a.link-active {font-weight: bold;}
#dataform {} /* Form tag ID - Default front page - old core definition */
#core-meta-settings {} /* General meta settings - Default front page */
-
/* prefs.php */
#core-prefs {} /* Main continer - contains all block lemenst from bewlow */
#core-prefs-main {} /* Settings section - Site Information */