X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=blobdiff_plain;f=phpfspot.class.php;h=391589a591d11c2068a34a87d36845b5c12a58d6;hp=191e06627f9e8dfc9f13e27877eb2387763d7bbe;hb=f805e292a7f3048bd0c7305b0bc4d92ad90d3407;hpb=1bf32ff139ed565557d9c807034f8251f88636e3

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 191e066..391589a 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -16,6 +16,11 @@ class PHPFSPOT {
 
    public function __construct()
    {
+      /* Check necessary requirements */
+      if(!$this->checkRequirements()) {
+         exit(1);
+      }
+
       $this->cfg = new PHPFSPOT_CFG;
 
       $this->db = new PHPFSPOT_DB(&$this, $this->cfg->fspot_db);
@@ -142,7 +147,7 @@ class PHPFSPOT {
 
       /* 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);
@@ -619,21 +624,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) {
 
@@ -642,16 +650,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;
 
@@ -659,10 +666,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()
 
@@ -798,7 +806,7 @@ class PHPFSPOT {
 
    } // get_photo_tags()
 
-   function showTextImage($txt, $color=000000, $space=4, $font=4, $w=300)
+   public function showTextImage($txt, $color=000000, $space=4, $font=4, $w=300)
    {
       if (strlen($color) != 6) 
          $color = 000000;
@@ -824,6 +832,42 @@ class PHPFSPOT {
 
    } // 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 '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()
+
 }
 
 ?>