Changeset 721

Timestamp:

01/22/09 17:33:09 (14 years ago)

Author:

Tomtom33

Message:

Many changes :

• Fixed SQL query
• Fixed results display
• Fixed post URL on different blog
• Fixed cateogry URL on different blog
• Fixed meta URL on different blog
• Fixed pagination on multi blog search

Location:

plugins/multiBlogSearch

Files:

• _admin.php (modified) (2 diffs)
• _define.php (modified) (1 diff)
• _public.php (modified) (9 diffs)
• default-templates/multiblogsearch.html (modified) (4 diffs)
• inc/class.multi.blog.search.php (modified) (10 diffs)

plugins/multiBlogSearch/_admin.php

@@ -23 +23 @@
           '<fieldset><legend>'.__('Multi blog search').'</legend>'.
           '<p><label class="classic">'.
-          form::checkbox('multiblogsearch_enabled','1',$settings->multisearch_enabled).
+          form::checkbox('multiblogsearch_enabled','1',$settings->multiblogsearch_enabled).
           __('Enable multi blog Search').'</label></p>'.
           '</fieldset>';
@@ -30 +30 @@
      public static function adminBeforeBlogSettingsUpdate(&$settings)
      {
-          $settings->setNameSpace('multiBlogSearch');
-          $settings->put('multiblogsearch_enabled',!empty($_POST['multisearch_enabled']),'boolean',false);
+          $settings->setNameSpace('multiblogsearch');
+          $settings->put('multiblogsearch_enabled',!empty($_POST['multiblogsearch_enabled']),'boolean');
           $settings->setNameSpace('system');
      }

plugins/multiBlogSearch/_define.php

@@ -15 +15 @@
           /* Description*/         "Find all posts in all blogs",
           /* Author */             "Tomtom (http://blog.zenstyle.fr)",
-          /* Version */            '0.2',
+          /* Version */            '0.3',
           /* Permissions */        'usage,contentadmin'
 );

plugins/multiBlogSearch/_public.php

@@ -16 +16 @@
 $core->tpl->addValue('MultiBlogSearchPaginationURL',array('multiBlogSearchTpl','paginationURL'));
 $core->tpl->addValue('MultiBlogSearchBlogName',array('multiBlogSearchTpl','blogName'));
+$core->tpl->addValue('MultiBlogSearchEntryURL',array('multiBlogSearchTpl','entryURL'));
+$core->tpl->addValue('MultiBlogSearchCategoryURL',array('multiBlogSearchTpl','categoryURL'));
+$core->tpl->addValue('MultiBlogSearchMetaURL',array('multiBlogSearchTpl','metaURL'));
 $core->tpl->addBlock('MultiBlogSearchEntries',array('multiBlogSearchTpl','entries'));
 $core->tpl->addBlock('MultiBlogSearchPagination',array('multiBlogSearchTpl','pagination'));
@@ -22 +25 @@
 class multiBlogSearchBehaviors extends dcUrlHandlers
 {
-     /**
-      * Adds multiBlogSearch templates
-      */
+
      public static function addTplPath()
      {
@@ -32 +33 @@
      }
 
-     /**
-      * Intercepts multiBlogSearch param in URI and serves right template
-      */
      public static function multiBlogSearch()
      {
@@ -46 +44 @@
 
           if ($GLOBALS['_search']) {
-               $_multiblogsearch = new multiBlogSearch($GLOBALS['core']);
-               $GLOBALS['_search_count'] = $_multiblogsearch->getMultiBlogPosts(array('search' => $GLOBALS['_search']),true)->f(0);
+               $GLOBALS['_ctx']->multiblogsearch = new multiBlogSearch($GLOBALS['core']);
+               $GLOBALS['_search_count'] = $GLOBALS['_ctx']->multiblogsearch->getPosts(array('search' => $GLOBALS['_search']),true)->f(0);
                self::serveDocument('multiblogsearch.html');
                exit;
@@ -71 +69 @@
           $f = $GLOBALS['core']->tpl->getFilters($attr);
           return '<?php echo '.sprintf($f,'$_ctx->posts->blog_name').'; ?>';
+     }
+
+     public static function entryURL($attr)
+     {
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          return '<?php echo '.sprintf($f,'$_ctx->posts->blog_url.$core->url->getBase("post").'.
+          '"/".$_ctx->posts->post_url').'; ?>';
+     }
+
+     public static function categoryURL($attr)
+     {
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          return '<?php echo '.sprintf($f,'$_ctx->posts->blog_url.$core->url->getBase("category").'.
+          '"/".$_ctx->posts->cat_url').'; ?>';
+     }
+     
+     public static function metaURL($attr)
+     {
+          $f = $GLOBALS['core']->tpl->getFilters($attr);
+          return '<?php echo '.sprintf($f,'$_ctx->posts->blog_url.$core->url->getBase("tag").'.
+          '"/".rawurlencode($_ctx->meta->meta_id)').'; ?>';
      }
 
@@ -146 +165 @@
           }
 
-          $sortby = 'post_dt';
-          $order = 'desc';
+          $sortby = 'blog_name';
+          $order = 'asc';
           if (isset($attr['sortby'])) {
                switch ($attr['sortby']) {
@@ -173 +192 @@
           $res = "<?php\n";
           $res .= $p;
-          $res .= '$_multiblogsearch = new multiBlogSearch($core);'."\n";
           $res .= '$_ctx->post_params = $params;'."\n";
-          $res .= '$_ctx->posts = $_multiblogsearch->getMultiBlogPosts($params);'."\n";
-          $res .= 'unset($params); unset($_multiblogsearch);'."\n";
+          $res .= '$_ctx->posts = $_ctx->multiblogsearch->getPosts($params);'."\n";
+          $res .= 'unset($params);'."\n";
           $res .= "?>\n";
 
@@ -189 +207 @@
      {
           return
-          "<?php if (!multiBlogSearch::firstPostOfBlog(\$_ctx->posts)) : ?>".
+          "<?php if (\$_ctx->multiblogsearch->firstPostOfBlog(\$_ctx->posts)) : ?>".
           $content.
           "<?php endif; ?>";
@@ -198 +216 @@
           $p = "<?php\n";
           $p .= '$params = $_ctx->post_params;'."\n";
-          $p .= '$_multiblogsearch = new multiBlogSearch($core);'."\n";
-          $p .= '$_ctx->pagination = $_multiblogsearch->getMultiBlogPosts($params,true); unset($params);'."\n";
+          $p .= '$_ctx->pagination = $_ctx->multiblogsearch->getPosts($params,true); unset($params);'."\n";
           $p .= "?>\n";
 

plugins/multiBlogSearch/default-templates/multiblogsearch.html

@@ -75 +75 @@
 
     <h2 class="post-title"><a
-    href="{{tpl:EntryURL}}">{{tpl:EntryTitle encode_html="1"}}</a></h2>
+    href="{{tpl:MultiBlogSearchEntryURL}}">{{tpl:EntryTitle encode_html="1"}}</a></h2>
 
     <p class="post-info">{{tpl:lang By}} {{tpl:EntryAuthorLink}}
     {{tpl:lang on}} {{tpl:EntryDate}}, {{tpl:EntryTime}}
     <tpl:EntryIf has_category="1">
-    - <a href="{{tpl:EntryCategoryURL}}">{{tpl:EntryCategory encode_html="1"}}</a>
+    - <a href="{{tpl:MultiBlogSearchCategoryURL}}">{{tpl:EntryCategory encode_html="1"}}</a>
     </tpl:EntryIf>
     </p>
@@ -86 +86 @@
     <tpl:EntryMetaData>
     <tpl:MetaDataHeader><ul class="post-tags"></tpl:MetaDataHeader>
-    <li><a href="{{tpl:MetaURL}}">{{tpl:MetaID}}</a></li>
+    <li><a href="{{tpl:MultiBlogSearchMetaURL}}">{{tpl:MetaID}}</a></li>
     <tpl:MetaDataFooter></ul></tpl:MetaDataFooter>
     </tpl:EntryMetaData>
@@ -96 +96 @@
     <tpl:EntryIf extended="1">
       <div class="post-content">{{tpl:EntryExcerpt}}</div>
-      <p class="read-it"><a href="{{tpl:EntryURL}}"
+      <p class="read-it"><a href="{{tpl:MultiBlogSearchEntryURL}}"
       title="{{tpl:lang Continue reading}} {{tpl:EntryTitle encode_html="1"}}">{{tpl:lang Continue
       reading}}</a>...</p>
@@ -114 +114 @@
     </tpl:EntryIf>
     <tpl:EntryIf show_comments="1">
-      <a href="{{tpl:EntryURL}}#comments" class="comment_count">{{tpl:EntryCommentCount}}</a>
+      <a href="{{tpl:MultiBlogSearchEntryURL}}#comments" class="comment_count">{{tpl:EntryCommentCount}}</a>
     </tpl:EntryIf>
     <tpl:EntryIf show_pings="1">
-      <a href="{{tpl:EntryURL}}#pings" class="ping_count">{{tpl:EntryPingCount}}</a></tpl:EntryIf>
+      <a href="{{tpl:MultiBlogSearchEntryURL}}#pings" class="ping_count">{{tpl:EntryPingCount}}</a></tpl:EntryIf>
     <tpl:EntryIf has_attachment="1">
-      <a href="{{tpl:EntryURL}}#attachments" class="attach_count">{{tpl:EntryAttachmentCount}}</a></tpl:EntryIf>
+      <a href="{{tpl:MultiBlogSearchEntryURL}}#attachments" class="attach_count">{{tpl:EntryAttachmentCount}}</a></tpl:EntryIf>
     <tpl:EntryIf operator="or" show_comments="1" show_pings="1" has_attachment="1">
       </p>

plugins/multiBlogSearch/inc/class.multi.blog.search.php

@@ -14 +14 @@
 {
      protected $core;
-     
+
      public function __construct(&$core)
      {
           $this->core =& $core;
      }
-     
-     public function getMultiBlogPosts($params=array(),$count_only=false)
+
+     public function getPosts($params = array(),$count_only = false)
      {
           if ($count_only)
@@ -35 +35 @@
                     'post_content, post_content_xhtml, post_notes, ';
                }
-               
+
                if (!empty($params['columns']) && is_array($params['columns'])) {
                     $content_req .= implode(', ',$params['columns']).', ';
                }
-               
+
                $strReq =
                'SELECT P.post_id, P.blog_id, P.user_id, P.cat_id, post_dt, '.
@@ -48 +48 @@
                'U.user_name, U.user_firstname, U.user_displayname, U.user_email, '.
                'U.user_url, '.
-               'C.cat_title, C.cat_url, C.cat_desc, B.blog_name ';
-          }
-          
+               'C.cat_title, C.cat_url, C.cat_desc, '.
+               'B.blog_url, B.blog_name ';
+          }
+
           $strReq .=
           'FROM '.$this->core->prefix.'post P '.
           'INNER JOIN '.$this->core->prefix.'user U ON U.user_id = P.user_id '.
-          'LEFT OUTER JOIN '.$this->core->prefix.'category C ON P.cat_id = C.cat_id '.
-          'LEFT OUTER JOIN '.$this->core->prefix.'blog B ON P.blog_id = B.blog_id ';
-          
+          'NATURAL JOIN '.$this->core->prefix.'blog B '.
+          'LEFT OUTER JOIN '.$this->core->prefix.'category C ON P.cat_id = C.cat_id ';
+
           if (!empty($params['from'])) {
                $strReq .= $params['from'].' ';
           }
-          
+
           $strReq .=
-          "WHERE P.blog_id != '' ";
-          
+          "WHERE P.blog_id != '' AND B.blog_id = P.blog_id ";
+
           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 .= ') ';
-               
+
                if ($this->core->auth->userID()) {
                     $strReq .= "OR P.user_id = '".$this->con->escape($this->core->auth->userID())."')";
@@ -78 +79 @@
                }
           }
-          
+
           # Adding parameters
           if (isset($params['post_type']))
@@ -92 +93 @@
                $strReq .= "AND post_type = 'post' ";
           }
-          
+
           if (!empty($params['post_id'])) {
                if (is_array($params['post_id'])) {
@@ -101 +102 @@
                $strReq .= 'AND P.post_id '.$this->core->con->in($params['post_id']);
           }
-          
+
           if (!empty($params['post_url'])) {
                $strReq .= "AND post_url = '".$this->core->con->escape($params['post_url'])."' ";
           }
-          
+
           if (!empty($params['user_id'])) {
                $strReq .= "AND U.user_id = '".$this->core->con->escape($params['user_id'])."' ";
           }
-          
+
           if (!empty($params['cat_id']))
           {
@@ -130 +131 @@
                $strReq .= 'AND '.$this->core->blog->getPostsCategoryFilter($params['cat_url'],'cat_url').' ';
           }
-          
+
           /* Other filters */
           if (isset($params['post_status'])) {
                $strReq .= 'AND post_status = '.(integer) $params['post_status'].' ';
           }
-          
+
           if (isset($params['post_selected'])) {
                $strReq .= 'AND post_selected = '.(integer) $params['post_selected'].' ';
           }
-          
+
           if (!empty($params['post_year'])) {
                $strReq .= 'AND '.$this->core->con->dateFormat('post_dt','%Y').' = '.
                "'".sprintf('%04d',$params['post_year'])."' ";
           }
-          
+
           if (!empty($params['post_month'])) {
                $strReq .= 'AND '.$this->core->con->dateFormat('post_dt','%m').' = '.
                "'".sprintf('%02d',$params['post_month'])."' ";
           }
-          
+
           if (!empty($params['post_day'])) {
                $strReq .= 'AND '.$this->core->con->dateFormat('post_dt','%d').' = '.
                "'".sprintf('%02d',$params['post_day'])."' ";
           }
-          
+
           if (!empty($params['post_lang'])) {
                $strReq .= "AND P.post_lang = '".$this->core->con->escape($params['post_lang'])."' ";
           }
-          
+
           if (!empty($params['search']))
           {
                $words = text::splitWords($params['search']);
-               
+     
                if (!empty($words))
                {
@@ -169 +170 @@
                          $this->core->callBehavior('multiBlogSearchPostsSearch',$this->core,array(&$words,&$strReq,&$params));
                     }
-                    
+
                     if ($words)
                     {
@@ -179 +180 @@
                }
           }
-          
+
           if (!empty($params['sql'])) {
                $strReq .= $params['sql'].' ';
           }
-          
+
           if (!$count_only)
           {
@@ -189 +190 @@
                     $strReq .= 'ORDER BY '.$this->core->con->escape($params['order']).' ';
                } else {
-                    $strReq .= 'ORDER BY blog_name ASC, post_dt DESC ';
-               }
-          }
-          
+                    $strReq .= 'ORDER BY post_dt DESC, blog_name ASC ';
+               }
+               $strReq .= ', post_dt DESC ';
+          }
+
           if (!$count_only && !empty($params['limit'])) {
-               //$strReq .= $this->core->con->limit($params['limit']);
-          }
-echo $strReq;//print_r($params['limit']);
+               $strReq .= $this->core->con->limit($params['limit']);
+          }
+
           $rs = $this->core->con->select($strReq);
           $rs->core = $this->core;
           $rs->_nb_media = array();
           $rs->extend('rsExtPost');
-          
+
           # --BEHAVIOR-- multiBlogSearchGetPosts
           $this->core->callBehavior('multiBlogSearchGetPosts',$rs);
-          
+
           return $rs;
      }
-     
-     public static function firstPostOfBlog(&$rs)
-     {
-          $cblog = $rs->blog_id; //var_dump($rs->post_id);
+
+     public function firstPostOfBlog(&$rs)
+     {
+          if ($rs->index() == 0) {
+               return true;
+          }
+          $cblog = $rs->blog_id;
           $rs->movePrev();
-          $nblog = $rs->blog_id; //var_dump($rs->post_id);
-          $rs->moveNext();  //var_dump($rs->count()); exit; //var_dump($cblog); exit;
+          $nblog = $rs->blog_id;
+          $rs->moveNext();
           return $nblog != $cblog;
      }
-     
+
      public static function paginationURL($offset = 0)
      {
           global $core;
-          
+
           $args = $_SERVER['URL_REQUEST_PART'];