diff --git a/e107_admin/cpage.php b/e107_admin/cpage.php index fcd118493..c28a64085 100644 --- a/e107_admin/cpage.php +++ b/e107_admin/cpage.php @@ -9,8 +9,8 @@ * Custom Menus/Pages Administration * * $Source: /cvs_backup/e107_0.8/e107_admin/cpage.php,v $ - * $Revision: 1.14 $ - * $Date: 2009-07-08 10:31:52 $ + * $Revision: 1.15 $ + * $Date: 2009-07-10 14:25:21 $ * $Author: e107coders $ * */ @@ -328,7 +328,7 @@ class page
- ".CUSLAN_3." + ".LAN_OPTIONS." @@ -451,9 +451,16 @@ class page if($type) { - $menu_name = $tp->toDB($_POST['menu_name']); // not to be confused with menu-caption. - $sql->db_Update("menus", "menu_name='{$menu_name}' WHERE menu_path='{$mode}' "); - $update++; + $menu_name = $tp -> toDB($_POST['menu_name']); // not to be confused with menu-caption. + + if($sql -> db_Update("menus", "menu_name='{$menu_name}' WHERE menu_path='{$mode}' ")) + { + $update++; + } + else + { + $sql -> db_Insert("menus", "0, '$menu_name', '0', '0', '0', '', '".$mode."' "); + } } if ($_POST['page_link']) @@ -534,7 +541,7 @@ class page $text = "
- ".CUSLAN_3." + ".LAN_OPTIONS."
@@ -563,7 +570,7 @@ class page "; - $e107->ns->tablerender(CUSLAN_3, $emessage->render().$text); + $e107->ns->tablerender(LAN_OPTIONS, $emessage->render().$text); } diff --git a/e107_admin/notify.php b/e107_admin/notify.php index bf8f9a51e..a1c754fa8 100644 --- a/e107_admin/notify.php +++ b/e107_admin/notify.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/notify.php,v $ -| $Revision: 1.6 $ -| $Date: 2009-07-08 06:58:00 $ +| $Revision: 1.7 $ +| $Date: 2009-07-10 14:25:22 $ | $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -29,7 +29,11 @@ require_once('auth.php'); require_once(e_HANDLER.'userclass_class.php'); require_once(e_HANDLER.'form_handler.php'); + +$emessage = &eMessage::getInstance(); + $rs = new form; +$frm = new e_form; $nc = new notify_config; $uc = new user_class; @@ -38,8 +42,19 @@ $uc->text_class_link['email'] = 'email'; if (isset($_POST['update'])) { - $message = ($nc -> update()) ? LAN_UPDATED : LAN_UPDATED_FAILED; - $ns -> tablerender($message,"
".$message."
"); + if($nc -> update()) + { + $message = LAN_UPDATED; + $style = E_MESSAGE_SUCCESS; + } + else + { + $message = LAN_UPDATED_FAILED; + $style = E_MESSAGE_FAILED; + } + $emessage->add($message, $style); + + // $ns -> tablerender($message,"
".$message."
"); } $nc -> config(); @@ -82,21 +97,27 @@ class notify_config } } - function config() + function config() { - global $ns, $rs; + global $ns, $rs, $frm, $emessage; $text = "
-
+
+
+ + + + - "; + + "; - $text .= " - - "; + $text .= " + + "; $text .= $this -> render_event('usersup', NU_LAN_2); $text .= $this -> render_event('userveri', NU_LAN_3); @@ -140,15 +161,19 @@ class notify_config } } - $text .= " - - + $text .= "
".NT_LAN_2.":
".NU_LAN_1."
".NU_LAN_1."
".$rs -> form_button('submit', 'update', LAN_UPDATE)."
+ +
"; + $text .= $frm->admin_button('update', LAN_UPDATE,'update'); + $text .= " +
+
"; - $ns -> tablerender(NT_LAN_1, $text); + $ns -> tablerender(NT_LAN_1,$emessage->render(). $text); } @@ -157,8 +182,8 @@ class notify_config global $rs, $tp, $uc; $text .= " - ".$description.": - + ".$description.": + ".$uc->uc_dropdown('event['.$id.'][class]', $this -> notify_prefs['event'][$id]['class'],"nobody,main,admin,member,classes,email","onchange=\"mail_field(this.value,'event_".$id."');\" "); if($this -> notify_prefs['event'][$id]['class'] == 'email') diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php index 8afcc1314..6b0a36d6b 100644 --- a/e107_admin/plugin.php +++ b/e107_admin/plugin.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/plugin.php,v $ -| $Revision: 1.28 $ -| $Date: 2009-07-09 02:47:10 $ +| $Revision: 1.29 $ +| $Date: 2009-07-10 14:25:22 $ | $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -637,25 +637,29 @@ class pluginManager{ $text = "
- +
+ + + + - - + - - +
".EPL_ADLAN_37." + ".EPL_ADLAN_37."
"; +
+ +
"; $text .= $frm->admin_button('upload', EPL_ADLAN_38, 'submit', EPL_ADLAN_38); $text .= " - - - - -
\n"; +
+ + \n"; } $ns->tablerender(EPL_ADLAN_16, $text); @@ -921,23 +925,22 @@ class pluginManager{ $text = "
- - - - - - - +
+ ".EPL_ADLAN_54." ".$tp->toHtml($plug_vars['@attributes']['name'], "", "defs,emotes_off, no_make_clickable")." +
".EPL_ADLAN_54." ".$tp->toHtml($plug_vars['name'], "", "defs,emotes_off, no_make_clickable")."
+ + + + + + + - - - - - - - - - - - - + + - -
".EPL_ADLAN_55."".LAN_YES."
".EPL_ADLAN_55."".LAN_YES."
+ ".EPL_ADLAN_57."
".EPL_ADLAN_58."
 +
+ ".EPL_ADLAN_78."
".$userclasses."
".EPL_ADLAN_79."
 +
+ ".EPL_ADLAN_80."
".$eufields."
".EPL_ADLAN_79."
 +
".EPL_ADLAN_59."
".EPL_ADLAN_60."
{$del_text}".EPL_ADLAN_59."
".EPL_ADLAN_60."
{$del_text}
"; +
+
"; $text .= "   "; // $frm->admin_button($name, $value, $action = 'submit', $label = '', $options = array()); - $text .= " - - + $text .= "
+
"; - $ns->tablerender(EPL_ADLAN_63." ".$tp->toHtml($plug_vars['name'], "", "defs,emotes_off, no_make_clickable"), $text); + $ns->tablerender(EPL_ADLAN_63." ".$tp->toHtml($plug_vars['@attributes']['name'], "", "defs,emotes_off, no_make_clickable"), $text); } diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php index e8796af79..ad10fed02 100755 --- a/e107_admin/users_extended.php +++ b/e107_admin/users_extended.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/users_extended.php,v $ -| $Revision: 1.14 $ -| $Date: 2008-12-06 20:56:40 $ -| $Author: e107steved $ +| $Revision: 1.15 $ +| $Date: 2009-07-10 14:25:22 $ +| $Author: e107coders $ +----------------------------------------------------------------------------+ */ require_once('../class2.php'); @@ -308,24 +308,27 @@ class users_ext { // Show existing fields $mode = 'show'; $text = "
"; - $text .= " - - - "; - $text .=" - - - - - - + $text .= "
".EXTLAN_1."".EXTLAN_2."".EXTLAN_4."".EXTLAN_5."".EXTLAN_6."".EXTLAN_7." ".EXTLAN_8."
+ + + + + + + + + + + + + "; foreach($catNums as $cn) { $text .= " - + "; @@ -338,13 +341,13 @@ class users_ext $uVal = str_replace(chr(1), "", $ext['user_extended_struct_default']); // Is this right? $text .= " - - - - - - - + + + + + +
".EXTLAN_1."".EXTLAN_2."".EXTLAN_4."".EXTLAN_5."".EXTLAN_6."".EXTLAN_7." ".EXTLAN_8."
{$catList[$cn][0]['user_extended_struct_name']}{$catList[$cn][0]['user_extended_struct_name']}
{$ext['user_extended_struct_name']}
[".$tp->toHTML($ext['user_extended_struct_text'], FALSE, "defs")."]		".$ue->user_extended_edit($ext,$uVal)."".($ext['user_extended_struct_required'] == 1 ? LAN_YES : LAN_NO)."".r_userclass_name($ext['user_extended_struct_applicable'])."".r_userclass_name($ext['user_extended_struct_read'])."".r_userclass_name($ext['user_extended_struct_write'])." + {$ext['user_extended_struct_name']}
[".$tp->toHTML($ext['user_extended_struct_text'], FALSE, "defs")."]		".$ue->user_extended_edit($ext,$uVal)."".($ext['user_extended_struct_required'] == 1 ? LAN_YES : LAN_NO)."".r_userclass_name($ext['user_extended_struct_applicable'])."".r_userclass_name($ext['user_extended_struct_read'])."".r_userclass_name($ext['user_extended_struct_write'])."
"; @@ -384,7 +387,7 @@ class users_ext } } //Show add/edit form - $text .= " + $text .= "
"; } else @@ -406,12 +409,17 @@ class users_ext $text .= " - "; - $text .= " "; +
"; + $text .= " +
+ + + + - - + - - + @@ -439,7 +447,7 @@ class users_ext "; $text .= " - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - -
".EXTLAN_10.":user_"; + ".EXTLAN_10.":user_"; if(is_array($current) && $current['user_extended_struct_name']) { $text .= $current['user_extended_struct_name']." @@ -430,8 +438,8 @@ class users_ext
".EXTLAN_12.": + ".EXTLAN_12.":
".EXTLAN_13."
".EXTLAN_14."".EXTLAN_14."
".EXTLAN_3.""; + ".EXTLAN_3.""; // Start of Values --------------------------------- $val_hide = ($current['user_extended_struct_type'] != 4) ? "visible" : "none"; @@ -548,40 +556,40 @@ class users_ext
".EXTLAN_16." + ".EXTLAN_16."
".EXTLAN_15." + ".EXTLAN_15."
".EXTLAN_51."
".EXTLAN_52." + ".EXTLAN_52."
".EXTLAN_53."
".EXTLAN_54." + ".EXTLAN_54."
".EXTLAN_55."
".EXTLAN_44." + ".EXTLAN_44."
".EXTLAN_18." + ".EXTLAN_18."
".EXTLAN_5." + ".EXTLAN_5." ".r_userclass("user_applicable", $current['user_extended_struct_applicable'], 'off', 'member, admin, classes, nobody')."
".EXTLAN_20."
".EXTLAN_6." + ".EXTLAN_6." ".r_userclass("user_read", $current['user_extended_struct_read'], 'off', 'public, member, admin, readonly, classes')."
".EXTLAN_22."
".EXTLAN_7." + ".EXTLAN_7." ".r_userclass("user_write", $current['user_extended_struct_write'], 'off', 'member, admin, classes')."
".EXTLAN_21."
".EXTLAN_49." + ".EXTLAN_49." +
"; +
+
+ "; // if ((!is_array($current) || $action == "continue") && $sub_action == "") if ((($mode == 'new') || $action == "continue") && $sub_action == "") @@ -675,11 +685,10 @@ class users_ext "; } - // ======= end added by Cam. - $text .= " - - + + $text .= "
+ "; } // $text .= "
"; @@ -771,30 +780,30 @@ class users_ext $text .= " - ".EXTLAN_38.": - + ".EXTLAN_38.": +
".EXTLAN_11." - ".EXTLAN_5." - + ".EXTLAN_5." + ".r_userclass("user_applicable", $current['user_extended_struct_applicable'], 'off', 'member, admin, classes')."
".EXTLAN_20." - ".EXTLAN_6." - + ".EXTLAN_6." + ".r_userclass("user_read", $current['user_extended_struct_read'], 'off', 'public, member, admin, classes, readonly')."
".EXTLAN_22." - ".EXTLAN_7." - + ".EXTLAN_7." + ".r_userclass("user_write", $current['user_extended_struct_write'], 'off', 'member, admin, classes')."
".EXTLAN_21." "; @@ -1081,13 +1090,14 @@ function headerjs()