Changeset 2566:9bf417837888 for plugins/pages

Timestamp:

11/17/13 20:25:53 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

2.6

Children:

2567:6c11245cbf04, 2568:61c67a7d17fa

Message:

Add some people in CREDITS, remove trailing spaces and tabs.

Location:

plugins/pages

Files:

• _admin.php (modified) (1 diff)
• _install.php (modified) (1 diff)
• _public.php (modified) (17 diffs)
• _users_actions.js (modified) (3 diffs)
• _widgets.php (modified) (2 diffs)
• class.actionpage.php (modified) (3 diffs)
• class.listpage.php (modified) (7 diffs)
• default-templates/page.html (modified) (13 diffs)
• list.js (modified) (6 diffs)
• list.php (modified) (1 diff)

plugins/pages/_admin.php

@@ -77 +77 @@
 
 require dirname(__FILE__).'/_widgets.php';
-?>

plugins/pages/_install.php

@@ -52 +52 @@
 $core->setVersion('pages',$version);
 return true;
-?>

plugins/pages/_public.php

@@ -30 +30 @@
                $_ctx =& $GLOBALS['_ctx'];
                $core =& $GLOBALS['core'];
-               
+
                $core->blog->withoutPassword(false);
-               
+
                $params = new ArrayObject(array(
                     'post_type' => 'page',
                     'post_url' => $args));
-               
+
                $core->callBehavior('publicPagesBeforeGetPosts',$params,$args);
-               
+
                $_ctx->posts = $core->blog->getPosts($params);
-               
+
                $_ctx->comment_preview = new ArrayObject();
                $_ctx->comment_preview['content'] = '';
@@ -49 +49 @@
                $_ctx->comment_preview['preview'] = false;
                $_ctx->comment_preview['remember'] = false;
-               
+
                $core->blog->withoutPassword(true);
-               
-               
+
+
                if ($_ctx->posts->isEmpty())
                {
@@ -62 +62 @@
                     $post_id = $_ctx->posts->post_id;
                     $post_password = $_ctx->posts->post_password;
-                    
+
                     # Password protected entry
                     if ($post_password != '' && !$_ctx->preview)
@@ -72 +72 @@
                               $pwd_cookie = array();
                          }
-                         
+
                          # Check for match
                          if ((!empty($_POST['password']) && $_POST['password'] == $post_password)
@@ -86 +86 @@
                          }
                     }
-                    
+
                     $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)
@@ -103 +103 @@
                               exit;
                          }
-                         
+
                          $name = $_POST['c_name'];
                          $mail = $_POST['c_mail'];
@@ -109 +109 @@
                          $content = $_POST['c_content'];
                          $preview = !empty($_POST['preview']);
-                         
+
                          if ($content != '')
                          {
@@ -120 +120 @@
                               $content = $core->HTMLfilter($content);
                          }
-                         
+
                          $_ctx->comment_preview['content'] = $content;
                          $_ctx->comment_preview['rawcontent'] = $_POST['c_content'];
@@ -126 +126 @@
                          $_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;
                          }
@@ -145 +145 @@
                               $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
                               {
@@ -154 +154 @@
                                         throw new Exception(__('You must provide a valid email address.'));
                                    }
-                                   
+
                                    # --BEHAVIOR-- publicBeforeCommentCreate
                                    $core->callBehavior('publicBeforeCommentCreate',$cur);
-                                   if ($cur->post_id) {                         
+                                   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';
@@ -169 +169 @@
                                         $redir_arg = 'pub=0';
                                    }
-                                   
+
                                    header('Location: '.$redir.$redir_arg);
                               }
@@ -179 +179 @@
                          }
                     }
-                    
+
                     # The entry
                     if ($_ctx->posts->trackbacksActive()) {
@@ -189 +189 @@
           }
      }
-     
+
      public static function pagespreview($args)
      {
           $core = $GLOBALS['core'];
           $_ctx = $GLOBALS['_ctx'];
-          
+
           if (!preg_match('#^(.+?)/([0-9a-z]{40})/(.+?)$#',$args,$m)) {
                # The specified Preview URL is malformed.
@@ -223 +223 @@
      {
           global $core, $_ctx;
-          
+
           if (($w->homeonly == 1 && $core->url->type != 'default') ||
                ($w->homeonly == 2 && $core->url->type == 'default')) {
                return;
           }
-          
+
           $params['post_type'] = 'page';
           $params['limit'] = abs((integer) $w->limit);
           $params['no_content'] = true;
           $params['post_selected'] = false;
-          
+
           $sort = $w->sortby;
           if (!in_array($sort,array('post_title','post_position','post_dt'))) {
                $sort = 'post_title';
           }
-          
+
           $order = $w->orderby;
           if ($order != 'asc') {
@@ -244 +244 @@
           }
           $params['order'] = $sort.' '.$order;
-          
+
           $rs = $core->blog->getPosts($params);
-          
+
           if ($rs->isEmpty()) {
                return;
           }
-          
+
           $res =
           ($w->content_only ? '' : '<div class="pages'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
           ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
           '<ul>';
-          
+
           while ($rs->fetch()) {
                $class = '';
@@ -264 +264 @@
                html::escapeHTML($rs->post_title).'</a></li>';
           }
-          
+
           $res .= '</ul>'.($w->content_only ? '' : '</div>');
-          
+
           return $res;
      }
 }
-?>

plugins/pages/_users_actions.js

@@ -1 +1 @@
 jQuery.fn.updatePagesPermissionsForm = function() {
      return this.each(function() {
-          
+
           var perms = {};
           var re = /^perm\[(.+?)\]\[(.+?)\]$/;
           var e,prop;
-          
+
           // Building a nice object of form elements
           for (var i=0; i<this.elements.length; i++) {
                e = this.elements[i];
-               
+
                if (e.name == undefined) {
                     continue;
@@ -22 +22 @@
                }
                perms[prop[1]][prop[2]] = e;
-               
+
                // select related permissions for admin
                if (prop[2] == 'admin') {
@@ -33 +33 @@
                }
           }
-          
+
           function admin(E,perms,re) {
                          P = E.name.match(re);
-                         
+
                          perms[P[1]]['pages'].checked = E.checked;
                          perms[P[1]]['pages'].disabled = E.checked;

plugins/pages/_widgets.php

@@ -41 +41 @@
           $w->pages->setting('class',__('CSS class:'),'');
      }
-     
+
      public static function initDefaultWidgets($w,$d)
      {
@@ -47 +47 @@
      }
 }
-?>

plugins/pages/class.actionpage.php

@@ -30 +30 @@
           );
           $this->endPage();
-     }    
+     }
      public function beginPage($breadcrumb='',$head='') {
           echo '<html><head><title>'.__('Pages').'</title>'.
@@ -40 +40 @@
 
      }
-     
+
      public function endPage() {
           echo '</body></html>';
@@ -58 +58 @@
           return parent::process();
      }
-     
+
      public static function doReorderPages($core, dcPostsActionsPage $ap, $post) {
           foreach($post['order'] as $post_id => $value) {
                if (!$core->auth->check('publish,contentadmin',$core->blog->id))
                     throw new Exception(__('You are not allowed to change this entry status'));
-               
+
                $strReq = "WHERE blog_id = '".$core->con->escape($core->blog->id)."' ".
                          "AND post_id ".$core->con->in($post_id);
-               
+
                #If user can only publish, we need to check the post's owner
                if (!$core->auth->check('contentadmin',$core->blog->id))
                     $strReq .= "AND user_id = '".$core->con->escape($core->auth->userID())."' ";
-               
+
                $cur = $core->con->openCursor($core->prefix.'post');
-               
+
                $cur->post_position = (integer) $value-1;
                $cur->post_upddt = date('Y-m-d H:i:s');
-               
+
                $cur->update($strReq);
                $core->blog->triggerBlog();
-               
+
           }
-          
+
           dcPage::addSuccessNotice(__('Selected pages have been successfully reordered.'));
           $ap->redirect(false);
-     }    
+     }
 }
 
-class DefaultPagesActions 
+class DefaultPagesActions
 {
      public static function adminPagesActionsPage($core, $ap) {

plugins/pages/class.listpage.php

@@ -29 +29 @@
                          $entries[(integer)$v]=true;
                     }
-               }              
+               }
                $html_block =
                '<div class="table-outer">'.
@@ -40 +40 @@
                '<th scope="col">'.__('Status').'</th>'.
                '</tr></thead><tbody id="pageslist">%s</tbody></table></div>';
-               
+
                if ($enclose_block) {
                     $html_block = sprintf($enclose_block,$html_block);
                }
-               
+
                echo $pager->getLinks();
-               
+
                $blocks = explode('%s',$html_block);
-               
+
                echo $blocks[0];
-               
+
                $count = 0;
                while ($this->rs->fetch())
@@ -57 +57 @@
                     $count ++;
                }
-               
+
                echo $blocks[1];
-               
+
                echo $pager->getLinks();
           }
      }
-     
+
      private function postLine($count,$checked)
      {
@@ -81 +81 @@
                     break;
           }
-          
+
           $protected = '';
           if ($this->rs->post_password) {
                $protected = sprintf($img,__('Protected'),'locker.png');
           }
-          
+
           $selected = '';
           if ($this->rs->post_selected) {
                $selected = sprintf($img,__('Hidden'),'hidden.png');
           }
-          
+
           $attach = '';
           $nb_media = $this->rs->countMedia();
@@ -98 +98 @@
                $attach = sprintf($img,sprintf($attach_str,$nb_media),'attach.png');
           }
-          
+
           $res = '<tr class="line'.($this->rs->post_status != 1 ? ' offline' : '').'"'.
           ' id="p'.$this->rs->post_id.'">';
-          
+
           $res .=
           '<td class="nowrap handle minimal">'.form::field(array('order['.$this->rs->post_id.']'),2,3,$count+1,'position','',false,'title="'.sprintf(__('position of %s'),html::escapeHTML($this->rs->post_title)).'"').'</td>'.
@@ -108 +108 @@
           '<td class="maximal" scope="row"><a href="'.$this->core->getPostAdminURL($this->rs->post_type,$this->rs->post_id).'">'.
           html::escapeHTML($this->rs->post_title).'</a></td>'.
-          '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->post_dt).'</td>'.        
+          '<td class="nowrap">'.dt::dt2str(__('%Y-%m-%d %H:%M'),$this->rs->post_dt).'</td>'.
           '<td class="nowrap">'.$this->rs->user_id.'</td>'.
           '<td class="nowrap count">'.$this->rs->nb_comment.'</td>'.
@@ -114 +114 @@
           '<td class="nowrap status">'.$img_status.' '.$selected.' '.$protected.' '.$attach.'</td>'.
           '</tr>';
-          
+
           return $res;
      }

plugins/pages/default-templates/page.html

@@ -5 +5 @@
   <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
   <meta name="ROBOTS" content="{{tpl:BlogMetaRobots}}" />
-  
+
   <title>{{tpl:EntryTitle encode_html="1"}} - {{tpl:BlogName encode_html="1"}}</title>
   <meta name="description" lang="{{tpl:EntryLang}}" content="{{tpl:EntryContent full="1" encode_html="1" remove_html="1" cut_string="180"}}" />
@@ -11 +11 @@
   <meta name="author" content="{{tpl:EntryAuthorCommonName encode_html="1"}}" />
   <meta name="date" scheme="W3CDTF" content="{{tpl:EntryDate iso8601="1"}}" />
-  
+
   <link rel="schema.dc" href="http://purl.org/dc/elements/1.1/" />
   <meta name="dc.title" content="{{tpl:EntryTitle encode_html="1"}}" />
@@ -22 +22 @@
   <meta name="dc.type" content="text" />
   <meta name="dc.format" content="text/html" />
-  
+
   <link rel="top" href="{{tpl:BlogURL}}" title="{{tpl:lang Home}}" />
   <link rel="contents" href="{{tpl:BlogArchiveURL}}" title="{{tpl:lang Archives}}" />
   <tpl:EntryIf pings_active="1"><link rel="pingback" href="{{tpl:BlogXMLRPCURL}}" /></tpl:EntryIf>
-  
+
   <link rel="alternate" type="application/atom+xml" title="Atom 1.0" href="{{tpl:BlogFeedURL type="atom"}}" />
-  
+
   {{tpl:include src="_head.html"}}
-  
+
   <script type="text/javascript" src="{{tpl:BlogThemeURL}}/../default/js/post.js"></script>
   <script type="text/javascript">
@@ -49 +49 @@
 <div id="main">
   <div id="content">
-  
+
   <div id="p{{tpl:EntryID}}" class="post">
     <h2 class="post-title">{{tpl:EntryTitle encode_html="1"}}</h2>
-    
+
     <!-- # --BEHAVIOR-- publicEntryBeforeContent -->
     {{tpl:SysBehavior behavior="publicEntryBeforeContent"}}
-    
+
     <tpl:EntryIf extended="1">
       <div class="post-excerpt">{{tpl:EntryExcerpt}}</div>
     </tpl:EntryIf>
     <div class="post-content">{{tpl:EntryContent}}</div>
-    
+
     <p class="page-info">{{tpl:lang Published on}} {{tpl:EntryDate}}
     {{tpl:lang by}} {{tpl:EntryAuthorLink}}</p>
-    
+
     <!-- # --BEHAVIOR-- publicEntryAfterContent -->
     {{tpl:SysBehavior behavior="publicEntryAfterContent"}}
   </div>
-  
+
   <!-- # Attachments -->
   <tpl:Attachments>
@@ -77 +77 @@
       <li class="{{tpl:AttachmentType}}">
         <tpl:AttachmentIf is_mp3="1">
-          {{tpl:include src="_mp3_player.html"/}} - 
+          {{tpl:include src="_mp3_player.html"/}} -
         </tpl:AttachmentIf>
         <tpl:AttachmentIf is_flv="1">
@@ -92 +92 @@
     </tpl:AttachmentsFooter>
   </tpl:Attachments>
- 
+
   <!-- # Comments -->
   <tpl:EntryIf show_comments="1">
@@ -105 +105 @@
       {{tpl:lang On}} {{tpl:CommentDate}}, {{tpl:CommentTime}}
       {{tpl:lang by}} {{tpl:CommentAuthorLink}}</dt>
-      
+
       <dd class="{{tpl:CommentIfMe}} {{tpl:CommentIfOdd}} {{tpl:CommentIfFirst}}">
       <!-- # --BEHAVIOR-- publicCommentBeforeContent -->
       {{tpl:SysBehavior behavior="publicCommentBeforeContent"}}
-      
+
       {{tpl:CommentContent}}
-      
+
       <!-- # --BEHAVIOR-- publicCommentAfterContent -->
       {{tpl:SysBehavior behavior="publicCommentAfterContent"}}
@@ -121 +121 @@
     </tpl:Comments>
   </tpl:EntryIf>
-  
-  <tpl:EntryIf comments_active="1">    
+
+  <tpl:EntryIf comments_active="1">
     <tpl:SysIfFormError>
       <p class="error" id="pr">{{tpl:SysFormError}}</p>
     </tpl:SysIfFormError>
-    
+
     <tpl:SysIfCommentPublished>
       <p class="message" id="pr">{{tpl:lang Your comment has been published.}}</p>
     </tpl:SysIfCommentPublished>
-    
+
     <tpl:SysIfCommentPending>
       <p class="message" id="pr">{{tpl:lang Your comment has been submitted and
       will be reviewed for publication.}}</p>
     </tpl:SysIfCommentPending>
-    
+
     <!-- # Comment form -->
     <form action="{{tpl:EntryURL}}#pr" method="post" id="comment-form">
@@ -147 +147 @@
         </div>
       </tpl:IfCommentPreview>
-      
+
       <h3>{{tpl:lang Add a comment}}</h3>
       <fieldset>
         <!-- # --BEHAVIOR-- publicCommentFormBeforeContent -->
         {{tpl:SysBehavior behavior="publicCommentFormBeforeContent"}}
-        
+
         <p class="field"><label for="c_name">{{tpl:lang Name or nickname}}&nbsp;:</label>
         <input name="c_name" id="c_name" type="text" size="30" maxlength="255"
         value="{{tpl:CommentPreviewName encode_html="1"}}" />
         </p>
-        
+
         <p class="field"><label for="c_mail">{{tpl:lang Email address}}&nbsp;:</label>
         <input name="c_mail" id="c_mail" type="text" size="30" maxlength="255"
         value="{{tpl:CommentPreviewEmail encode_html="1"}}" />
         </p>
-        
+
         <p class="field"><label for="c_site">{{tpl:lang Website}} ({{tpl:lang optional}})&nbsp;:</label>
         <input name="c_site" id="c_site" type="text" size="30" maxlength="255"
         value="{{tpl:CommentPreviewSite encode_html="1"}}" />
         </p>
-        
+
         <p style="display:none"><input name="f_mail" type="text" size="30"
         maxlength="255" value="" /></p>
-        
+
         <p class="field"><label for="c_content">{{tpl:lang Comment}}&nbsp;:</label>
         <textarea name="c_content" id="c_content" cols="35"
         rows="7">{{tpl:CommentPreviewContent raw="1" encode_html="1"}}</textarea>
         </p>
-        
+
         <p class="form-help">{{tpl:CommentHelp}}</p>
-        
+
         <!-- # --BEHAVIOR-- publicCommentFormAfterContent -->
         {{tpl:SysBehavior behavior="publicCommentFormAfterContent"}}
       </fieldset>
-      
+
       <fieldset>
         <p class="buttons"><input type="submit" class="preview" name="preview" value="{{tpl:lang preview}}" />
@@ -188 +188 @@
     </form>
   </tpl:EntryIf>
-  
+
   <!-- # Trackbacks -->
   <tpl:EntryIf show_pings="1">
@@ -201 +201 @@
         {{tpl:lang On}} {{tpl:PingDate}}, {{tpl:PingTime}}
         {{tpl:lang by}} {{tpl:PingBlogName encode_html="1"}}</dt>
-        
+
         <dd class="{{tpl:PingIfOdd}} {{tpl:PingIfFirst}}">
         <!-- # --BEHAVIOR-- publicPingBeforeContent -->
         {{tpl:SysBehavior behavior="publicPingBeforeContent"}}
-        
+
         <p><a href="{{tpl:PingAuthorURL}}"
         {{tpl:PingNoFollow}}>{{tpl:PingTitle encode_html="1"}}</a></p>
         {{tpl:PingContent}}
-        
+
         <!-- # --BEHAVIOR-- publicPingAfterContent -->
         {{tpl:SysBehavior behavior="publicPingAfterContent"}}
@@ -219 +219 @@
     </div>
   </tpl:EntryIf>
-  
+
   <tpl:EntryIf pings_active="1">
     <p id="ping-url">{{tpl:lang Trackback URL}}&nbsp;: {{tpl:EntryPingLink}}</p>
   </tpl:EntryIf>
-  
+
   <tpl:EntryIf operator="or" comments_active="1" pings_active="1">
   <p id="comments-feed"><a class="feed" href="{{tpl:BlogFeedURL type="atom"}}/comments/{{tpl:EntryID}}"
@@ -235 +235 @@
     {{tpl:Widgets type="nav"}}
   </div> <!-- End #blognav -->
-  
+
   <div id="blogextra">
     {{tpl:Widgets type="extra"}}

plugins/pages/list.js

@@ -3 +3 @@
      var postId = $(line).attr('id').substr(1);
      var tr = document.getElementById('pe'+postId);
-     
+
      if ( !tr && ( action == 'toggle' || action == 'open' ) ) {
           tr = document.createElement('tr');
@@ -11 +11 @@
           td.className = 'expand';
           tr.appendChild(td);
-          
+
           // Get post content
           $.get('services.php',{f:'getPostById', id: postId, post_type: ''},function(data) {
                var rsp = $(data).children('rsp')[0];
-               
+
                if (rsp.attributes[0].value == 'ok') {
                     var post = $(rsp).find('post_display_content').text();
                     var post_excerpt = $(rsp).find('post_display_excerpt').text();
                     var res = '';
-                    
+
                     if (post) {
                          if (post_excerpt) {
@@ -32 +32 @@
                }
           });
-          
+
           $(line).addClass('expand');
           line.parentNode.insertBefore(tr,line.nextSibling);
@@ -62 +62 @@
      });
      $('#pageslist td input[type=checkbox]').enableShiftClick();
-     
+
      $("#pageslist tr.line td:not(.expander)").mousedown(function(){
           $('#pageslist tr.line').each(function() {
@@ -70 +70 @@
           $('#pageslist tr:not(.line)').remove();
      });
-     
+
      $("#pageslist").sortable({
           cursor:'move',
@@ -86 +86 @@
      $("#pageslist tr td input.position").hide();
      $("#pageslist tr td.handle").addClass('handler');
-     
+
      $("form input[type=submit]").click(function() {
           $("input[type=submit]", $(this).parents("form")).removeAttr("clicked");
           $(this).attr("clicked", "true");
      })
-     
+
      $('#form-entries').submit(function() {
           var action = $(this).find('select[name="action"]').val();

plugins/pages/list.php

@@ -89 +89 @@
      $post_list->display($page,$nb_per_page,
      '<form action="plugin.php" method="post" id="form-entries">'.
-     
+
      '%s'.
-     
+
      '<div class="two-cols">'.
      '<p class="col checkboxes-helpers"></p>'.
-     
+
      '<p class="col right"><label for="action" class="classic">'.__('Selected pages action:').'</label> '.
      form::combo('action',$pages_actions_page->getCombo()).