";
- $att = 'aw=120&ah=100';
+ $ret = "
thumbUrl($im['media_url'], "&w={$w}") : $tp->thumbUrl($im['media_url']); // $tp->replaceConstants($im['media_url'],'full'); // max-size
- $realPath = $tp->thumbUrl($im['media_url'], $att);
+ $realPath = $tp->thumbUrl($im['media_url'], $prevAtt); // Parsed back to Form as Preview Image.
+
$diz = $tp->toAttribute($im['media_title'])."\n".$im['media_dimensions'];
$repl = array($im['media_url'],$media_path);
@@ -637,7 +654,7 @@ class e_media
$data_bb = ($bbcode) ? "img" : "";
- $img_url = ($cat !='_icon') ? e107::getParser()->thumbUrl($im['media_url'], $att) : $media_path;
+ $img_url = ($cat !='_icon') ? e107::getParser()->thumbUrl($im['media_url'], $thumbAtt) : $media_path;
$text .= "";
$text .= "![\"".$im['media_title']."\"](".$img_url." "\\"{$diz}\\"")
";
diff --git a/e107_handlers/plugin_class.php b/e107_handlers/plugin_class.php
index b3eed2b23..c890e4238 100644
--- a/e107_handlers/plugin_class.php
+++ b/e107_handlers/plugin_class.php
@@ -1850,7 +1850,7 @@ class e107plugin
$data['class'] = 253;
$status = e107::getMedia()->createCategory($data) ? E_MESSAGE_SUCCESS : E_MESSAGE_ERROR;
$mes->add("Adding Media Category: {$data['category']}", $status);
-
+ e107::getMedia()->import($data['category'],e_PLUGIN.$folder, false,'min-size=20000');
$c++;
}
diff --git a/e107_images/advanced.png b/e107_images/advanced.png
deleted file mode 100644
index 60c08c108..000000000
Binary files a/e107_images/advanced.png and /dev/null differ
diff --git a/e107_images/banners/banner1.png b/e107_images/banners/banner1.png
deleted file mode 100644
index e7e4943f4..000000000
Binary files a/e107_images/banners/banner1.png and /dev/null differ
diff --git a/e107_images/banners/banner2.png b/e107_images/banners/banner2.png
deleted file mode 100644
index d58df9f69..000000000
Binary files a/e107_images/banners/banner2.png and /dev/null differ
diff --git a/e107_images/banners/banner3.png b/e107_images/banners/banner3.png
deleted file mode 100644
index 0f6e1b373..000000000
Binary files a/e107_images/banners/banner3.png and /dev/null differ
diff --git a/e107_images/generic/nomedia.png b/e107_images/generic/nomedia.png
new file mode 100644
index 000000000..1bf0e438c
Binary files /dev/null and b/e107_images/generic/nomedia.png differ
diff --git a/e107_plugins/banner/admin_banner.php b/e107_plugins/banner/admin_banner.php
index bb4e1ca1b..76d0b2209 100644
--- a/e107_plugins/banner/admin_banner.php
+++ b/e107_plugins/banner/admin_banner.php
@@ -497,7 +497,12 @@ if ($action == "create")
".BNRLAN_14."
-
+ ".$frm->imagepicker('banner_image', $_POST['banner_image'], '', 'media=banner&w=600');
+
+
+
+ /*
+ $text .= "
@@ -542,7 +547,10 @@ if ($action == "create")
$c++;
}
$text .= "
-
+ ";
+ */
+
+ $text .= "
diff --git a/e107_plugins/banner/images/banner1.png b/e107_plugins/banner/images/banner1.png
new file mode 100644
index 000000000..f7838d434
Binary files /dev/null and b/e107_plugins/banner/images/banner1.png differ
diff --git a/e107_plugins/banner/plugin.xml b/e107_plugins/banner/plugin.xml
index 339b107e5..980ba75b8 100644
--- a/e107_plugins/banner/plugin.xml
+++ b/e107_plugins/banner/plugin.xml
@@ -12,4 +12,7 @@
Configure Banners
+
+ Banners
+
\ No newline at end of file
diff --git a/e107_web/js/core/mediaManager.js b/e107_web/js/core/mediaManager.js
index bc8ad4a14..f10cc1331 100644
--- a/e107_web/js/core/mediaManager.js
+++ b/e107_web/js/core/mediaManager.js
@@ -165,6 +165,7 @@ $(document).ready(function()
//alert(bbpath);
}
+
$('#src').attr('value',src); // working old
$('#preview').attr('src',preview); // working old
@@ -174,6 +175,7 @@ $(document).ready(function()
$('#width').val(width);
$('#height').val(height);
+
$('img#' + target + "_prev", window.top.document).attr('src',preview); // set new value
$('div#' + target + "_prev", window.top.document).html(preview); // set new value
$('span#' + target + "_prev", window.top.document).html(preview); // set new value
";
+ $att = 'aw='.$width."'&ah=".$height."'";
$thpath = isset($sc_parameters['nothumb']) || vartrue($hide) ? $default : $tp->thumbUrl($default_thumb, $att, true);
- $label = "
";
+ $label = "";
+ if($cat != 'news' && $cat !='page')
+ {
+ $cat = $cat . "_image";
+ }
}
+
-
- $ret .= $this->mediaUrl($cat, $label,$name_id);
+ $ret .= $this->mediaUrl($cat, $label,$name_id,$sc_parameters);
$ret .= "
\n";
$ret .= "";
// $ret .= $this->text($name,$default); // to be hidden eventually.
@@ -545,9 +556,12 @@ class e_form
$default_label = ($default) ? $default : "Choose a file";
$label = "".basename($default_label)."";
+ $sc_parameters['mode'] = 'main';
+ $sc_parameters['action'] = 'dialog';
+
// $ret .= $this->mediaUrl($cat, $label,$name_id,"mode=dialog&action=list");
- $ret .= $this->mediaUrl($cat, $label,$name_id,"mode=main&action=dialog");
+ $ret .= $this->mediaUrl($cat, $label,$name_id,$sc_parameters);
$ret .= "";
return $ret;
diff --git a/e107_handlers/media_class.php b/e107_handlers/media_class.php
index c18c5f78e..a1da18e7d 100644
--- a/e107_handlers/media_class.php
+++ b/e107_handlers/media_class.php
@@ -361,12 +361,20 @@ class e_media
{
$cat = str_replace("+","",$cat);
// $inc[] = "media_category = '_common_image' ";
- $inc[] = "media_category REGEXP '(^|,)(_common_image)(,|$)' ";
+ // $inc[] = "media_category REGEXP '(^|,)(_common_image)(,|$)' ";
+ // $inc[] = "media_category LIKE '%_common_image%' ";
+ $catArray[] = '_common_image';
}
if($cat)
{
- $inc[] = "media_category REGEXP '(^|,)(".$cat.")(,|$)' "; // for multiple category field.
+ $catArray[] = $cat;
+ // $inc[] = "media_category LIKE '%".$cat."%' "; // for multiple category field.
+ // $inc[] = "media_category REGEXP '(^|,)(".$cat.")(,|$)' "; // for multiple category field.
}
+
+
+ // $inc[] = "media_category REGEXP '(^|,)_common_image|banner_image(,|$)' ";
+
// TODO check the category is valid.
if($search)
@@ -379,22 +387,24 @@ class e_media
$ret = array();
- $query = "SELECT * FROM #core_media WHERE media_userclass IN (".USERCLASS_LIST.") AND ( ".implode(" OR ",$inc)." ) " ;
+ // $query = "SELECT * FROM #core_media WHERE media_userclass IN (".USERCLASS_LIST.") AND ( ".implode(" OR ",$inc)." ) " ;
+
+ $query = "SELECT * FROM #core_media WHERE `media_category` REGEXP '(^|,)".implode("|",$catArray)."(,|$)' AND `media_userclass` IN (".USERCLASS_LIST.") " ;
if($search)
{
$query .= " AND ( ".implode(" OR ",$searchinc)." ) " ;
}
- $query .= " ORDER BY media_datestamp DESC";
+ $query .= " ORDER BY media_id DESC";
if($amount)
{
$query .= " LIMIT ".$from." ,".$amount;
}
- e107::getDb()->db_Select_gen($query);
- while($row = e107::getDb()->db_Fetch(MYSQL_ASSOC))
+ e107::getDb()->gen($query);
+ while($row = e107::getDb()->fetch(MYSQL_ASSOC))
{
$id = $row['media_id'];
$ret[$id] = $row;
@@ -503,7 +513,13 @@ class e_media
public function mediaSelect($category='',$tagid=null,$att=null)
{
- parse_str($att,$option); // grab 'onclick' .
+ if(is_string($att))
+ {
+ parse_str($att,$option); // grab 'onclick' .
+ }
+ else {
+ $option = $att;
+ }
$frm = ($option['from']) ? $option['from'] : 0;
$limit = ($option['limit']) ? $option['limit'] : 20;
@@ -511,8 +527,6 @@ class e_media
$bbcode = ($option['bbcode']) ? $option['bbcode'] : null;
$navMode = ($option['nav']) ? TRUE : FALSE;
$search = ($option['search']) ? $option['search'] : null;
-
-
if($category !='_icon')
{
@@ -539,8 +553,9 @@ class e_media
// $total_images = $this->getImages($cat); // for use by next/prev in filter at some point.
- $att = 'aw=120&ah=100';
- $prevId = $tagid."_prev";
+ $prevAtt = '&aw='.vartrue($option['w'],$w); // .'&ah=100'; // Image Parsed back to Form as PREVIEW image.
+ $prevId = $tagid."_prev"; // ID of image in Form.
+ $thumbAtt = 'aw=120&ah=100'; // Thumbnail of the Media-Manager Preview.
// EXAMPLE of FILTER GUI.
// $text .= "CAT=".$cat;
@@ -603,14 +618,16 @@ class e_media
$media_path : Inserted into html tags eg.