Changeset 1522

Timestamp:

09/28/09 10:28:29 (14 years ago)

Author:

Tomtom33

Message:

dcOpenSearch 1.0.3 :

• fixes bug with media search
• adds IHM for page search engine

Location:

plugins/dcOpenSearch

Files:

• _define.php (modified) (1 diff)
• engines/class.dc.engine.medias.php (modified) (2 diffs)
• engines/class.dc.engine.pages.php (modified) (4 diffs)

plugins/dcOpenSearch/_define.php

@@ -17 +17 @@
           /* Description*/         "Add an advanced search on your blog (posts, pages, comments, medias and other)",
           /* Author */             "Tomtom (http://blog.zenstyle.fr/)",
-          /* Version */            '1.0.2-r1479',
+          /* Version */            '1.0.3',
           /* Permissions */        'usage,contentadmin',
           /* Priority */           20

plugins/dcOpenSearch/engines/class.dc.engine.medias.php

@@ -45 +45 @@
           'U.user_name, U.user_firstname, U.user_displayname, U.user_url '.
           'FROM '.$this->core->prefix.'media M '.
-          'INNER JOIN '.$this->core->prefix.'user U ON (M.user_id = U.user_id) '.
-          "WHERE (media_title LIKE '%".$q."%' OR ".
-          "media_file LIKE '%".$q."%') AND ".
-          "media_path = '".$this->core->blog->settings->public_path."'";
+          'INNER JOIN '.$this->core->prefix.'user U ON (M.user_id = U.user_id) WHERE';
+          
+          $words = text::splitWords($q);
+               
+          if (!empty($words)) {
+               if ($words) {
+                    foreach ($words as $i => $w) {
+                         $words[$i] = "(media_title LIKE '%".$this->core->con->escape($w)."%' OR media_file LIKE '%".$this->core->con->escape($w)."%')";
+                    }
+                    $strReq .= ' '.implode(' AND ',$words).' ';
+               }
+          }
+          
+          $strReq .= " AND media_path = '".$this->core->blog->settings->public_path."'";
           
           if (!$this->core->auth->check('media_admin',$this->core->blog->id))
@@ -55 +65 @@
                
                if ($this->core->auth->userID()) {
-                    $strReq .= "OR user_id = '".$this->con->escape($this->core->auth->userID())."'";
+                    $strReq .= "OR user_id = '".$this->core->con->escape($this->core->auth->userID())."'";
                }
                $strReq .= ') ';

plugins/dcOpenSearch/engines/class.dc.engine.pages.php

@@ -20 +20 @@
      
      protected $core;
-     protected $has_gui = false;
+     protected $has_gui = true;
      protected $gui_url = null;
      
@@ -42 +42 @@
           
           while ($rs->fetch()) {
+               if ($rs->post_excerpt_xhtml === '') {
+                    $content = $rs->post_content_xhtml;
+               }
+               elseif ($this->getEngineConfig('display') === 'both') {
+                    $content = $rs->post_excerpt_xhtml.$rs->post_content_xhtml;
+               }
+               elseif ($this->getEngineConfig('display') === 'excerpt') {
+                    $content = $rs->post_excerpt_xhtml;
+               }
+               else {
+                    $content = $rs->post_content_xhtml;
+               }
                $res[] = array(
                     'search_id' => $rs->post_id,
@@ -54 +66 @@
                     'search_dt' => $rs->post_creadt,
                     'search_tz' => $rs->post_tz,
-                    'search_content' => (empty($rs->post_excerpt_xhtml) ? $rs->post_content_xhtml : $rs->post_excerpt_xhtml),
+                    'search_content' => $content,
                     'search_comment_nb' => $rs->nb_trackback,
                     'search_trackback_nb' => $rs->nb_comment,
@@ -64 +76 @@
           
           return $res;   
+     }
+     
+     public function gui($url)
+     {
+          $res = '';
+          
+          $value = array(
+               __('Content only') => 'content',
+               __('Excerpt when it exists') => 'excerpt',
+               __('Both') => 'both'
+          );
+          
+          if (isset($_POST['save']))
+          {
+               try {
+                    $this->addEngineConfig('display',$_POST['display']);
+                    $this->saveEngineConfig();
+                    http::redirect($url.'&config=1');
+               } catch (Exception $e) {
+                    $core->error->add($e->getMessage());
+               }
+          }
+          
+          if (!empty($_GET['config'])) {
+               $res .= '<p class="message">'.__('Configuration have been successfully saved.').'</p>';
+          }
+          
+          $res .=
+          '<form action="'.html::escapeURL($url).'" method="post">'.
+          '<fieldset><legend>'.__('General').'</legend>'.
+          '<p class="field"><label class="classic">'.form::combo('display',$value,$this->getEngineConfig('display')).' '.
+          __('Content type:').'</label></p>'.
+          '</fieldset>'.
+          $this->core->formNonce().
+          '<p><input type="submit" name="save" value="'.__('Save').'"/></p>'.
+          '</form>';
+          
+          return $res;
      }