From b9d3cf01424682ee5d25ae44a73b819ceb9a51ce Mon Sep 17 00:00:00 2001 From: CaMer0n Date: Tue, 22 Sep 2009 18:28:49 +0000 Subject: [PATCH] Poll interface cleanup and TinyMce pref fixes --- e107_plugins/poll/admin_config.php | 238 +++++++++++------- e107_plugins/poll/languages/English.php | 16 +- .../poll/languages/English_admin_poll.php | 22 +- e107_plugins/poll/poll_class.php | 72 +++--- e107_plugins/tinymce/admin_config.php | 43 ++-- e107_plugins/tinymce/e_meta.php | 8 +- e107_plugins/tinymce/wysiwyg.php | 20 +- 7 files changed, 244 insertions(+), 175 deletions(-) diff --git a/e107_plugins/poll/admin_config.php b/e107_plugins/poll/admin_config.php index 855bd0023..480dc41d7 100644 --- a/e107_plugins/poll/admin_config.php +++ b/e107_plugins/poll/admin_config.php @@ -3,7 +3,7 @@ + ----------------------------------------------------------------------------+ | e107 website system | -| ©Steve Dunstan 2001-2002 +| �Steve Dunstan 2001-2002 | http://e107.org | jalist@e107.org | @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/poll/admin_config.php,v $ -| $Revision: 1.8 $ -| $Date: 2009-07-10 14:25:22 $ +| $Revision: 1.9 $ +| $Date: 2009-09-22 18:28:45 $ | $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -36,7 +36,6 @@ if(isset($_POST)) $_POST = strip_if_magic($_POST); } - $rs = new form; $poll = new poll; @@ -45,23 +44,15 @@ if (isset($_POST['reset'])) unset($poll_id, $_POST['poll_title'], $_POST['poll_option'], $_POST['activate'], $_POST['multipleChoice'], $_POST['showResults'], $_POST['startday'], $_POST['startmonth'], $_POST['startyear'], $_POST['endday'], $_POST['endmonth'], $_POST['endyear']); define("RESET", TRUE); } -elseif (e_QUERY) -{ - list($action, $id) = explode(".", e_QUERY); - define("POLLACTION", $action); - define("POLLID", $id); -} -else -{ - define("POLLACTION", FALSE); - define("POLLID", FALSE); -} -if ($action == "delete") + $emessage = eMessage::getInstance(); + +if (varset($_POST['delete'])) { - $message = $poll->delete_poll($id); + $message = $poll->delete_poll(key($_POST['delete'])); unset($poll_id, $_POST['poll_title'], $_POST['poll_option'], $_POST['activate']); + $_GET['mode']='list'; } @@ -69,21 +60,63 @@ if (isset($_POST['submit'])) { if($_POST['poll_title']) { - $message = $poll -> submit_poll(); + define("POLLID",$_POST['poll_id']); + $emessage->add($poll -> submit_poll(), E_MESSAGE_SUCCESS); unset($_POST['poll_title'], $_POST['poll_option'], $_POST['activate'], $_POST['poll_comment']); } else { - $message = POLLAN_46; + $emessage->add(POLLAN_46, E_MESSAGE_SUCCESS); } + $_GET['mode']='list'; + +} + +if (isset($_POST['preview'])) +{ + // Can't have everyone voting if tracking method is user ID + if (($_POST['pollUserclass'] == e_UC_PUBLIC) && ($_POST['storageMethod'] == 2)) $_POST['pollUserclass'] = e_UC_MEMBER; + $poll->render_poll($_POST, "preview"); +} + +if (varset($_POST['edit']) || varset($_GET['mode'])=='create' && !varset($_POST['submit'])) +{ + $_GET['mode']='create'; + if($_POST['edit']) + { + edit_poll(); + define("POLLACTION",'edit'); + } + + $poll_total = $sql->db_Select("polls"); + $text = $poll -> renderPollForm(); + $ns->tablerender(POLLAN_MENU_CAPTION." :: ".POLLAN_2, $text); } -if (POLLACTION == "edit" && !$_POST['preview'] && !$_POST['submit']) -{ - if ($sql->db_Select("polls", "*", "poll_id=".POLLID)) +if (isset($message)) +{ + $emessage->add($message, E_MESSAGE_SUCCESS); + +} + +if(!varset($_POST['edit']) && ($_GET['mode']=="list" || !$_GET['mode'])) +{ + poll_list(); +} + +require_once(e_ADMIN."footer.php"); + +function edit_poll() +{ + + $sql = e107::getDb(); + $id = key($_POST['edit']); + + if ($sql->db_Select("polls", "*", "poll_id=".$id)) { + $_GET['mode'] = 'create'; $row = $sql->db_Fetch(); extract($row); @@ -94,6 +127,7 @@ if (POLLACTION == "edit" && !$_POST['preview'] && !$_POST['submit']) $_POST['poll_option'][] = $option; } + $_POST['poll_id'] = $id; $_POST['activate'] = $poll_active; $_POST['option_count'] = count($_POST['poll_option']); $_POST['poll_title'] = $poll_title; @@ -122,80 +156,98 @@ if (POLLACTION == "edit" && !$_POST['preview'] && !$_POST['submit']) } } -if (isset($_POST['preview'])) +function poll_list() { - // Can't have everyone voting if tracking method is user ID - if (($_POST['pollUserclass'] == e_UC_PUBLIC) && ($_POST['storageMethod'] == 2)) $_POST['pollUserclass'] = e_UC_MEMBER; - $poll->render_poll($_POST, "preview"); -} - -if (isset($message)) -{ - $ns->tablerender("", "
".$message."
"); -} - -$text = "
-
"; - -if ($poll_total = $sql->db_Select("polls", "*", "poll_type=1")) -{ - $text .= " - - - - - - - - - - - - - - "; - while ($row = $sql->db_Fetch()) { - extract($row); - $text .= " - - - - "; + $sql = e107::getDb(); + $ns = e107::getRender(); + $tp = e107::getParser(); + $frm = new e_form(true); + + + global $user_pref; + if(isset($_POST['submit-e-columns'])) //TODO User + { + $user_pref['admin_poll_columns'] = $_POST['e-columns']; + save_prefs('user'); } - $text .= "
ID - - ".POLLAN_3."".POLLAN_4."
$poll_id".$tp -> toHTML($poll_title, TRUE,"no_hook, emotes_off, defs")."
". $rs->form_button("button", "main_edit_{$poll_id}", POLLAN_5, "onclick=\"document.location='".e_SELF."?edit.$poll_id'\""). $rs->form_button("submit", "main_delete_{$poll_id}", POLLAN_6, "onclick=\"confirm_($poll_id)\"")." -
"; + + $fieldpref = (varset($user_pref['admin_poll_columns'])) ? $user_pref['admin_poll_columns'] : array("poll_id","poll_title","poll_options","poll_vote_userclass"); ; + + //TODO Add more column options. + $fields = array( + 'poll_id' => array('title'=> ID, 'width'=>'5%', 'forced'=> TRUE), + 'poll_title' => array('title'=> POLLAN_3, 'width'=>'auto'), + 'poll_options' => array('title'=> POLLAN_4, 'type' => 'text', 'width' => 'auto', 'thclass' => 'center' ), // No real vetting + // 'poll_start_datestamp' => array('title'=> LAN_AUTHOR, 'type' => 'text', 'width' => 'auto', 'thclass' => 'left first'), // Display name + // 'poll_end_datestamp' => array('title'=> LAN_DATE, 'type' => 'text', 'width' => 'auto'), // User name + 'poll_vote_userclass' => array('title'=> LAN_USERCLASS, 'type' => 'text', 'width' => 'auto'), // Photo + + 'options' => array('title'=> LAN_OPTIONS, 'forced'=>TRUE, 'width' => '10%', 'thclass' => 'center last') + ); + + + + + + + + $text = "
+ "; + + if ($poll_total = $sql->db_Select("polls", "*", "poll_type=1")) + { + $text .= ""; + $text .= $frm->colGroup($fields,$fieldpref). + $frm->thead($fields,$fieldpref); + $text .= ""; + + while ($row = $sql->db_Fetch()) + { + extract($row); + + $text .= " + "; + $text .= (in_array("poll_title",$fieldpref)) ? "" : ""; + $text .= (in_array("poll_options",$fieldpref)) ? "" : ""; + $text .= (in_array("poll_comment",$fieldpref)) ? "" : ""; + $text .= (in_array("poll_vote_userclass",$fieldpref)) ? "" : ""; + + $text .= " + + "; + } + $text .= "
$poll_id".$tp -> toHTML($poll_title, TRUE,"no_hook, emotes_off, defs")."".(str_replace(chr(1),"
",$poll_options))."		".($poll_comment ? LAN_YES : LAN_NO)."".(r_userclass_name($poll_vote_userclass))." + + toJS(LAN_CONFIRMDEL." [".$poll_id."]")."') \" src='".ADMIN_DELETE_ICON_PATH."' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px' /> +
"; + } + else + { + $text .= "
".POLLAN_7."
"; + } + $text .= "
"; + + $emessage = eMessage::getInstance(); + + $ns->tablerender(POLLAN_MENU_CAPTION." :: ".POLLAN_1,$emessage->render(). $text); } -else + + + + + +function admin_config_adminmenu() { - $text .= "
".POLLAN_7."
"; -} -$text .= "
"; -$ns->tablerender(POLLAN_1, $text); - -$poll_total = $sql->db_Select("polls"); - -$text = $poll -> renderPollForm(); - -$ns->tablerender(POLLAN_2, $text); -require_once(e_ADMIN."footer.php"); - - -function headerjs() -{ - global $tp; - $headerjs = ""; - return $headerjs; + $action = varset($_GET['mode']) ? $_GET['mode'] : "list"; + $var['list']['text'] = POLLAN_1; + $var['list']['link'] = e_SELF; + $var['list']['perm'] = "P"; + $var['create']['text'] = POLLAN_2 ; + $var['create']['link'] = e_SELF."?mode=create"; + $var['create']['perm'] = "P"; +/* $var['import']['text'] = GSLAN_23; + $var['import']['link'] = e_SELF."?import"; + $var['import']['perm'] = "0";*/ + show_admin_menu(POLLAN_MENU_CAPTION, $action, $var); } ?> \ No newline at end of file diff --git a/e107_plugins/poll/languages/English.php b/e107_plugins/poll/languages/English.php index 06dba59aa..6bd74b8c5 100644 --- a/e107_plugins/poll/languages/English.php +++ b/e107_plugins/poll/languages/English.php @@ -3,7 +3,7 @@ + ----------------------------------------------------------------------------+ | e107 website system | -| ©Steve Dunstan 2001-2002 +| �Steve Dunstan 2001-2002 | http://e107.org | jalist@e107.org | @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/poll/languages/English.php,v $ -| $Revision: 1.3 $ -| $Date: 2008-08-16 16:25:45 $ -| $Author: e107steved $ +| $Revision: 1.4 $ +| $Date: 2009-09-22 18:28:47 $ +| $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -28,10 +28,10 @@ define("POLLAN_MENU_CAPTION", "Poll"); -//define("POLLAN_1", "Existing polls"); -//define("POLLAN_2", "Create / edit polls"); -//define("POLLAN_3", "Poll question"); -//define("POLLAN_4", "Options"); +define("POLLAN_1", "Existing polls"); +define("POLLAN_2", "Create / edit polls"); +define("POLLAN_3", "Poll question"); +define("POLLAN_4", "Poll Options"); //define("POLLAN_5", "Edit"); //define("POLLAN_6", "Delete"); //define("POLLAN_7", "No polls yet."); diff --git a/e107_plugins/poll/languages/English_admin_poll.php b/e107_plugins/poll/languages/English_admin_poll.php index d80ef4d55..1aafa1464 100644 --- a/e107_plugins/poll/languages/English_admin_poll.php +++ b/e107_plugins/poll/languages/English_admin_poll.php @@ -3,7 +3,7 @@ + ----------------------------------------------------------------------------+ | e107 website system | -| ©Steve Dunstan 2001-2002 +| �Steve Dunstan 2001-2002 | http://e107.org | jalist@e107.org | @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/poll/languages/English_admin_poll.php,v $ -| $Revision: 1.1 $ -| $Date: 2008-12-10 21:49:54 $ -| $Author: e107steved $ +| $Revision: 1.2 $ +| $Date: 2009-09-22 18:28:48 $ +| $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -29,12 +29,12 @@ define("POLL_ADLAN08", "Poll deleted"); define("POLLAN_MENU_CAPTION", "Poll"); -define("POLLAN_1", "Existing polls"); -define("POLLAN_2", "Create / edit polls"); -define("POLLAN_3", "Poll question"); -define("POLLAN_4", "Options"); -define("POLLAN_5", "Edit"); -define("POLLAN_6", "Delete"); +//define("POLLAN_1", "Existing polls"); +//define("POLLAN_2", "Create / edit polls"); +//define("POLLAN_3", "Poll Question"); +//define("POLLAN_4", "Poll Options"); +//define("POLLAN_5", "Edit"); +//define("POLLAN_6", "Delete"); define("POLLAN_7", "No polls yet."); /* define("POLLAN_8", "Add another option"); @@ -75,7 +75,7 @@ define("POLLAN_42", "This poll is restricted to administrators only"); define("POLLAN_43", "You do not have the required permissions to vote in this poll"); define("POLLAN_44", "Delete this poll?"); */ -define("POLLAN_45", "Poll successfully updated"); + define("POLLAN_46", "Field(s) left blank"); // Log messages diff --git a/e107_plugins/poll/poll_class.php b/e107_plugins/poll/poll_class.php index 35f9d20a7..f4c811bed 100644 --- a/e107_plugins/poll/poll_class.php +++ b/e107_plugins/poll/poll_class.php @@ -3,7 +3,7 @@ + ----------------------------------------------------------------------------+ | e107 website system | -| ©Steve Dunstan 2001-2002 +| �Steve Dunstan 2001-2002 | http://e107.org | jalist@e107.org | @@ -11,9 +11,9 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/poll/poll_class.php,v $ -| $Revision: 1.16 $ -| $Date: 2009-08-15 11:55:30 $ -| $Author: marj_nl_fr $ +| $Revision: 1.17 $ +| $Date: 2009-09-22 18:28:47 $ +| $Author: e107coders $ +----------------------------------------------------------------------------+ */ if (!defined('e107_INIT')) { exit; } @@ -64,12 +64,13 @@ class poll $active_end = (!$_POST['endmonth'] || !$_POST['endday'] || !$_POST['endyear'] ? 0 : mktime (0, 0, 0, $_POST['endmonth'], $_POST['endday'], $_POST['endyear'])); $poll_options = ""; + $_POST['poll_option'] = array_filter($_POST['poll_option']); foreach($_POST['poll_option'] as $key => $value) { $poll_options .= $tp->toDB($value).chr(1); } - if(POLLACTION == "edit") + if(POLLACTION == "edit" || vartrue($_POST['poll_id'])) { $sql -> db_Update("polls", "poll_title='{$poll_title}', poll_options='{$poll_options}', @@ -463,7 +464,10 @@ class poll $mode = "admin" :: called from admin_config.php $mode = "forum" :: called from forum_post.php */ - global $tp; + $tp = e107::getParser(); + + //TODO Hardcoded FORUM code needs to be moved somewhere. + if($mode == "forum") { $text = " @@ -530,9 +534,9 @@ class poll
".POLLAN_3.":
- "; + "; - $option_count = (count($_POST['poll_option']) ? count($_POST['poll_option']) : 1); + $option_count = (varset($_POST['poll_option']) && count($_POST['poll_option']) ? count($_POST['poll_option']) : 2); $text .= " ".LAN_OPTIONS." : @@ -541,10 +545,6 @@ class poll for($count = 1; $count <= $option_count; $count++) { - if($count != 1 && $_POST['poll_option'][($count-1)] =="") - { - break; - } $opt = ($count==1) ? "id='pollopt'" : ""; $text .=" post_toForm($_POST['poll_option'][($count-1)])."\" maxlength='200' />"; $text .= "
"; @@ -556,55 +556,67 @@ class poll ".POLLAN_9." - ".POLLAN_10."   - ".POLLAN_11." + ".POLLAN_10."   + ".POLLAN_11." ".POLLAN_12." - ".POLLAN_13."
- ".POLLAN_14." + ".POLLAN_13."
+ ".POLLAN_14." - ".POLLAN_15." - ".r_userclass("pollUserclass", $_POST['pollUserclass'], 'off', "public,member,admin,classes,matchclass")." + ".POLLAN_15.""; + + $uclass = (ADMIN) ? "" : "public,member,admin,classes,matchclass"; + + + $text .= " + ".r_userclass("pollUserclass", $_POST['pollUserclass'], 'off', $uclass)." ".POLLAN_16." - ".POLLAN_17."
- ".POLLAN_18."
- ".POLLAN_19." + ".POLLAN_17."
+ ".POLLAN_18."
+ ".POLLAN_19." - ".POLLAN_20.": - ".POLLAN_10." - ".POLLAN_11." + ".POLLAN_20.": + ".POLLAN_10." + ".POLLAN_11."
"; - if (isset($_POST['preview'])) { - $text .= " "; - if (POLLACTION == "edit") { - $text .= " "; - } else { + if (isset($_POST['preview']) || varset($_POST['edit'])) + { + $text .= " "; + + if (POLLACTION == "edit") + { + $text .= " + "; + } + else + { $text .= " "; } } else { $text .= " "; } - if (POLLID) { + + if (defset('POLLID')) { $text .= " "; } diff --git a/e107_plugins/tinymce/admin_config.php b/e107_plugins/tinymce/admin_config.php index 54331ead6..c011f03de 100644 --- a/e107_plugins/tinymce/admin_config.php +++ b/e107_plugins/tinymce/admin_config.php @@ -9,8 +9,8 @@ * Plugin Administration - gsitemap * * $Source: /cvs_backup/e107_0.8/e107_plugins/tinymce/admin_config.php,v $ - * $Revision: 1.6 $ - * $Date: 2009-09-21 21:54:26 $ + * $Revision: 1.7 $ + * $Date: 2009-09-22 18:28:49 $ * $Author: e107coders $ * */ @@ -31,16 +31,19 @@ $emessage = &eMessage::getInstance(); if($_POST['save_settings']) // Needs to be saved before e_meta.php is loaded by auth.php. { - $pref['tinymce']['customjs'] = $_POST['customjs']; - $pref['tinymce']['theme_advanced_buttons1'] = $_POST['theme_advanced_buttons1']; - $pref['tinymce']['theme_advanced_buttons2'] = $_POST['theme_advanced_buttons2']; - $pref['tinymce']['theme_advanced_buttons3'] = $_POST['theme_advanced_buttons3']; - $pref['tinymce']['theme_advanced_buttons4'] = $_POST['theme_advanced_buttons4']; - $pref['tinymce']['plugins'] = $_POST['mce_plugins']; + $tpref['customjs'] = $_POST['customjs']; + $tpref['theme_advanced_buttons1'] = $_POST['theme_advanced_buttons1']; + $tpref['theme_advanced_buttons2'] = $_POST['theme_advanced_buttons2']; + $tpref['theme_advanced_buttons3'] = $_POST['theme_advanced_buttons3']; + $tpref['theme_advanced_buttons4'] = $_POST['theme_advanced_buttons4']; + $tpref['plugins'] = $_POST['mce_plugins']; - save_prefs(); + e107::getPlugConfig('tinymce')->setPref($tpref); + e107::getPlugConfig('tinymce')->save(); } + $tpref = e107::getPlugConfig('tinymce')->getPref(); + require_once(e_ADMIN."auth.php"); @@ -59,24 +62,24 @@ if($_POST['save_settings']) // is there an if $emessage? $emessage->hasMessage sort($plug_array); } - if(!$pref['tinymce']['theme_advanced_buttons1']) + if(!$tpref['theme_advanced_buttons1']) { - $pref['tinymce']['theme_advanced_buttons1'] = "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect"; + $tpref['theme_advanced_buttons1'] = "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect"; } - if(!$pref['tinymce']['theme_advanced_buttons2']) + if(!$tpref['theme_advanced_buttons2']) { - $pref['tinymce']['theme_advanced_buttons2'] = "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor"; + $tpref['theme_advanced_buttons2'] = "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor"; } - if(!$pref['tinymce']['theme_advanced_buttons3']) + if(!$tpref['theme_advanced_buttons3']) { - $pref['tinymce']['theme_advanced_buttons3'] = "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen,emoticons,ibrowser"; + $tpref['theme_advanced_buttons3'] = "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen,emoticons,ibrowser"; } - if(!$pref['tinymce']['theme_advanced_buttons4']) + if(!$tpref['theme_advanced_buttons4']) { - $pref['tinymce']['theme_advanced_buttons4'] = "insertlayer,moveforward,movebackward,absolute,|,styleprops,spellchecker,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,blockquote,pagebreak,|,insertfile,insertimage"; + $tpref['theme_advanced_buttons4'] = "insertlayer,moveforward,movebackward,absolute,|,styleprops,spellchecker,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,blockquote,pagebreak,|,insertfile,insertimage"; } @@ -106,7 +109,7 @@ if($_POST['save_settings']) // is there an if $emessage? $emessage->hasMessage foreach($plug_array as $mce_plg) { - $checked = (in_array($mce_plg,$pref['tinymce']['plugins'])) ? "checked='checked'" : ""; + $checked = (in_array($mce_plg,$tpref['plugins'])) ? "checked='checked'" : ""; $text .= "
$mce_plg
"; } @@ -122,7 +125,7 @@ if($_POST['save_settings']) // is there an if $emessage? $emessage->hasMessage for ($i=1; $i<=4; $i++) { $rowNm = "theme_advanced_buttons".$i; - $text .= "\t\n"; + $text .= "\t\n"; } $text .= " @@ -132,7 +135,7 @@ if($_POST['save_settings']) // is there an if $emessage? $emessage->hasMessage Custom TinyMce Javascript - + diff --git a/e107_plugins/tinymce/e_meta.php b/e107_plugins/tinymce/e_meta.php index e6c6d71f2..9b904efec 100644 --- a/e107_plugins/tinymce/e_meta.php +++ b/e107_plugins/tinymce/e_meta.php @@ -3,7 +3,7 @@ + ----------------------------------------------------------------------------+ | e107 website system | -| ©Steve Dunstan 2001-2002 +| �Steve Dunstan 2001-2002 | http://e107.org | jalist@e107.org | @@ -11,8 +11,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/tinymce/e_meta.php,v $ -| $Revision: 1.4 $ -| $Date: 2009-07-10 14:27:31 $ +| $Revision: 1.5 $ +| $Date: 2009-09-22 18:28:49 $ | $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -22,7 +22,7 @@ if (!defined('e107_INIT')) { exit; } if(e_WYSIWYG || strpos(e_SELF,"tinymce/admin_config.php")) { require_once(e_PLUGIN."tinymce/wysiwyg.php"); - echo wysiwyg($e_wysiwyg); + echo wysiwyg(); } diff --git a/e107_plugins/tinymce/wysiwyg.php b/e107_plugins/tinymce/wysiwyg.php index dbc14b82a..1c03c158d 100644 --- a/e107_plugins/tinymce/wysiwyg.php +++ b/e107_plugins/tinymce/wysiwyg.php @@ -4,8 +4,8 @@ | e107 website system - Tiny MCE controller file. | | $Source: /cvs_backup/e107_0.8/e107_plugins/tinymce/wysiwyg.php,v $ -| $Revision: 1.14 $ -| $Date: 2009-09-21 16:31:02 $ +| $Revision: 1.15 $ +| $Date: 2009-09-22 18:28:49 $ | $Author: e107coders $ +----------------------------------------------------------------------------+ */ @@ -13,6 +13,8 @@ function wysiwyg($formids) { + $tinyMcePrefs = e107::getPlugConfig('tinymce')->getPref(); + global $pref,$HANDLERS_DIRECTORY,$PLUGINS_DIRECTORY,$IMAGES_DIRECTORY; $lang = e_LANGUAGE; @@ -45,7 +47,7 @@ if(!$tinylang[$lang]) $admin_only = array("ibrowser","code"); -foreach($pref['tinymce']['plugins'] as $val) +foreach($tinyMcePrefs['plugins'] as $val) { if(in_array($val,$admin_only) && !ADMIN) { @@ -115,10 +117,10 @@ $text .= ",theme_advanced_buttons3 : ''"; */ $text .= ", -theme_advanced_buttons1 : '".$pref['tinymce']['theme_advanced_buttons1']."', -theme_advanced_buttons2 : '".$pref['tinymce']['theme_advanced_buttons2']."', -theme_advanced_buttons3 : '".$pref['tinymce']['theme_advanced_buttons3']."', -theme_advanced_buttons4 : '".$pref['tinymce']['theme_advanced_buttons4']."', +theme_advanced_buttons1 : '".$tinyMcePrefs['theme_advanced_buttons1']."', +theme_advanced_buttons2 : '".$tinyMcePrefs['theme_advanced_buttons2']."', +theme_advanced_buttons3 : '".$tinyMcePrefs['theme_advanced_buttons3']."', +theme_advanced_buttons4 : '".$tinyMcePrefs['theme_advanced_buttons4']."', theme_advanced_toolbar_location : \"bottom\", theme_advanced_toolbar_align : \"left\", theme_advanced_statusbar_location : \"bottom\", @@ -144,7 +146,7 @@ $text .= ",verify_css_classes : false\n"; $text .= ",cleanup_callback : \"tinymce_html_bbcode_control\" \n"; $text .= (ADMIN) ? "\n, external_link_list_url: '../".e_PLUGIN_ABS."tiny_mce/filelist.php'\n" : ""; -if($pref['tinymce']['customjs']) +if($tinyMcePrefs['customjs']) { $text .= "\n, @@ -171,7 +173,7 @@ $text .= " function tinymce_html_bbcode_control(type, source) { "; - if(in_array("bbcode",$pref['tinymce']['plugins'])) + if(in_array("bbcode",$tinyMcePrefs['plugins'])) { // $text .= " return source; "; }