diff --git a/e107_admin/image.php b/e107_admin/image.php index 2a1d1e308..b34dd3562 100644 --- a/e107_admin/image.php +++ b/e107_admin/image.php @@ -993,6 +993,11 @@ class media_admin_ui extends e_admin_ui $options = array(); $options['bbcode'] = ($this->getQuery('bbcode')=='img') ? 'img' : FALSE; + + if($this->getQuery('for') == '_icon') + { + // $options['glyphs'] = true; + } $text = " @@ -1005,6 +1010,17 @@ class media_admin_ui extends e_admin_ui $text .= "
  • Appearance
    • \n"; } + if(varset($options['glyphs'])) + { + $text .= "
  • Glyphs
    • \n"; + } + + + if(varset($options['bbcode'])) + { + $text .= "
  • Appearance
    • \n"; + } + if(varset($_GET['from'])) { $options['from'] .= intval($_GET['from']); @@ -1120,6 +1136,20 @@ class media_admin_ui extends e_admin_ui "; } + + if(varset($options['glyphs'])) + { + //TODO + $text .= "
    + + + +
    + "; + + + } + $text .= ""; // For BBCODE mode. //TODO image-float. diff --git a/e107_admin/menus.php b/e107_admin/menus.php index 657adb0ff..ead6c6e10 100644 --- a/e107_admin/menus.php +++ b/e107_admin/menus.php @@ -11,6 +11,8 @@ if(isset($_GET['configure'])) { //Switch to Front-end + $_GET['configure'] = preg_replace('[^a-z0-9_-]','',$_GET['configure']); + define("USER_AREA", true); //Switch to desired layout define('THEME_LAYOUT', $_GET['configure']); diff --git a/e107_core/xml/default_install.xml b/e107_core/xml/default_install.xml index e6cd42b5e..b8b93b76e 100644 --- a/e107_core/xml/default_install.xml +++ b/e107_core/xml/default_install.xml @@ -239,8 +239,8 @@ City, State, Country 0 0 - - 0 + 253 + 253 0 canvas.css diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index a3b20f46e..9826167bd 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -240,7 +240,7 @@ class e_form } $mlength = vartrue($maxlength) ? "maxlength=".$maxlength : ""; - + $options = $this->format_options('text', $name, $options); //never allow id in format name-value for text fields return "get_attributes($options, $name)." />"; @@ -873,7 +873,8 @@ class e_form * IMPORTANT: $$mediaCat is also used is the media-manager category identifier */ function bbarea($name, $value, $template = '', $mediaCat='_common', $size = 'large', $options = array()) - { + { + if(is_string($options)) parse_str($options, $options); //size - large|medium|small //width should be explicit set by current admin theme $size = 'input-large'; diff --git a/submitnews.php b/submitnews.php index 8543fba93..1729fbcbf 100644 --- a/submitnews.php +++ b/submitnews.php @@ -8,6 +8,12 @@ * */ + +if(!empty($_POST) && !isset($_POST['e-token'])) +{ + // set e-token so it can be processed by class2 + $_POST['e-token'] = ''; +} require_once("class2.php"); include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/lan_'.e_PAGE); @@ -109,10 +115,16 @@ if (isset($_POST['submitnews_submit']) && $_POST['submitnews_title'] && $_POST[' if ($submitnews_error === FALSE) { - $sql->db_Insert("submitnews", "0, '$submitnews_user', '$submitnews_email', '$submitnews_title', '".intval($_POST['cat_id'])."', '$submitnews_item', '".time()."', '$ip', '0', '".implode(',',$submitnews_filearray)."' "); + $sql->insert("submitnews", "0, '$submitnews_user', '$submitnews_email', '$submitnews_title', '".intval($_POST['cat_id'])."', '$submitnews_item', '".time()."', '$ip', '0', '".implode(',',$submitnews_filearray)."' "); + $edata_sn = array("user" => $submitnews_user, "email" => $submitnews_email, "itemtitle" => $submitnews_title, "catid" => intval($_POST['cat_id']), "item" => $submitnews_item, "image" => $submitnews_file, "ip" => $ip); $e_event->trigger("subnews", $edata_sn); - $ns->tablerender(LAN_133, "
    ".LAN_134."
    "); + + $mes = e107::getMessage(); + $mes->addSuccess(LAN_134); + echo $mes->render(); + + // $ns->tablerender(LAN_133, "
    ".LAN_134."
    "); require_once(FOOTERF); exit; } @@ -131,27 +143,27 @@ $text = " if (!empty($pref['news_subheader'])) { - $text .= " - - ".$tp->toHTML($pref['news_subheader'], TRUE, "TITLE")."
    - "; + $text .= " + + ".$tp->toHTML($pref['news_subheader'], TRUE, "TITLE")."
    + "; } if (!USER) { - $text .= " - - ".LAN_7." - - - - - - ".LAN_112." - - - - "; + $text .= " + + ".LAN_7." + + + + + + ".LAN_112." + + + + "; } $text .= " @@ -187,39 +199,11 @@ $text .= " ".LAN_135." - ".e107::getForm()->bbarea('submitnews_item', $tp->toForm(vartrue($_POST['submitnews_item'])))." + ".e107::getForm()->bbarea('submitnews_item', $tp->toForm(vartrue($_POST['submitnews_item'])),null, null, 'large', 'required=1')." "; -/* -if (e_WYSIWYG) -{ - $insertjs = "rows='25'"; -} -else -{ - require_once(e_HANDLER."ren_help.php"); - $insertjs = "rows='15' onselect='storeCaret(this);' onclick='storeCaret(this);' onkeyup='storeCaret(this);'"; -} - -$text .= " - - ".LAN_135." - -
    "; - // toHTML is dangerous. - -if (!e_WYSIWYG) -{ - $text .= display_help("helpb","submitnews"); -} - -$text .= " - -"; -*/ - if ($pref['subnews_attach'] && $pref['upload_enabled'] && check_class($pref['upload_class']) && FILE_UPLOADS) { $text .= " @@ -235,6 +219,7 @@ $text .= " + @@ -242,31 +227,9 @@ $text .= " "; $ns->tablerender(LAN_136, $text); + require_once(FOOTERF); -function headerjs() -{ - $adder = ""; - if (e_WYSIWYG) $adder = 'tinyMCE.triggerSave();'; - $script = " - "; - return $script; -} -?> +?> \ No newline at end of file