From 13a4843ca0b2e8aaa3afac58b93cb62c96ec1524 Mon Sep 17 00:00:00 2001 From: CaMer0n Date: Tue, 22 Sep 2009 15:42:27 +0000 Subject: [PATCH] Notice removal --- .../batch/admin_shortcodes_class.php | 12 +++---- e107_handlers/form_handler.php | 32 ++++++++++++------- 2 files changed, 27 insertions(+), 17 deletions(-) diff --git a/e107_files/shortcode/batch/admin_shortcodes_class.php b/e107_files/shortcode/batch/admin_shortcodes_class.php index adc6e3214..468c5ed98 100644 --- a/e107_files/shortcode/batch/admin_shortcodes_class.php +++ b/e107_files/shortcode/batch/admin_shortcodes_class.php @@ -1,7 +1,7 @@ plug_vars; e107::loadLanFiles($row['plugin_path'], 'admin'); - if($plug_vars['administration']['configFile']) + if(varset($plug_vars['administration']['configFile'])) { $plugpath = varset($plug_vars['plugin_php']) ? e_PLUGIN_ABS : e_PLUGIN_ABS.$row['plugin_path'].'/'; $icon_src = varset($plug_vars['administration']['iconSmall']) ? $plugpath.$plug_vars['administration']['iconSmall'] : ''; $icon_src_lrg = varset($plug_vars['administration']['icon']) ? $plugpath.$plug_vars['administration']['iconSmall'] : ''; $id = 'plugnav-'.$row['plugin_path']; - + $tmp[$id]['text'] = $e107->tp->toHTML($plug_vars['@attributes']['name'], FALSE, "defs"); $tmp[$id]['description'] = $plug_vars['description']; $tmp[$id]['link'] = e_PLUGIN_ABS.$row['plugin_path'].'/'.$plug_vars['administration']['configFile']; - $tmp[$id]['image'] = $icon_src ? "{$tmp[" : E_16_PLUGIN; - $tmp[$id]['image_large'] = $icon_src_lrg ? "{$tmp[" : $icon_src_lrg; + $tmp[$id]['image'] = $icon_src ? "\"".varset($tmp[$id]['text'])."\"" : E_16_PLUGIN; + $tmp[$id]['image_large'] = $icon_src_lrg ? "\"".varset($tmp[$id]['text'])."\"" : $icon_src_lrg; $tmp[$id]['image_src'] = $icon_src; $tmp[$id]['image_large_src'] = $icon_src_lrg; $tmp[$id]['perm'] = 'P'.$row['plugin_id']; @@ -1219,7 +1219,7 @@ class admin_shortcodes $tmp[$id]['sub'][$subid]['text'] = $e107->tp->toHTML($plugsub['title'], FALSE, "defs"); $tmp[$id]['sub'][$subid]['description'] = $plug_vars['description']; $tmp[$id]['sub'][$subid]['link'] = e_PLUGIN_ABS.$row['plugin_path'].'/'.$plugsub['link']; - $tmp[$id]['sub'][$subid]['image'] = $icon_src ? "{$tmp[" : ""; + $tmp[$id]['sub'][$subid]['image'] = $icon_src ? "\"".varset($tmp[$id]['sub'][$subid]['text'])."\"" : ""; $tmp[$id]['sub'][$subid]['image_large'] = ''; $tmp[$id]['sub'][$subid]['image_src'] = $icon_src; $tmp[$id]['sub'][$subid]['image_large_src'] = ''; diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index dee47af3d..1f2c6e914 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -9,9 +9,9 @@ * Form Handler * * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $ - * $Revision: 1.43 $ - * $Date: 2009-09-19 15:21:51 $ - * $Author: secretr $ + * $Revision: 1.44 $ + * $Date: 2009-09-22 15:42:27 $ + * $Author: e107coders $ * */ @@ -84,6 +84,13 @@ class e_form //never allow id in format name-value for text fields return "get_attributes($options, $name)." />"; } + + function iconpreview($id,$default,$width='',$height='') // FIXME + { + $parms = $name."|".$width."|".$height."|".$id; + $sc_parameters .= 'mode=preview&default='.$default.'&id='.$id; + return e107::getParser()->parseTemplate("{ICONPICKER=".$sc_parameters."}"); + } function iconpicker($name, $default, $label, $sc_parameters = '', $ajax = true) { @@ -96,7 +103,9 @@ class e_form $id = $this->name2id($name); $sc_parameters .= '&id='.$id; $jsfunc = $ajax ? "e107Ajax.toggleUpdate('{$id}-iconpicker', '{$id}-iconpicker-cn', 'sc:iconpicker=".urlencode($sc_parameters)."', '{$id}-iconpicker-ajax', { overlayElement: '{$id}-iconpicker-button' })" : "e107Helper.toggle('{$id}-iconpicker')"; - $ret = $this->text($name, $default).$this->admin_button($name.'-iconpicker-button', $label, 'action', '', array('other' => "onclick=\"{$jsfunc}\"")); + $ret = $this->text($name, $default); + // $ret .= $this->iconpreview($id,$default); //FIXME + $ret .= $this->admin_button($name.'-iconpicker-button', $label, 'action', '', array('other' => "onclick=\"{$jsfunc}\"")); $ret .= "
@@ -643,7 +652,7 @@ class e_form if(!varset($fld['forced'])) { $checked = (in_array($key,$columnsDefault)) ? TRUE : FALSE; - $text .= $this->checkbox('e-columns[]', $key, $checked). $fld['title']."
\n"; + $text .= $this->checkbox('e-columns[]', $key, $checked). varset($fld['title'])."
\n"; } } @@ -700,9 +709,9 @@ class e_form } } - if(!$fromval){ $fromval = 0; } + if(!varset($fromval)){ $fromval = 0; } - $ascdesc = ($ascdesc == 'desc') ? 'asc' : 'desc'; + $ascdesc = (varset($ascdesc) == 'desc') ? 'asc' : 'desc'; foreach($fieldarray as $key=>$val) { @@ -737,20 +746,21 @@ class e_form // The 2 functions below are for demonstration purposes only, and may be moved/modified before release. function filterType($fieldarray) { + return " frm-> filterType() is Deprecated    "; define("e_AJAX_REQUEST",TRUE); - $text .= ""; foreach($fieldarray as $key=>$val) { - $text .= ($val['type']) ? "\n" : ""; + $text .= varset($val['type']) ? "\n" : ""; } $text .= ""; return $text; } - function filterValue($type,$fields) + function filterValue($type='',$fields='') { - + return " frm-> filterValue() is Deprecated.   "; if($type) {