Changeset 877:e012da998f83 for inc/core

Timestamp:

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

Author:

Dsls <dsls@…>

Branch:

sexy

Message:

Entries passwords will be a dedicated plugin.

Location:

inc/core

Files:

• class.dc.blog.php (modified) (5 diffs)
• class.dc.meta.php (modified) (1 diff)
• class.dc.xmlrpc.php (modified) (3 diffs)

inc/core/class.dc.blog.php

@@ -227 +227 @@
                $strReq =
                'SELECT P.post_id, P.blog_id, P.user_id, post_dt, '.
-               'post_tz, post_creadt, post_upddt, post_format, post_password, '.
+               'post_tz, post_creadt, post_upddt, post_format, '.
                'post_url, post_lang, post_title, '.$content_req.
                'post_type, post_meta, post_status, post_selected, post_position, '.
@@ -246 +246 @@
           
           if (!$this->core->auth->check('contentadmin',$this->id)) {
-               $strReq .= 'AND ((post_status = 1 ';
-               
-               if ($this->without_password) {
-                    $strReq .= 'AND post_password IS NULL ';
-               }
-               $strReq .= ') ';
+               $strReq .= 'AND ((post_status = 1) ';
                
                if ($this->core->auth->userID()) {
@@ -436 +431 @@
           
           if (!$this->core->auth->check('contentadmin',$this->id)) {
-               $strReq .= 'AND ((post_status = 1 ';
-               
-               if ($this->without_password) {
-                    $strReq .= 'AND post_password IS NULL ';
-               }
-               $strReq .= ') ';
+               $strReq .= 'AND ((post_status = 1) ';
                
                if ($this->core->auth->userID()) {
@@ -518 +508 @@
           
           if (!$this->core->auth->check('contentadmin',$this->id)) {
-               $strReq .= 'AND ((post_status = 1 ';
-               
-               if ($this->without_password) {
-                    $strReq .= 'AND post_password IS NULL ';
-               }
-               $strReq .= ') ';
+               $strReq .= 'AND ((post_status = 1) ';
                
                if ($this->core->auth->userID()) {
@@ -905 +890 @@
           }
           
-          if ($cur->post_password === '') {
-               $cur->post_password = null;
-          }
-          
           if ($cur->post_dt == '') {
                $offset = dt::getTimeOffset($this->core->auth->getInfo('user_tz'));

inc/core/class.dc.meta.php

@@ -317 +317 @@
           
           if (!$this->core->auth->check('contentadmin',$this->core->blog->id)) {
-               $strReq .= 'AND ((post_status = 1 ';
-               
-               if ($this->core->blog->without_password) {
-                    $strReq .= 'AND post_password IS NULL ';
-               }
-               $strReq .= ') ';
+               $strReq .= 'AND ((post_status = 1) ';
                
                if ($this->core->auth->userID()) {

inc/core/class.dc.xmlrpc.php

@@ -305 +305 @@
           }
           
-          if (isset($struct['wp_password'])) {
-               $cur->post_password = $struct['wp_password'];
-          }
-          
           $cur->post_type = 'post';
           if (!empty($struct['post_type'])) {
@@ -398 +394 @@
           if (isset($struct['wp_slug'])) {
                $cur->post_url = $struct['wp_slug'];
-          }
-          
-          if (isset($struct['wp_password'])) {
-               $cur->post_password = $struct['wp_password'];
           }
           
@@ -728 +720 @@
                     "text_more"              => '',
                     "wp_slug"                => $post->post_url,
-                    "wp_password"            => $post->post_password,
                     "wp_author"              => $post->getAuthorCN(),
                     "wp_page_parent_id"      => 0,