mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 20:58:30 +01:00
Code Issues Releases Wiki Activity

Tweaks to the banner menu rendering.

Browse Source
This commit is contained in:
Cameron 2015-04-04 16:24:10 -07:00
parent 3a4cb01811
commit f5ea27d637
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
e107_handlers/e_parse_class.php
View File

@ -2603,7 +2603,9 @@ class e_parser
'img' => array('id', 'src', 'style', 'class', 'alt', 'title', 'width', 'height'),
'a' => array('id', 'href', 'style', 'class', 'title', 'target'),
'script' => array('type', 'src', 'language'),
'iframe' => array('id', 'src', 'frameborder', 'class', 'width', 'height', 'style')
'iframe' => array('id', 'src', 'frameborder', 'class', 'width', 'height', 'style'),
'input' => array('type','name','value','class','style'),
'form' => array('action','method','target')
);
protected $badAttrValues = array('javascript[\s]*?:','alert\(','vbscript[\s]*?:','data:text\/html', 'mhtml[\s]*?:', 'data:[\s]*?image');
@ -2617,7 +2619,7 @@ class e_parser
'div','pre','section','article', 'blockquote','hgroup','aside','figure','span', 'video', 'br',
'small', 'caption', 'noscript'
);
protected $scriptTags = array('script','applet','iframe'); //allowed when $pref['post_script'] is enabled.
protected $scriptTags = array('script','applet','iframe','form','input','button'); //allowed when $pref['post_script'] is enabled.
protected $blockTags = array('pre','div','h1','h2','h3','h4','h5','h6','blockquote'); // element includes its own line-break.

2
e107_plugins/banner/admin_banner.php
View File

@ -306,7 +306,7 @@ class banner_ui extends e_admin_ui
}
$renderTypes = array(BNRLAN_44,'1 - '.BNRLAN_45,'2 - '.BNRLAN_46);
$renderTypes = array(BNRLAN_48,'1 - '.BNRLAN_45,'2 - '.BNRLAN_46);
$renderTypes[3] = "3 - ".BNRLAN_47; //TODO

13
e107_plugins/banner/banner_menu.php
View File

@ -48,6 +48,19 @@ else
}
if(!empty($parm))
{
parse_str($parm, $parms);
}
if(isset($parms['w']) && isset($parms['h']))
{
e107::getParser()->setThumbSize(intval($parms['w']), intval($parms['h']));
}
/*

8
e107_plugins/banner/languages/English_admin.php
View File

@ -59,8 +59,8 @@ define('BNRLAN_42', 'This is only used when multiple campaigns are selected.');
define("BNRLAN_43", "How to show the campaigns?"); // BANNER_MENU_L10
define("BNRLAN_44", "Choose render type ..."); // BANNER_MENU_L11
define("BNRLAN_45", "One campaign in a single menu"); // BANNER_MENU_L12
define("BNRLAN_46", "All selected campaigns in one single menu"); // BANNER_MENU_L13
define("BNRLAN_47", "All selected campaigns in separate menus"); // BANNER_MENU_L14
define("BNRLAN_45", "One campaign rendered in a single menu"); // BANNER_MENU_L12
define("BNRLAN_46", "All selected campaigns rendered in one single menu"); // BANNER_MENU_L13
define("BNRLAN_47", "All selected campaigns rendered in separate menus"); // BANNER_MENU_L14
define("BNRLAN_48", "All selected campaigns (no box rendering)");
?>