';
+ }
$text .= "
\n";
@@ -99,16 +103,32 @@ function imageselector_shortcode($parm = '', $mod = '')
$pth = $dir;
if($fullpath)
{
- $pth = !vartrue($parms['media']) ? $tp->createConstants($icon['path'], 'rel') : $icon['path'];
+ if(!vartrue($parms['media']))
+ {
+ $pth = $tp->createConstants($icon['path'], 'rel');
+ $_value = $pth.$icon['fname'];
+ $_label = $dir.$icon['fname'];
+ $selected = ($default == $_value || $pth.$default == $_value) ? " selected='selected'" : "";
+ }
+ else
+ {
+ // convert e.g. {e_MEDIA}images/ to {e_MEDIA_IMAGES}
+ $pth = $tp->createConstants($tp->replaceConstants($icon['path']), 'rel');
+ $_value = $pth;
+ $_label = $icon['fname'];
+ $selected = ($default == $_value) ? " selected='selected'" : "";
+ }
}
- $selected = ($default == $pth.$icon['fname'] || $pth.$default == $pth.$icon['fname']) ? " selected='selected'" : "";
- $text .= "\n";
+
+ $text .= "\n";
}
}
}
$text .= '';
}
$text .= "";
+ $text .= "refresh";
+ if(!e_AJAX_REQUEST) $text .= '
';
if ($scaction == 'select') return $text;
}
@@ -149,7 +169,7 @@ function imageselector_shortcode($parm = '', $mod = '')
}
else
{
- $text .= "";
+ $text .= "";
}
if (vartrue($height)) $height = intval($height);
if (vartrue($width)) $width = intval($width);
diff --git a/e107_files/jslib/core/dialog.js b/e107_files/jslib/core/dialog.js
index 3b7eeaaa6..d4a602b71 100644
--- a/e107_files/jslib/core/dialog.js
+++ b/e107_files/jslib/core/dialog.js
@@ -56,7 +56,10 @@ e107Widgets.Dialog = Class.create(e107WidgetAbstract, {
this.events = new e107EventManager(this);
this.initMod('core-dialog', options);
+ if(!e107Widgets['DialogManagerDefault']) e107Widgets.DialogManagerDefault = new e107Widgets.DialogManager();
+
this.dialogManager = this.options.dialogManager || e107Widgets.DialogManagerDefault;
+
if(this.options.id && this.dialogManager.getWindow($(this.options.id))) return;
this.setMethodChains();
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index c4b8aeb17..8f7413de3 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -411,7 +411,7 @@ class e_admin_request
//special case - exclude all current
if(true === $exclude_from_query)
{
- $exclude_from_query = $ret;
+ $exclude_from_query = array_keys($ret);
}
// to array
if(is_string($exclude_from_query))
@@ -1834,7 +1834,7 @@ class e_admin_controller
if($mode) $request->setMode($mode);
if($action) $request->setAction($action);
if(!$path) $path = e_SELF;
-
+
$url = $path.'?'.$request->buildQueryString($merge_query, false, $exclude_query);
// Transfer all messages to session
e107::getMessage()->moveToSession();
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index d639b235d..2d5a9500a 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -137,6 +137,35 @@ class e_form
return $ret;
}
+
+ public function mediaUrl($category = '', $label = '')
+ {
+ if($category) $category = '&for='.$category;
+ if(!$label) $label = ' Upload an image or file';
+ $ret = "".$label."";
+
+ if(!e107::getRegistry('core/form/mediaurl'))
+ {
+ e107::getJs()->requireCoreLib('core/admin.js')
+ ->requireCoreLib('core/dialog.js')
+ ->requireCoreLib('core/draggable.js')
+ ->coreCSS('core/dialog/dialog.css')
+ ->coreCSS('core/dialog/e107/e107.css')
+ ->footerInline('
+ $$("a.e-dialog").invoke("observe", "click", function(ev) {
+ var element = ev.findElement("a");
+ ev.stop();
+ new e107Widgets.URLDialog(element.href + "&iframe=1", {
+ id: element["id"] || "e-dialog",
+ width: 900,
+ height: 550
+ }).center().activate().show();
+ });
+ ');
+ e107::setRegistry('core/form/mediaurl', true);
+ }
+ return $ret;
+ }
/**
* FIXME - better GUI, {IMAGESELECTOR} rewrite, flexibility, thumbnails, tooltip image preivew, etc.
@@ -166,7 +195,7 @@ class e_form
if(strpos($sc_parameters, '=') === false) $sc_parameters = 'media='.$sc_parameters;
parse_str($sc_parameters, $sc_parameters);
}
-
+
/* $qry = "SELECT * FROM `#core_media` WHERE media_userclass IN (".USERCLASS_LIST.") ";
$qry .= vartrue($sc_parameters['media']) ? " AND media_category = '".$tp->toDB($sc_parameters['media'])."' " : " AND `media_category` NOT REGEXP '_icon_16|_icon_32|_icon_48|_icon_64' ";
$qry .= "ORDER BY media_name";
@@ -218,6 +247,7 @@ class e_form
if(!$label) $label = LAN_SELECT;
$parms = "name={$name}";
+ $parms .= '&media='.varset($sc_parameters['media']);
$parms .= "&path=".rawurlencode(e107::getParser()->replaceConstants(vartrue($sc_parameters['path'], '{e_MEDIA}images/|{e_MEDIA}temp/')));
$parms .= "&filter=0";
$parms .= "&fullpath=1";