X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=fb54eb6cf87258fa7dd9401308919b8b9976a2e0;hp=525b5c1b0d4b8f8dc3d0858f53da994cc97909ef;hb=dd7413bc6a4cdb0578ea827f60d18b17849be4a6;hpb=dc815d80d15437e0e6a56bfcfbff81b241cdd727

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 525b5c1..fb54eb6 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -16,10 +16,14 @@ class PHPFSPOT {
 
    public function __construct()
    {
-      $this->cfg = new PHPFSPOT_CFG;
+      /* Check necessary requirements */
+      if(!$this->checkRequirements()) {
+         exit(1);
+      }
 
-      $this->db = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db);
+      $this->cfg = new PHPFSPOT_CFG;
 
+      $this->db  = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db);
       $this->cfg_db = new PHPFSPOT_DB(&$this, $this->cfg->phpfspot_db);
       $this->check_config_table();
 
@@ -47,12 +51,24 @@ class PHPFSPOT {
       $this->tmpl->assign('searchfor', $_SESSION['searchfor']);
       $this->tmpl->assign('page_title', $this->cfg->page_title);
       $this->tmpl->assign('current_condition', $_SESSION['tag_condition']);
+
+      switch($_GET['mode']) {
+         case 'showpi':
+            if(isset($_GET['tags'])) {
+               $_SESSION['selected_tags'] = split(',', $_GET['tags']);
+            }
+            break;
+      }
+
+      $this->tmpl->assign('content_page', 'welcome.tpl');
       $this->tmpl->show("index.tpl");
 
+
    } // show()
 
    private function get_tags()
    {
+   
       $this->avail_tags = Array();
       $count = 0;
    
@@ -121,9 +137,17 @@ class PHPFSPOT {
       $orig_path = $this->translate_path($details['directory_path']) ."/". $details['name'];
       $thumb_path = $this->cfg->base_path ."/thumbs/". $this->cfg->photo_width ."_". $this->getMD5($photo);
 
+      if(!file_exists($orig_path)) {
+         print "Photo ". $orig_path ." does not exist!<br />\n";
+      }
+
+      if(!is_readable($orig_path)) {
+         print "Photo ". $orig_path ." is not readable for user ". get_current_user() ."<br />\n";
+      }
+
       /* If the thumbnail doesn't exist yet, try to create it */
       if(!file_exists($thumb_path)) {
-         $this->gen_thumb($photo, 0, 1);
+         $this->gen_thumb($photo, true);
       }
 
       $meta = $this->get_meta_informations($orig_path);
@@ -257,6 +281,12 @@ class PHPFSPOT {
 
    } // resetTags()
 
+   public function resetTagSearch()
+   {
+      unset($_SESSION['searchfor']);
+
+   } // resetTagSearch()
+
    public function getPhotoSelection()
    {  
       $tagged_photos = Array();
@@ -410,7 +440,17 @@ class PHPFSPOT {
          if($end_with < $count)
             $this->tmpl->assign("next_url", "javascript:showPhotoIndex(". $next_start .");"); 
       }
-   
+
+      $current_tags = "";
+      if($_SESSION['selected_tags'] != "") {
+         foreach($_SESSION['selected_tags'] as $tag)
+            $current_tags.= $tag .",";
+         $current_tags = substr($current_tags, 0, strlen($current_tags)-1);
+      }
+
+      $extern_link = "http://". $_SERVER['SERVER_NAME'] ."/index.php?mode=showpi&tags=". $current_tags;
+
+      $this->tmpl->assign('extern_link', $extern_link);
       $this->tmpl->assign('count', $count);
       $this->tmpl->assign('width', $this->cfg->thumb_width);
       $this->tmpl->assign('images', $images);
@@ -431,13 +471,24 @@ class PHPFSPOT {
          $direction = "bubbleimg_down";
 
       $details = $this->get_photo_details($photo);
+      $orig_path = $this->translate_path($details['directory_path'])  ."/". $details['name'];
 
       $image_url = "phpfspot_img.php?idx=". $photo ."&amp;width=". $this->cfg->bubble_width;
 
-      $filesize = filesize($this->translate_path($details['directory_path'])  ."/". $details['name']);
+      $filesize = filesize($orig_path);
       $filesize = rand($filesize/1024, 2);
 
-      $img = getimagesize($this->translate_path($details['directory_path'])  ."/". $details['name']);
+      if(!file_exists($orig_path)) {
+         print "Photo ". $orig_path ." does not exist!<br />\n";
+         return;
+      }
+      
+      if(!is_readable($orig_path)) {
+         print "Photo ". $orig_path ." is not readable for user ". get_current_user() ."<br />\n";
+         return;
+      }
+
+      $img = getimagesize($orig_path);
 
       $this->tmpl->assign('file_size', $filesize);
       $this->tmpl->assign('width', $img[0]);
@@ -462,6 +513,12 @@ class PHPFSPOT {
       if(!file_exists($orig_image))
          return false;
 
+      $details = getimagesize($orig_image);
+      
+      /* check if original photo is a support image type */
+      if(!$this->parent->checkifImageSupported($details['mime']))
+         return false;
+
       $meta = $this->get_meta_informations($orig_image);
 
       $rotate = 0;
@@ -582,21 +639,24 @@ class PHPFSPOT {
     * 2. Check if the md5sum of the original file has changed
     * 3. Generate the thumbnails if needed
     */
-   public function gen_thumb($idx = 0, $fromcmd = 0, $force = 0)
+   public function gen_thumb($idx = 0, $force = 0)
    {
+      $error = 0;
+
       $resolutions = Array(
          $this->cfg->thumb_width,
          $this->cfg->bubble_width,
          $this->cfg->photo_width,
       );
 
+      /* get details from F-Spot's database */
       $details = $this->get_photo_details($idx);
+
+      /* calculate file MD5 sum */
       $full_path = $this->translate_path($details['directory_path'])  ."/". $details['name'];
       $file_md5 = md5_file($full_path);
 
-      if($fromcmd) print "Image [". $idx ."] ". $details['name'] ." Thumbnails:";
-
-      $error = 0;
+      $this->_debug("Image [". $idx ."] ". $details['name'] ." Thumbnails:");
 
       foreach($resolutions as $resolution) {
 
@@ -605,16 +665,15 @@ class PHPFSPOT {
          /* if the thumbnail file doesn't exist, create it */
          if(!file_exists($thumb_path)) {
 
-            if($fromcmd) print " ". $resolution ."px";
+            $this->_debug(" ". $resolution ."px");
             if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
                $error = 1;
-
          }
 
          /* if the file hasn't changed there is no need to regen the thumb */
          elseif($file_md5 != $this->getMD5($idx) || $force) {
 
-            if($fromcmd) print " ". $resolution ."px";
+            $this->_debug(" ". $resolution ."px");
             if(!$this->create_thumbnail($full_path, $thumb_path, $resolution))
                $error = 1;
 
@@ -622,10 +681,11 @@ class PHPFSPOT {
       }
 
       /* set the new/changed MD5 sum for the current photo */
-      if(!$error)
+      if(!$error) {
          $this->setMD5($idx, $file_md5);
+      }
 
-      if($fromcmd) print "\n";
+      $this->_debug("\n");
 
    } // gen_thumb()
 
@@ -660,11 +720,17 @@ class PHPFSPOT {
 
    } // setTagCondition()
 
-   public function startSearch($searchfor)
+   public function startTagSearch($searchfor)
    {
       $_SESSION['searchfor'] = $searchfor;
+      $_SESSION['selected_tags'] = Array();
 
-   } // startSearch()
+      foreach($this->avail_tags as $tag) {
+         if(preg_match('/'. $searchfor .'/i', $this->tags[$tag]))
+            array_push($_SESSION['selected_tags'], $tag);
+      }
+
+   } // startTagSearch()
 
    private function rotateImage($img, $degrees)
    {
@@ -755,6 +821,77 @@ class PHPFSPOT {
 
    } // get_photo_tags()
 
+   public function showTextImage($txt, $color=000000, $space=4, $font=4, $w=300)
+   {
+      if (strlen($color) != 6) 
+         $color = 000000;
+
+      $int = hexdec($color);
+      $h = imagefontheight($font);
+      $fw = imagefontwidth($font);
+      $txt = explode("\n", wordwrap($txt, ($w / $fw), "\n"));
+      $lines = count($txt);
+      $im = imagecreate($w, (($h * $lines) + ($lines * $space)));
+      $bg = imagecolorallocate($im, 255, 255, 255);
+      $color = imagecolorallocate($im, 0xFF & ($int >> 0x10), 0xFF & ($int >> 0x8), 0xFF & $int);
+      $y = 0;
+
+      foreach ($txt as $text) {
+         $x = (($w - ($fw * strlen($text))) / 2);
+         imagestring($im, $font, $x, $y, $text, $color);
+         $y += ($h + $space);
+      }
+
+      Header("Content-type: image/png");
+      ImagePng($im);
+
+   } // showTextImage()
+
+   private function checkRequirements()
+   {
+      if(!function_exists("imagecreatefromjpeg")) {
+         print "PHP GD library extension is missing<br />\n";
+         $missing = true;
+      }
+
+      if(!function_exists("sqlite3_open")) {
+         print "PHP SQLite3 library extension is missing<br />\n";
+         $missing = true;
+      }
+
+      /* Check for HTML_AJAX PEAR package, lent from Horde project */
+      ini_set('track_errors', 1);
+      @include_once 'HTML/AJAX/Server.php';
+      if(isset($php_errormsg)) {
+         print "PEAR HTML_AJAX package is missing<br />\n";
+         $missing = true;
+      }
+      ini_restore('track_errors');
+
+      if(isset($missing))
+         return false;
+
+      return true;
+
+   } // checkRequirements()
+
+   private function _debug($text)
+   {
+      if($this->fromcmd) {
+         print $text;
+      }
+
+   } // _debug()
+
+   public function checkifImageSupported($mime)
+   {
+      if(in_array($mime, Array("image/jpeg")))
+         return true;
+
+      return false;
+
+   } // checkifImageSupported()
+
 }
 
 ?>