Changeset 2764:27e5dbc88610
- Timestamp:
- 11/04/14 09:04:50 (9 years ago)
- Branch:
- default
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
admin/media.php
r2751 r2764 75 75 $popup = (integer) !empty($_GET['popup']); 76 76 77 $page_url = $core->adminurl->get("admin.media",array('popup' => $popup,'post_id' => $post_id , 'plugin_id' => $plugin_id));78 if (($temp = $core->callBehavior('adminMediaURL',$page_url ))!='') {77 $page_url = $core->adminurl->get("admin.media",array('popup' => $popup,'post_id' => $post_id)); 78 if (($temp = $core->callBehavior('adminMediaURL',$page_url.'&plugin_id='.$plugin_id))!='') { 79 79 $page_url = $temp; 80 80 } … … 137 137 html::escapeHTML($_POST['newdir'])) 138 138 ); 139 http::redirect($page_url.'& d='.rawurlencode($d));139 http::redirect($page_url.'&plugin_id='.$plugin_id.'&d='.rawurlencode($d)); 140 140 } catch (Exception $e) { 141 141 $core->error->add($e->getMessage()); … … 164 164 'name' => $upfile['name'], 165 165 'size' => $upfile['size'], 166 'html' => mediaItemLine($core->media->getFile($new_file_id), 1 , $plugin_id)166 'html' => mediaItemLine($core->media->getFile($new_file_id), 1) 167 167 ); 168 168 } catch (Exception $e) { … … 184 184 185 185 dcPage::addSuccessNotice(__('Files have been successfully uploaded.')); 186 http::redirect($page_url.'& d='.rawurlencode($d));186 http::redirect($page_url.'&plugin_id='.$plugin_id.'&d='.rawurlencode($d)); 187 187 } catch (Exception $e) { 188 188 $core->error->add($e->getMessage()); … … 205 205 ) 206 206 ); 207 http::redirect($page_url.'& d='.rawurlencode($d));207 http::redirect($page_url.'&plugin_id='.$plugin_id.'&d='.rawurlencode($d)); 208 208 } catch (Exception $e) { 209 209 $core->error->add($e->getMessage()); … … 224 224 $core->media->removeItem($_POST['remove']); 225 225 dcPage::addSuccessNotice($msg); 226 http::redirect($page_url.'& d='.rawurlencode($d));226 http::redirect($page_url.'&plugin_id='.$plugin_id.'&d='.rawurlencode($d)); 227 227 } catch (Exception $e) { 228 228 $core->error->add($e->getMessage()); … … 240 240 html::escapeHTML($d)) 241 241 ); 242 http::redirect($page_url.'& d='.rawurlencode($d));242 http::redirect($page_url.'&plugin_id='.$plugin_id.'&d='.rawurlencode($d)); 243 243 } catch (Exception $e) { 244 244 $core->error->add($e->getMessage()); … … 289 289 ); 290 290 } else { 291 $breadcrumb_media = $core->media->breadCrumb(html::escapeURL($page_url).'& d=%s','<span class="page-title">%s</span>');291 $breadcrumb_media = $core->media->breadCrumb(html::escapeURL($page_url).'&plugin_id='.$plugin_id.'&d=%s','<span class="page-title">%s</span>'); 292 292 if ($breadcrumb_media == '') { 293 293 $breadcrumb = dcPage::breadcrumb( … … 302 302 array( 303 303 html::escapeHTML($core->blog->name) => '', 304 __('Media manager') => html::escapeURL($page_url.'& d='),304 __('Media manager') => html::escapeURL($page_url.'&plugin_id='.$plugin_id.'&d='), 305 305 $breadcrumb_media => '' 306 306 ), … … 423 423 { 424 424 if ($items[$i]->d) { 425 $dgroup .= mediaItemLine($items[$i],$j ,$plugin_id);425 $dgroup .= mediaItemLine($items[$i],$j); 426 426 } else { 427 $fgroup .= mediaItemLine($items[$i],$j ,$plugin_id);427 $fgroup .= mediaItemLine($items[$i],$j); 428 428 } 429 429 } … … 466 466 form::field(array('newdir','newdir'),35,255).'</p>'. 467 467 '<p><input type="submit" value="'.__('Create').'" />'. 468 form::hidden(array('d'),html::escapeHTML($d)).'</p>'. 468 form::hidden(array('d'),html::escapeHTML($d)). 469 form::hidden(array('plugin_id'),$plugin_id).'</p>'. 469 470 '</div>'. 470 471 '</form>'; … … 546 547 '<div>'. 547 548 form::hidden('rmyes',1).form::hidden('d',html::escapeHTML($d)). 548 form::hidden( 'remove','').549 form::hidden(array('plugin_id'),$plugin_id).form::hidden('remove',''). 549 550 $core->formNonce(). 550 551 '</div>'. … … 564 565 565 566 /* ----------------------------------------------------- */ 566 function mediaItemLine($f,$i ,$plugin_id)567 { 568 global $core, $page_url, $popup, $post_id ;567 function mediaItemLine($f,$i) 568 { 569 global $core, $page_url, $popup, $post_id, $plugin_id; 569 570 570 571 $fname = $f->basename; … … 573 574 574 575 if ($f->d) { 575 $link = html::escapeURL($page_url).'& d='.html::sanitizeURL($f->relname);576 $link = html::escapeURL($page_url).'&plugin_id='.$plugin_id.'&d='.html::sanitizeURL($f->relname); 576 577 if ($f->parent) { 577 578 $fname = '..'; … … 636 637 } else { 637 638 $act .= '<a class="media-remove" '. 638 'href="'.html::escapeURL($page_url).'& d='.639 'href="'.html::escapeURL($page_url).'&plugin_id='.$plugin_id.'&d='. 639 640 rawurlencode($GLOBALS['d']).'&remove='.rawurlencode($f->basename).'">'. 640 641 '<img src="images/trash.png" alt="'.__('Delete').'" title="'.__('delete').'" /></a>';
Note: See TracChangeset
for help on using the changeset viewer.