Changeset 1107:3943962d69b8 for plugins/pages

Timestamp:

02/27/13 11:48:32 (12 years ago)

Author:

JcDenis

Branch:

sexy

Parents:

880:02c78f56f430 (diff), 1105:ce855d61f9ce (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 with default branch in 2.5-RC

Location:

plugins/pages

Files:

• _public.php (modified) (4 diffs)
• _public.php (modified) (1 diff)
• list.php (modified) (1 diff)
• list.php (modified) (2 diffs)
• page.php (modified) (14 diffs)
• page.php (modified) (6 diffs)

plugins/pages/_public.php

@@ -102 +102 @@
           global $core, $_ctx;
           
-          if ($w->homeonly && $core->url->type != 'default') {
+          if (($w->homeonly == 1 && $core->url->type != 'default') ||
+               ($w->homeonly == 2 && $core->url->type == 'default')) {
                return;
           }
@@ -109 +110 @@
           $params['limit'] = abs((integer) $w->limit);
           $params['no_content'] = true;
+          $params['post_selected'] = false;
           
           $sort = $w->sortby;
@@ -128 +130 @@
           
           $res =
-          '<div class="pages">'.
+          ($w->content_only ? '' : '<div class="pages'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
           ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
           '<ul>';
@@ -141 +143 @@
           }
           
-          $res .= '</ul></div>';
+          $res .= '</ul>'.($w->content_only ? '' : '</div>');
           
           return $res;

plugins/pages/_public.php

@@ -61 +61 @@
                {
                     $post_id = $_ctx->posts->post_id;
-                    $post_password = $_ctx->posts->post_password;
-                    
-                    # Password protected entry
-                    if ($post_password != '' && !$_ctx->preview)
-                    {
-                         # Get passwords cookie
-                         if (isset($_COOKIE['dc_passwd'])) {
-                              $pwd_cookie = unserialize($_COOKIE['dc_passwd']);
-                         } else {
-                              $pwd_cookie = array();
-                         }
-                         
-                         # Check for match
-                         if ((!empty($_POST['password']) && $_POST['password'] == $post_password)
-                         || (isset($pwd_cookie[$post_id]) && $pwd_cookie[$post_id] == $post_password))
-                         {
-                              $pwd_cookie[$post_id] = $post_password;
-                              setcookie('dc_passwd',serialize($pwd_cookie),0,'/');
-                         }
-                         else
-                         {
-                              self::serveDocument('password-form.html','text/html',false);
-                              return;
-                         }
-                    }
-                    
-                    $post_comment =
-                         isset($_POST['c_name']) && isset($_POST['c_mail']) &&
-                         isset($_POST['c_site']) && isset($_POST['c_content']) &&
-                         $_ctx->posts->commentsActive();
-                    
-                    # Posting a comment
-                    if ($post_comment)
-                    {
-                         # Spam trap
-                         if (!empty($_POST['f_mail'])) {
-                              http::head(412,'Precondition Failed');
-                              header('Content-Type: text/plain');
-                              echo "So Long, and Thanks For All the Fish";
-                              # Exits immediately the application to preserve the server.
-                              exit;
-                         }
-                         
-                         $name = $_POST['c_name'];
-                         $mail = $_POST['c_mail'];
-                         $site = $_POST['c_site'];
-                         $content = $_POST['c_content'];
-                         $preview = !empty($_POST['preview']);
-                         
-                         if ($content != '')
-                         {
-                              if ($core->blog->settings->system->wiki_comments) {
-                                   $core->initWikiComment();
-                              } else {
-                                   $core->initWikiSimpleComment();
-                              }
-                              $content = $core->wikiTransform($content);
-                              $content = $core->HTMLfilter($content);
-                         }
-                         
-                         $_ctx->comment_preview['content'] = $content;
-                         $_ctx->comment_preview['rawcontent'] = $_POST['c_content'];
-                         $_ctx->comment_preview['name'] = $name;
-                         $_ctx->comment_preview['mail'] = $mail;
-                         $_ctx->comment_preview['site'] = $site;
-                         
-                         if ($preview)
-                         {
-                              # --BEHAVIOR-- publicBeforeCommentPreview
-                              $core->callBehavior('publicBeforeCommentPreview',$_ctx->comment_preview);
-                              
-                              $_ctx->comment_preview['preview'] = true;
-                         }
-                         else
-                         {
-                              # Post the comment
-                              $cur = $core->con->openCursor($core->prefix.'comment');
-                              $cur->comment_author = $name;
-                              $cur->comment_site = html::clean($site);
-                              $cur->comment_email = html::clean($mail);
-                              $cur->comment_content = $content;
-                              $cur->post_id = $_ctx->posts->post_id;
-                              $cur->comment_status = $core->blog->settings->system->comments_pub ? 1 : -1;
-                              $cur->comment_ip = http::realIP();
-                              
-                              $redir = $_ctx->posts->getURL();
-                              $redir .= $core->blog->settings->system->url_scan == 'query_string' ? '&' : '?';
-                              
-                              try
-                              {
-                                   if (!text::isEmail($cur->comment_email)) {
-                                        throw new Exception(__('You must provide a valid email address.'));
-                                   }
-                                   
-                                   # --BEHAVIOR-- publicBeforeCommentCreate
-                                   $core->callBehavior('publicBeforeCommentCreate',$cur);
-                                   if ($cur->post_id) {                         
-                                        $comment_id = $core->blog->addComment($cur);
-                                   
-                                        # --BEHAVIOR-- publicAfterCommentCreate
-                                        $core->callBehavior('publicAfterCommentCreate',$cur,$comment_id);
-                                   }
-                                   
-                                   if ($cur->comment_status == 1) {
-                                        $redir_arg = 'pub=1';
-                                   } else {
-                                        $redir_arg = 'pub=0';
-                                   }
-                                   
-                                   header('Location: '.$redir.$redir_arg);
-                              }
-                              catch (Exception $e)
-                              {
-                                   $_ctx->form_error = $e->getMessage();
-                                   $_ctx->form_error;
-                              }
-                         }
-                    }
-                    
                     # The entry
                     $core->tpl->setPath($core->tpl->getPath(), dirname(__FILE__).'/default-templates');

plugins/pages/list.php

@@ -81 +81 @@
           $selected = '';
           if ($this->rs->post_selected) {
-               $selected = sprintf($img,__('selected'),'selected.png');
+               $selected = sprintf($img,__('hidden'),'hidden.png');
           }
           

plugins/pages/list.php

@@ -79 +79 @@
           }
           
-          $protected = '';
-          if ($this->rs->post_password) {
-               $protected = sprintf($img,__('protected'),'locker.png');
-          }
-          
           $selected = '';
           if ($this->rs->post_selected) {
@@ -109 +104 @@
           '<td class="nowrap">'.$this->rs->nb_comment.'</td>'.
           '<td class="nowrap">'.$this->rs->nb_trackback.'</td>'.
-          '<td class="nowrap status">'.$img_status.' '.$selected.' '.$protected.' '.$attach.'</td>'.
+          '<td class="nowrap status">'.$img_status.' '.$selected.' '.$attach.'</td>'.
           '</tr>';
           

plugins/pages/page.php

@@ -30 +30 @@
 $post_open_comment = false;
 $post_open_tb = false;
+$post_selected = false;
 
 $post_media = array();
@@ -54 +55 @@
      $status_combo[$v] = (string) $k;
 }
+$img_status_pattern = '<img class="img_select_option" alt="%1$s" title="%1$s" src="images/%2$s" />';
 
 # Formaters combo
@@ -75 +77 @@
 unset($rs);
 
+# Validation flag
+$bad_dt = false;
 
 # Get page informations
@@ -106 +110 @@
           $post_open_comment = (boolean) $post->post_open_comment;
           $post_open_tb = (boolean) $post->post_open_tb;
+          $post_selected = (boolean) $post->post_selected;
           
           $page_title = __('Edit page');
@@ -152 +157 @@
           $post_dt = '';
      } else {
-          $post_dt = strtotime($_POST['post_dt']);
-          $post_dt = date('Y-m-d H:i',$post_dt);
+          try
+          {
+               $post_dt = strtotime($_POST['post_dt']);
+               if ($post_dt == false || $post_dt == -1) {
+                    $bad_dt = true;
+                    throw new Exception(__('Invalid publication date'));
+               }
+               $post_dt = date('Y-m-d H:i',$post_dt);
+          }
+          catch (Exception $e)
+          {
+               $core->error->add($e->getMessage());
+          }
      }
      
      $post_open_comment = !empty($_POST['post_open_comment']);
      $post_open_tb = !empty($_POST['post_open_tb']);
+     $post_selected = !empty($_POST['post_selected']);
      $post_lang = $_POST['post_lang'];
      $post_position = (integer) $_POST['post_position'];
@@ -173 +190 @@
 }
 
-# Create or update post
-if (!empty($_POST) && !empty($_POST['save']) && $can_edit_page)
+# Delete page
+if (!empty($_POST['delete']) && $can_delete)
+{
+     try {
+          # --BEHAVIOR-- adminBeforePageDelete
+          $core->callBehavior('adminBeforePageDelete',$post_id);
+          $core->blog->delPost($post_id);
+          http::redirect($p_url);
+     } catch (Exception $e) {
+          $core->error->add($e->getMessage());
+     }
+}
+
+# Create or update page
+if (!empty($_POST) && !empty($_POST['save']) && $can_edit_page && !$bad_dt)
 {
      $cur = $core->con->openCursor($core->prefix.'post');
@@ -196 +226 @@
      $cur->post_open_comment = (integer) $post_open_comment;
      $cur->post_open_tb = (integer) $post_open_tb;
+     $cur->post_selected = (integer) $post_selected;
      
      if (isset($_POST['post_url'])) {
@@ -241 +272 @@
                $core->error->add($e->getMessage());
           }
-     }
-}
-
-if (!empty($_POST['delete']) && $can_delete)
-{
-     try {
-          # --BEHAVIOR-- adminBeforePageDelete
-          $core->callBehavior('adminBeforePageDelete',$post_id);
-          $core->blog->delPost($post_id);
-          http::redirect($p_url);
-     } catch (Exception $e) {
-          $core->error->add($e->getMessage());
      }
 }
@@ -292 +311 @@
 
 if (!empty($_GET['upd'])) {
-          echo '<p class="message">'.__('Page has been successfully updated.').'</p>';
+     dcPage::message(__('Page has been successfully updated.'));
 }
 elseif (!empty($_GET['crea'])) {
-          echo '<p class="message">'.__('Page has been successfully created.').'</p>';
+     dcPage::message(__('Page has been successfully created.'));
 }
 elseif (!empty($_GET['attached'])) {
-     echo '<p class="message">'.__('File has been successfully attached.').'</p>';
+     dcPage::message(__('File has been successfully attached.'));
 }
 elseif (!empty($_GET['rmattach'])) {
-     echo '<p class="message">'.__('Attachment has been successfully removed.').'</p>';
+     dcPage::message(__('Attachment has been successfully removed.'));
 }
 
@@ -311 +330 @@
      $post_format = 'xhtml';
      
-     echo '<p class="message">'.__('Don\'t forget to validate your XHTML conversion by saving your post.').'</p>';
+     dcPage::message(__('Don\'t forget to validate your XHTML conversion by saving your post.'));
 }
 
@@ -317 +336 @@
 ' &rsaquo; <a href="'.$p_url.'">'.__('Pages').'</a> &rsaquo; <span class="page-title">'.$page_title; 
      if ($post_id) {
-          echo ' &ldquo;'.$post_title.'&rdquo;';
+          switch ($post_status) {
+               case 1:
+                    $img_status = sprintf($img_status_pattern,__('published'),'check-on.png');
+                    break;
+               case 0:
+                    $img_status = sprintf($img_status_pattern,__('unpublished'),'check-off.png');
+                    break;
+               case -1:
+                    $img_status = sprintf($img_status_pattern,__('scheduled'),'scheduled.png');
+                    break;
+               case -2:
+                    $img_status = sprintf($img_status_pattern,__('pending'),'check-wrn.png');
+                    break;
+               default:
+                    $img_status = '';
+          }
+          echo ' &ldquo;'.$post_title.'&rdquo;'.' '.$img_status;
      }
 echo '</span></h2>';
@@ -410 +445 @@
      
      '<p><label for="post_dt">'.__('Published on:').
-     form::field('post_dt',16,16,$post_dt).'</label></p>'.
+     form::field('post_dt',16,16,$post_dt,($bad_dt ? 'invalid' : '')).'</label></p>'.
      
      '<p><label for="post_format">'.__('Text formating:').
@@ -419 +454 @@
      '<p><label for="post_open_comment" class="classic">'.form::checkbox('post_open_comment',1,$post_open_comment).' '.
      __('Accept comments').'</label></p>'.
+     ($core->blog->settings->system->allow_comments ? 
+          (isContributionAllowed($post_id,strtotime($post_dt),true) ? 
+               '' :
+               '<p class="form-note warn">'.__('Warning: Comments are not more accepted for this page.').'</p>') : 
+          '<p class="form-note warn">'.__('Warning: Comments are not accepted on this blog.').'</p>').
+
      '<p><label for="post_open_tb" class="classic">'.form::checkbox('post_open_tb',1,$post_open_tb).' '.
      __('Accept trackbacks').'</label></p>'.
-     
+     ($core->blog->settings->system->allow_trackbacks ? 
+          (isContributionAllowed($post_id,strtotime($post_dt),false) ? 
+               '' :
+               '<p class="form-note warn">'.__('Warning: Trackbacks are not more accepted for this page.').'</p>') : 
+          '<p class="form-note warn">'.__('Warning: Trackbacks are not accepted on this blog.').'</p>').
+     
+     '<p><label for="post_selected" class="classic">'.form::checkbox('post_selected',1,$post_selected).' '.
+     __('Hide').'</label></p>'.
+     '<p class="form-note">'.
+     __('If checked this page will be active but not listed in widget Pages.').
+     '</p>'.
+
      '<p><label for="post_position" class="classic">'.__('Page position:').' '.
      form::field('post_position',3,3,(string) $post_position).
@@ -594 +646 @@
 }
 
+# Controls comments or trakbacks capabilities
+function isContributionAllowed($id,$dt,$com=true)
+{
+     global $core;
+
+     if (!$id) {
+          return true;
+     }
+     if ($com) {
+          if (($core->blog->settings->system->comments_ttl == 0) || 
+               (time() - $core->blog->settings->system->comments_ttl*86400 < $dt)) {
+               return true;
+          }
+     } else {
+          if (($core->blog->settings->system->trackbacks_ttl == 0) || 
+               (time() - $core->blog->settings->system->trackbacks_ttl*86400 < $dt)) {
+               return true;
+          }
+     }
+     return false;
+}
 
 # Show comments or trackbacks

plugins/pages/page.php

@@ -18 +18 @@
 $post_dt = '';
 $post_format = $core->auth->getOption('post_format');
-$post_password = '';
 $post_url = '';
 $post_lang = $core->auth->getInfo('user_lang');
@@ -99 +98 @@
           $post_dt = date('Y-m-d H:i',strtotime($post->post_dt));
           $post_format = $post->post_format;
-          $post_password = $post->post_password;
           $post_url = $post->post_url;
           $post_lang = $post->post_lang;
@@ -178 +176 @@
      $post_selected = !empty($_POST['post_selected']);
      $post_lang = $_POST['post_lang'];
-     $post_password = !empty($_POST['post_password']) ? $_POST['post_password'] : null;
      $post_position = (integer) $_POST['post_position'];
      
@@ -218 +215 @@
      $cur->post_dt = $post_dt ? date('Y-m-d H:i:00',strtotime($post_dt)) : '';
      $cur->post_format = $post_format;
-     $cur->post_password = $post_password;
      $cur->post_lang = $post_lang;
      $cur->post_title = $post_title;
@@ -300 +296 @@
   <?php echo
   dcPage::jsDatePicker().
-  dcPage::jsToolBar().
   dcPage::jsModal().
   dcPage::jsLoad('js/_post.js').
@@ -485 +480 @@
      '<p><label for="post_lang">'.__('Page lang:').
      form::combo('post_lang',$lang_combo,$post_lang).'</label></p>'.
-     
-     '<p><label for="post_password">'.__('Page password:').
-     form::field('post_password',10,32,html::escapeHTML($post_password),'maximal').
-     '</label></p>'.
      
      '<div class="lockable">'.