Changeset 237

Timestamp:

09/24/08 09:04:25 (15 years ago)

Author:

bruno

Message:

Onto 0.3 ...

Location:

plugins/gallery

Files:

• CHANGELOG (modified) (1 diff)
• _define.php (modified) (1 diff)
• _prepend.php (modified) (1 diff)
• _public.php (modified) (17 diffs)
• class.dc.gallery.php (modified) (1 diff)
• default-templates/default/galleries.html (modified) (1 diff)
• default-templates/default/image.html (modified) (1 diff)
• default-templates/default/swfobject.js (added)
• default-templates/flashGallery (added)
• default-templates/flashGallery/flashGallery.swf (added)
• default-templates/flashGallery/galleries.html (added)
• default-templates/flashGallery/gallery.css (added)
• default-templates/flashGallery/gallery.html (added)
• default-templates/flashGallery/image.html (added)
• default-templates/flashGallery/image_feed.xml (added)
• default-templates/flashGallery/images.html (added)
• default-templates/jwplayer (added)
• default-templates/jwplayer/galleries.html (added)
• default-templates/jwplayer/gallery.css (added)
• default-templates/jwplayer/gallery.html (added)
• default-templates/jwplayer/image.html (added)
• default-templates/jwplayer/image_feed.xml (added)
• default-templates/jwplayer/images.html (added)
• default-templates/jwplayer/mediaplayer.swf (added)
• default-templates/rotator (added)
• default-templates/rotator/galleries.html (added)
• default-templates/rotator/gallery.css (added)
• default-templates/rotator/gallery.html (added)
• default-templates/rotator/image.html (added)
• default-templates/rotator/image_feed.xml (added)
• default-templates/rotator/imagerotator.swf (added)
• default-templates/rotator/images.html (added)
• default-templates/tiltViewer (added)
• default-templates/tiltViewer/galleries.html (added)
• default-templates/tiltViewer/gallery.css (added)
• default-templates/tiltViewer/gallery.html (added)
• default-templates/tiltViewer/image.html (added)
• default-templates/tiltViewer/image_feed.xml (added)
• default-templates/tiltViewer/images.html (added)
• default-templates/tiltViewer/tiltViewer.swf (added)
• gal.php (modified) (14 diffs)
• options.php (modified) (3 diffs)

plugins/gallery/CHANGELOG

@@ +1 @@
+Gallery 0.3
+* Added new gallery themes (imported from DS Gallery)
+* New urlhandlers for static gallery files
+* Gallery themes can be externalized through gallery_themes_path option
+
 
 Gallery 0.2.16

plugins/gallery/_define.php

@@ -15 +15 @@
      /* Description*/         "Image Gallery for Dotclear2",
      /* Author */             "Bruno Hondelatte",
-     /* Version */            '0.2.16',
+     /* Version */            'SVN',
      /* Permissions */        'usage,contentadmin'
 );

plugins/gallery/_prepend.php

@@ -27 +27 @@
      $core->url->register('galitem',$core->blog->settings->gallery_image_url_prefix,'^'
           .$core->blog->settings->gallery_image_url_prefix.'/(.+)$',array('urlGallery','image'));
+     $core->url->register('galtheme','gallerytheme','^gallerytheme/(.+/.+)$',array('urlGalleryProxy','galtheme'));
      /* RNot yes implemented
      $core->url->register('images','images','^images/(.+)$',array('urlGallery','images'));

plugins/gallery/_public.php

@@ -36 +36 @@
 $core->tpl->addBlock('GalleryItemGallery',array('tplGallery','GalleryItemGallery'));
 $core->tpl->addValue('GalleryItemFeedURL',array('tplGallery','GalleryItemFeedURL'));
+$core->tpl->addValue('GalleryItemMeta',array('tplGallery','GalleryItemMeta'));
 
 
@@ -46 +47 @@
 $core->addBehavior('publicBeforeDocument',array('behaviorsGallery','addTplPath'));
 
+
+
 // Later on, some rest features :)
 if (!empty($core->pubrest))
@@ -54 +57 @@
   public static function addTplPath(&$core)
   {
-    $core->tpl->setPath($core->tpl->getPath(),dirname(__FILE__).'/default-templates');
+    $core->tpl->setPath($core->tpl->getPath(),path::fullFromRoot($core->blog->settings->gallery_themes_path,DC_ROOT));
   }
 
@@ -66 +69 @@
           global $core;
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          $css = $core->blog->url.(($core->blog->settings->url_scan == 'path_info')?'?':'').'pf=gallery/default-templates/'
-               .$core->blog->settings->gallery_default_theme.'/gallery.css';
+          $css_relname = $core->blog->settings->gallery_default_theme.'/gallery.css';
+          if (file_exists(path::real($core->blog->settings->themes_path.'/'.$core->blog->settings->theme).'/tpl/'.$css_relname))
+               $css = $core->blog->settings->themes_url.'/'.$core->blog->settings->theme.'/tpl/'.$css_relname;
+          else
+               $css = $core->blog->url.(($core->blog->settings->url_scan == 'path_info')?'?':'').'pf=gallery/default-templates/'
+               .$css_relname;
           $res = "\n<?php echo '<style type=\"text/css\" media=\"screen\">@import url(".$css.");</style>';\n?>";
           return $res;
@@ -253 +260 @@
           $type = !empty($attr['type']) ? $attr['type'] : 'rss2';
           
-          if (!preg_match('#^(rss2|atom|mediarss)$#',$type)) {
+          if (!preg_match('#^(rss2|atom|mediarss|custom)$#',$type)) {
                $type = 'rss2';
           }
@@ -259 +266 @@
           return '<?php echo '.sprintf($f,'$core->blog->url.$core->url->getBase("gal")."/feed/'.$type.'"').'; ?>';
            /*return '<?php echo '.sprintf($f,'$_ctx->posts->getURL()."/feed/'.$type.'"').'; ?>';*/
+     }
+
+     public static function GalleryItemMeta($attr)
+     {
+          if (empty($attr['name']))
+               return '';
+          $value = addslashes($attr['name']);
+          
+
+          $p = '<?php if ($_ctx->media->type == "image/jpeg") {'."\n".
+               'if (isset($_ctx->media->media_meta))'."\n".
+               'echo $_ctx->media->media_meta->{\''.$value."'};\n".
+               "}\n".
+               '?>';
+          return $p;
      }
 
@@ -277 +299 @@
           $lastn = 0;
           if (isset($attr['lastn'])) {
-               $lastn = abs((integer) $attr['lastn'])+0;
+               $lastn = (integer) $attr['lastn'];
           }
           
@@ -285 +307 @@
           if ($lastn > 0) {
                $p .= "\$params['limit'] = ".$lastn.";\n";
-          } else {
+          } else if ($lastn == 0) {
                $p .= "\$params['limit'] = \$core->blog->settings->gallery_nb_images_per_page;\n";
           }
-          
+          if ($lastn >= 0)    
           $p .= "\$params['limit'] = array(((\$_page_number-1)*\$params['limit']),\$params['limit']);\n";
           
@@ -691 +713 @@
 class urlGallery extends dcUrlHandlers
 {
+     public static function serveThemeDocument($theme,$page,$content_type='text/html',$http_cache=true,$http_etag=true) {
+          global $core;
+          if ($theme == '')
+               self::serveDocument($page,$content_type,$http_cache,$http_etag);
+          elseif ($GLOBALS['core']->tpl->getFilePath($theme.'/'.$page) !== false)
+               self::serveDocument($theme.'/'.$page,$content_type,$http_cache,$http_etag);
+          else
+               self::serveDocument($core->blog->settings->gallery_default_theme.'/'.$page,$content_type,$http_cache,$http_etag);
+
+     }
      public static function gallery($args)
      {
           $n = self::getPageNumber($args);
-          if (preg_match('%(^|/)feed/(mediarss|rss2|atom)/([0-9]+)$%',$args,$m)){
-               $args = preg_replace('#(^|/)feed/(mediarss|rss2|atom)/([0-9]+)$#','',$args);
+          $theme='';
+          $type='';
+          if (preg_match('%(^|/)feed/(mediarss|rss2|atom|custom)/([0-9]+)$%',$args,$m)){
+               $args = preg_replace('#(^|/)feed/(mediarss|rss2|atom|custom)/([0-9]+)$#','',$args);
                $type = $m[2];
-               $page = "feed/img-".$type.".xml";
+               if ($type == 'custom') {
+                    $theme=$GLOBALS['core']->blog->settings->gallery_default_theme;
+                    $page = "image_feed.xml";
+               } else {
+                    $page = "feed/img-".$type.".xml";
+               }
                $mime = 'application/xml';
                $params['post_id'] = $m[3];
@@ -707 +746 @@
                $params['post_id'] = $m[3];
           } elseif ($args != '') {
-               $page=$GLOBALS['core']->blog->settings->gallery_default_theme.'/gallery.html';
-          $params['post_url'] = $args;
+               //$page=$GLOBALS['core']->blog->settings->gallery_default_theme.'/gallery.html';
+               $page='gallery.html';
+               $params['post_url'] = $args;
                $mime='text/html';
+               $theme=$GLOBALS['core']->blog->settings->gallery_default_theme;
           } else {
                self::p404();
@@ -751 +792 @@
           $post_id = $GLOBALS['_ctx']->posts->post_id;
           $post_password = $GLOBALS['_ctx']->posts->post_password;
+          $meta = $GLOBALS['core']->meta->getMetaArray($GLOBALS['_ctx']->posts->post_meta);
+          if ($theme != '' && isset($meta['galtheme'])) {
+               $theme = $meta['galtheme'][0];
+          } 
           
           
@@ -862 +907 @@
           
           # The entry
-          self::serveDocument($page,$mime);
+          self::serveThemeDocument($theme,$page,$mime);
           exit;
      }
@@ -882 +927 @@
           $GLOBALS['core']->meta = new dcMeta($GLOBALS['core']);;
           $GLOBALS['core']->gallery = new dcGallery($GLOBALS['core']);
-          self::serveDocument($GLOBALS['core']->blog->settings->gallery_default_theme.'/galleries.html');
+          self::serveThemeDocument($GLOBALS['core']->blog->settings->gallery_default_theme,'/galleries.html');
           exit;
      }
@@ -895 +940 @@
                $params['post_id'] = $m[3];
           } elseif ($args != '') {
-               $page=$GLOBALS['core']->blog->settings->gallery_default_theme.'/image.html';
+               $page='image.html';
                $params['post_url'] = $args;
                $mime='text/html';
@@ -942 +987 @@
           $post_password = $GLOBALS['_ctx']->posts->post_password;
           
+          if ($GLOBALS['_ctx']->gallery_url != null) {
+               $galtemp = $GLOBALS['core']->gallery->getGalleries(array('post_url'=>$GLOBALS['_ctx']->gallery_url));
+               $meta = $GLOBALS['core']->meta->getMetaArray($galtemp->post_meta);
+               if (isset($meta['galtheme'])) {
+                    $theme = $meta['galtheme'][0];
+               } else {
+                    $theme=$GLOBALS['core']->blog->settings->gallery_default_theme;
+               }
+          } else {
+               $theme=$GLOBALS['core']->blog->settings->gallery_default_theme;
+          }
+
           # Password protected entry
           if ($post_password != '')
@@ -1050 +1107 @@
           }
           //self::serveDocument('image.html');
-          self::serveDocument($page,$mime);
+          self::serveThemeDocument($theme,$page,$mime);
           exit;
      }
@@ -1107 +1164 @@
 }
 
+class urlGalleryProxy extends dcUrlHandlers
+{
+     public static function galtheme($args) {
+          if (preg_match('#([^/]+)/(.+)$#',$args,$m)) {
+               $theme = $m[1];
+               $res = $m[2];
+               $full_path = path::real($GLOBALS['core']->blog->settings->gallery_themes_path.'/'.$theme.'/'.$res);
+               if ($full_path == null)
+                    $full_path = path::real($GLOBALS['core']->blog->settings->gallery_themes_path.'/default/'.$res);
+
+               $allowed_types = array('png','jpg','jpeg','gif','css','js','swf');
+               if (!in_array(files::getExtension($full_path),$allowed_types)) {
+                    self::p404();
+                    exit;
+               }
+               http::cache(array_merge(array($full_path),get_included_files()));
+               header('Content-Type: '.files::getMimeType($full_path));
+               header('Content-Length: '.filesize($full_path));
+               readfile($full_path);
+               exit;
+
+          } else {
+               self::p404();
+          }
+
+     }
+}
 
 ?>

plugins/gallery/class.dc.gallery.php

@@ -807 +807 @@
      }
 
+
+     /* Themes functions */
+     public function getThemes() {
+          $themes = array();
+          $themes['default']='default';
+          if ($dh = opendir(path::fullFromRoot($this->core->blog->settings->gallery_themes_path,DC_ROOT))) {
+               while (($file = readdir($dh)) !== false) {
+                    if((substr($file,0,1) != '.' ) && ($file !== 'feed')) {
+                         $themes[$file]=$file;
+                    }
+               }
+          }
+          return $themes;
+     }
+
 }
 ?>

plugins/gallery/default-templates/default/galleries.html

@@ -89 +89 @@
     </tpl:EntryIf>
     <tpl:EntryIf show_pings="1">
-    <a href="{{tpl:EntryURL}}#pings" class="ping_count">{{tpl:EntryTrackbackCount}}</a></tpl:EntryIf>
+    <a href="{{tpl:EntryURL}}#pings" class="ping_count">{{tpl:EntryPingCount}}</a></tpl:EntryIf>
     </p>
     </div>

plugins/gallery/default-templates/default/image.html

@@ -85 +85 @@
     </tpl:EntryIf>
     
-    <div class="post-content">{{tpl:EntryContent}}</div>
+    <div class="post-content">
+    <p>EXIF :</p>
+    <ul>
+     <li>Make : {{tpl:GalleryItemMeta name="Make"}}</li>
+     <li>Exposure : {{tpl:GalleryItemMeta name="Exposure"}}</li>
+    </ul>
+    
+    {{tpl:EntryContent}}</div>
   </div>
   

plugins/gallery/gal.php

@@ -1 +1 @@
 <?php
-# -- BEGIN LICENSE BLOCK ----------------------------------
+# ***** BEGIN LICENSE BLOCK *****
+# This file is part of DotClear Gallery plugin.
+# Copyright (c) 2007 Bruno Hondelatte,  and contributors. 
+# Many, many thanks to Olivier Meunier and the Dotclear Team.
+# All rights reserved.
 #
-# This file is part of Dotclear 2 Gallery plugin.
+# Gallery plugin for DC2 is free sofwtare; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+# 
+# DotClear is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with DotClear; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
-# Copyright (c) 2003-2008 Olivier Meunier and contributors
-# Licensed under the GPL version 2.0 license.
-# See LICENSE file or
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
-#
-# -- END LICENSE BLOCK ------------------------------------
+# ***** END LICENSE BLOCK *****
 if (!defined('DC_CONTEXT_ADMIN')) { exit; }
 
@@ -46 +57 @@
 $core->gallery = new dcGallery($core);
 
+$themes = $core->gallery->getThemes();
 /*
 $post_headlink = '<link rel="%s" title="%s" href="post.php?id=%s" />';
@@ -52 +64 @@
 $next_link = $prev_link = $next_headlink = $prev_headlink = null;
 
-$gal_headlink = '<link rel="%s" title="%s" href="plugin.php?p=gallery&amp;m=gal&amp;id=%s" />';
-$gal_link = '<a href="plugin.php?p=gallery&amp;m=gal&amp;id=%s" title="%s">%s</a>';
+$gal_headlink = '<link rel="%s" title="%s" href="plugin.php?p=gallery&m=gal&id=%s" />';
+$gal_link = '<a href="plugin.php?p=gallery&m=gal&id=%s" title="%s">%s</a>';
 
 
@@ -89 +101 @@
 $f_media_dir = $f_tag = $f_user = $f_cat = null;
 $f_orderby = $f_sortby = null;
+$f_theme = "default";
 
 
@@ -157 +170 @@
                $gal_thumb = $gal_thumb[0];
           }
-          $image_ids = $core->meta->getMetaArray($post->post_meta);
-          $gal_nb_img = isset($image_ids['galitem'])?sizeof($image_ids['galitem']):0;
+          $meta_list = $core->meta->getMetaArray($post->post_meta);
+          $gal_nb_img = isset($meta_list['galitem'])?sizeof($meta_list['galitem']):0;
+          $f_theme = isset($meta_list['galtheme'])?$meta_list['galtheme'][0]:'default';
 
           /*$gal_meta=$core->meta->getMetaArray($post->post_meta);
@@ -240 +254 @@
      $f_orderby = !empty($_POST['f_orderby']) ? $_POST['f_orderby'] : null;
      $f_sortby = !empty($_POST['f_sortby']) ? $_POST['f_sortby'] : null;
+     $f_theme = !empty($_POST['f_theme']) ? $_POST['f_theme'] : 'default';
 
 
@@ -296 +311 @@
                $core->meta->delPostMeta($post_id,"galorderby");
                $core->meta->delPostMeta($post_id,"galsortby");
+               $core->meta->delPostMeta($post_id,"galtheme");
                if ($c_media_dir) {
                     $core->meta->setPostMeta($post_id,"galmediadir",$f_media_dir);
@@ -315 +331 @@
                     $core->meta->setPostMeta($post_id,"galsortby",$f_sortby);
                }
+               if (isset ($f_theme) && $f_theme != 'default') {
+                    $core->meta->setPostMeta($post_id,"galtheme",$f_theme);
+               }
                $core->gallery->refreshGallery($post_id);
 
-               http::redirect('plugin.php?p=gallery&amp;m=gal&amp;id='.$post_id.'&upd=1');
+               http::redirect('plugin.php?p=gallery&m=gal&id='.$post_id.'&upd=1');
           }
           catch (Exception $e)
@@ -352 +371 @@
                $core->gallery->refreshGallery($return_id);
                
-               http::redirect('plugin.php?p=gallery&amp;m=gal&amp;id='.$return_id.'&amp;crea=1');
+               http::redirect('plugin.php?p=gallery&m=gal&id='.$return_id.'&crea=1');
           }
           catch (Exception $e)
@@ -443 +462 @@
           '<div class="col">'.
           "<h3>".__('Presentation thumbnail')."</h3>";
-     $change_thumb_url='plugin.php?p=gallery&amp;m=galthumb&amp;gal_id='.$post_id;
+     $change_thumb_url='plugin.php?p=gallery&m=galthumb&gal_id='.$post_id;
      if ($c_media_dir)
-          $change_thumb_url .= '&amp;d='.$f_media_dir;
+          $change_thumb_url .= '&d='.$f_media_dir;
 
      if ($has_thumb) {
@@ -454 +473 @@
           echo '<li>'.$gal_thumb->media_dtstr.' - '. files::size($gal_thumb->size).' - '.
           '<a href="'.$change_thumb_url.'">'.__('Change').'</a>'.'</li></ul>';
-          echo '<li class="media-action"><form action="plugin.php?p=gallery&amp;m=galthumb" method="post">'.
+          echo '<li class="media-action"><form action="plugin.php?p=gallery&m=galthumb" method="post">'.
           '<input type="image" src="images/minus.png" alt="'.__('Remove').'" '.
           'title="'.__('Remove').'" /> '.
@@ -481 +500 @@
 {
 
-     echo '<form action="plugin.php?p=gallery&amp;m=gal" method="post" id="entry-form">';
+     echo '<form action="plugin.php?p=gallery&m=gal" method="post" id="entry-form">';
      echo '<div id="entry-sidebar">';
      
@@ -552 +571 @@
      '<p><label class="classic">'.__('Order')." : ".form::combo('f_orderby',$orderby_combo,$f_orderby).'</label></p>'.
      '<p><label class="classic">'.__('Sort')." : ".form::combo('f_sortby',$sortby_combo,$f_sortby).'</label></p>'.
+     "<h3>".__('Theme')."</h3>".
+     '<p><label class="classic">'.__('Gallery theme')." : ".form::combo('f_theme',$themes,$f_theme).'</label></p>'.
      '</div>'.
      '</div>'.
@@ -583 +604 @@
      echo '</fieldset></div>';          // End #entry-content
      echo '</form>';
-     //echo '</div>';
      
      /*if ($post_id && $post->post_status == 1) {

plugins/gallery/options.php

@@ -60 +60 @@
 $c_gal_prefix=defaultIfNotSet($core->blog->settings->gallery_gallery_url_prefix,'gallery');
 $c_img_prefix=defaultIfNotSet($core->blog->settings->gallery_image_url_prefix,'image');
+$c_gal_themes_path=defaultIfNotSet($core->blog->settings->gallery_themes_path,'plugins/gallery/default-templates');
 
 if (!empty($_POST['enable_plugin'])) {
@@ -96 +97 @@
      $c_gal_prefix = !empty($_POST['gallery_prefix'])?$_POST['gallery_prefix']:$c_gal_prefix;
      $c_img_prefix = !empty($_POST['images_prefix'])?$_POST['images_prefix']:$c_img_prefix;
+     $c_gal_themes_path = !empty($_POST['themes_path'])?$_POST['themes_path']:$c_img_prefix;
      $core->blog->settings->setNamespace('gallery');
      $core->blog->settings->put('gallery_galleries_url_prefix',$c_gals_prefix,'string','Gallery lists URL prefix');
      $core->blog->settings->put('gallery_gallery_url_prefix',$c_gal_prefix,'string','Galleries URL prefix');
      $core->blog->settings->put('gallery_image_url_prefix',$c_img_prefix,'string','Images URL prefix');
+     $core->blog->settings->put('gallery_themes_path',$c_gal_themes_path,'string','Gallery Themes path');
      $core->blog->triggerBlog();
      http::redirect('plugin.php?p=gallery&m=options&upd=1');
@@ -215 +218 @@
           form::field('images_prefix', 60, 255, $c_img_prefix).
           '</label></p>'.
+          '<p><label class=" classic">'. __('Gallery themes path').' : '.
+          form::field('themes_path', 60, 255, $c_gal_themes_path).
+          '</label></p>'.
           form::hidden('p','gallery').
           form::hidden('m','options').$core->formNonce().