From 1c7db4632a333d7182104f0d59378b9cbf5e9299 Mon Sep 17 00:00:00 2001
From: CaMer0n <cameron@e107coders.org>
Date: Fri, 25 May 2012 11:38:58 +0000
Subject: [PATCH] Minor improvements to filepicker()
---
e107_admin/image.php | 14 ++++++++------
e107_handlers/form_handler.php | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/e107_admin/image.php b/e107_admin/image.php
index c91b8908b..def8d6868 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -210,11 +210,7 @@ class media_form_ui extends e_admin_form_ui
$path = $this->getController()->getListModel()->get('media_url');
$preview = basename($path);
-
- $text .= "<input type='button' value='Select' class='button e-media-select e-dialog-close' data-target='{$tagid}' data-path='{$path}' data-preview='{$preview}' title=\"".$diz."\" style='float:left' href='#' />";
- // $text .= "SELECT";
- // $text .= "</a>\n\n";
- return $text;
+ return "<input type='button' value='Select' class='e-media-select e-dialog-close' data-target='{$tagid}' data-path='{$path}' data-preview='{$preview}' title=\"Select\" />";
}
@@ -358,12 +354,18 @@ class media_admin_ui extends e_admin_ui
if($this->getQuery('mode') == 'dialog')
{
$cat = $_GET['for'];
+ if(!isset($this->cats[$cat]))
+ {
+ return;
+ }
+
$this->listQry = "SELECT m.*,u.user_id,u.user_name FROM #core_media AS m LEFT JOIN #user AS u ON m.media_author = u.user_id WHERE media_category = '".$cat."' "; // without any Order or Limit.
unset($this->fields['checkboxes']);
$this->fields['options']['type'] = 'method';
+ $this->fields['media_category']['nolist'] = true;
$this->fields['media_userclass']['nolist'] = true;
- $this->fields['media_dimentions']['nolist'] = true;
+ $this->fields['media_dimensions']['nolist'] = true;
$this->fields['media_description']['nolist'] = true;
$this->fields['media_type']['nolist'] = true;
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 66d9bc3e8..d8e13ddc0 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -296,7 +296,7 @@ class e_form
$cat = $tp->toDB($sc_parameters['media']);
$default = ($default) ? $default : "Choose a file";
- $label = "<span id='{$name_id}_prev' >".$default."</span>";
+ $label = "<span id='{$name_id}_prev' >".basename($default)."</span>";
$ret .= $this->mediaUrl($cat, $label,$name_id,"mode=dialog&action=list");