Changes in [2710:f99841305743:2711:fab26880034e]

Files:

• admin/index.php (modified) (1 diff)
• admin/plugin.php (modified) (1 diff)
• admin/post.php (modified) (8 diffs)
• inc/admin/lib.dc.adminurl.php (added)
• inc/admin/prepend.php (modified) (2 diffs)
• inc/core/class.dc.modules.php (modified) (1 diff)
• inc/prepend.php (modified) (1 diff)

admin/index.php

@@ -325 +325 @@
           '<div id="quick">'.
           '<h3>'.__('Quick entry').'</h3>'.
-          '<form id="quick-entry" action="post.php" method="post" class="fieldset">'.
+          '<form id="quick-entry" action="'.$core->adminurl->get('admin.post').'" method="post" class="fieldset">'.
           '<h4>'.__('New entry').'</h4>'.
           '<p class="col"><label for="post_title" class="required"><abbr title="'.__('Required field').'">*</abbr> '.__('Title:').'</label>'.

admin/plugin.php

@@ -36 +36 @@
      $p_info = $core->plugins->getModules($p);
 
+     $p_name = $p;
      $p_url = 'plugin.php?p='.$p;
 

admin/post.php

@@ -41 +41 @@
 $can_delete = false;
 
-$post_headlink = '<link rel="%s" title="%s" href="post.php?id=%s" />';
-$post_link = '<a href="post.php?id=%s" title="%s">%s</a>';
+$post_headlink = '<link rel="%s" title="%s" href="'.$core->adminurl->get('admin.post',array('id' => "%s"),'&').'" />';
+$post_link = '<a href="'.$core->adminurl->get('admin.post',array('id' => "%s"),'&').'" title="%s">%s</a>';
 
 $next_link = $prev_link = $next_headlink = $prev_headlink = null;
@@ -163 +163 @@
 }
 
-$comments_actions_page = new dcCommentsActionsPage($core,'post.php',array('id' => $post_id, '_ANCHOR'=>$anchor,'section' => $anchor));
+$comments_actions_page = new dcCommentsActionsPage($core,$core->adminurl->get('admin.post'),array('id' => $post_id, '_ANCHOR'=>$anchor,'section' => $anchor));
 
 if ($comments_actions_page->process()) {
@@ -190 +190 @@
           if (!$core->error->flag()) {
                dcPage::addSuccessNotice(__('All pings sent.'));
-               http::redirect('post.php?id='.$post_id.'&tb=1');
+               http::redirect($core->adminurl->get(
+                    'admin.post',
+                    array('id' => $post_id, 'tb'=> '1')
+               ));
           }
      }
@@ -325 +328 @@
                $core->callBehavior('adminAfterPostUpdate',$cur,$post_id);
                dcPage::addSuccessNotice (sprintf(__('The post "%s" has been successfully updated'),html::escapeHTML($cur->post_title)));
-               http::redirect('post.php?id='.$post_id);
+               http::redirect($core->adminurl->get(
+                    'admin.post',
+                    array('id' => $post_id)
+               ));
           } catch (Exception $e) {
                $core->error->add($e->getMessage());
@@ -346 +352 @@
 
                dcPage::addSuccessNotice(__('Entry has been successfully created.'));
-               http::redirect('post.php?id='.$return_id);
+               http::redirect($core->adminurl->get(
+                    'admin.post',
+                    array('id' => $return_id)
+               ));
           } catch (Exception $e) {
                $core->error->add($e->getMessage());
@@ -507 +516 @@
                          '<p>'.$post_format_field.'</p>'.
                          '<p class="format_control control_no_xhtml">'.
-                         '<a id="convert-xhtml" class="button'.($post_id && $post_format != 'wiki' ? ' hide' : '').'" href="post.php?id='.$post_id.'&amp;xconv=1">'.
+                         '<a id="convert-xhtml" class="button'.($post_id && $post_format != 'wiki' ? ' hide' : '').'" href="'.
+                         $core->adminurl->get('admin.post',array('id'=> $post_id,'xconv'=> '1')).
+                         '">'.
                          __('Convert to XHTML').'</a></p></div>')),
           'metas-box' => array(
@@ -604 +615 @@
 
      echo '<div class="multi-part" title="'.($post_id ? __('Edit entry') : __('New entry')).'" id="edit-entry">';
-     echo '<form action="post.php" method="post" id="entry-form">';
+     echo '<form action="'.$core->adminurl->get('admin.post').'" method="post" id="entry-form">';
      echo '<div id="entry-wrapper">';
      echo '<div id="entry-content"><div class="constrained">';
@@ -682 +693 @@
 
      if ($has_action) {
-          echo '<form action="post.php" id="form-comments" method="post">';
+          echo '<form action="'.$core->adminurl->get('admin.post').'" id="form-comments" method="post">';
      }
 

inc/admin/prepend.php

@@ -174 +174 @@
 */
 }
+
+$core->adminurl = new dcAdminURL($core);
+
+$core->adminurl->register('admin.posts','posts.php');
+$core->adminurl->register('admin.post','post.php');
+$core->adminurl->register('admin.blog.theme','blog_theme.php');
+$core->adminurl->register('admin.blog.pref','blog_pref.php');
+$core->adminurl->register('admin.blogs','blogs.php');
+$core->adminurl->register('admin.categories','categories.php');
+$core->adminurl->register('admin.category','category.php');
+$core->adminurl->register('admin.comments','comments.php');
+$core->adminurl->register('admin.comments','comment.php');
+$core->adminurl->register('admin.help','help.php');
+$core->adminurl->register('admin.home','index.php');
+$core->adminurl->register('admin.langs','langs.php');
+$core->adminurl->register('admin.media','media.php');
+$core->adminurl->register('admin.media_item','media_item.php');
+$core->adminurl->register('admin.plugins','plugins.php');
+$core->adminurl->register('admin.plugin','plugin.php');
+$core->adminurl->register('admin.user.preferences','preferences.php');
+$core->adminurl->register('admin.user','user.php');
+$core->adminurl->register('admin.users','users.php');
 
 if ($core->auth->userID() && $core->blog !== null)
@@ -278 +300 @@
      }
 }
+

inc/core/class.dc.modules.php

@@ -131 +131 @@
                if ($ns == 'admin') {
                     $this->loadModuleL10Nresources($id,$lang);
+                    $this->core->adminurl->register('admin.plugin.'.$id,'plugin.php',array('p'=>$id));
                }
                $this->loadNsFile($id,$ns);

inc/prepend.php

@@ -76 +76 @@
 $__autoload['context']               = dirname(__FILE__).'/public/lib.tpl.context.php';
 $__autoload['dcUrlHandlers']         = dirname(__FILE__).'/public/lib.urlhandlers.php';
+$__autoload['dcAdminURL']            = dirname(__FILE__).'/admin/lib.dc.adminurl.php';
 $__autoload['dcPostsActionsPage']    = dirname(__FILE__).'/admin/actions/class.dcactionposts.php';
 $__autoload['dcCommentsActionsPage'] = dirname(__FILE__).'/admin/actions/class.dcactioncomments.php';