Changeset 2711:fab26880034e for admin

Timestamp:

05/15/14 08:44:22 (11 years ago)

Author:

Dsls

Branch:

default

Parents:

2710:f99841305743 (diff), 2708:e8b17b3a7413 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge

Files:

• admin/post.php (modified) (13 diffs)
• admin/post.php (modified) (8 diffs)

admin/post.php

@@ -19 +19 @@
 $post_dt = '';
 $post_format = $core->auth->getOption('post_format');
-$editor = $core->auth->getOption('editor');
+$post_editor = $core->auth->getOption('editor');
 $post_password = '';
 $post_url = '';
@@ -61 +61 @@
 
 # Formaters combo
-$formaters_combo = dcAdminCombos::getFormatersCombo($editor);
+$formaters_combo = dcAdminCombos::getFormatersCombo();
+foreach ($formaters_combo as $editor => $formats) {
+     foreach ($formats as $format) {
+          $formaters_combo[$editor][$format] = "$editor:$format";
+     }
+}
 
 # Languages combo
@@ -75 +80 @@
 
 if (count($formaters_combo)==0 || !$core->auth->getOption('editor') || $core->auth->getOption('editor')=='') {
-     dcPage::addNotice("message",
-                           sprintf(__('Choose an active editor in %s.'),
+     dcPage::addNotice("message", 
+                           sprintf(__('Choose an active editor in %s.'), 
                                           '<a href="preferences.php#user-options">'.__('your preferences').'</a>'
                                           )
@@ -83 +88 @@
 
 # Get entry informations
-if (!empty($_REQUEST['id']))
-{
+if (!empty($_REQUEST['id'])) {
      $page_title = __('Edit entry');
 
@@ -91 +95 @@
      $post = $core->blog->getPosts($params);
 
-     if ($post->isEmpty())
-     {
+     if ($post->isEmpty()) {
           $core->error->add(__('This entry does not exist.'));
           $can_view_page = false;
-     }
-     else
-     {
+     } else {
           $post_id = $post->post_id;
           $cat_id = $post->cat_id;
           $post_dt = date('Y-m-d H:i',strtotime($post->post_dt));
           $post_format = $post->post_format;
+        # try to retrieve editor from post meta
+        $meta_editor = $core->meta->getMetaStr($post->post_meta,'editor');
+        if (!empty($meta_editor)) {
+            $post_editor = $meta_editor;
+        }
           $post_password = $post->post_password;
           $post_url = $post->post_url;
@@ -193 +199 @@
 
 # Format excerpt and content
-elseif (!empty($_POST) && $can_edit_post)
-{
-     $post_format = $_POST['post_format'];
+elseif (!empty($_POST) && $can_edit_post) {
+
+     if (strpos($_POST['post_format'], ':')!==false) {
+          list($post_editor, $post_format) = explode(':', $_POST['post_format']);
+     } else {
+          $post_format = $_POST['post_format'];
+          $post_editor = '';
+     }
+
      $post_excerpt = $_POST['post_excerpt'];
      $post_content = $_POST['post_content'];
@@ -283 +295 @@
      $cur->post_dt = $post_dt ? date('Y-m-d H:i:00',strtotime($post_dt)) : '';
      $cur->post_format = $post_format;
+     $cur->post_meta = serialize(array('editor' => $post_editor));
      $cur->post_password = $post_password;
      $cur->post_lang = $post_lang;
@@ -301 +314 @@
 
      # Update post
-     if ($post_id)
-     {
-          try
-          {
+     if ($post_id) {
+          try {
+            $meta = $core->meta;
+            $meta->delPostMeta($post_id,'editor');
+            $meta->setPostMeta($post_id,'editor',$post_editor);
+
                # --BEHAVIOR-- adminBeforePostUpdate
                $core->callBehavior('adminBeforePostUpdate',$cur,$post_id);
@@ -317 +332 @@
                     array('id' => $post_id)
                ));
-          }
-          catch (Exception $e)
-          {
+          } catch (Exception $e) {
                $core->error->add($e->getMessage());
           }
-     }
-     else
-     {
+     } else {
           $cur->user_id = $core->auth->userID();
 
-          try
-          {
+          try {
                # --BEHAVIOR-- adminBeforePostCreate
                $core->callBehavior('adminBeforePostCreate',$cur);
 
                $return_id = $core->blog->addPost($cur);
+
+            $meta = $core->meta;
+            $meta->delPostMeta($return_id,'editor');
+            $meta->setPostMeta($return_id,'editor',$post_editor);
 
                # --BEHAVIOR-- adminAfterPostCreate
@@ -342 +356 @@
                     array('id' => $return_id)
                ));
-          }
-          catch (Exception $e)
-          {
+          } catch (Exception $e) {
                $core->error->add($e->getMessage());
           }
@@ -390 +402 @@
 }
 
+$admin_post_behavior = '';
+if (($core->auth->getOption('editor')==$post_editor) 
+    && in_array($post_format, $core->getFormaters($core->auth->getOption('editor')))) {
+    $admin_post_behavior = $core->callBehavior('adminPostEditor');
+}
 
 dcPage::open($page_title.' - '.__('Entries'),
@@ -395 +412 @@
      dcPage::jsModal().
      dcPage::jsMetaEditor().
+    $admin_post_behavior.
      dcPage::jsLoad('js/_post.js').
-     $core->callBehavior('adminPostEditor').
      dcPage::jsConfirmClose('entry-form','comment-form').
      # --BEHAVIOR-- adminPostHeaders
@@ -464 +481 @@
 /* Post form if we can edit post
 -------------------------------------------------------- */
-if ($can_edit_post)
-{
+if ($can_edit_post) {
      if (count($formaters_combo)>0 && ($core->auth->getOption('editor') && $core->auth->getOption('editor')!='')) {
-          $post_format_field = form::combo('post_format',$formaters_combo,$post_format,'maximal');
+          // temporay removed until we can switch easily editor
+        // $post_format_field = form::combo('post_format',$formaters_combo,"$post_editor:$post_format",'maximal');
+
+        $post_format_field = sprintf('%s (%s)', $post_format, $post_editor);
+          $post_format_field .= form::hidden('post_format',"$post_editor:$post_format");
      } else {
-          $post_format_field = sprintf(__('Choose an active editor in %s.'),
+          $post_format_field = sprintf(__('Choose an active editor in %s.'), 
           '<a href="preferences.php#user-options">'.__('your preferences').'</a>'
           );
+          $post_format_field .= form::hidden('post_format','xhtml');
      }
 

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">';
      }