Changeset 877:e012da998f83 for plugins/pages

Timestamp:

08/16/12 14:13:27 (13 years ago)

Author:

Dsls <dsls@…>

Branch:

sexy

Message:

Entries passwords will be a dedicated plugin.

Location:

plugins/pages

Files:

• _public.php (modified) (1 diff)
• list.php (modified) (2 diffs)
• page.php (modified) (5 diffs)

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

@@ -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

@@ -18 +18 @@
 $post_dt = '';
 $post_format = $core->auth->getOption('post_format');
-$post_password = '';
 $post_url = '';
 $post_lang = $core->auth->getInfo('user_lang');
@@ -95 +94 @@
           $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;
@@ -161 +159 @@
      $post_open_tb = !empty($_POST['post_open_tb']);
      $post_lang = $_POST['post_lang'];
-     $post_password = !empty($_POST['post_password']) ? $_POST['post_password'] : null;
      $post_position = (integer) $_POST['post_position'];
      
@@ -188 +185 @@
      $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;
@@ -433 +429 @@
      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">'.
      '<p><label for="post_url">'.__('Basename:').