Changeset 2852:86651202b279 for admin/media.php

Timestamp:

12/16/14 21:59:13 (11 years ago)

Author:

Dsls

Branch:

2.7

Message:

Tuned redirections and admin urls management, should work with media & attachments now
Added adminurl->redirect to avoid confusion in "when to use & and when not to"

File:

• admin/media.php (modified) (16 diffs)

admin/media.php

@@ -75 +75 @@
 $popup = (integer) !empty($_GET['popup']);
 
-$page_url = $core->adminurl->get("admin.media",array('popup' => $popup,'post_id' => $post_id));
-if (($temp = $core->callBehavior('adminMediaURL',$page_url.'&plugin_id='.$plugin_id))!='') {
-     $page_url = $temp;
-}
+$page_url_params = new ArrayObject(array('popup' => $popup,'post_id' => $post_id));
+if ($d) {
+     $page_url_params ['d'] = rawurlencode($d);
+}
+if ($plugin_id != '') {
+     $page_url_params ['plugin_id'] = $plugin_id;
+}
+
+$core->callBehavior('adminMediaURLParams',$page_url_params);
+$page_url_params = (array) $page_url_params;
 
 if ($popup) {
@@ -137 +143 @@
                html::escapeHTML($_POST['newdir']))
           );
-          http::redirect($page_url.'&plugin_id='.$plugin_id.'&d='.rawurlencode($d));
+          $core->adminurl->redirect('admin.media',$page_url_params);
      } catch (Exception $e) {
           $core->error->add($e->getMessage());
@@ -184 +190 @@
 
                dcPage::addSuccessNotice(__('Files have been successfully uploaded.'));
-               http::redirect($page_url.'&plugin_id='.$plugin_id.'&d='.rawurlencode($d));
+               $core->adminurl->redirect('admin.media',$page_url_params);
           } catch (Exception $e) {
                $core->error->add($e->getMessage());
@@ -205 +211 @@
                )
           );
-          http::redirect($page_url.'&plugin_id='.$plugin_id.'&d='.rawurlencode($d));
+          $core->adminurl->redirect('admin.media',$page_url_params);
      } catch (Exception $e) {
           $core->error->add($e->getMessage());
@@ -224 +230 @@
           $core->media->removeItem($_POST['remove']);
           dcPage::addSuccessNotice($msg);
-          http::redirect($page_url.'&plugin_id='.$plugin_id.'&d='.rawurlencode($d));
+          $core->adminurl->redirect('admin.media',$page_url_params);
      } catch (Exception $e) {
           $core->error->add($e->getMessage());
@@ -240 +246 @@
                html::escapeHTML($d))
           );
-          http::redirect($page_url.'&plugin_id='.$plugin_id.'&d='.rawurlencode($d));
+          $core->adminurl->redirect('admin.media',$page_url_params);
      } catch (Exception $e) {
           $core->error->add($e->getMessage());
@@ -261 +267 @@
 
      echo
-     '<form action="'.html::escapeURL($page_url).'" method="post">'.
+     '<form action="'.html::escapeURL($core->adminurl->get('admin.media')).'" method="post">'.
      '<p>'.sprintf(__('Are you sure you want to remove %s?'),
           html::escapeHTML($_GET['remove'])).'</p>'.
@@ -267 +273 @@
      ' &nbsp; <input type="submit" name="rmyes" value="'.__('Yes').'" />'.
      form::hidden('d',$d).
+     $core->adminurl->getHiddenFormFields('admin.media',$page_url_params).
      $core->formNonce().
      form::hidden('remove',html::escapeHTML($_GET['remove'])).'</p>'.
@@ -289 +296 @@
      );
 } else {
-     $breadcrumb_media = $core->media->breadCrumb(html::escapeURL($page_url).'&amp;plugin_id='.$plugin_id.'&amp;d=%s','<span class="page-title">%s</span>');
+     $temp_params = $page_url_params;
+     $temp_params['d']='%s';
+     $bc_template = str_replace("%25s","%s",$core->adminurl->get('admin.media',$temp_params));
+     $breadcrumb_media = $core->media->breadCrumb($bc_template,'<span class="page-title">%s</span>');
      if ($breadcrumb_media == '') {
           $breadcrumb = dcPage::breadcrumb(
@@ -299 +309 @@
           );
      } else {
+          $home_params = $page_url_params;
+          $home_params['d']='';
+
           $breadcrumb = dcPage::breadcrumb(
                array(
                     html::escapeHTML($core->blog->name) => '',
-                    __('Media manager') => html::escapeURL($page_url.'&plugin_id='.$plugin_id.'&d='),
+                    __('Media manager') => $core->adminurl->get('admin.media',$home_params),
                     $breadcrumb_media => ''
                ),
@@ -459 +472 @@
      {
           echo
-          '<form action="'.html::escapeURL($page_url).'" method="post" class="fieldset">'.
+          '<form action="'.$core->adminurl->getBase('admin.media').'" method="post" class="fieldset">'.
           '<div id="new-dir-f">'.
           '<h4 class="pretty-title">'.__('Create new directory').'</h4>'.
@@ -466 +479 @@
           form::field(array('newdir','newdir'),35,255).'</p>'.
           '<p><input type="submit" value="'.__('Create').'" />'.
-          form::hidden(array('d'),html::escapeHTML($d)).
-          form::hidden(array('plugin_id'),$plugin_id).'</p>'.
+          $core->adminurl->getHiddenFormFields('admin.media',$page_url_params).
+          '</p>'.
           '</div>'.
           '</form>';
@@ -478 +491 @@
           '<div class="fieldset">'.
           '<h4 class="pretty-title">'.sprintf(__('Backup content of %s'),($d == '' ? '“'.__('Media manager').'”' : '“'.$d.'”')).'</h4>'.
-          '<p><a class="button submit" href="'.html::escapeURL($page_url).'&amp;zipdl=1">'.
-          __('Download zip file').'</a></p>'.
+          '<p><a class="button submit" href="'.$core->adminurl->get('admin.media',
+               array_merge($page_url_params,array('zipdl' => 1))).'">'.__('Download zip file').'</a></p>'.
           '</div>';
      }
@@ -567 +580 @@
 function mediaItemLine($f,$i)
 {
-     global $core, $page_url, $popup, $post_id, $plugin_id;
+     global $core, $page_url, $popup, $post_id, $plugin_id,$page_url_params;
 
      $fname = $f->basename;
 
-     $class = 'media-item media-col-'.($i%2);
+     $class = 'media-item media-col-'.($i%2); 
 
      if ($f->d) {
-          $link = html::escapeURL($page_url).'&amp;plugin_id='.$plugin_id.'&amp;d='.html::sanitizeURL($f->relname);
+
+          $link = $core->adminurl->get('admin.media',array_merge($page_url_params,array('d' => html::sanitizeURL($f->relname) )));
           if ($f->parent) {
                $fname = '..';
@@ -582 +596 @@
           }
      } else {
-          $link = $core->adminurl->get(
-               'admin.media.item',
+          $params = new ArrayObject(
                array(
                     'id' => $f->media_id,
@@ -591 +604 @@
                )
           );
-          if (($temp = $core->callBehavior('adminMediaURL',$link))!='') {
-               $link = $temp;
-          }
+          $core->callBehavior('adminMediaURLParams',$params);
+          $params = (array) $params;
+          $link = $core->adminurl->get(
+               'admin.media.item', $params
+          );
      }