From 4113e8801d1705be9b03958c72efad3abfdb6971 Mon Sep 17 00:00:00 2001 From: CaMer0n Date: Thu, 5 May 2011 11:30:00 +0000 Subject: [PATCH] bbcode for adding local images now retrieving images from media-manager. --- e107_handlers/form_handler.php | 3 ++ e107_handlers/media_class.php | 42 +++++++++++++++++++++++ e107_handlers/ren_help.php | 42 ++++++++++++----------- e107_themes/templates/bbcode_template.php | 8 ++--- 4 files changed, 71 insertions(+), 24 deletions(-) diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 5878ea9c4..4a52511df 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -402,6 +402,9 @@ class e_form return "".(false !== $counter ? $this->hidden('__'.$name.'autoheight_opt', $counter) : ''); } + /** + * Bbcode Area. Name, value, help_mode, form-id, size, counter + */ function bbarea($name, $value, $help_mod = '', $help_tagid='', $size = 'large', $counter = false) { //size - large|medium|small diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php index ec8f46a58..dd9497a32 100644 --- a/e107_handlers/media_class.php +++ b/e107_handlers/media_class.php @@ -20,6 +20,8 @@ if (!defined('e107_INIT')) { exit; } class e_media { + var $imagelist = array(); + /** * Import files from specified path into media database. * @param string $cat Category nickname @@ -218,6 +220,46 @@ class e_media { // TODO } + + + /** + * Generate Simple Thumbnail window for image-selection + * TODO Use Whole-page popup window + * TODO Add an upload Tab?. + * TODO Real-time ajax filter by keyword + */ + public function imageSelect($cat,$formid='imageSel') + { + $sql = e107::getDb(); + $tp = e107::getParser(); + + $text .= ""; + + return $text; + } } diff --git a/e107_handlers/ren_help.php b/e107_handlers/ren_help.php index 8b2a59e5b..c22a639a3 100644 --- a/e107_handlers/ren_help.php +++ b/e107_handlers/ren_help.php @@ -71,7 +71,7 @@ function display_help($tagid="helpb", $mode = 1, $addtextfunc = "addtext", $help $temp['extended'] = $BBCODE_TEMPLATE_NEWSPOST; $temp['admin'] = $BBCODE_TEMPLATE_ADMIN; $temp['mailout'] = $BBCODE_TEMPLATE_MAILOUT; - $temp['cpage'] = $BBCODE_TEMPLATE_CPAGE; + $temp['page'] = $BBCODE_TEMPLATE_CPAGE; $temp['maintenance']= $BBCODE_TEMPLATE_ADMIN; $temp['comment'] = "{BB_HELP}
".$BBCODE_TEMPLATE; @@ -182,25 +182,24 @@ function Color_Select($formid='col_selector') { } -function PreImage_Select($formid) { - global $fl, $tp, $bbcode_imagedir; - - $path = ($bbcode_imagedir) ? $bbcode_imagedir : e_IMAGE."newspost_images/"; - $formid = ($formid) ? ($formid) : "preimage_selector"; - - - if(!is_object($fl)){ - require_once(e_HANDLER."file_class.php"); - $fl = new e_file; - } - -// $rejecthumb = array('$.','$..','/','CVS','thumbs.db','*._$', 'index', 'null*'); - $imagelist = $fl->get_files($path,'','standard',2); - sort($imagelist); - - $text =" - \n\n"; return $text; + */ } @@ -236,6 +236,8 @@ function PreFile_Select($formid='prefile_selector') global $IMAGES_DIRECTORY, $fl; $sql = e107::getDb(); + $fl = e107::getFile(); + $filelist = array(); $downloadList = array(); diff --git a/e107_themes/templates/bbcode_template.php b/e107_themes/templates/bbcode_template.php index 086a5de57..30b187cf2 100644 --- a/e107_themes/templates/bbcode_template.php +++ b/e107_themes/templates/bbcode_template.php @@ -48,7 +48,7 @@ $BBCODE_TEMPLATE_ADMIN = "
{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left} {BB=right}{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes} - {BB_PREIMAGEDIR=".e_IMAGE."} + {BB_PREIMAGEDIR} {BB=preimage}{BB=prefile}{BB=flash}{BB=youtube}
"; @@ -58,7 +58,7 @@ $BBCODE_TEMPLATE_MAILOUT = "
{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left} {BB=right}{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes} - {BB_PREIMAGEDIR=".e_IMAGE."} + {BB_PREIMAGEDIR} {BB=preimage}{BB=prefile}{BB=flash}{BB=shortcode}
"; @@ -70,7 +70,7 @@ $BBCODE_TEMPLATE_NEWSPOST = "
{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left} {BB=right}{BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes} - {BB_PREIMAGEDIR=".e_IMAGE."newspost_images/} + {BB_PREIMAGEDIR=news} {BB=preimage}{BB=prefile}{BB=flash}{BB=youtube}
"; @@ -81,7 +81,7 @@ $BBCODE_TEMPLATE_CPAGE = " {BB=newpage} {BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=center}{BB=left}{BB=right} {BB=bq}{BB=code}{BB=list}{BB=fontcol}{BB=fontsize}{BB=emotes} - {BB_PREIMAGEDIR=".e_IMAGE."custom/} + {BB_PREIMAGEDIR=page} {BB=preimage}{BB=prefile}{BB=flash}{BB=youtube}
";