mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 11:50:30 +02:00
Code Issues Releases Wiki Activity

Notice removal

Browse Source
This commit is contained in:
CaMer0n
2009-09-22 15:42:27 +00:00
parent 22996e415c
commit 13a4843ca0
2 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
e107_files/shortcode/batch/admin_shortcodes_class.php
View File

@@ -1,7 +1,7 @@
<?php
/*
* Copyright e107 Inc e107.org, Licensed under GNU GPL (http://www.gnu.org/licenses/gpl.txt)
* $Id: admin_shortcodes_class.php,v 1.23 2009-09-21 21:56:02 e107coders Exp $
* $Id: admin_shortcodes_class.php,v 1.24 2009-09-22 15:37:46 e107coders Exp $
*
* Admin shortcode batch - class
*/
@@ -1186,18 +1186,18 @@ class admin_shortcodes
$plug_vars = $plug->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 ? "<img src='{$icon_src}' alt='{$tmp['text']}' class='icon S16' />" : E_16_PLUGIN;
$tmp[$id]['image_large'] = $icon_src_lrg ? "<img src='{$icon_src_lrg}' alt='{$tmp['text']}' class='icon S32' />" : $icon_src_lrg;
$tmp[$id]['image'] = $icon_src ? "<img src='{$icon_src}' alt=\"".varset($tmp[$id]['text'])."\" class='icon S16' />" : E_16_PLUGIN;
$tmp[$id]['image_large'] = $icon_src_lrg ? "<img src='{$icon_src_lrg}' alt=\"".varset($tmp[$id]['text'])."\" class='icon S32' />" : $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 ? "<img src='{$icon_src}' alt='{$tmp['text']}' class='icon S16' />" : "";
$tmp[$id]['sub'][$subid]['image'] = $icon_src ? "<img src='{$icon_src}' alt=\"".varset($tmp[$id]['sub'][$subid]['text'])."\" class='icon S16' />" : "";
$tmp[$id]['sub'][$subid]['image_large'] = '';
$tmp[$id]['sub'][$subid]['image_src'] = $icon_src;
$tmp[$id]['sub'][$subid]['image_large_src'] = '';

32
e107_handlers/form_handler.php
View File

@@ -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 "<input type='text' name='{$name}' value='{$value}' maxlength='{$maxlength}'".$this->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 .= "
<div id='{$id}-iconpicker' class='e-hideme'>
<div class='expand-container' id='{$id}-iconpicker-cn'>
@@ -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']."<br />\n";
$text .= $this->checkbox('e-columns[]', $key, $checked). varset($fld['title'])."<br />\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 &nbsp;&nbsp; ";
define("e_AJAX_REQUEST",TRUE);
$text .= "<select name='search_filter[]' style='margin:2px' onchange='UpdateForm(this.options[selectedIndex].value)'>";
$text = "<select name='search_filter[]' style='margin:2px' onchange='UpdateForm(this.options[selectedIndex].value)'>";
foreach($fieldarray as $key=>$val)
{
$text .= ($val['type']) ? "<option value='$key'>".$val['title']."</option>\n" : "";
$text .= varset($val['type']) ? "<option value='$key'>".$val['title']."</option>\n" : "";
}
$text .= "</select>";
return $text;
}
function filterValue($type,$fields)
function filterValue($type='',$fields='')
{
return " frm-> filterValue() is Deprecated.&nbsp;&nbsp; ";
if($type)
{