mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Partial fix for Issue #177

Browse Source
This commit is contained in:
Cameron
2013-04-24 03:53:02 -07:00
parent 976c386cf2
commit 0d93068439
5 changed files with 57 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
e107_core/shortcodes/batch/bbcode_shortcodes.php
View File

@@ -102,7 +102,7 @@ class bbcode_shortcodes extends e_shortcode
$data = "[list][*]Item 1[*]Item 2[/list]"; $data = "[list][*]Item 1[*]Item 2[/list]";
// $data = "[list]\n[*]Item 1\n[*]Item 2\n[/list]"; // works with jquery, but not onclick. // $data = "[list]\n[*]Item 1\n[*]Item 2\n[/list]"; // works with jquery, but not onclick.
$event = $this->getEvent('addtext',$data,LANHELP_36); $event = $this->getEvent($this->var['trigger'],$data,LANHELP_36);
$text = "<a {$event} class='e-bb' id='{$id}' data-function='insert' href='#{$this->var['tagid']}' data-bbcode='{$data}'>"; $text = "<a {$event} class='e-bb' id='{$id}' data-function='insert' href='#{$this->var['tagid']}' data-bbcode='{$data}'>";
$text .= "<img class='btn btn-small bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/list.png' alt='' title='".nl2br(LANHELP_36)."' /></a>"; $text .= "<img class='btn btn-small bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/list.png' alt='' title='".nl2br(LANHELP_36)."' /></a>";
return $text; return $text;
@@ -401,7 +401,9 @@ class bbcode_shortcodes extends e_shortcode
// if(defsettrue('e_WYSIWYG')){ return; } // if(defsettrue('e_WYSIWYG')){ return; }
$bbcode_func = ($bbcode_func) ? $bbcode_func : "addtext"; $bbcode_func = ($this->var['trigger']) ? $this->var['trigger'] : "addtext";
$bbcode_help = ($bbcode_help) ? $bbcode_help : "help"; $bbcode_help = ($bbcode_help) ? $bbcode_help : "help";
$bbcode_tag = ($bbcode_helptag != 'helpb') ? ",'$bbcode_helptag'" : ""; $bbcode_tag = ($bbcode_helptag != 'helpb') ? ",'$bbcode_helptag'" : "";

8
e107_handlers/bbcode_handler.php
View File

@@ -483,7 +483,7 @@ class e_bbcode
// NEW bbcode button rendering function. replacing displayHelp(); // NEW bbcode button rendering function. replacing displayHelp();
function renderButtons($template,$id='') function renderButtons($template, $id='', $options=array())
{ {
$tp = e107::getParser(); $tp = e107::getParser();
@@ -528,9 +528,9 @@ class e_bbcode
$data = array( $data = array(
'tagid' => $id, 'tagid' => $id,
'template' => $template, 'template' => $template,
'trigger' => vartrue($addtextfunc), 'trigger' => vartrue($options['trigger']), // For BC
// 'hint_func' => $helpfunc, // unused // 'hint_func' => $helpfunc, // deprecated and unused
// 'hint_active' => $bbcode_helpactive, // unused // 'hint_active' => $bbcode_helpactive, // deprecated and unused
'size' => vartrue($helpsize) 'size' => vartrue($helpsize)
); );

15
e107_handlers/ren_help.php
View File

@@ -29,17 +29,21 @@ function ren_help($mode = 1, $addtextfunc = "addtext", $helpfunc = "help")
// DONE - full rewrite, EVERYTHING - bbcode class (php + JS), core callbacks, tooltip help, optimize // DONE - full rewrite, EVERYTHING - bbcode class (php + JS), core callbacks, tooltip help, optimize
/**
* @DEPRECATED use $frm->bbarea() instead.
*/
function display_help($tagid="helpb", $mode = 1, $addtextfunc = "addtext", $helpfunc = "help", $helpsize = '') function display_help($tagid="helpb", $mode = 1, $addtextfunc = "addtext", $helpfunc = "help", $helpsize = '')
{ {
return e107::getBB()->renderButtons($mode,'data'); // guessing the name of the textarea as 'data' no indicator unfortunately.
$options = array('trigger' => $addtextfunc );
return e107::getBB()->renderButtons($mode,'data',$options); // guessing the name of the textarea as 'data' no indicator unfortunately.
// may cause pre-image and pre-file selector issues. // may cause pre-image and pre-file selector issues.
// if(defsettrue('e_WYSIWYG')) { return; } // if(defsettrue('e_WYSIWYG')) { return; }
/*
global $tp, $pref, $eplug_bb, $bbcode_func, $register_bb, $bbcode_help, $bbcode_helpactive, $bbcode_helptag, $bbcode_helpsize; global $tp, $pref, $eplug_bb, $bbcode_func, $register_bb, $bbcode_help, $bbcode_helpactive, $bbcode_helptag, $bbcode_helpsize;
$bbcode_helpsize = $helpsize; $bbcode_helpsize = $helpsize;
@@ -122,6 +126,7 @@ function display_help($tagid="helpb", $mode = 1, $addtextfunc = "addtext", $help
{ {
return "ERROR: ".e_CORE."shortcodes/batch/bbcode_shortcodes.php IS NOT READABLE."; return "ERROR: ".e_CORE."shortcodes/batch/bbcode_shortcodes.php IS NOT READABLE.";
} }
*/
} }

3
e107_plugins/forum/forum_admin_class.php
View File

@@ -1030,6 +1030,7 @@ class forumAdmin
$tp = e107::getParser(); $tp = e107::getParser();
$frm = e107::getForm(); $frm = e107::getForm();
/*
$sql->select("wmessage"); $sql->select("wmessage");
list($null) = $sql->fetch(); list($null) = $sql->fetch();
list($null) = $sql->fetch(); list($null) = $sql->fetch();
@@ -1037,6 +1038,8 @@ class forumAdmin
list($id, $guestrules, $wm_active4) = $sql->fetch(); list($id, $guestrules, $wm_active4) = $sql->fetch();
list($id, $memberrules, $wm_active5) = $sql->fetch(); list($id, $memberrules, $wm_active5) = $sql->fetch();
list($id, $adminrules, $wm_active6) = $sql->fetch(); list($id, $adminrules, $wm_active6) = $sql->fetch();
*/
if($sql->select('generic','*',"gen_type='forum_rules_guest'")) if($sql->select('generic','*',"gen_type='forum_rules_guest'"))
{ {

2
e107_web/js/core/admin.jquery.css
View File

@@ -29,4 +29,6 @@ legend { display: none; }
.e-autocomplete { display: none } .e-autocomplete { display: none }
.e-expandit-container { margin-top:10px } .e-expandit-container { margin-top:10px }
input.helpbox { display:none; } /* legacy BBcode helper box - deprecated and hidden if found in v2.x */
.col-selection { padding:5px; text-align:left; background-color: #FCFDFF; border: 1px outset black; width:200px; margin-right:0px;overflow:visible; position:absolute; z-index:101; right:0px;} .col-selection { padding:5px; text-align:left; background-color: #FCFDFF; border: 1px outset black; width:200px; margin-right:0px;overflow:visible; position:absolute; z-index:101; right:0px;}