From 126d96da349b6d53bb19009c2ecb4bc657fadf4b Mon Sep 17 00:00:00 2001 From: e107steved Date: Sun, 6 Apr 2008 21:38:02 +0000 Subject: [PATCH] Bugtracker #4375 - notice removal --- e107_admin/footer.php | 6 +-- e107_admin/users_extended.php | 54 +++++++++++++++++---------- e107_handlers/user_extended_class.php | 7 ++-- 3 files changed, 41 insertions(+), 26 deletions(-) diff --git a/e107_admin/footer.php b/e107_admin/footer.php index d63ae3c8c..628f49dc9 100644 --- a/e107_admin/footer.php +++ b/e107_admin/footer.php @@ -11,15 +11,15 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/footer.php,v $ -| $Revision: 1.9 $ -| $Date: 2008-01-27 18:34:10 $ +| $Revision: 1.10 $ +| $Date: 2008-04-06 21:38:02 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } $In_e107_Footer = TRUE; // For registered shutdown function -global $eTraffic, $error_handler, $db_time, $sql, $mySQLserver, $mySQLuser, $mySQLpassword, $mySQLdefaultdb, $ADMIN_FOOTER, $e107; +global $eTraffic, $error_handler, $db_time, $sql, $mySQLserver, $mySQLuser, $mySQLpassword, $mySQLdefaultdb, $ADMIN_FOOTER, $e107, $pref; // // SHUTDOWN SEQUENCE diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php index 51ec27e36..d55f3011f 100755 --- a/e107_admin/users_extended.php +++ b/e107_admin/users_extended.php @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_admin/users_extended.php,v $ -| $Revision: 1.9 $ -| $Date: 2008-01-15 21:57:16 $ +| $Revision: 1.10 $ +| $Date: 2008-04-06 21:38:02 $ | $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -43,13 +43,14 @@ require_once(e_HANDLER."userclass_class.php"); $ue = new e107_user_extended; +$message = ''; if (e_QUERY) { $tmp = explode(".", e_QUERY); $action = $tmp[0]; - $sub_action = $tmp[1]; - $id = $tmp[2]; + $sub_action = varset($tmp[1],''); + $id = varset($tmp[2],0); unset($tmp); } @@ -155,7 +156,7 @@ if (isset($_POST['add_category'])) } -if ($_POST['eu_action'] == "delext") +if (varset($_POST['eu_action'],'') == "delext") { list($_id, $_name) = explode(",",$_POST['key']); if($ue->user_extended_remove($_id, $_name)) @@ -165,7 +166,7 @@ if ($_POST['eu_action'] == "delext") } // Delete category -if ($_POST['eu_action'] == "delcat") +if (varset($_POST['eu_action'],'') == "delcat") { list($_id, $_name) = explode(",",$_POST['key']); if (count($ue->user_extended_get_fields($_id)) > 0) @@ -260,7 +261,7 @@ require_once("footer.php"); class users_ext { - function show_extended($current) + function show_extended($current = '') { global $sql, $ns, $ue, $curtype, $tp, $mySQLdefaultdb, $action, $sub_action; @@ -268,14 +269,15 @@ class users_ext $catList[0][0] = array('user_extended_struct_name' => EXTLAN_36); $catNums = array_keys($catList); $extendedList = $ue->user_extended_get_fields(); + $text = ''; - if(!$current){ + if(!$current) + { // Show existing fields $text = "
"; $text .= ""; - // $text .=""; $text .=" @@ -295,11 +297,11 @@ class users_ext $i=0; if(count($extendedList)) - { - // Show current extended fields - foreach($extendedList[$cn] as $ext) { + { // Show current extended fields + foreach($extendedList[$cn] as $ext) + { $fname = "user_".$ext['user_extended_struct_name']; - $uVal = str_replace(chr(1), "", $curVal[$fname]); + $uVal = str_replace(chr(1), "", $ext['user_extended_struct_default']); // Is this right? $text .= " @@ -312,7 +314,8 @@ class users_ext "; - if($i > 0){ + if($i > 0) + { $text .= " "; @@ -354,15 +357,21 @@ class users_ext { if($current == 'new') { - $current = ''; + $current = array(); + $current_include = ''; + $current_regex = ''; + $current_regexfail = ''; + $current_hide = ''; } + else + { // Editing existing definition list($current_include, $current_regex, $current_regexfail, $current_hide) = explode("^,^",$current['user_extended_struct_parms']); + } $text .= " "; $text .= "
".EXTLAN_1." ".EXTLAN_2."".EXTLAN_3."".EXTLAN_4." ".EXTLAN_5." ".EXTLAN_6."
{$ext['user_extended_struct_name']}
[".$tp->toHTML($ext['user_extended_struct_text'], FALSE, "defs")."]
"; $text .= " - "; if($_POST['table_db'] || $curVals[0]){ @@ -839,6 +852,7 @@ function show_predefined() //Get list of predefined fields, determine which are already activated. $preList = $ue->parse_extended_xml('getfile'); ksort($preList); + $active = array(); foreach($preList as $k => $v) { if($k != 'version') diff --git a/e107_handlers/user_extended_class.php b/e107_handlers/user_extended_class.php index 8c32a13d1..84d90fb71 100755 --- a/e107_handlers/user_extended_class.php +++ b/e107_handlers/user_extended_class.php @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_handlers/user_extended_class.php,v $ -| $Revision: 1.10 $ -| $Date: 2008-01-20 04:46:35 $ -| $Author: mcfly_e107 $ +| $Revision: 1.11 $ +| $Date: 2008-04-06 21:38:02 $ +| $Author: e107steved $ +----------------------------------------------------------------------------+ */ @@ -120,6 +120,7 @@ class e107_user_extended function user_extended_get_fields($cat = "") { global $sql; + $ret = array(); $more = ($cat) ? " AND user_extended_struct_parent = ".intval($cat)." " : ""; if($sql->db_Select("user_extended_struct", "*", "user_extended_struct_type > 0 AND user_extended_struct_text != '_system_' {$more} ORDER BY user_extended_struct_order ASC")) {
".EXTLAN_10.": user_"; @@ -446,10 +455,14 @@ class users_ext $text .= EXTLAN_62."