Gallery

Revision: 14984
          http://svn.sourceforge.net/gallery/?rev=14984&view=rev
Author:   jenst
Date:     2006-10-27 12:10:31 -0700 (Fri, 27 Oct 2006)

Log Message:
-----------
2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b13

 * Fix: Save did not work in rearrange items.

 * Fix: Typo in stats-wizard.php prevented the generated url to show up.

 Thanks to Peter Schumacher for finding and reporting those bugs.

 * Fix: Remove -v from jhead, as the output has different structure.

 * Fix: Autorotate rotated in the wrong direction.

Modified Paths:
--------------
    trunk/gallery/ChangeLog
    trunk/gallery/Version.php
    trunk/gallery/lib/imageManipulation.php
    trunk/gallery/popups/rearrange.php
    trunk/gallery/stats-wizard.php

Modified: trunk/gallery/ChangeLog
===================================================================
--- trunk/gallery/ChangeLog	2006-10-27 18:54:39 UTC (rev 14983)
+++ trunk/gallery/ChangeLog	2006-10-27 19:10:31 UTC (rev 14984)
@@ -1,3 +1,17 @@
+2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b13
+
+ * Fix: Save did not work in rearrange items.
+
+ * Fix: Typo in stats-wizard.php prevented the generated url to show up.
+
+ Thanks to Peter Schumacher for finding and reporting those bugs.
+
+ * Fix: Remove -v from jhead, as the output has different structure.
+
+ * Fix: Autorotate rotated in the wrong direction.
+
+ * Fix: still some _(), converted to gTranslate()
+
 2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b12
 
  * Change: Minor things like indenting, code cleaning and phpDoc.

Modified: trunk/gallery/Version.php
===================================================================
--- trunk/gallery/Version.php	2006-10-27 18:54:39 UTC (rev 14983)
+++ trunk/gallery/Version.php	2006-10-27 19:10:31 UTC (rev 14984)
@@ -22,7 +22,7 @@
 ?>
 <?php
 
-$gallery->version = '1.6-alpha2-svn-b12';
+$gallery->version = '1.6-alpha2-svn-b13';
 $gallery->config_version = 99;
 $gallery->album_version = 38;
 $gallery->user_version = 6;

Modified: trunk/gallery/lib/imageManipulation.php
===================================================================
--- trunk/gallery/lib/imageManipulation.php	2006-10-27 18:54:39 UTC (rev 14983)
+++ trunk/gallery/lib/imageManipulation.php	2006-10-27 19:10:31 UTC (rev 14984)
@@ -33,7 +33,7 @@
  *  2:  Existing resized file should be removed
  */
 function resize_image($src, $dest, $target = 0, $target_fs = 0, $keepProfiles = 0, $createThumbnail = false, $quality = 0) {
-    debugMessage(sprintf(_("Resizing Image: %s"), $src), __FILE__, __LINE__);
+    debugMessage(sprintf(gTranslate('core', "Resizing Image: %s"), $src), __FILE__, __LINE__);
 
     global $gallery;
 
@@ -64,7 +64,7 @@
     /* Check for images smaller then target size, don't blow them up. */
     if ((empty($target) || ($width <= $target && $height <= $target)) &&
       (empty($target_fs) || ((int) fs_filesize($src) >> 10) <= $target_fs)) {
-        echo debugMessage("&nbsp;&nbsp;&nbsp;". _("No resizing required"), __FILE__, __LINE__,1);
+        echo debugMessage("&nbsp;&nbsp;&nbsp;". gTranslate('core', "No resizing required"), __FILE__, __LINE__,1);
 
         /* If the file is already smaller than the target filesize, don't
         * create a new sized image.  return 2 indicates that the current .sized.
@@ -82,7 +82,8 @@
 
     if ($target_fs == 0) {
         compressImage($src, $out, $target, $quality, $keepProfiles, $createThumbnail);
-    } else {
+    }
+    else {
         $filesize = (int) fs_filesize($src) >> 10;
         $max_quality = $gallery->app->jpegImageQuality;
         $min_quality = 5;
@@ -91,7 +92,7 @@
         if (!isset($quality)) {
             $quality = $gallery->album->fields['last_quality'];
         }
-        processingMsg("&nbsp;&nbsp;&nbsp;". sprintf(_("target file size %d kbytes"), $target_fs)."\n");
+        processingMsg("&nbsp;&nbsp;&nbsp;". sprintf(gTranslate('core', "target file size %d kbytes"), $target_fs)."\n");
 
 	$loop = 0;
         do {
@@ -100,16 +101,18 @@
             compressImage($src, $out, $target, $quality, $keepProfiles, $createThumbnail);
 
             $prev_quality = $quality;
-            printf(_("-> file size %d kbytes"), round($filesize));
-            processingMsg("&nbsp;&nbsp;&nbsp;" . sprintf(_("trying quality %d%%"), $quality));
+            printf(gTranslate('core', "-> file size %d kbytes"), round($filesize));
+            processingMsg("&nbsp;&nbsp;&nbsp;" . sprintf(gTranslate('core', "trying quality %d%%"), $quality));
             clearstatcache();
             $filesize = (int)fs_filesize($out) >> 10;
             if ($filesize < $target_fs) {
                 $min_quality = $quality;
-            } elseif ($filesize > $target_fs){
+            }
+            elseif ($filesize > $target_fs){
                 $max_quality = $quality;
                 $max_filesize = $filesize;
-            } elseif ($filesize == $target_fs){
+            }
+            elseif ($filesize == $target_fs){
                 $min_quality = $quality;
                 $max_quality = $quality;
                 $max_filesize = $filesize;
@@ -127,16 +130,18 @@
         abs(($filesize-$target_fs)/$target_fs) > .02 );
 
         $gallery->album->fields['last_quality'] = $prev_quality;
-        printf(_("-> file size %d kbytes"), round($filesize));
-        processingMsg(_("Done."));
+        printf(gTranslate('core', "-> file size %d kbytes"), round($filesize));
+        processingMsg(gTranslate('core', "Done."));
     }
+
     if (fs_file_exists("$out") && fs_filesize("$out") > 0) {
         if ($useTemp) {
             fs_copy($out, $dest);
             fs_unlink($out);
         }
         return 1;
-    } else {
+    }
+    else {
         return 0;
     }
 }
@@ -158,31 +163,38 @@
         case "png":
             $getOverlay = netPBM("pngtopnm", "$input > $overlay");
             $getAlpha   = netPBM("pngtopnm", "-alpha $input > $alpha");
-        break;
+            break;
+
         case "gif":
             $getOverlay = netPBM("giftopnm", "--alphaout=$alpha $input > $overlay");
-        break;
-            case "tif":
-        $getOverlay = netPBM("tifftopnm", "-alphaout=$alpha $input > $overlay");
-        break;
+            break;
+
+        case "tif":
+            $getOverlay = netPBM("tifftopnm", "-alphaout=$alpha $input > $overlay");
+            break;
     }
 
     exec_wrapper($getOverlay);
+
     if (isset($getAlpha)) {
         exec_wrapper($getAlpha);
     }
+
     return array($overlay, $alpha);
 }
 
 function watermark_image($src, $dest, $wmName, $wmAlphaName, $wmAlign, $wmAlignX, $wmAlignY) {
     global $gallery;
+
     if (!strcmp($src,$dest)) {
         $useTemp = true;
         $out = "$dest.tmp";
-    } else {
+    }
+    else {
         $useTemp = false;
         $out = $dest;
     }
+
     if (isDebugging()) {
         print "<table border=\"1\">";
         print "<tr><td>src</td><td>$src</td></tr>";
@@ -206,26 +218,30 @@
                 if (eregi('\.png$',$wmName, $regs)) {
                     list ($overlayFile, $alphaFile) = netpbm_decompose_image($wmName, "png");
                     $tmpOverlay = 1;
-                } elseif (eregi('\.tiff?$',$wmName, $regs)) {
+                }
+                elseif (eregi('\.tiff?$',$wmName, $regs)) {
                     list ($overlayFile, $alphaFile) = netpbm_decompose_image($wmName, "tif");
                     $tmpOverlay = 1;
-                } elseif (eregi('\.gif$',$wmName, $regs)) {
+                }
+                elseif (eregi('\.gif$',$wmName, $regs)) {
                     list ($overlayFile, $alphaFile) = netpbm_decompose_image($wmName, "gif");
                     $tmpOverlay = 1;
-                } else {
+                }
+                else {
                     $alphaFile = $wmName;
                     if (strlen($wmAlphaName)) {
                         $overlayFile = $wmAlphaName;
                     }
                 }
             break;
+
             default:
-                echo debugMessage(_("You have no graphics package configured for use!"), __FILE__, __LINE__);
-            return 0;
+                echo debugMessage(gTranslate('core', "You have no graphics package configured for use!"), __FILE__, __LINE__);
+            return false;
         }
     } else {
-        echo gallery_error(_("No watermark name specified!"));
-        return 0;
+        echo gallery_error(gTranslate('core', "No watermark name specified!"));
+        return false;
     }
 
     // Set or Clip $wmAlignX and $wmAlignY
@@ -359,10 +375,19 @@
     }
 } // end watermark_image()
 
+/**
+ * Rotates an images.
+ *
+ * @param string $src       filename of the source image.
+ * @param string $dest      filename of the destination image (can be the same).
+ * @param string $target    degree of rotation.
+ * @param string $type      filetype.
+ * @return boolean          true if successfully rotated.
+ */
 function rotate_image($src, $dest, $target, $type) {
     global $gallery;
 
-    if (!strcmp($src,$dest)) {
+    if (!strcmp($src, $dest)) {
         $useTemp = true;
         $out = "$dest.tmp";
     }
@@ -374,45 +399,63 @@
     $srcFile = fs_import_filename($src, 1);
 
     $type = strtolower($type);
-    if (isset($gallery->app->use_jpegtran) && !empty($gallery->app->use_jpegtran) && ($type === 'jpg' || $type === 'jpeg')) {
-        if ($target == '90') {
+    if (!empty($gallery->app->use_jpegtran) && ($type === 'jpg' || $type === 'jpeg')) {
+        debugMessage(gTranslate('core', "Using jpegtran for rotation"), __FILE__, __LINE__, 3);
+        if (!strcmp($target, '-90')) {
             $args = '-rotate 90';
-        } elseif ($target == '180'){
+        }
+        elseif (!strcmp($target, '180')){
             $args = '-rotate 180';
-        } elseif ($target == '-90' || $target = '270') {
+        }
+        elseif (!strcmp($target, '90')) {
             $args = '-rotate 270';
-        } elseif ($target == 'fv') {
+        }
+        elseif (!strcmp($target, 'fv')) {
             $args = '-flip vertical';
-        } elseif ($target == 'fh') {
+        }
+        elseif (!strcmp($target, 'fh')) {
             $args = '-flip horizontal';
-        } elseif ($target == 'tr') {
+        }
+        elseif (!strcmp($target, 'tr')) {
             $args = '-transpose';
-        } elseif ($target == 'tv') {
+        }
+        elseif (!strcmp($target, 'tv')) {
             $args = '-transverse';
-        } else {
+        }
+        else {
             $args = '';
         }
 
         $path = $gallery->app->use_jpegtran;
         // -copy all ensures all headers (i.e. EXIF) are copied to the rotated image
         exec_internal(fs_import_filename($path, 1) . " $args -trim -copy all -outfile $outFile $srcFile");
-    } else {
+    }
+    else {
         switch($gallery->app->graphics) {
             case "NetPBM":
+                debugMessage(gTranslate('core', "Using netPBM for rotation"), __FILE__, __LINE__, 3);
                 $args2 = '';
-                if ($target == '-90' || $target = '270') {
+                if (!strcmp($target, '-90')) {
+                    /* NetPBM's docs mix up CW and CCW...
+                    * We'll do it right. */
                     $args = '-r270';
-                } elseif ($target == '180') {
+                }
+                elseif (!strcmp($target, '180')) {
                     $args = '-r180';
-                } elseif ($target == '90') {
+                }
+                elseif (!strcmp($target, '90')) {
                     $args = '-r90';
-                } elseif ($target == 'fv') {
+                }
+                elseif (!strcmp($target, 'fv')) {
                     $args = '-tb';
-                } elseif ($target == 'fh') {
+                }
+                elseif (!strcmp($target, 'fh')) {
                     $args = '-lr';
-                } elseif ($target == 'tr') {
+                }
+                elseif (!strcmp($target, 'tr')) {
                     $args = '-xy';
-                } elseif ($target == 'tv') {
+                }
+                elseif (!strcmp($target, 'tv')) {
                     /* Because of NetPBM inconsistencies, the only
                     * way to do this transformation on *all*
                     * versions of NetPBM is to pipe two separate
@@ -424,7 +467,8 @@
                     * workaround. -Beckett 9/9/2003 */
                     $args = '-xy';
                     $args2 = ' | ' . NetPBM('pnmflip', '-r180');
-                } else {
+                }
+                else {
                     $args = '';
                 }
 
@@ -438,33 +482,46 @@
                     $path = $gallery->app->use_exif;
                     exec_internal(fs_import_filename($path, 1) . " -te $srcFile $outFile");
                 }
-            break;
+
+                break;
+
             case "ImageMagick":
-                if ($target == '-90' || $target = '270') {
+                debugMessage(gTranslate('core', "Using ImageMagick for rotation"), __FILE__, __LINE__, 3);
+                if (!strcmp($target, '-90')) {
+                    $destOperator = '-rotate 90';
+                }
+                elseif (!strcmp($target, '180')) {
+                    $destOperator = '-rotate 180';
+                }
+                elseif (!strcmp($target, '90')) {
                     $destOperator = '-rotate -90';
-                } elseif ($target == '180') {
-                    $destOperator = '-rotate 180';
-                } elseif ($target == '90') {
-                    $destOperator = '-rotate 90';
-                } elseif ($target == 'fv') {
+                }
+                elseif (!strcmp($target, 'fv')) {
                     $destOperator = '-flip';
-                } elseif ($target == 'fh') {
+                }
+                elseif (!strcmp($target, 'fh')) {
                     $destOperator = '-flop';
-                } elseif ($target == 'tr') {
+                }
+                elseif (!strcmp($target, 'tr')) {
                     $destOperator = '-affine 0,1,1,0,0,0 -transform';
-                } elseif ($target == 'tv') {
+                }
+                elseif (!strcmp($target, 'tv')) {
                     $destOperator = '-affine 0,-1,-1,0,0,0 -transform';
-                } else {
+                }
+                else {
                     $destOperator = '';
                 }
 
-                exec_wrapper(ImCmd('convert', '', $srcFile, $destOperator, $outFile));
-            break;
+                $status = exec_wrapper(ImCmd('convert', '', $srcFile, $destOperator, $outFile));
+
+                break;
+
             default:
-                if (isDebugging())
-                echo "<br>". _("You have no graphics package configured for use!") ."<br>";
-                return 0;
-            break;
+                if (isDebugging()) {
+                    echo "<br>". gTranslate('core', "You have no graphics package configured for use!") ."<br>";
+                }
+                return false;
+                break;
         }
     }
 
@@ -473,14 +530,15 @@
             fs_copy($out, $dest);
             fs_unlink($out);
         }
-        return 1;
-    } else {
-        return 0;
+        return true;
     }
+    else {
+        return false;
+    }
 }
 
 function cut_image($src, $dest, $offsetX, $offsetY, $width, $height) {
-    echo debugMessage(_("Cropping Image"),__FILE__, __LINE__);
+    echo debugMessage(gTranslate('core', "Cropping Image"),__FILE__, __LINE__);
     global $gallery;
 
     if (!strcmp($src,$dest)) {
@@ -514,8 +572,8 @@
         break;
         default:
             if (isDebugging()) {
-                echo "<br>" . _("You have no graphics package configured for use!") ."<br>";
-                return 0;
+                echo "<br>" . gTranslate('core', "You have no graphics package configured for use!") ."<br>";
+                return false;
             }
         break;
     }
@@ -532,9 +590,9 @@
             fs_copy($out, $dest);
             fs_unlink($out);
         }
-        return 1;
+        return true;
     } else {
-        return 0;
+        return false;
     }
 }
 
@@ -544,7 +602,7 @@
 
     switch($ratio) {
         case '1/1':
-        debugMessage(sprintf(_("Generating squared Version to %dpx"), $destSize), __FILE__, __LINE__);
+        debugMessage(sprintf(gTranslate('core', "Generating squared Version to %dpx"), $destSize), __FILE__, __LINE__);
 
         if($width > $height && $height > $destSize) {
             $offsetX = round(($width - $height)/2);
@@ -565,7 +623,7 @@
             $size);
         }
         else {
-            debugMessage(_("No Cropping Done"), __FILE__, __LINE__);
+            debugMessage(gTranslate('core', "No Cropping Done"), __FILE__, __LINE__);
             $ret = false;
         }
         break;
@@ -575,11 +633,11 @@
 
 function valid_image($file) {
     if (($type = getimagesize($file)) == FALSE) {
-        debugMessage(sprintf(_("Call to %s failed in %s for file %s!"), 'getimagesize()', 'valid_image()', $file), __FILE__, __LINE__);
+        debugMessage(sprintf(gTranslate('core', "Call to %s failed in %s for file %s!"), 'getimagesize()', 'valid_image()', $file), __FILE__, __LINE__);
         return 0;
     }
 
-    debugMessage(sprintf(_("File %s type %d."), $file, $type[2]), __FILE__, __LINE__);
+    debugMessage(sprintf(gTranslate('core', "File %s type %d."), $file, $type[2]), __FILE__, __LINE__);
 
     switch($type[2]) {
         case 1: // GIF
@@ -616,7 +674,7 @@
     }
     else {
 	echo gallery_error(
-	  sprintf(_("Files with type %s are not supported by Gallery with netPBM"), $type)
+	  sprintf(gTranslate('core', "Files with type %s are not supported by Gallery with netPBM"), $type)
 	);
 	return '';
     }
@@ -640,7 +698,7 @@
 	return "$cmd > " . fs_import_filename($file);
     } else {
 	echo gallery_error(
-	  sprintf(_("Files with type %s are not supported by Gallery with netPBM"),
+	  sprintf(gTranslate('core', "Files with type %s are not supported by Gallery with netPBM"),
 	  getExtension($file))
 	);
 	return '';
@@ -689,13 +747,13 @@
 }
 
 function compressImage($src = '', $dest = '', $targetSize = 0, $quality, $keepProfiles = false, $createThumbnail = false) {
-    debugMessage(sprintf(_("Compressing image: %s"), $src), __FILE__, __LINE__);
+    debugMessage(sprintf(gTranslate('core', "Compressing image: %s"), $src), __FILE__, __LINE__);
     global $gallery;
     static $ImVersion;
 
     if (empty($src) || empty($dest)) {
-        echo gallery_error(_("Not all necessary params for resizing given."));
-        echo debugMessage(sprintf(_("Resizing params: src: %s, dest : %s, targetSize: %s"), $src, $dest, $targetSize), __FILE__, __LINE__);
+        echo gallery_error(gTranslate('core', "Not all necessary params for resizing given."));
+        echo debugMessage(sprintf(gTranslate('core', "Resizing params: src: %s, dest : %s, targetSize: %s"), $src, $dest, $targetSize), __FILE__, __LINE__);
         return false;
     }
 
@@ -738,7 +796,7 @@
                     . $srcFile . ' ' . $destFile);
                     return true;
                 } else {
-                    processingMsg(_('Unable to preserve EXIF data (jhead not installed)') . "\n");
+                    processingMsg(gTranslate('core', 'Unable to preserve EXIF data (jhead not installed)') . "\n");
                     return true;
                 }
             }
@@ -781,11 +839,11 @@
                     }
                     else {
                         if($gallery->app->IM_HQ == 'yes') {
-                            echo debugMessage(_("Using IM high quality"), __FILE__, __LINE__, 3);
+                            echo debugMessage(gTranslate('core', "Using IM high quality"), __FILE__, __LINE__, 3);
                         }
                         else {
                             $srcOperator = "-size ${targetSize}x${targetSize}";
-                            echo debugMessage(_("Not using IM high quality"), __FILE__, __LINE__, 3);
+                            echo debugMessage(gTranslate('core', "Not using IM high quality"), __FILE__, __LINE__, 3);
                         }
                         $destOperator .= " -resize ${targetSize}x${targetSize} $stripProfiles";
                     }
@@ -796,7 +854,7 @@
             return exec_wrapper(ImCmd('convert', $srcOperator, $srcFile, $destOperator, $destFile));
         break;
         default:
-            echo debugMessage(_("You have no graphics package configured for use!"), __FILE__, __LINE__);
+            echo debugMessage(gTranslate('core', "You have no graphics package configured for use!"), __FILE__, __LINE__);
             return false;
         break;
     }

Modified: trunk/gallery/popups/rearrange.php
===================================================================
--- trunk/gallery/popups/rearrange.php	2006-10-27 18:54:39 UTC (rev 14983)
+++ trunk/gallery/popups/rearrange.php	2006-10-27 19:10:31 UTC (rev 14984)
@@ -45,58 +45,61 @@
 doctype();
 
 ?>
+
 <html>
 <head>
-  <title><?php echo $gallery->app->galleryTitle ?> :: <?php echo sprintf (gTranslate('core', "Rearrange Album: %s"),$gallery->album->fields["title"]) ?></title>
+  <title><?php printf(gTranslate('core', "Rearrange items in album: %s"),$gallery->album->fields["title"]); ?></title>
   <?php common_header(); ?>
+  <script type="text/javascript">
 
-<script language="javascript" type="text/javascript">
-var sel = -1, list = new Array();
+  var sel = -1, list = new Array();
 
-function save() {
-  var s = '';
-  for (i=1; i<list.length; i++) {
-    if (i>1) s+=',';
-    s+=list[i];
+  function copy(from, to) {
+      to.src = from.src;
+      to.width = from.width;
+      to.height = from.height;
+      to.style.border = from.style.border;
   }
-  document.forms['rearr_form'].rearrList.value = s;
-  document.forms['rearr_form'].submit();
-}
-function copy(from, to) {
-  to.src = from.src;
-  to.width = from.width;
-  to.height = from.height;
-  to.style.border = from.style.border;
-}
 
-function doclick(idx) {
-  if (sel < 0) {
-    sel=idx;
-    savedFromBorder = document.getElementById('im_'+sel).style.border;
-    document.getElementById('im_'+sel).style.borderStyle='dashed';
-  } else {
-    if (idx != sel) {
-      var sv = new Object()
-      var si; 
-      var dir = (sel<idx)?1:-1;
+  function doclick(idx) {
+      if (sel < 0) {
+          sel = idx;
+          savedFromBorder = document.getElementById('im_'+sel).style.border;
+          document.getElementById('im_'+sel).style.borderStyle='dashed';
+      }
+      else {
+          if (idx != sel) {
+              var sv = new Object()
+              var si;
+              var dir = (sel<idx)?1:-1;
 
-      sv.style = new Object();
+              sv.style = new Object();
 
-      copy(document.getElementById('im_'+sel), sv);
-      si = list[sel];
-      for (i=sel; i!=idx; i+=dir) {
-        copy(document.getElementById('im_'+(i+dir)),
-             document.getElementById('im_'+i));
-        list[i] = list[i+dir];
+              copy(document.getElementById('im_'+sel), sv);
+              si = list[sel];
+              for (i=sel; i!=idx; i+=dir) {
+                  copy(document.getElementById('im_'+(i+dir)),
+                  document.getElementById('im_'+i));
+                  list[i] = list[i+dir];
+              }
+              copy(sv, document.getElementById('im_'+idx));
+              list[idx] = si;
+          }
+          document.getElementById('im_'+idx).style.border = savedFromBorder;
+          sel = -1;
       }
-      copy(sv, document.getElementById('im_'+idx));
-      list[idx] = si;
-    }
-    document.getElementById('im_'+idx).style.border = savedFromBorder;	
-    sel = -1;
   }
-}
-</script>
+  
+  function saveOrder() {
+      var s = '';
+      for (i = 1; i <list.length; i++) {
+          if (i > 1) s+=',';
+          s+=list[i];
+      }
+      document.forms['rearr_form'].rearrList.value = s;
+      document.forms['rearr_form'].submit();
+  }
+  </script>
 </head>
 <body>
 <div class="g-header-popup">
@@ -137,8 +140,8 @@
 $pictureTable->setColumnCount($cols);
 
 $pictureTable->addElement(array(
-    'content' => '<input type="button" onclick="save();return false" value="' . gTranslate('core', "save") .'" class="g-button">'. 
-    '<input type="button" onclick="window.close();return false" value="'. gTranslate('core', "cancel") .'" class="g-button">',
+    'content' => gButton('saveButtonTop', gTranslate('core', "_Save"), 'saveOrder();') .
+                 gButton('cancelButtonTop', gTranslate('core', "_Cancel"), 'window.close();'),
     'cellArgs' => array('colspan' => $cols, 'class' => 'right')));
 
 $list = array();
@@ -157,8 +160,8 @@
 
     $attrs = array(
     	'id' => "im_$i",
-    	'onclick' => "doclick($i)",
-    	'style' => 'padding: 2px; border: '. ($gallery->album->isHidden($i) ? ' red' : ' green')
+    	'onClick' => "doclick($i)",
+    	'style' => 'margin: 1px; padding: 2px; border: '. ($gallery->album->isHidden($i) ? ' red' : ' green')
 	);
 
     if ($gallery->album->isAlbum($i)) {
@@ -167,10 +170,12 @@
         $myAlbum->load($myAlbumName);
         $attrs['style'] .= ' 3px double';
         $tag = $myAlbum->getHighlightTag(0, $attrs);
-    } elseif ($gallery->album->isMovieByIndex($i)) {
+    }
+    elseif ($gallery->album->isMovieByIndex($i)) {
     	$attrs['style'] .= ' 2px dotted';
     	$tag = $gallery->album->getThumbnailTag($i, 0, $attrs);
-    } else {
+    }
+    else {
     	$attrs['style'] .= ' 2px solid';
 		$tag = $gallery->album->getThumbnailTag($i, 0, $attrs);
     }
@@ -181,8 +186,8 @@
 }
 
 $pictureTable->addElement(array(
-    'content' => gButton('save', gTranslate('core', "_Save"), 'save();return false') .
-		 gButton('cancel', gTranslate('core', "_Cancel"), 'window.close();return false'),
+    'content' => gButton('saveButtonBottom', gTranslate('core', "_Save"), 'saveOrder();') .
+		         gButton('cancelButtonBottom', gTranslate('core', "_Cancel"), 'window.close();'),
     'cellArgs' => array('colspan' => $cols, 'class' => 'right')));
 
 echo $pictureTable->render();
@@ -192,7 +197,7 @@
 
 <script language="javascript" type="text/javascript">
 <?php 
-foreach ($list as $key=>$value) { 
+foreach ($list as $key => $value) { 
 	echo "list[".($key+1)."]=$value;\n"; 
 }
 ?>

Modified: trunk/gallery/stats-wizard.php
===================================================================
--- trunk/gallery/stats-wizard.php	2006-10-27 18:54:39 UTC (rev 14983)
+++ trunk/gallery/stats-wizard.php	2006-10-27 19:10:31 UTC (rev 14984)
@@ -58,6 +58,7 @@
     	gTranslate('core',"return to _admin page"),
     	array(), '', true
     );
+    
     $adminbox["commands"] .= galleryLink(
     	makeAlbumUrl(),
     	gTranslate('core',"return to _gallery"),
@@ -82,7 +83,7 @@
 	/* This javascript goes through all elements of the form 'stats_form'
 	** depending if set or not it generates an string that represents the parameters for stats.php
 	*/
-	for(var i=0;i<document.stats_form.length; i++) {
+	for(var i = 0; i < document.stats_form.length; i++) {
 		value = false;
 		/* special case */
 		if ((document.stats_form.elements[i].name == 'cols' || document.stats_form.elements[i].name == 'rows') &&
@@ -119,7 +120,7 @@
 </script>
 
 <?php
-	echo makeFormIntro('stats.php', array('name' => '"stats_form', 'onChange' => 'updateUrl()'));
+	echo makeFormIntro('stats.php', array('name' => 'stats_form', 'onChange' => 'updateUrl()'));
 ?>
 	<table width="100%" class="g-stats-wizard">
 	<tr>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14985
          http://svn.sourceforge.net/gallery/?rev=14985&view=rev
Author:   jenst
Date:     2006-10-27 12:21:05 -0700 (Fri, 27 Oct 2006)

Log Message:
-----------
2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b14

 * New: function toogleButton()

 * New: function toogleBox()

 * Fix: Some phpDoc.

Modified Paths:
--------------
    trunk/gallery/ChangeLog
    trunk/gallery/Version.php
    trunk/gallery/lib/content.php

Modified: trunk/gallery/ChangeLog
===================================================================
--- trunk/gallery/ChangeLog	2006-10-27 19:10:31 UTC (rev 14984)
+++ trunk/gallery/ChangeLog	2006-10-27 19:21:05 UTC (rev 14985)
@@ -1,3 +1,9 @@
+2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b14
+
+ * New: function toogleButton()
+
+ * New: function toogleBox()
+
 2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b13
 
  * Fix: Save did not work in rearrange items.

Modified: trunk/gallery/Version.php
===================================================================
--- trunk/gallery/Version.php	2006-10-27 19:10:31 UTC (rev 14984)
+++ trunk/gallery/Version.php	2006-10-27 19:21:05 UTC (rev 14985)
@@ -22,7 +22,7 @@
 ?>
 <?php
 
-$gallery->version = '1.6-alpha2-svn-b13';
+$gallery->version = '1.6-alpha2-svn-b14';
 $gallery->config_version = 99;
 $gallery->album_version = 38;
 $gallery->user_version = 6;

Modified: trunk/gallery/lib/content.php
===================================================================
--- trunk/gallery/lib/content.php	2006-10-27 19:10:31 UTC (rev 14984)
+++ trunk/gallery/lib/content.php	2006-10-27 19:21:05 UTC (rev 14985)
@@ -456,16 +456,17 @@
     }
 
     if ($withExif && (isset($gallery->app->use_exif) || isset($gallery->app->exiftags)) &&
-      (eregi("jpe?g\$", $photo->image->type))) {
+       (eregi("jpe?g\$", $photo->image->type))) {
         $myExif = $gallery->album->getExif($index, $forceRefresh);
 
-        if (!empty($myExif) && !isset($myExif['Error'])) {
+         if (!empty($myExif) && !isset($myExif['Error'])) {
             $tables[gTranslate('common', "EXIF Data")]  = $myExif;
         }
         elseif (isset($myExif['status']) && $myExif['status'] == 1) {
             echo infoBox(array(array(
-		'text' => gTranslate('common', "Display of EXIF data enabled, but no data found.")
-	    )), '', false);
+                'text' => gTranslate('common', "Display of EXIF data enabled, but no data found.")
+                )), '', false
+            );
         }
     }
 
@@ -638,7 +639,14 @@
     return round($filesize, 2) .'&nbsp;'. $units[$pass];
 }
 
+/**
+ * Generates a HTML page "header" that closes itself and reloads the opener window.
+ */
 function dismissAndReload() {
+    doctype();
+    echo "\n<html>";
+    echo "\n<title>". gTranslate('core', "Operation done, closing window.") . '</title>';
+
     if (isDebugging()) {
         echo "\n<body onLoad='opener.location.reload();'>\n";
         common_header();
@@ -650,6 +658,7 @@
     } else {
         echo "<body onLoad='opener.location.reload(); parent.close()'></body>";
     }
+
     echo "\n</html>";
 }
 
@@ -659,7 +668,16 @@
     echo '</script>';
 }
 
+/**
+ * Generates a HTML page "header" that closes itself and loads a specific url in the opener window.
+ *
+ * @param string $url
+ */
 function dismissAndLoad($url) {
+    doctype();
+    echo "\n<html>";
+    echo "\n<title>". gTranslate('core', "Operation done, closing window.") . '</title>';
+
     if (isDebugging()) {
         echo "<body onLoad='opener.location = \"$url\"; '>";
         common_header();
@@ -673,7 +691,8 @@
                 'text' => gTranslate('common', "Not closing this window because debug mode is on.")
             )
         ));
-    } else {
+    }
+    else {
         echo("<body onLoad='opener.location = \"$url\"; parent.close()'>");
     }
 }
@@ -1460,4 +1479,46 @@
 
     return $html;
 }
+
+/**
+ * Creates a toggle Button. Button calls Javascript function gallery_toggle()
+ * This needs to be loaded separately.
+ *
+ * @param string $id
+ * @return string   The HTML code.
+ * @author Jens Tkotz <jens@...>
+ */
+function toogleButton($id) {
+    $html = "<a href=\"#\" style=\"outline: none;\" onClick=\"gallery_toggle('$id'); return false;\">" .
+            gImage('expand.gif', gTranslate('config', "Show/hide more information"), array('id' => "toogleBut_$id")) .
+            '</a> ';
+
+    return $html;
+
+}
+/**
+ * Creates a toggle Box. Optionally a toggle Button is added before, or after.
+ *
+ * @param string $id
+ * @param string $text
+ * @param string $toogleButton  Can be 'append', 'prepend', if something else, no toggle Button shows up.
+ * @return string   The HTML code.
+ * @author Jens Tkotz <jens@...>
+ */
+function toogleBox($id, $text, $toogleButton = 'prepend') {
+    $html = "\n<div id=\"toogleFrame_$id\" style=\"display:none;\">$text\n</div>";
+
+    if ($toogleButton == 'prepend') {
+        $html = toogleButton($id) . $html;
+    }
+
+    if ($toogleButton == 'append') {
+        $html .= toogleButton($id);
+    }
+
+    $html = '<br>' . $html;
+
+    return $html;
+
+}
 ?>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14986
          http://svn.sourceforge.net/gallery/?rev=14986&view=rev
Author:   jenst
Date:     2006-10-27 12:29:51 -0700 (Fri, 27 Oct 2006)

Log Message:
-----------
2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b15

 * New: function generateCaption()

 * New: function getLabelByIndex()

 * Change: Use label for feature block.
           Now you can feature any type of item.

Modified Paths:
--------------
    trunk/gallery/ChangeLog
    trunk/gallery/Version.php
    trunk/gallery/block-feature-photo.php
    trunk/gallery/lib/albumItem.php
    trunk/gallery/popups/featured-photo.php

Modified: trunk/gallery/ChangeLog
===================================================================
--- trunk/gallery/ChangeLog	2006-10-27 19:21:05 UTC (rev 14985)
+++ trunk/gallery/ChangeLog	2006-10-27 19:29:51 UTC (rev 14986)
@@ -1,3 +1,12 @@
+2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b15
+
+ * New: function generateCaption()
+
+ * New: function getLabelByIndex()
+
+ * Change: Use label for feature block.
+	   Now you can feature any type of item.
+
 2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b14
 
  * New: function toogleButton()

Modified: trunk/gallery/Version.php
===================================================================
--- trunk/gallery/Version.php	2006-10-27 19:21:05 UTC (rev 14985)
+++ trunk/gallery/Version.php	2006-10-27 19:29:51 UTC (rev 14986)
@@ -22,7 +22,7 @@
 ?>
 <?php
 
-$gallery->version = '1.6-alpha2-svn-b14';
+$gallery->version = '1.6-alpha2-svn-b15';
 $gallery->config_version = 99;
 $gallery->album_version = 38;
 $gallery->user_version = 6;

Modified: trunk/gallery/block-feature-photo.php
===================================================================
--- trunk/gallery/block-feature-photo.php	2006-10-27 19:21:05 UTC (rev 14985)
+++ trunk/gallery/block-feature-photo.php	2006-10-27 19:29:51 UTC (rev 14986)
@@ -103,7 +103,7 @@
 else {
     echo infoBox(array(array(
         'type' => 'information',
-        'text' => gTranslate('core', "Currently is no photo featured by this Gallery.")
+        'text' => gTranslate('core', "Currently no item is featured by this Gallery.")
     )));
 }
 

Modified: trunk/gallery/lib/albumItem.php
===================================================================
--- trunk/gallery/lib/albumItem.php	2006-10-27 19:21:05 UTC (rev 14985)
+++ trunk/gallery/lib/albumItem.php	2006-10-27 19:29:51 UTC (rev 14986)
@@ -83,7 +83,8 @@
     elseif ($gallery->album->isMovieByIndex($i)) {
     	$label = gTranslate('core', "Movie");
     	$isMovie = true;
-    } else {
+    }
+    else {
     	$label = gTranslate('core', "Photo");
 		$isPhoto = true;
     }
@@ -229,7 +230,7 @@
             'icon' => ($withIcons) ? 'yast_kuser.gif' : ''
         );
         $options[] = array(
-            'text' => _('Feature Photo'),
+            'text' => sprintf(gTranslate('core', "Feature %s"), $label),
             'value' => showChoice2('featured-photo.php',
                             array(
                                 'set' => 1,
@@ -246,7 +247,8 @@
 	    		'value' => showChoice2("do_command.php", array("cmd" => "show", "index" => $i)),
 	    		'icon' => ($withIcons) ? 'idea.gif' : ''
     		);
-    	} else {
+    	}
+    	else {
     		$options[] = array(
 	    		'text' => gTranslate('core', "_Hide"),
 	    		'value' => showChoice2("do_command.php", array("cmd" => "hide", "index" => $i)),
@@ -318,7 +320,7 @@
 }
 
 /**
- * Enter description here...
+ * Returns a HTML with all comments of an album item.
  *
  * @param integer   $index      itemindex
  * @param string    $albumName  Name of the album containing the item
@@ -404,12 +406,88 @@
 
     if ($current < sizeof($allIds)-1) {
         $nextId = $allIds[$current+1];
-    } elseif ($current > 0) {
+    }
+    elseif ($current > 0) {
         $nextId = $allIds[$current-1];
-    } else {
+    }
+    else {
         $nextId = $currentId;
     }
 
     return $nextId;
 }
+
+/**
+ * What should the caption be, if no caption was given by user ?
+ * See captionOptions.inc.php for options
+ *
+ * @param intger    $captionType
+ * @param string    $originalFilename
+ * @param string    $filename
+ * @return string   $caption
+ * @author Jens Tkotz <jens@...>
+ */
+function generateCaption($captionType = 1, $originalFilename, $filename) {
+    global $gallery;
+
+    if (isset($gallery->app->dateTimeString)) {
+        $dateTimeFormat = $gallery->app->dateTimeString;
+    }
+    else {
+        $dateTimeFormat = "%D %T";
+    }
+
+    switch ($captionType) {
+        case 0:
+            $caption = '';
+            $captionTypeString = 'no caption';
+            break;
+
+        case 1:
+        default:
+            /* Use filename */
+            $caption = strtr($originalFilename, '_', ' ');
+            $captionTypeString = 'filename';
+            break;
+
+        case 2:
+            /* Use file creation date */
+            $caption = strftime($dateTimeFormat, filectime($filename));
+            $captionTypeString = 'file creation date';
+            break;
+
+        case 3:
+            /* Use capture date */
+            $caption = strftime($dateTimeFormat, getItemCaptureDate($filename));
+            $captionTypeString = 'file capture date';
+            break;
+    }
+
+    echo debugMessage(sprintf(gTranslate('core', "Generating caption. Type: %s"), $captionTypeString), __FILE__, __LINE__, 3);
+
+    return $caption;
+}
+
+/**
+ * Returns the label (photo, movie, or album) of an album item.
+ *
+ * @param integer   $index
+ * @return string   $label
+ * @author Jens Tkotz <jens@...>
+ */
+function getLabelByIndex($index) {
+    global $gallery;
+
+    if ($gallery->album->isAlbum($index)) {
+        $label = gTranslate('core', "Album");
+    }
+    elseif ($gallery->album->isMovieByIndex($index)) {
+        $label = gTranslate('core', "Movie");
+    }
+    else {
+        $label = gTranslate('core', "Photo");
+    }
+
+    return $label;
+}
 ?>

Modified: trunk/gallery/popups/featured-photo.php
===================================================================
--- trunk/gallery/popups/featured-photo.php	2006-10-27 19:21:05 UTC (rev 14985)
+++ trunk/gallery/popups/featured-photo.php	2006-10-27 19:29:51 UTC (rev 14986)
@@ -35,14 +35,16 @@
 
 if (!empty($set)) {
     if (!$gallery->user->isAdmin()) {
-    	echo gTranslate('core', "You are not allowed to perform this action!");
-    	exit;
+        echo gTranslate('core', "You are not allowed to perform this action!");
+        exit;
     }
+    
+    if ($gallery->session->albumName && $index) {
+        $label = getLabelByIndex($index);
 
-    printPopupStart(gTranslate('core', "Featured Photo"));
+        printPopupStart(sprintf(gTranslate('core', "Featured %s"), $label));
 
-    if ($gallery->session->albumName && $index) {
-	   echo "<p>". $gallery->album->getThumbnailTag($index) ."</p>";
+        echo "<p>". $gallery->album->getThumbnailTag($index) ."</p>";
 
         if ($fd = @fs_fopen(FEATURE_CACHE, 'w')) {
             fwrite($fd, $gallery->session->albumName . "/$index");
@@ -50,7 +52,7 @@
 
             $notice_messages[] = array(
                 'type' => 'success',
-                'text' => gTranslate('core', "New featured photo saved.")
+                'text' => sprintf(gTranslate('core', "New featured %s saved."), $label)
             );
         }
         else {
@@ -64,6 +66,8 @@
         }
     }
     else {
+        printPopupStart(gTranslate('core', "Featured item"), $label);
+        
         $notice_messages[] = array(
                 'type' => 'error',
                 'text' => gTranslate('core', "Invalid Parameters.")


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14987
          http://svn.sourceforge.net/gallery/?rev=14987&view=rev
Author:   jenst
Date:     2006-10-27 12:32:55 -0700 (Fri, 27 Oct 2006)

Log Message:
-----------
2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b16

 * Change: After saving the album properties,
           the tab which was last edited is still selected.

Modified Paths:
--------------
    trunk/gallery/ChangeLog
    trunk/gallery/Version.php
    trunk/gallery/lib/Form.php
    trunk/gallery/popups/view_photo_properties.php

Modified: trunk/gallery/ChangeLog
===================================================================
--- trunk/gallery/ChangeLog	2006-10-27 19:29:51 UTC (rev 14986)
+++ trunk/gallery/ChangeLog	2006-10-27 19:32:55 UTC (rev 14987)
@@ -1,3 +1,8 @@
+2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b16
+
+ * Change: After saving the album properties,
+	   the tab which was last edited is still selected.
+
 2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b15
 
  * New: function generateCaption()

Modified: trunk/gallery/Version.php
===================================================================
--- trunk/gallery/Version.php	2006-10-27 19:29:51 UTC (rev 14986)
+++ trunk/gallery/Version.php	2006-10-27 19:32:55 UTC (rev 14987)
@@ -22,7 +22,7 @@
 ?>
 <?php
 
-$gallery->version = '1.6-alpha2-svn-b15';
+$gallery->version = '1.6-alpha2-svn-b16';
 $gallery->config_version = 99;
 $gallery->album_version = 38;
 $gallery->user_version = 6;

Modified: trunk/gallery/lib/Form.php
===================================================================
--- trunk/gallery/lib/Form.php	2006-10-27 19:29:51 UTC (rev 14986)
+++ trunk/gallery/lib/Form.php	2006-10-27 19:32:55 UTC (rev 14987)
@@ -201,7 +201,7 @@
             continue;
         }
         list($key, $val) = split("=", $arg);
-        $form .= "<input type=\"hidden\" name=\"$key\" value=\"$val\">\n";
+        $form .= "<input type=\"hidden\" id=\"$key\" name=\"$key\" value=\"$val\">\n";
     }
 
     return $form;

Modified: trunk/gallery/popups/view_photo_properties.php
===================================================================
--- trunk/gallery/popups/view_photo_properties.php	2006-10-27 19:29:51 UTC (rev 14986)
+++ trunk/gallery/popups/view_photo_properties.php	2006-10-27 19:32:55 UTC (rev 14987)
@@ -104,16 +104,18 @@
         echo '<div style="padding: 2px;">';
         echo galleryLink(
             makeGalleryUrl("view_photo_properties.php",
-                    array("reloadExifFromFile" => 1,
-                        "set_albumName" => $gallery->session->albumName,
-                        "index" => $index,
-                        'type' => 'popup')),
-	    gTranslate('core', "Reload EXIF Data From File")
-	);
+                array(
+                    'reloadExifFromFile' => 1,
+                    'set_albumName' => $gallery->session->albumName,
+                    'index' => $index,
+                    'type' => 'popup')),
+            gTranslate('core', "Reload EXIF Data From File")
+        );
         echo "<br>";
         echo gTranslate('core', "(if the data is current, this will not appear to do anything)");
     }
-} else {
+}
+else {
     echo gallery_error(gTranslate('core', "no album / index specified"));
 }
 ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14988
          http://svn.sourceforge.net/gallery/?rev=14988&view=rev
Author:   jenst
Date:     2006-10-27 12:36:53 -0700 (Fri, 27 Oct 2006)

Log Message:
-----------
2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b17

 * Fix: Added 2 missing files to $safe_to_include list.

   Thanks to Kai Tomalik.

Modified Paths:
--------------
    trunk/gallery/ChangeLog
    trunk/gallery/Version.php
    trunk/gallery/index.php

Modified: trunk/gallery/ChangeLog
===================================================================
--- trunk/gallery/ChangeLog	2006-10-27 19:32:55 UTC (rev 14987)
+++ trunk/gallery/ChangeLog	2006-10-27 19:36:53 UTC (rev 14988)
@@ -1,3 +1,9 @@
+2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b17
+
+ * Fix: Added 2 missing files to $safe_to_include list.
+
+   Thanks to Kai Tomalik.
+
 2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b16
 
  * Change: After saving the album properties,

Modified: trunk/gallery/Version.php
===================================================================
--- trunk/gallery/Version.php	2006-10-27 19:32:55 UTC (rev 14987)
+++ trunk/gallery/Version.php	2006-10-27 19:36:53 UTC (rev 14988)
@@ -22,7 +22,7 @@
 ?>
 <?php
 
-$gallery->version = '1.6-alpha2-svn-b16';
+$gallery->version = '1.6-alpha2-svn-b17';
 $gallery->config_version = 99;
 $gallery->album_version = 38;
 $gallery->user_version = 6;

Modified: trunk/gallery/index.php
===================================================================
--- trunk/gallery/index.php	2006-10-27 19:32:55 UTC (rev 14987)
+++ trunk/gallery/index.php	2006-10-27 19:36:53 UTC (rev 14988)
@@ -107,7 +107,8 @@
 	$safe_to_include = array(
 		       "admin-page.php",
 		       "albums.php",
-		       "block-random.php",
+	'block-random.php',
+	'block-feature-photo.php',
 		       "captionator.php",
 		       "create_user.php",
 		       "delete_user.php",
@@ -124,7 +125,7 @@
 		       "multi_create_user.php",
 		       "poll_properties.php",
 		       "poll_results.php",
-		       'popups/add_comment.php',
+        'popups/add_comment.php',
         'popups/add_photos.php',
         'popups/add_photos_frame.php',
         'popups/administer_startpage.php',
@@ -153,7 +154,7 @@
         'popups/save_photos.php',
         'popups/sort_album.php',
         'popups/view_photo_properties.php',
-		       "progress_uploading.php",
+        'popups/progress_uploading.php',
 		       "publish_xp.php",
 		       "publish_xp_docs.php",
 		       "register.php",


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14989
          http://svn.sourceforge.net/gallery/?rev=14989&view=rev
Author:   jenst
Date:     2006-10-27 12:49:59 -0700 (Fri, 27 Oct 2006)

Log Message:
-----------
2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b18

 * New: Added field initialized to Gallery UserDB.
        Set if the UserDB was successfully initialized.

 * New: userDB->isInitialized()

 * Change: Much more detailed infos about userdir failures.

 * Change: Check for userDB initialization in init.php,
           don't do the automatic user upgrade.

Modified Paths:
--------------
    trunk/gallery/ChangeLog
    trunk/gallery/Version.php
    trunk/gallery/classes/UserDB.php
    trunk/gallery/classes/gallery/UserDB.php
    trunk/gallery/init.php

Modified: trunk/gallery/ChangeLog
===================================================================
--- trunk/gallery/ChangeLog	2006-10-27 19:36:53 UTC (rev 14988)
+++ trunk/gallery/ChangeLog	2006-10-27 19:49:59 UTC (rev 14989)
@@ -1,3 +1,15 @@
+2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b18
+
+ * New: Added field initialized to Gallery UserDB.
+	Set if the UserDB was successfully initialized.
+
+ * New: userDB->isInitialized()
+
+ * Change: Much more detailed infos about userdir failures.
+
+ * Change: Check for userDB initialization in init.php,
+	   don't do the automatic user upgrade.
+
 2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b17
 
  * Fix: Added 2 missing files to $safe_to_include list.

Modified: trunk/gallery/Version.php
===================================================================
--- trunk/gallery/Version.php	2006-10-27 19:36:53 UTC (rev 14988)
+++ trunk/gallery/Version.php	2006-10-27 19:49:59 UTC (rev 14989)
@@ -22,7 +22,7 @@
 ?>
 <?php
 
-$gallery->version = '1.6-alpha2-svn-b17';
+$gallery->version = '1.6-alpha2-svn-b18';
 $gallery->config_version = 99;
 $gallery->album_version = 38;
 $gallery->user_version = 6;

Modified: trunk/gallery/classes/UserDB.php
===================================================================
--- trunk/gallery/classes/UserDB.php	2006-10-27 19:36:53 UTC (rev 14988)
+++ trunk/gallery/classes/UserDB.php	2006-10-27 19:49:59 UTC (rev 14989)
@@ -2,17 +2,17 @@
 /*
  * Gallery - a web based photo album viewer and editor
  * Copyright (C) 2000-2006 Bharat Mediratta
- * 
+ *
  * This program is free software; 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.
- * 
+ *
  * This program 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 this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
@@ -23,17 +23,17 @@
 <?php
 class Abstract_UserDB {
 
-	/* By default, UserDB can't create a user */	
+	/* By default, UserDB can't create a user */
 	function canCreateUser() {
 		return false;
 	}
 
-	/* By default, UserDB can't modify a user */	
+	/* By default, UserDB can't modify a user */
 	function canModifyUser() {
 		return false;
 	}
 
-	/* By default, UserDB can't delete a user */	
+	/* By default, UserDB can't delete a user */
 	function canDeleteUser() {
 		return false;
 	}
@@ -78,5 +78,16 @@
 	function convertUidToNewFormat($uid) {
 	        return $uid;
 	}
+
+	/**
+	 * Returns wether the UserDB was succesfully initialized or not.
+	 * Is currently only used for standalone Gallery UserDB.
+	 *
+	 * @return boolean     true if succesfully initialized.
+	 * @author Jens Tkotz <jens@...>
+	 */
+	function isInitialized() {
+        return true;
+	}
 }
 ?>

Modified: trunk/gallery/classes/gallery/UserDB.php
===================================================================
--- trunk/gallery/classes/gallery/UserDB.php	2006-10-27 19:36:53 UTC (rev 14988)
+++ trunk/gallery/classes/gallery/UserDB.php	2006-10-27 19:49:59 UTC (rev 14989)
@@ -27,10 +27,13 @@
 	var $everybody;
 	var $loggedIn;
 	var $version;
+	var $initialized;
 
 	function Gallery_UserDB() {
 		global $gallery;
 		
+		$this->initialized = false;
+		
 		if(empty($gallery->app->userDir)) {
             echo infoBox(array(array(
                 'type' => 'error',
@@ -50,11 +53,25 @@
 		$this->userMap = array();
 
 		if (!fs_file_exists($userDir)) {
-			if (!mkdir($userDir, 0777)) {
-				echo gallery_error(gTranslate('core', "Unable to create dir") .": $userDir");
-				return;
+		    if(isDebugging()) {
+    		    echo infoBox(array(array(
+                    'type' => 'warning',
+                    'text' => sprintf("The Diretory for storing the user information (%s) is defined but does not exits. Trying to create it ...",
+                        $userDir)
+                )));
+		    }
+
+            if (!@mkdir($userDir, 0777)) {
+			    echo infoBox(array(array(
+                    'type' => 'error',
+                    'text' => sprintf("Gallery is unable to use/create the userdir. Please check the path to the albums folder and userdir in your config.php. You can't use the config wizard, as Gallery can't verify your useraccount.",
+                        '<a href="'. makeGalleryUrl('setup/') .'">', '</a>')
+                )));
+                
+				return false;
 			}
-		} else {
+		}
+		else {
 			if (!fs_is_dir($userDir)) {
 				echo gallery_error(sprintf(gTranslate('core', "%s exists, but is not a directory!"),
 							$userDir));
@@ -67,7 +84,8 @@
 				$fd = fs_fopen("$userDir/.htaccess", "w");
 				fwrite($fd, "Order deny,allow\nDeny from all\n");
 				fclose($fd);
-			} else {
+			}
+			else {
 				echo gallery_error(sprintf(gTranslate('core', "The folder folder which contains your user information (%s) is not writable for the webserver."),
 								$userDir));
 				exit;
@@ -104,8 +122,21 @@
 		if (!$this->loggedIn) {
 			$this->loggedIn = new LoggedInUser();
 		}
+		
+		$this->initialized = true;
 	}
 
+	
+	/**
+	 * Returns wether the UserDB was succesfully initialized or not
+	 *
+	 * @return boolean     true if succesfully initialized.
+	 * @author Jens Tkotz <jens@...>
+	 */
+	function isInitialized() {
+        return $this->initialized === true;
+	}
+	
 	function canCreateUser() {
 		return true;
 	}
@@ -132,9 +163,11 @@
 
 		if (!strcmp($username, $this->nobody->getUsername())) {
 			return $this->nobody;
-		} else if (!strcmp($username, $this->everybody->getUsername())) {
+		}
+		else if (!strcmp($username, $this->everybody->getUsername())) {
 			return $this->everybody;
-		} else if (!strcmp($username, $this->loggedIn->getUsername())) {
+		}
+		else if (!strcmp($username, $this->loggedIn->getUsername())) {
 			return $this->loggedIn;
 		}
 
@@ -142,13 +175,16 @@
 			$this->rebuildUserMap();
 			if (!isset($this->userMap[$username])) {
 				return;
-			} else {
+			}
+			else {
 				$uid = $this->userMap[$username];
 			}
-		} else {
+		}
+		else {
 			$uid = $this->userMap[$username];
 
 		}
+		
 		$uid = $this->convertUidToNewFormat($uid);
 		$user = $this->getUserByUid($uid);
 		if (!$user || strcmp($user->getUsername(), $username)) {
@@ -157,7 +193,8 @@
 			// this means our map is out of date.
 			$this->rebuildUserMap();
 			return $this->getUserByUsername($username, ++$level);
-		} else {
+		}
+		else {
 			return $user;
 		}
 
@@ -169,9 +206,11 @@
 
 		if (!$uid || !strcmp($uid, $this->nobody->getUid())) {
 			return $this->nobody;
-		} else if (!strcmp($uid, $this->everybody->getUid())) {
+		}
+		else if (!strcmp($uid, $this->everybody->getUid())) {
 			return $this->everybody;
-		} else if (!strcmp($uid, $this->loggedIn->getUid())) {
+		}
+		else if (!strcmp($uid, $this->loggedIn->getUid())) {
 			return $this->loggedIn;
 		}
 
@@ -180,9 +219,11 @@
 
 		if (fs_file_exists("$userDir/$uidNew")) {
 			$user->load($uidNew);
-		} else if ($tryOldFormat && fs_file_exists("$userDir/$uid")) {
+		}
+		else if ($tryOldFormat && fs_file_exists("$userDir/$uid")) {
 			$user->load($uid);
-		} else {
+		}
+		else {
 			$user = $this->nobody;
 		}
 
@@ -245,6 +286,7 @@
 
 		return safe_serialize($this, "$userDir/userdb.dat");
 	}
+	
 	function save() {
 		global $gallery;
 		$userDir = $gallery->app->userDir;
@@ -285,6 +327,7 @@
 		array_push($uidList, $this->loggedIn->getUid());
 
 		sort($uidList);
+		
 		return $uidList;
 	}
 
@@ -339,13 +382,20 @@
 		return null;
 	}
 
+	/**
+	 * Checks wether the UserDB is out of Date.
+	 *
+	 * @return boolean     true if out of Date.
+	 */
 	function versionOutOfDate() {
 		global $gallery;
+		
 		if (strcmp($this->version, $gallery->user_version)) {
-			return 1;
+			return true;
 		}
-		return 0;
+		return false;
 	}
+	
 	function integrityCheck() {
 		global $gallery;
 

Modified: trunk/gallery/init.php
===================================================================
--- trunk/gallery/init.php	2006-10-27 19:36:53 UTC (rev 14988)
+++ trunk/gallery/init.php	2006-10-27 19:49:59 UTC (rev 14989)
@@ -439,7 +439,9 @@
             $results = $db->query('SELECT id FROM ' . $gallery->database{'user_prefix'} . "menu WHERE componentid='$componentId' AND type = 'components' AND published = 1");
             $row = $db->fetch_row($results);
             $MOS_GALLERY_PARAMS['itemid'] = $row[0]; // pick the first one
+
             break;
+
         case 'GeekLog':
             // Cheat, and grab USER information from the global session variables.
             // Hey, it's faster and easier than reading them out of the database.
@@ -466,7 +468,9 @@
             if (isset($gallery->session->username)) {
                 $gallery->user = $gallery->userDB->getUserByUsername($gallery->session->username);
             }
+
             break;
+
         case 'cpgnuke':
             /* we're in CPG-Nuke */
             include_once(dirname(__FILE__) . "/classes/Database.php");
@@ -475,10 +479,10 @@
             include_once(dirname(__FILE__) . "/classes/nsnnuke/User.php");
 
             $gallery->database{"cpgnuke"} = new MySQL_Database(
-            $GLOBALS['dbhost'],
-            $GLOBALS['dbuname'],
-            $GLOBALS['dbpass'],
-            $GLOBALS['dbname']);
+                $GLOBALS['dbhost'],
+                $GLOBALS['dbuname'],
+                $GLOBALS['dbpass'],
+                $GLOBALS['dbname']);
 
             if (isset($GLOBALS['user_prefix'])) {
                 $gallery->database{"user_prefix"} = $GLOBALS['prefix'] . '_';
@@ -490,8 +494,7 @@
             $gallery->database{"admin_prefix"} = $GLOBALS['prefix'] . 'b_';
 
             /* Select the appropriate field names */
-            $gallery->database{'fields'} =
-            array (
+            $gallery->database{'fields'} = array (
                 'name'  => 'name',
                 'uname' => 'username',
                 'email' => 'user_email',
@@ -529,8 +532,11 @@
 
 /* If there's no specific user, they are the special Everybody user */
 if (!isset($gallery->user) || empty($gallery->user)) {
-    if (empty($gallery->userDB)) {
-        exit("Fatal error: UserDB failed to initialize!");
+    if (!$gallery->userDB->isInitialized()) {
+        echo infoBox(array(array(
+                'type' => 'error',
+                'text' => "Fatal error: UserDB failed to initialize!"
+            )));
     }
     $gallery->user = $gallery->userDB->getEverybody();
     $gallery->session->username = "";
@@ -545,7 +551,7 @@
     $gallery->session->offline = FALSE;
 }
 
-if ($gallery->userDB->versionOutOfDate()) {
+if ($gallery->userDB->isInitialized() && $gallery->userDB->versionOutOfDate()) {
     include_once(dirname(__FILE__) . "/upgrade_users.php");
     exit;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14992
          http://svn.sourceforge.net/gallery/?rev=14992&view=rev
Author:   jenst
Date:     2006-10-28 08:10:22 -0700 (Sat, 28 Oct 2006)

Log Message:
-----------
German update.

Modified Paths:
--------------
    trunk/gallery/locale/de_DE/LC_MESSAGES/de_DE-gallery_common.mo
    trunk/gallery/locale/de_DE/LC_MESSAGES/de_DE-gallery_config.mo
    trunk/gallery/locale/de_DE/LC_MESSAGES/de_DE-gallery_core.mo
    trunk/gallery/locale/de_DE/de_DE-gallery_common.po
    trunk/gallery/locale/de_DE/de_DE-gallery_config.po
    trunk/gallery/locale/de_DE/de_DE-gallery_core.po
    trunk/gallery/po/gallery-common.pot
    trunk/gallery/po/gallery-config.pot
    trunk/gallery/po/gallery-core.pot

Modified: trunk/gallery/locale/de_DE/LC_MESSAGES/de_DE-gallery_common.mo
===================================================================
(Binary files differ)

Modified: trunk/gallery/locale/de_DE/LC_MESSAGES/de_DE-gallery_config.mo
===================================================================
--- trunk/gallery/locale/de_DE/LC_MESSAGES/de_DE-gallery_config.mo	2006-10-28 14:01:45 UTC (rev 14991)
+++ trunk/gallery/locale/de_DE/LC_MESSAGES/de_DE-gallery_config.mo	2006-10-28 15:10:22 UTC (rev 14992)
@@ -1,60 +1,71 @@
-\xDE\x95

Revision: 14993
          http://svn.sourceforge.net/gallery/?rev=14993&view=rev
Author:   jenst
Date:     2006-10-28 08:42:59 -0700 (Sat, 28 Oct 2006)

Log Message:
-----------
2006-10-28 Jens Tkotz <jens@...> 1.6-alpha2-svn-b19

 * CHANGE: Removed Js function localGetElementsByTagName() and
           nnGetAllLayers().
           So the config wizard does NOT WORK IN Netscape 4 anymore !

 * Change: Again nicifying in config wizard.
           Putted longer messages in step 1 into a toggle Box.

 * Change: Typo toogle -> toggle 
           (Is there something well known with *oogle ?)

 * Fix: typo in step 1, "nogo" is no type for infoBoxes.

 * Change: indenting and " to ' convertion.

 * Change: Use of galleryTable() in step 1, along with css adjustment.

 * Removed: css/config.css.default

Modified Paths:
--------------
    trunk/gallery/ChangeLog
    trunk/gallery/Version.php
    trunk/gallery/css/base.css.default
    trunk/gallery/css/screen.css.default
    trunk/gallery/includes/setup/checks.inc
    trunk/gallery/js/toggle.js
    trunk/gallery/lib/content.php
    trunk/gallery/lib/setup.php
    trunk/gallery/setup/check.inc
    trunk/gallery/setup/check_versions.php
    trunk/gallery/setup/index.php

Removed Paths:
-------------
    trunk/gallery/css/config.css.default

Modified: trunk/gallery/ChangeLog
===================================================================
--- trunk/gallery/ChangeLog	2006-10-28 15:10:22 UTC (rev 14992)
+++ trunk/gallery/ChangeLog	2006-10-28 15:42:59 UTC (rev 14993)
@@ -1,3 +1,22 @@
+2006-10-28 Jens Tkotz <jens@...> 1.6-alpha2-svn-b19
+
+ * CHANGE: Removed Js function localGetElementsByTagName() and
+	   nnGetAllLayers.
+	   So the config wizard does NOT WORK IN Netscape 4 anymore !
+
+ * Change: Again nicifying in config wizard.
+	   Putted longer messages in step 1 into a toggle Box.
+
+ * Change: Typo toogle -> toggle (Is there something well known with *oogle ?).
+
+ * Fix: typo in step 1, "nogo" is no type for infoBoxes.
+
+ * Change: indenting and " to ' convertion.
+
+ * Change: Use of galleryTable() in step 1, along with css adjustment.
+
+ * Removed: css/config.css.default
+
 2006-10-27 Jens Tkotz <jens@...> 1.6-alpha2-svn-b18
 
  * New: Added field initialized to Gallery UserDB.

Modified: trunk/gallery/Version.php
===================================================================
--- trunk/gallery/Version.php	2006-10-28 15:10:22 UTC (rev 14992)
+++ trunk/gallery/Version.php	2006-10-28 15:42:59 UTC (rev 14993)
@@ -22,7 +22,7 @@
 ?>
 <?php
 
-$gallery->version = '1.6-alpha2-svn-b18';
+$gallery->version = '1.6-alpha2-svn-b19';
 $gallery->config_version = 99;
 $gallery->album_version = 38;
 $gallery->user_version = 6;

Modified: trunk/gallery/css/base.css.default
===================================================================
--- trunk/gallery/css/base.css.default	2006-10-28 15:10:22 UTC (rev 14992)
+++ trunk/gallery/css/base.css.default	2006-10-28 15:42:59 UTC (rev 14993)
@@ -388,6 +388,8 @@
 
 /******************** End autocomplete *********************/
 
+/***************** Styles used in config *******************/
+
 .g-setup-block, .g-setup-fields {
     width: 100%;
     margin-bottom: 10px;
@@ -400,6 +402,28 @@
     padding: 10px !important;
 }
 
+.g-setupchecks td {
+    border-bottom: 2px solid #ececec;
+    vertical-align: top;
+}
+
+.g-setup-check-desc {
+    width: 35%;
+    font-weight: bold;
+}
+
+.g-setup-check-desc div {
+    font-weight: normal;
+}
+
+.g-setup-check-toggle {
+    border-right: 2px solid #ececec;
+}
+
+.g-setup-check-trafficlight {
+    border-right: 2px solid #ececec;
+}
+
 .g-sitedesc td {
     vertical-align: top;
 }
@@ -489,4 +513,16 @@
     -moz-border-radius: 8px;
 }
 
-/******************** End infoBox ********************/
\ No newline at end of file
+/******************** End infoBox ********************/
+
+.progressBar {
+    width: 100%;
+    background: red;
+    height: 10px;
+}
+
+.progressBarDone {
+    width: 0%;
+    background: green;
+    height: 10px;
+}
\ No newline at end of file

Deleted: trunk/gallery/css/config.css.default
===================================================================
--- trunk/gallery/css/config.css.default	2006-10-28 15:10:22 UTC (rev 14992)
+++ trunk/gallery/css/config.css.default	2006-10-28 15:42:59 UTC (rev 14993)
@@ -1,152 +0,0 @@
-/*
-  $Id$
- 
-  Gallery - a web based photo album viewer and editor
-  Copyright (C) 2000-2006 Bharat Mediratta
- 
-  This program is free software; 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.
- 
-  This program 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 this program; if not, write to the Free Software
-  Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
-
-*/ 
-
-body { 
-    margin-top: 10px; margin-left: 20px; margin-right: 20px;
-    color: #000000;
-    background-image: url(../images/simplex-bkg.gif);
-}
-
-.header {
-    background-color: #E6E6DC;
-    font-size: 1.5em; font-weight:bold;
-    padding: 10px;
-    border: 1px solid #000000;
-}
-
-.sitedesc {
-    background-color: #FCFCF3;
-    margin-top:5px; padding:5px;
-    border: 1px solid #000000;
-}
-
-textarea:focus, input:focus {
-    background-color: #FFFFDA;
-}
-
-img {
-    border: none;
-}
-
-p#bottom	{ width: 500px; }
-
-div#top {
-    width: 200px;
-    text-align:center;
-}
-
-.error		{ font-weight:bold; background-color: #CC0000; color: #FFFFFF ;
-		  padding:2px;
-		}
-
-.errorpct	{ font-weight:bold; background-color: #CC0000; color: #FFFFFF ;
-		  padding:2px;
-		}
-
-.errorlong	{ font-weight:bold; background-color: #CC0000; color: #FFFFFF ;
-		  padding:2px; width: 100%; padding-left:10px;
-		}
-
-.success        { font-weight:bold; background-color: green; color: #FFFFFF ;
-		  width: 150px; padding:2px; 
-		}
-
-.successpct	{ font-weight:bold; background-color: green; color: #FFFFFF ;
-		  padding:2px;
-		}
-
-.successlong    { font-weight:bold; background-color: green; color: #FFFFFF ;
-		  width: 100%; padding:2px; padding-left:10px;
-		}
-
-
-.warning        { font-weight:bold; background-color: #FFFF33; color: #000000 ;
-		  width: 150px; padding:2px; 
-		}
-
-.warninglong    { font-weight:bold; background-color: #FFFF33; color: #000000 ;
-		  width: 100%; padding:2px; padding-left:10px;
-		}
-
-.warningpct	{ font-weight:bold; background-color: #FFFF33; color: #000000 ;
-		  padding:2px; 
-		}
-
-.separator {
-    text-align:center;
-    font-size: 22px;
-    background-color: #000099; color:#FFFFFF;
-	padding:2px;
-}
-
-
-.subgroup {
-    text-align: center;
-    font-size: 16px; font-weight: bold;
-    background-color: #5e78dd; color:#FFFFFF;
-    padding: 2px;
-    width: 60%;
-    margin-top: -5px; margin-bottom: 5px;
-}
-
-.inner {
-    margin-bottom: 7px;
-    border-bottom: 3px double #000000;
-}
-
-.shortdesc {
-    background-color: #DCDCC0;
-    padding:5px;
-    font-weight: bold;
-}
-
-.desc {
-    background-color: #FCFCF3 ;
-    padding: 3px;
-}
-
-.emphasis	{
-    font-weight: bold;
-}
-
-.attention	{ font-size: 1.1em; font-weight:bold; 
-		  color:red ;
-		}
-
-a:link		{ color: #000099;
-		}
-
-a:visited, a:hover {
-    color: #409D27;
-}
-
-
-.install {
-	margin-left: auto;
-	margin-right: auto;
-	margin-top: 3em;
-	margin-bottom: 3em;
-	padding: 10px;
-	border: 1px solid #cccccc;
-	width: 750px;
-	background: #F1F1F1;
-}
\ No newline at end of file

Modified: trunk/gallery/css/screen.css.default
===================================================================
--- trunk/gallery/css/screen.css.default	2006-10-28 15:10:22 UTC (rev 14992)
+++ trunk/gallery/css/screen.css.default	2006-10-28 15:42:59 UTC (rev 14993)
@@ -652,7 +652,7 @@
     border: 1px solid #fff;
 }
 
-/****** Styles used in config *****/
+/***************** Styles used in config *******************/
 
 /* Indicates an important setting. */
 .g-attention {

Modified: trunk/gallery/includes/setup/checks.inc
===================================================================
--- trunk/gallery/includes/setup/checks.inc	2006-10-28 15:10:22 UTC (rev 14992)
+++ trunk/gallery/includes/setup/checks.inc	2006-10-28 15:42:59 UTC (rev 14993)
@@ -66,39 +66,32 @@
   '<p style="font-weight: bold;">' . gTranslate('config',"Note:"). '</p>'.
   gTranslate('config',"You can install the binaries from the Gallery site even if you don't have root access on your box!  If you can't get it working, try leaving the NetPBM path blank and using ImageMagick instead.");
 
-$common_messages['fail-netpbm-partial'] =
-  gTranslate('config',"I've found part of NetPBM, but some critical components are missing (see below).  Perhaps your version of NetPBM is out of date.") . '  ' .
-  $common_messages['getting-netpbm'];
-
 $common_messages['getting-imagemagick'] = '<br>'.
   sprintf(gTranslate('config',"Gallery prefers ImageMagick version 5.4.8 and up. (Tough Version 6.x is recommended.)  You can get the entire ImageMagick package from the %sImageMagick website%s." ),
   '<a href="http://www.imagemagick.org" target="_blank">', '</a>') .
   '<p style="font-weight: bold;">' . gTranslate('config',"Note:"). '</p>'.
   gTranslate('config',"The site also has binaries available for assorted operating systems.  If you can't get it working, try leaving the ImageMagick path blank and using NetPBM instead.");
 
-$common_messages['fail-imagemagick-partial'] =
-  gTranslate('config',"I've found part of ImageMagick , but some critical components are missing (see below).") . '  ' .
-  $common_messages['getting-imagemagick'];
-
 $common_messages['open-basedir-active'] =
   '<p style="font-weight: bold;">' . gTranslate('config',"Note:"). '</p>'.
   sprintf(gTranslate('config',"Your PHP installation is configured with the %s restriction.   This may make it difficult for Gallery to detect and verify your binaries, even if you've already successfully used the Config. Wizard in the past.  Don't worry too much if this page gives warnings; your settings will still be saved properly."),
   '<b><a href="http://www.php.net/manual/en/features.safe-mode.php#ini.open-basedir" target="_blank">open_basedir</a></b>');
 
+/* The list of checks done in step 1 */
 $checklist = array(
 	'gallery_version' => array(
 		'prompt' => gTranslate('config',"Gallery version"),
-		'optional' => 1,
 		'desc' => sprintf(gTranslate('config',"Check to see how old %s version %s is."),
 		  Gallery(),
 		  "<i>$gallery->version</i>"),
-		'func' => 'check_gallery_version'
+		'func' => 'check_gallery_version',
+        'optional' => 1,
 	),
 	'php' => array(
 		'prompt' => gTranslate('config',"PHP version"),
 		'desc' => gTranslate('config',"Check to see if you are running a supported Version of PHP.") .'<br>'.  gTranslate('config',"Due to bugs and missing functionality in some PHP versions, the minimum PHP version for Gallery 1.5 and newer is at least PHP 4.1.0"),
 		'func' => 'check_php',
-		'fail-too-old' => sprintf(gTranslate('config',"You're running PHP version %s.  You need to upgrade to PHP %s."), phpversion(), $MIN_PHP_MAJOR_VERSION),
+		'fail-too-old' => sprintf(gTranslate('config',"You're running PHP version %s.  You need to upgrade to at least PHP %s."), phpversion(), $MIN_PHP_MAJOR_VERSION),
 		'fail-incompatible' => sprintf(gTranslate('config',"You're running PHP version %s which has known bugs that cause Gallery to fail."),  phpversion()),
 		'fail-buggy__FILE__' => gTranslate('config',"It seems your PHP has a problem with __FILE__, please upgrade to a recent Version"),
 		'serious' => 1,
@@ -112,24 +105,28 @@
 		'optional' => 1,
 	),
 	'safe_mode' => array(
-		'prompt' => gTranslate('config',"PHPs safe mode disabled"),
+		'prompt' => gTranslate('config',"PHPs safe mode"),
 		'desc' => gTranslate('config',"Check to see if PHP is running in <b>safe_mode</b>.  Safe Mode is a PHP security feature commonly used in shared environments.  Gallery cannot run when Safe Mode is enabled because it imposes too many restrictions."),
 		'func' => 'check_safe_mode',
-		'fail-safe-mode' => sprintf(gTranslate('config',"<b>safe_mode</b> is enabled on this server.  You must disable it before you can use Gallery.  Refer to the FAQ, the forums, and the help page on the %sGallery website%s and the %sPHP website%s for assistance."),
-		  '<a href="http://gallery.sourceforge.net" target="_blank">',
-		  '</a>',
-		  '<a href="http://www.php.net/manual/en/features.safe-mode.php" target="_blank">',
-		  '</a>') .
-		  '<br><br>' .
-		  '<p style="font-weight: bold;">' . gTranslate('config',"Note:"). '</p>'.
-		  sprintf(gTranslate('config',"In some rare circumstances, Gallery thinks that Safe Mode is on, when it's really off.  You can see for yourself by looking in the <i>Local</i> column of the <i>safe_mode</i> row in the %sPHP Info%s page.  If it says 'Off' or '0' or 'undefined' then it's possible that Gallery made a mistake and you can continue.  If not, then you must resolve this problem before you can use Gallery."),
-		  '<a href="phpinfo.php" target="_blank">',
-		  '</a>'),
+		'fail-safe-mode' => gTranslate('config',"<b>safe_mode</b> is enabled on this server.") .
+            toggleBox('check_safe_mode',
+                sprintf(gTranslate('config',"<b>safe_mode</b> is enabled on this server.  You must disable it before you can use Gallery.  Refer to the FAQ, the forums, and the help page on the %sGallery website%s and the %sPHP website%s for assistance."),
+                    '<a href="http://gallery.sourceforge.net" target="_blank">',
+                    '</a>',
+                    '<a href="http://www.php.net/manual/en/features.safe-mode.php" target="_blank">',
+                    '</a>'
+                ) .
+                '<br><br>' .
+                '<p style="font-weight: bold;">' . gTranslate('config',"Note:") . '</p>'.
+                sprintf(gTranslate('config',"In some rare circumstances, Gallery thinks that Safe Mode is on, when it's really off.  You can see for yourself by looking in the <i>Local</i> column of the <i>safe_mode</i> row in the %sPHP Info%s page.  If it says 'Off' or '0' or 'undefined' then it's possible that Gallery made a mistake and you can continue.  If not, then you must resolve this problem before you can use Gallery."),
+        		  '<a href="phpinfo.php" target="_blank">',
+        		  '</a>')
+            ),
 		'optional' => 1,
 		'serious' => 1
 	),
 	'exec' => array(
-		'prompt' => gTranslate('config',"PHPs exec() function enabled"),
+		'prompt' => gTranslate('config',"PHPs exec() function"),
 		'desc' => gTranslate('config',"The <b>exec()</b> function is what Gallery uses to launch programs such as NetPBM, ImageMagick, and jhead.  If <b>exec()</b> is disabled on your server then Gallery will not be able operate."),
 		'func' => 'check_exec',
 		'fail-exec' => gTranslate('config',"The <b>exec()</b> function is disabled on your server.  Gallery will not function with this PHP configuration."),
@@ -144,50 +141,60 @@
 		  "\tAllowOverride Options FileInfo\n" .
 		  "&lt;/Directory&gt;</pre>\n" .
 		  gTranslate('config',"If you are running PHP in CGI mode, this message is unavoidable."),
-		  'fail-nohtaccess' => gTranslate('config',"Gallery could not test if your webserver is obeying the 'php_value' lines in your <b>.htaccess</b> as the (original) .htaccess file in your setup folder is missing."),
+        'fail-nohtaccess' => gTranslate('config',"Gallery could not test if your webserver is obeying the 'php_value' lines in your <b>.htaccess</b> as the (original) .htaccess file in your setup folder is missing."),
 		'optional' => 1
 	),
 	'magic-quotes' => array(
 		'prompt' => gTranslate('config',"PHPs magic quotes off"),
-		'optional' => 1,
 		'desc' => sprintf(gTranslate('config',"Check to see if %smagic quotes%s are enabled on your PHP server.  If they're on, you may notice strange behavior if you put ' (single-quote), &quot; (double quote) or &#92; (backslash) characters in titles or captions in Gallery."),
 		  '<b><a href="http://www.php.net/manual/en/configuration.php#ini.magic-quotes-gpc" target="_blank">',
 		  '</a></b>'),
 		'func' => 'check_magic_quotes',
 		'fail-magic-quotes' => sprintf(gTranslate('config',"Magic quotes are on.  Your webserver administrator can turn them off by putting %s in your <b>php.ini</b> file."),
-		  ": <pre>\n\tmagic_quotes_gpc = Off</pre>")
+		  ": <pre>\n\tmagic_quotes_gpc = Off</pre>"),
+		'optional' => 1
 	),
 	'mod-rewrite' => array(
 		'prompt' => gTranslate('config',"Apache mod_rewrite"),
 		'desc' => gTranslate('config',"Check to see if your webserver is compiled with <b>mod_rewrite</b>.  This Apache module allows Gallery to use shorter URLs that are easier to read and look nicer when you mail them to your web-challenged relatives.  It's not an essential feature."),
 		'func' => 'check_mod_rewrite',
-		'fail-mod-rewrite' => gTranslate('config',"Either <b>mod_rewrite</b> is not installed or your <b>.htaccess</b> file is not enabled (see above).  Either way, we'll have to use longer URLs in the Gallery.  If you want to turn it on, first make sure that your <b>.htaccess</b> file is being obeyed. If it still doesn't work, you may need to reconfigure and rebuild Apache with this flag: ") .
-		  "<pre>\t--enable-module=rewrite</pre>",
+		'fail-mod-rewrite' => gTranslate('config',"Either <b>mod_rewrite</b> is not installed or your <b>.htaccess</b> file is not enabled (see above).") .
+            toggleBox('check_mod_rewrite',
+                gTranslate('config', "Either way, we'll have to use longer URLs in the Gallery.  If you want to turn it on, first make sure that your <b>.htaccess</b> file is being obeyed. If it still doesn't work, you may need to reconfigure and rebuild Apache with this flag: ") .
+                    "<pre>\t--enable-module=rewrite</pre>"),
 		'fail-mod-rewrite-nohtaccess' => gTranslate('config',"Gallery could not test if <b>mod_rewrite</b> is working, as the (original) .htaccess file in your setup folder is missing."),
 		'optional' => 1
 	),
 	'NetPBM' => array(
 		'prompt' => gTranslate('config',"NetPBM installed"),
-		'optional' => 1,
-		'desc' => gTranslate('config',"Check to see if NetPBM is installed so that Gallery can manipulate images (rotate, resize, make thumbnails, etc.).  You only need to have either NetPBM <b>or</b> ImageMagick installed."),
+    	'desc' => gTranslate('config',"Check to see if NetPBM is installed so that Gallery can manipulate images (rotate, resize, make thumbnails, etc.).  You only need to have either NetPBM <b>or</b> ImageMagick installed."),
 		'func' => 'check_graphics',
-		'fail-netpbm' => gTranslate('config',"I can't find NetPBM.  If it's installed and not in the path of the webserver user that's OK&#8212;you can specify the path to NetPBM by hand on the following page.  If it's not installed, you have two choices: " ) .
-		  $common_messages['getting-netpbm'],
-		'fail-netpbm-partial' =>
-		  $common_messages['fail-netpbm-partial'] .
-		  '<p><b> ' . gTranslate('config',"If NetPBM is installed and Gallery isn't finding it automatically that's OK&#8212;you can specify the path to NetPBM by hand on the following page.") .' </b>',
-		  'open-basedir-note' => $common_messages['open-basedir-active']
+		'fail-netpbm' => gTranslate('config',"I can't find NetPBM!") .
+            toggleBox('checkNetPBM', gTranslate('config',
+                "If it's installed and not in the path of the webserver user that's OK&#8212;you can specify the path to NetPBM by hand on the following page.  If it's not installed, you have two choices: " ) .
+                $common_messages['getting-netpbm']),
+		'fail-netpbm-partial' => gTranslate('config',"I've found part of NetPBM, but some components are missing (see below).") .
+            toggleBox('fail_netpbm_partial', gTranslate('config',"Perhaps your version of NetPBM is out of date.") . '  ' .
+                $common_messages['getting-netpbm'] .
+                '<p><b> ' . gTranslate('config',"If NetPBM is installed and Gallery isn't finding it automatically that's OK&#8212;you can specify the path to NetPBM by hand on the following page.") .' </b>'
+            ),
+        'open-basedir-note' => $common_messages['open-basedir-active'],
+        'optional' => 1,
 	),
 	'ImageMagick' => array(
 		'prompt' => gTranslate('config',"ImageMagick installed"),
 		'optional' => 1,
 		'desc' => gTranslate('config',"Check to see if ImageMagick is installed so that Gallery can manipulate images (rotate, resize, make thumbnails, etc.).  You only need to have either ImageMagick <b>or</b> NetPBM installed."),
 		'func' => 'check_graphics_im',
-		'fail-imagemagick' => gTranslate('config',"I can't find ImageMagick.  If it's installed and not in the path of the webserver user that's OK&#8212;you can specify the path to ImageMagick by hand on the following page.  If it's not installed, you must install it.  ") .
-		  $common_messages['getting-imagemagick'],
-		'fail-imagemagick-partial' =>
-		  $common_messages['fail-imagemagick-partial'] .
-		  '<p><b> ' . gTranslate('config',"If ImageMagick is installed and Gallery isn't finding it automatically that's OK&#8212;you can specify the path to ImageMagick by hand on the following page.") .' </b>',
+		'fail-imagemagick' => gTranslate('config',"I can't find ImageMagick") .
+            toggleBox('fail_imagemagick', gTranslate('config',
+                "If it's installed and not in the path of the webserver user that's OK&#8212;you can specify the path to ImageMagick by hand on the following page.  If it's not installed, you must install it.  ") .
+            $common_messages['getting-imagemagick']),
+		'fail-imagemagick-partial' => gTranslate('config',"I've found part of ImageMagick , but some components are missing (see below).") .
+            toggleBox('fail_imagemagick_partial',
+                $common_messages['getting-imagemagick'] .
+                '<p><b> ' . gTranslate('config',"If ImageMagick is installed and Gallery isn't finding it automatically that's OK&#8212;you can specify the path to ImageMagick by hand on the following page.") .' </b>'
+            ),
 		  'open-basedir-note' => $common_messages['open-basedir-active']
 	),
 	'exif' => array(
@@ -195,9 +202,10 @@
 		'optional' => 1,
 		'desc' => gTranslate('config',"Check to see if <b>jhead</b> is installed so that Gallery can examine EXIF headers embedded in images created with most digital cameras."),
 		'func' => 'check_exif',
-		'fail-exif' => sprintf(gTranslate('config',"I can't find <b>jhead</b>.  If it's installed and not in the path of the webserver user that's OK&#8212;you can specify the path by hand on the following page.  If it's not installed, you can install it yourself. Jhead is a public domain EXIF parser.  Source, linux binaries, and windows binaries can be found at the %sjhead homepage%s."),
-		  '<a href="http://www.sentex.net/~mwandel/jhead/index.html" target="_blank">',
-		  '</a>'),
+		'fail-exif' => gTranslate('config',"I can't find <b>jhead</b>") .
+            toggleBox('check_exif', sprintf(gTranslate('core',
+                 "If it's installed and not in the path of the webserver user that's OK&#8212;you can specify the path by hand on the following page.  If it's not installed, you can install it yourself. Jhead is a public domain EXIF parser.  Source, linux binaries, and windows binaries can be found at the %sjhead homepage%s."),
+                '<a href="http://www.sentex.net/~mwandel/jhead/index.html" target="_blank">', '</a>')),
 		'open-basedir-note' => $common_messages['open-basedir-active']
 		),
 	'jpegtran' => array (
@@ -205,9 +213,10 @@
 		'optional' => 1,
 		'desc' => gTranslate('config',"Check to see if <b>jpegtran</b> is installed so that Gallery can perform lossless rotations on JPEG images."),
 		'func' => 'check_jpegtran',
-		'fail-jpegtran' => sprintf(gTranslate('config',"I can't find <b>jpegtran</b>.  If it's installed and not in the path of the webserver user that's OK&#8212;you can specify the path by hand on the following page.  If it's not installed, you can install it yourself.  Jpegtran is a free tool distributed by the Independent JPEG Group as part of <i>libjpeg</i>.  Source may be found at the %sIJG homepage%s.  Binaries may be found at the %sJPEG Club website%s or in the <i>libjpeg</i> package of Linux distributions."),
+		'fail-jpegtran' => gTranslate('config',"I can't find <b>jpegtran</b>!") .
+            toggleBox('check_jpegtran', sprintf(gTranslate('config', "If it's installed and not in the path of the webserver user that's OK&#8212;you can specify the path by hand on the following page.  If it's not installed, you can install it yourself.  Jpegtran is a free tool distributed by the Independent JPEG Group as part of <i>libjpeg</i>.  Source may be found at the %sIJG homepage%s.  Binaries may be found at the %sJPEG Club website%s or in the <i>libjpeg</i> package of Linux distributions."),
 		  '<a href="http://www.ijg.org" target="_blank">', '</a>',
-		  '<a href="http://jpegclub.org/" target="_blank">', '</a>'),
+		  '<a href="http://jpegclub.org/" target="_blank">', '</a>')),
 		  'open-basedir-note' => $common_messages['open-basedir-active']
 	),
 	'gettext' => array (
@@ -244,14 +253,14 @@
 
 $checkPriority = array(
     'mandatory' => array(
-        'checks' => array('gallery_version', 'php', 'safe_mode', 'exec',
-                          'NetPBM', 'ImageMagick', 'check-versions'),
+        'checkslist' => array('gallery_version', 'php', 'safe_mode', 'exec',
+                             'NetPBM', 'ImageMagick', 'check-versions'),
         'shortdesc' => gTranslate('config',"Mandatory checks"),
         'longdesc' => gTranslate('config' ,"If any of these items are highlighted in red then please take actions to correct them. Failure to do so could lead to your Gallery installation not functioning correctly.")
     ),
     'recommend' => array(
-        'checks' => array('register_globals', 'htaccess', 'magic-quotes', 'mod-rewrite', 'exif',
-                          'jpegtran', 'gettext', 'gallery-locale', 'missing-locales'),
+        'checkslist' => array('register_globals', 'htaccess', 'magic-quotes', 'mod-rewrite', 'exif',
+                             'jpegtran', 'gettext', 'gallery-locale', 'missing-locales'),
         'shortdesc' => gTranslate('config',"Recommended things"),
         'longdesc' => gTranslate('config' ,"Nice to have.")
     )

Modified: trunk/gallery/js/toggle.js
===================================================================
--- trunk/gallery/js/toggle.js	2006-10-28 15:10:22 UTC (rev 14992)
+++ trunk/gallery/js/toggle.js	2006-10-28 15:42:59 UTC (rev 14993)
@@ -7,9 +7,9 @@
 	var img;
 	var elem;
 
-	img = document.getElementById('toogleBut_' + id);
-	elem = document.getElementById('toogleFrame_' + id);
-	
+	img = document.getElementById('toggleBut_' + id);
+	elem = document.getElementById('toggleFrame_' + id);
+
 	if (elem.style.display == 'none') {
 		elem.style.display = 'inline';
 		img.src = '../images/collapse.gif';

Modified: trunk/gallery/lib/content.php
===================================================================
--- trunk/gallery/lib/content.php	2006-10-28 15:10:22 UTC (rev 14992)
+++ trunk/gallery/lib/content.php	2006-10-28 15:42:59 UTC (rev 14993)
@@ -1488,32 +1488,33 @@
  * @return string   The HTML code.
  * @author Jens Tkotz <jens@...>
  */
-function toogleButton($id) {
+function toggleButton($id) {
     $html = "<a href=\"#\" style=\"outline: none;\" onClick=\"gallery_toggle('$id'); return false;\">" .
-            gImage('expand.gif', gTranslate('config', "Show/hide more information"), array('id' => "toogleBut_$id")) .
+            gImage('expand.gif', gTranslate('config', "Show/hide more information"), array('id' => "toggleBut_$id")) .
             '</a> ';
 
     return $html;
 
 }
+
 /**
  * Creates a toggle Box. Optionally a toggle Button is added before, or after.
  *
  * @param string $id
  * @param string $text
- * @param string $toogleButton  Can be 'append', 'prepend', if something else, no toggle Button shows up.
+ * @param string $toggleButton  Can be 'append', 'prepend', if something else, no toggle Button shows up.
  * @return string   The HTML code.
  * @author Jens Tkotz <jens@...>
  */
-function toogleBox($id, $text, $toogleButton = 'prepend') {
-    $html = "\n<div id=\"toogleFrame_$id\" style=\"display:none;\">$text\n</div>";
+function toggleBox($id, $text, $toggleButton = 'prepend') {
+    $html = "\n<div id=\"toggleFrame_$id\" style=\"display:none;\">$text\n</div>";
 
-    if ($toogleButton == 'prepend') {
-        $html = toogleButton($id) . $html;
+    if ($toggleButton == 'prepend') {
+        $html = toggleButton($id) . $html;
     }
 
-    if ($toogleButton == 'append') {
-        $html .= toogleButton($id);
+    if ($toggleButton == 'append') {
+        $html .= toggleButton($id);
     }
 
     $html = '<br>' . $html;

Modified: trunk/gallery/lib/setup.php
===================================================================
--- trunk/gallery/lib/setup.php	2006-10-28 15:10:22 UTC (rev 14992)
+++ trunk/gallery/lib/setup.php	2006-10-28 15:42:59 UTC (rev 14993)
@@ -301,8 +301,19 @@
 	return $buf;
 }
 
+/**
+ * Returns an array containing all pathes set in the environment var 'PATH'
+ * plus some additional guesses.
+ *
+ * @return array    $path
+ */
 function getPath() {
+    static $path;
 
+    if(!empty($path)) {
+        return $path;
+    }
+
 	/* Start with the server user's path */
 	if (getOS() != OS_WINDOWS) {
 		$path = explode(":", getenv('PATH'));
@@ -413,7 +424,7 @@
 	if (!empty($disabled)) {
 		foreach(explode(',', $disabled) as $disabled_func) {
 			if(eregi('^exec$', $disabled_func)) {
-				$fail["fail-exec"] = 1;
+				$fail['fail-exec'] = 1;
 			}
 		}
 	}
@@ -449,25 +460,25 @@
 }
 
 function check_php() {
-	global $MIN_PHP_MAJOR_VERSION;
+    global $MIN_PHP_MAJOR_VERSION;
 
-	$version = phpversion();
-	$success = array();
-	$fail = array();
-	$warn = array();
+    $version = phpversion();
+    $success = array();
+    $fail = array();
+    $warn = array();
 
-	if (!function_exists('version_compare') || !version_compare($version, $MIN_PHP_MAJOR_VERSION, ">=")) {
-		$fail['fail-too-old'] = 1;
-	}
+    if (!function_exists('version_compare') ||
+        !version_compare($version, $MIN_PHP_MAJOR_VERSION, ">=")) {
+        $fail['fail-too-old'] = 1;
+    }
+    elseif (strstr(__FILE__, 'lib/setup.php') || strstr(__FILE__, 'lib\\setup.php')) {
+        $success[] = sprintf(gTranslate('config', "PHP v%s is OK."), $version);
+    }
+    else {
+        $fail['fail-buggy__FILE__'] = 1;
+    }
 
-	if (strstr(__FILE__, 'lib/setup.php') ||
-	strstr(__FILE__, 'lib\\setup.php')) {
-		$success[] = sprintf(gTranslate('config', "PHP v%s is OK."), $version);
-	} else {
-		$fail['fail-buggy__FILE__'] = 1;
-	}
-
-	return array($success, $fail, $warn);
+    return array($success, $fail, $warn);
 }
 
 function check_mod_rewrite()  {
@@ -478,15 +489,15 @@
     $warn = array();
 
     if(fs_file_exists(GALLERY_SETUPDIR .'/.htaccess')) {
-	if ($GALLERY_REWRITE_OK) {
-	    $success[] = gTranslate('config', "<b>mod_rewrite</b> is enabled.");
-	}
-	else {
-	    $fail["fail-mod-rewrite"] = true;
-	}
+        if ($GALLERY_REWRITE_OK) {
+            $success[] = gTranslate('config', "<b>mod_rewrite</b> is enabled.");
+        }
+        else {
+            $fail["fail-mod-rewrite"] = 1;
+        }
     }
     else {
-	$fail["fail-mod-rewrite-nohtaccess"] = true;
+        $fail["fail-mod-rewrite-nohtaccess"] = 1;
     }
 
     return array($success, $fail, $warn);
@@ -528,28 +539,28 @@
 	$missing_critical = array();
 	$missing = 0;
 	$netpbm = array(
-		fs_executable("jpegtopnm"),
-		fs_executable("giftopnm"),
-		fs_executable("pngtopnm"),
-		fs_executable("pnmtojpeg"),
-		fs_executable("ppmtogif"),
-		fs_executable("pnmtopng"),
-		fs_executable("pnmscale"),
-		fs_executable("pnmfile"),
-		fs_executable("ppmquant"),
-		fs_executable("pnmcut"),
-		fs_executable("pnmrotate"),
-		fs_executable("pnmflip"),
-		fs_executable("pnmcomp"),
+		fs_executable('jpegtopnm'),
+		fs_executable('giftopnm'),
+		fs_executable('pngtopnm'),
+		fs_executable('pnmtojpeg'),
+		fs_executable('ppmtogif'),
+		fs_executable('pnmtopng'),
+		fs_executable('pnmscale'),
+		fs_executable('pnmfile'),
+		fs_executable('ppmquant'),
+		fs_executable('pnmcut'),
+		fs_executable('pnmrotate'),
+		fs_executable('pnmflip'),
+		fs_executable('pnmcomp'),
 	);
 
 	$fallback = array(
-		fs_executable("pnmtojpeg") => fs_executable("ppmtojpeg"),
-		fs_executable("pnmcomp")   => fs_executable("pamcomp")
+		fs_executable('pnmtojpeg') => fs_executable('ppmtojpeg'),
+		fs_executable('pnmcomp')   => fs_executable('pamcomp')
 	);
 
 	$optional = array(
-		fs_executable("pnmcomp") =>
+		fs_executable('pnmcomp') =>
 		gTranslate('config', "Without pnmcomp and pamcomp gallery will not be able to watermark images, unless you use ImageMagick and have the composite binary installed."),
 	);
 
@@ -609,18 +620,19 @@
 	}
 
 	if ($missing == count($netpbm)) {
-		$fail["fail-netpbm"] = 1;
+		$fail['fail-netpbm'] = 1;
 		/* Any other warning doesnt care */
 		$warn = array();
 	}
 	elseif ($missing > 0) {
-		$warn[] = sprintf(gTranslate('config', "%d of %d NetPBM binaries located."),
+		$warn[] = "\n<br>" . sprintf(gTranslate('config', "%d of %d NetPBM binaries located."),
 		count($netpbm) - $missing, count($netpbm));
 
-		if(count($missing_critical) > 0) {
-			$fail["fail-netpbm-partial"] = array_values($missing_critical);
+		if(count($missing_critical) > 0 || 1 != 2) {
+			$fail['fail-netpbm-partial'] = array_values($missing_critical);
 		}
-	} else {
+	}
+	else {
 		$success[] = sprintf(gTranslate('config', "%d of %d NetPBM binaries located."),
 		count($netpbm), count($netpbm));
 	}
@@ -638,13 +650,14 @@
 	$missing_critical = array();
 	$missing = 0;
 	$imagick = array(
-		fs_executable("identify"),
-		fs_executable("convert"),
-		fs_executable("composite"),
+		fs_executable('identify'),
+		fs_executable('convert'),
+        fs_executable('disco1'),
+		fs_executable('composite'),
 	);
 
 	$optional = array(
-		fs_executable("composite") =>
+		fs_executable('composite') =>
 		gTranslate('config', "Without composite gallery will not be able to watermark images, except you use NetPBM and have the pnmcomp binary installed."),
 	);
 
@@ -687,16 +700,16 @@
 	}
 
 	if ($missing == count($imagick)) {
-		$fail["fail-imagemagick"] = 1;
+		$fail['fail-imagemagick'] = 1;
 		/* Any other warning doesnt care */
 		$warn = array();
 	}
 	elseif ($missing > 0) {
-		$warn[] = sprintf(gTranslate('config', "%d of %d ImageMagick binaries located."),
+		$warn[] = '<br>'. sprintf(gTranslate('config', "%d of %d ImageMagick binaries located."),
 		count($imagick) - $missing, count($imagick));
 
 		if(count($missing_critical) > 0) {
-			$fail["fail-imagemagick-partial"] = array_values($missing_critical);
+			$fail['fail-imagemagick-partial'] = array_values($missing_critical);
 		}
 	} else {
 		$success[] = sprintf(gTranslate('config', "%d of %d ImageMagick binaries located."),
@@ -713,12 +726,12 @@
 	$success = array();
 	$warn = array();
 
-	$bin = fs_executable("jpegtran");
+	$bin = fs_executable('jpegtran');
 
 	if ($location) {
 		$dir = locateDir($bin, $location);
 	} else {
-		$dir = locateDir($bin, isset($gallery->app->use_jpegtran) ? dirname($gallery->app->use_jpegtran) : "");
+		$dir = locateDir($bin, isset($gallery->app->use_jpegtran) ? dirname($gallery->app->use_jpegtran) : '');
 	}
 	if (!$dir) {
 		$warn["fail-jpegtran"] = gTranslate('config', "Can't find <i>jpegtran</i>!");
@@ -765,10 +778,14 @@
 
 function check_gallery_version() {
 	global $gallery;
+
 	$fail = array();
 	$success = array();
 	$warn = array();
 
+	$maxAge = 180;
+	$maxBetaAge = 14;
+
 	/* how many days old is the gallery version? */
 	$age = (time() - $gallery->last_change)/86400;
 
@@ -777,7 +794,7 @@
 
 	$link = galleryLink($gallery->url, $gallery->url, array('target' => '_blank'));
 
-	$visit = '<br>'. sprintf(gTranslate('config', "You can check for more recent versions by visiting %s."), $link);
+	$visit = sprintf(gTranslate('config', "You can check for more recent versions by visiting %s."), $link);
 
 	$this_version = sprintf(gTranslate('config', "This version of %s was released on %s."),
 		Gallery(), strftime("%x", $gallery->last_change));
@@ -785,16 +802,29 @@
 	$this_beta_version = sprintf(gTranslate('config', "This is a development build of %s that was released on %s."),
 		Gallery(), strftime("%x", $gallery->last_change));
 
-	if ($age > 180) {
-		$fail["too_old"] = "$this_version  $visit";
-	} else if ($age > 14 && $beta) {
-		$fail["too_old"] = "$this_beta_version  $visit";
-	} else if ($beta) {
-		$success["ok"] = "$this_beta_version  $visit" . "  "
-		. gTranslate('config', "Please check regularly for updates.");
-	} else {
-		$success["ok"] = "$this_version  $visit";
+	if ($age > $maxAge) {
+	    if($beta) {
+	        $fail['too_old'] = $this_beta_version . ' ' .
+	                           sprintf(gTranslate('config', "Thats more than %d days ago. Which is way too old for a pre Release version."), $maxAge) .
+	                           toggleBox('g_version', $visit);
+	    }
+	    else {
+		  $fail['too_old'] = $this_version . ' ' .
+		                   sprintf(gTranslate('config', "Thats more than %d days ago."), $maxAge) .
+		                   toggleBox('g_version', $visit);
+	    }
 	}
+	else if ($beta && $age > $maxBetaAge) {
+		$fail['too_old'] = $this_beta_version . toggleBox('g_version', $visit);
+	}
+	else if ($beta) {
+	    $visit .= ' '. gTranslate('config', "Please check regularly for updates.");
+		$success['ok'] = $this_beta_version . toggleBox('g_version', $visit);
+	}
+	else {
+		$success['ok'] = $this_version . toggleBox('g_version', $visit);
+	}
+
 	return array($success, $fail, $warn);
 }
 
@@ -806,42 +836,42 @@
     $warn = array();
     $msg = '';
 
-    $available = $locale_check["available_locales"];
-    $maybe = $locale_check["maybe_locales"];
-    $unavailable = $locale_check["unavailable_locales"];
+    $available = $locale_check['available_locales'];
+    $maybe = $locale_check['maybe_locales'];
+    $unavailable = $locale_check['unavailable_locales'];
 
     if($locale_check != NULL && sizeof($unavailable) == 0) {
-	$success[] = gTranslate('config', "All gallery locales are available on this host.");
+	   $success[] = gTranslate('config', "All gallery locales are available on this host.");
     }
     else if( (sizeof($maybe) + sizeof($unavailable)) > 0) {
-	if (sizeof($maybe) > 0) {
-	    $msg = sprintf(gTranslate('config', "There are %d locales that Gallery was unable to locate. You may need to select manually date formats. "),sizeof($maybe));
-	}
+        if (sizeof($maybe) > 0) {
+            $msg = sprintf(gTranslate('config', "There are %d locales that Gallery was unable to locate. You may need to select manually date formats. "),sizeof($maybe));
+        }
 
-	if (sizeof($unavailable) > 0) {
-	    if(sizeof($maybe) > 0) {
-		$msg .= "<br><br>";
-	    }
+        if (sizeof($unavailable) > 0) {
+            if(sizeof($maybe) > 0) {
+                $msg .= '<br><br>';
+            }
 
-	    $msg .= sprintf(gTranslate('config', "Dates in %d languages may not be formatted properly, because the corresponding locales are missing. You may need to select manually the date formats for these."),sizeof($unavailable));
-	}
-	$warn[] = $msg;
+            $msg .= sprintf(gTranslate('config', "Dates in %d languages may not be formatted properly, because the corresponding locales are missing. You may need to select manually the date formats for these."),sizeof($unavailable));
+        }
+        $warn[] = $msg;
     }
     else {
-	if (ini_get('open_basedir') && getOS() != OS_LINUX) {
-	    $warn[] = sprintf(gTranslate('config', "We were unable to detect any locales.  However, your PHP installation is configured with the %s restriction so this may be interfering with the way that we detect locales.  Unfortunately this means the date format will not change for different languages.  However, it is OK to continue."),
-		      '<b><a href="http://www.php.net/manual/en/features.safe-mode.php#ini.open-basedir" target="_blank">open_basedir</a></b>');
-	}
-	else {
-	    if (getOS() == OS_LINUX) {
-		$fail[] = sprintf(gTranslate('config', "We were unable to detect any system locales. Multi-language functions will be disabled. Please install the corresponding locales or ask your administrator to do this. This problem is known on %s systems. In this case please have a look at this %sDebian locale HowTo%s."),
-		  'Debian',
-		  '<a href="http://people.debian.org/~schultmc/locales.html" target="_blank">', '</a>');
-	    }
-	    else {
-		  $warn[] = gTranslate('config', "Only the default locale for this machine is available, so date format will not change for different languages.");
-	    }
-	}
+        if (ini_get('open_basedir') && getOS() != OS_LINUX) {
+            $warn[] = sprintf(gTranslate('config', "We were unable to detect any locales.  However, your PHP installation is configured with the %s restriction so this may be interfering with the way that we detect locales.  Unfortunately this means the date format will not change for different languages.  However, it is OK to continue."),
+            '<b><a href="http://www.php.net/manual/en/features.safe-mode.php#ini.open-basedir" target="_blank">open_basedir</a></b>');
+        }
+        else {
+            if (getOS() == OS_LINUX) {
+                $fail[] = sprintf(gTranslate('config', "We were unable to detect any system locales. Multi-language functions will be disabled. Please install the corresponding locales or ask your administrator to do this. This problem is known on %s systems. In this case please have a look at this %sDebian locale HowTo%s."),
+                'Debian',
+                '<a href="http://people.debian.org/~schultmc/locales.html" target="_blank">', '</a>');
+            }
+            else {
+                $warn[] = gTranslate('config', "Only the default locale for this machine is available, so date format will not change for different languages.");
+            }
+        }
     }
 
     return array($success, $fail, $warn);
@@ -861,7 +891,7 @@
 		# Unix / Linux
 		# Check which locales are installed
 
-		exec("locale -a", $results, $status);
+		exec('locale -a', $results, $status);
 
 		if(count($results) >2) {
 			$system_locales = $results;
@@ -979,66 +1009,66 @@
 
     $nr = 0;
     foreach ($maybe as $key => $aliases) {
-	if (sizeof($aliases) == 0) {
-	    $unavailable[] = $key;
-	    continue;
-	}
+        if (sizeof($aliases) == 0) {
+            $unavailable[] = $key;
+            continue;
+        }
 
-	/*
-	if (sizeof($aliases) == 1) {
-		$results["locale_alias['$key']"] = array (
-		"type" => "hidden",
-		"value" => array_pop($aliases),
-		"desc" => "locale_alias[$key]",
-		"prompt" => "locale_alias[$key]"
-		);
-		continue;
-	}
-	*/
+        /*
+        if (sizeof($aliases) == 1) {
+            $results["locale_alias['$key']"] = array (
+            "type" => "hidden",
+            "value" => array_pop($aliases),
+            "desc" => "locale_alias[$key]",
+            "prompt" => "locale_alias[$key]"
+            );
+            continue;
+        }
+        */
 
-	$nr++;
-	if (!$block_start_done) {
-	    $block_start_done = true;
-	    $results[] = array (
-		'type' => 'block_start',
-		'prompt' => '<b>(' . gTranslate('config', "Advanced") . ') </b><br>' .
-			    sprintf(gTranslate('config', "<b>System</b> locale selection required")),
-		'desc' => gTranslate('config', "There is more than one suitable <b>system</b> locale installed on your machine for the following languages.  Please chose the one you think is most suitable.") .
-			  '<br><br>' .
-			  gTranslate('config', "This is <b>only</b> for date &amp; time format. You only need to edit the languages you enabled above.")
-		);
-	}
+        $nr++;
+        if (!$block_start_done) {
+            $block_start_done = true;
+            $results[] = array (
+                'type' => 'block_start',
+                'prompt' => '<b>(' . gTranslate('config', "Advanced") . ') </b><br>' .
+                    sprintf(gTranslate('config', "<b>System</b> locale selection required")),
+                        'desc' => gTranslate('config', "There is more than one suitable <b>system</b> locale installed on your machine for the following languages.  Please chose the one you think is most suitable.") .
+                        '<br><br>' .
+                    gTranslate('config', "This is <b>only</b> for date &amp; time format. You only need to edit the languages you enabled above.")
+            );
+        }
 
-	$index = $nls['language'][$key];
+        $index = $nls['language'][$key];
 
-	$choices = array();
+        $choices = array();
 
-	foreach ($aliases as $value) {
-	    $choices[$value] = $value;
-	}
+        foreach ($aliases as $value) {
+            $choices[$value] = $value;
+        }
 
-	if (getOS() != OS_WINDOWS) {
-	    $choices[''] = gTranslate('config', "System locale");
-	    next($choices);
-	}
+        if (getOS() != OS_WINDOWS) {
+            $choices[''] = gTranslate('config', "System locale");
+            next($choices);
+        }
 
-	$results["locale_alias['$key']"] = array (
-	    'prompt' => $nr . '.) ' . $nls['language'][$key],
-	    'optional' => true,
-	    'name' => 'locale_alias',
-	    'key' => $key,
-	    'type' => 'block_element',
-	    'choices' => $choices,
-	    'value' => (getOS() != OS_WINDOWS) ? key($choices) : '',
-	    'allow_empty' => true,
-	    'remove_empty' => true
-	);
+        $results["locale_alias['$key']"] = array (
+            'prompt' => $nr . '.) ' . $nls['language'][$key],
+            'optional' => true,
+            'name' => 'locale_alias',
+            'key' => $key,
+            'type' => 'block_element',
+            'choices' => $choices,
+            'value' => (getOS() != OS_WINDOWS) ? key($choices) : '',
+            'allow_empty' => true,
+            'remove_empty' => true
+        );
 
 
     } // End foreach maybe
 
     if ($block_start_done) {
-	$results[] = array ('type' => 'block_end');
+        $results[] = array ('type' => 'block_end');
     }
 
     $block_start_done = false;
@@ -1046,78 +1076,78 @@
     $choices = array();
 
     if (getOS() != OS_WINDOWS) {
-	$choices = array('' => gTranslate('config', "System locale"));
+        $choices = array('' => gTranslate('config', "System locale"));
     }
 
     if (sizeof($available) > 0) {
-	foreach ($available as $choice => $value) {
-	    $choices[$choice] = $nls['language'][$value];
-	}
+        foreach ($available as $choice => $value) {
+            $choices[$choice] = $nls['language'][$value];
+        }
 
-	$avail_keys = array_keys($available);
+        $avail_keys = array_keys($available);
     }
     elseif (sizeof($maybe) > 0) {
-	foreach ($maybe as $key => $aliases) {
-	    foreach ($aliases as $choice) {
-		$choices[$choice] = $choice;
-	    }
-	}
+        foreach ($maybe as $key => $aliases) {
+            foreach ($aliases as $choice) {
+                $choices[$choice] = $choice;
+            }
+        }
 
-	$avail_keys = array_keys($choices);
+        $avail_keys = array_keys($choices);
     }
     else {
-	if (getOS() == OS_OTHER) {
-	    $array_keys = $choices;
-	}
-	else {
-	    $skip = true;
-	}
+        if (getOS() == OS_OTHER) {
+            $array_keys = $choices;
+        }
+        else {
+            $skip = true;
+        }
     }
 
     if (! isset ($skip)) {
-	$avail_keys = array_keys($choices);
-	foreach ($unavailable as $key) {
-	    if (sizeof($choices) == 1) {
-		$results["locale_alias['$key']"] = array (
-		    'type' => 'hidden',
-		    'value' => $avail_keys[0],
-		    'desc' => "locale_alias[$key]",
-		    'prompt' => "locale_alias[$key]",
-		    'allow_empty' => true,
-		    'remove_empty' => true
-		);
-		continue;
-	    }
+        $avail_keys = array_keys($choices);
+        foreach ($unavailable as $key) {
+            if (sizeof($choices) == 1) {
+                $results["locale_alias['$key']"] = array (
+                    'type' => 'hidden',
+                    'value' => $avail_keys[0],
+                    'desc' => "locale_alias[$key]",
+                    'prompt' => "locale_alias[$key]",
+                    'allow_empty' => true,
+                    'remove_empty' => true
+                );
+                continue;
+            }
 
-	    if (!$block_start_done) {
-		$block_start_done = true;
-		$results[] = array (
-		    'type' => 'block_start',
-		    'prompt' => '<b>(' . gTranslate('config', "Advanced") . ')</b><br>' .
-				sprintf(gTranslate('config', "<b>System</b> locale problems")),
-		    'desc' => gTranslate('config', "There are no apparently suitable <b>system</b> locales installed on your machine for the following languages.  Please choose the one you think is most suitable.") .
-			      '<br><br>' .
-			      gTranslate('config', "This is <b>only</b> for date &amp; time format. You only need to edit the languages you enabled above.")
-		);
-	    }
+            if (!$block_start_done) {
+                $block_start_done = true;
+                $results[] = array (
+                    'type' => 'block_start',
+                    'prompt' => '<b>(' . gTranslate('config', "Advanced") . ')</b><br>' .
+                        sprintf(gTranslate('config', "<b>System</b> locale problems")),
+                            'desc' => gTranslate('config', "There are no apparently suitable <b>system</b> locales installed on your machine for the following languages.  Please choose the one you think is most suitable.") .
+                            '<br><br>' .
+                        gTranslate('config', "This is <b>only</b> for date &amp; time format. You only need to edit the languages you enabled above.")
+                );
+            }
 
-	    $index = $nls['language'][$key] ;
+            $index = $nls['language'][$key] ;
 
-	    $results["locale_alias['$key']"] = array (
-		'prompt' => $nls['language'][$key],
-		'name' => 'locale_alias',
-		'key' => $key,
-		'type' => 'block_element',
-		'choices' => $choices,
-		'value' => '',
-		'allow_empty' => true,
-		'remove_empty' => true
-	    );
-	}
+            $results["locale_alias['$key']"] = array (
+                'prompt' => $nls['language'][$key],
+                'name' => 'locale_alias',
+                'key' => $key,
+                'type' => 'block_element',
+                'choices' => $choices,
+                'value' => '',
+                'allow_empty' => true,
+                'remove_empty' => true
+            );
+        }
 
-	if ($block_start_done) {
-	    $results[] = array ('type' => 'block_end');
-	}
+        if ($block_start_done) {
+            $results[] = array ('type' => 'block_end');
+        }
     }
 
     return $results;
@@ -1134,20 +1164,23 @@
 }
 
 function check_safe_mode() {
-	$fail = array();
-	$success = array();
-	$warn = array();
+    $fail = array();
+    $success = array();
+    $warn = array();
 
-	$safe_mode = ini_get("safe_mode");
-	if (empty($safe_mode) ||
-	  !strcasecmp($safe_mode, "off") ||
-	  !strcasecmp($safe_mode, "0") ||
-	  !strcasecmp($safe_mode, "false")) {
-		$success[] = gTranslate('config', "<b>safe_mode</b> is off.");
-	} else {
-		$fail["fail-safe-mode"] = 1;
-	}
-	return array($success, $fail,$warn);
+    $safe_mode = ini_get("safe_mode");
+
+    if (empty($safe_mode) ||
+    !strcasecmp($safe_mode, "off") ||
+    !strcasecmp($safe_mode, "0") ||
+    !strcasecmp($safe_mode, "false")) {
+        $success[] = gTranslate('config', "<b>safe_mode</b> is off.");
+    }
+    else {
+        $fail["fail-safe-mode"] = 1;
+    }
+
+    return array($success, $fail,$warn);
 }
 
 function check_magic_quotes() {
@@ -1592,7 +1625,7 @@
         $versionStatus['unkown']
     );
 
-    $hint = "<p>" . gTranslate('config', "This should be fixed before proceeding") .
+    $hint = "<p>" . gTranslate('config', "This should be fixed before proceeding.") .
         "<br>" . sprintf(gTranslate('config', "Look at %sCheck Versions%s for more details."),
         '<a href="check_versions.php">', '</a>') . '</p>';
 
@@ -1827,14 +1860,19 @@
 		require_once(GALLERY_BASE . '/classes/UserDB.php');
 		require_once(GALLERY_BASE . '/classes/gallery/UserDB.php');
 		require_once(GALLERY_BASE . '/classes/gallery/User.php');
+
 		$gallery->userDB = new Gallery_UserDB();
 
-		// Check the UserDB for upgrades before trying to make someone login
-		if ($gallery->userDB->versionOutOfDate()) {
-			include(GALLERY_BASE . "/upgrade_users.php");
-			exit;
+		if (! $gallery->userDB->isInitialized()) {
+		    exit;
 		}
 
+        // Check the UserDB for upgrades before trying to make someone login
+        if ($gallery->userDB->versionOutOfDate()) {
+            include(GALLERY_BASE . "/upgrade_users.php");
+            exit;
+		}
+
 		include(GALLERY_BASE . '/setup/login.inc');
 	}
 }
@@ -1861,14 +1899,22 @@
 }
 
 /**
+ * Returns a status code base on the given resultset
+ *
  * 0 - success
  * 5 - warning, optional
  * 10 - serious warning, but optional
  * 51 - serious warning
  * 100 - failure
+ *
+ * @param array $result     The resultcheck
+ * @param array $check
+ * @return integer
+ * @author Jens Tkotz <jens@...>
  */
 function getCheckStatus($result, $check) {
 	list($success, $fail, $warn) = $result;
+
 	if(!empty($success)) {
 		return 0;
 	}
@@ -1881,13 +1927,16 @@
 			else {
 				return 10;
 			}
-		} else {
+		}
+		else {
 			return 5;
 		}
-	} else {
+	}
+	else {
 		if (isset($check["serious"]) && $check["serious"] == 1) {
 			return 51;
-		} else {
+		}
+		else {
 			return 100;
 		}
 	}

Modified: trunk/gallery/setup/check.inc
===================================================================
--- trunk/gallery/setup/check.inc	2006-10-28 15:10:22 UTC (rev 14992)
+++ trunk/gallery/setup/check.inc	2006-10-28 15:42:59 UTC (rev 14993)
@@ -47,13 +47,13 @@
         'image' => gImage('red_trafficlight.gif', gTranslate('config', "Serious warning, no go !")),
         'text' => gTranslate('config', "Serious warning, no go !"),
         'border' => 'border: 4px solid #ec000a',
-        'type' => 'nogo'
+        'type' => 'error'
     ),
     100 => array(
         'image' => gImage('red_trafficlight.gif', gTranslate('config', "Failure")),
         'text' => gTranslate('config', "Failure"),
         'border' => 'border: 4px solid #ec000a',
-        'type' => 'nogo'
+        'type' => 'error'
     )
 );
 
@@ -113,58 +113,59 @@
         }
         ?>
         </div>
-        <?php foreach ($checkPriority as $key => $content) {
-        echo "\n\t<h1>". $content['shortdesc'] . '</h1>';
+        <?php
 
-        echo "\n\t" . $content['longdesc'];
-?>
+        foreach ($checkPriority as $key => $checklistGroup) {
+            echo "\n\t<h1>". $checklistGroup['shortdesc'] . '</h1>';
 
-        <div class="g-config-main">
-            <table cellspacing="0" align="center">
-<?php
-            foreach ($content['checks'] as $short) {
+            echo "\n\t" . $checklistGroup['longdesc'];
+
+            $table = new galleryTable();
+            $table->setColumnCount(4);
+            $table->setAttrs(array(
+                'cellspacing' => 0,
+                'id' => "setupchecks_$key",
+                'class' => 'g-setupchecks'));
+
+            /* $checklist contains actually the complete list of checks */
+            foreach ($checklistGroup['checkslist'] as $short) {
                 $check = $checklist[$short];
                 if( isset($check["enabled"]) && $check["enabled"] == "no") continue;
 
-                $func = $check["func"];
+                $func = $check['func'];
                 $result = $func();
 
                 list($success, $fail, $warn) = $result;
                 $status = getCheckStatus($result, $check);
                 $usedStatus[$status] = $status;
 
-                // new Line //
-                echo "\n<tr style=\"margin-top: 2px\">";
-                // shortdesc
-                echo "\n\t<td class=\"g-desc-cell\" width=\"35%\" style=\"font-weight: bold; vertical-align: top; border-bottom: 2px solid #ececec;\">". $check['prompt'];
-                echo "\n\t\t". '<br><div style="font-weight: normal; display:none;" id="toogleFrame_'. $short .'">'. $check["desc"] .'</div>';
-                echo "\n</td>";
+                 // shortdesc
+                $table->addElement(array(
+                    'content' => $check['prompt'] . '<br>' . toggleBox($short, $check["desc"], 'none'),
+                    'cellArgs' => array('class' => 'g-desc-cell g-setup-check-desc')));
 
-                // toogle button
-                echo "\n\t<td class=\"g-desc-cell\" style=\"vertical-align: top; border-right: 2px solid #ececec; border-bottom: 2px solid #ececec;\">" .
-                    "\n\t\t<a href=\"#\" onClick=\"gallery_toggle('$short'); return false;\">" .
-                    gImage('expand.gif', gTranslate('config', "Show/hide more information"), array('id' => "toogleBut_$short")) .
-                    '</a>';
-                echo "\n\t</td>";
+                // toggle button for the long description
+                $table->addElement(array(
+                    'content' => toggleButton($short),
+                    'cellArgs' => array('class' => 'g-desc-cell g-setup-check-toggle')));
 
                 // traffic light
-                echo "\n\t<td class=\"g-desc-cell\" style=\"border-right: 2px solid #ececec; border-bottom: 2px solid #ececec;\">";
-                echo $configTestStatus[$status]['image'];
-                echo "\n\t</td>";
+                $table->addElement(array(
+                    'content' => $configTestStatus[$status]['image'],
+                    'cellArgs' => array('class' => 'g-desc-cell g-setup-check-trafficlight')));
 
                 // result
-                echo "\n\t<td class=\"g-desc-cell\" style=\"vertical-align: top;border-bottom: 2px solid #ececec;\">";
+                $message = '';
 
-                $message = '';
-                foreach ($success as $key) {
-                    if ($key != '') {
-                        $message .= $key;
+               foreach ($success as $successMsg) {
+                    if ($successMsg != '') {
+                        $message .= $successMsg;
                     }
                 }
 
                 foreach ($fail as $key => $val) {
-                    if (isset($check['optional']) && $check['optional'] == 1) {
-                        if (isset($check["serious"]) && $check["serious"] == 1) {
+                    if (isset($check['optional']) && $check['optional']) {
+                        if (isset($check['serious']) && $check['serious']) {
                             $serious_warning = true;
                         }
                         if (isset($check) && isset($check[$key])) {
@@ -173,7 +174,7 @@
                         $warning++;
                     }
                     else {
-                        if (isset($check["serious"]) && $check["serious"] == 1) {
+                        if (isset($check['serious']) && $check['serious']) {
                             $serious_warning = true;
                         }
 
@@ -183,8 +184,8 @@
                         $error++;
                     }
 
-                    if (isset($check["open-basedir-note"]) && !empty($openBasedir)) {
-                        $message .= '<p>'. $check["open-basedir-note"] . '</p>';
+                    if (isset($check['open-basedir-note']) && !empty($openBasedir)) {
+                        $message .= '<p>'. $check['open-basedir-note'] . '</p>';
                     }
 
                     if (is_array($val)) {
@@ -212,24 +213,26 @@
                     }
                 }
 
-                echo infoBox(array(array(
-                    'type' => $configTestStatus[$status]['type'],
-                    'text' => $message)
-                    ), '', false
-                );
-                echo "</td>";
-
-                echo "\n</tr>";
+                $table->addElement(array(
+                    'content' => infoBox(array(array(
+                        'type' => $configTestStatus[$status]['type'],
+                        'text' => $message)
+                        ), '', false
+                    ),
+                    'cellArgs' => array('class' => 'g-desc-cell')));
             }
-?>
-            </table>
 
-        </div>
+            // Now show the checklist.
+            ?>
+            <div class="g-config-main">
+            <?php echo $table->render(); ?>
+            </div>
 
-        <div class="clear"></div>
-<?php
+            <div class="clear"></div>
+            <?php
+
         }
-?>
+    ?>
     </div>
 
     <div class="floatleft left" style="width: 30%">
@@ -237,12 +240,13 @@
         <tr>
           <td colspan="2" class="left"><?php echo gTranslate ('config', "Legend:"); ?></td>
         </tr><?php
-    foreach ($usedStatus as $status) {
-        echo "\n    <tr>";
-        echo "\n      <td>". $configTestStatus[$status]['image'] .'</td>';
-        echo "\n     <td style=\"padding: 2px; ". $configTestStatus[$status]['border'] .'">'. $configTestStatus[$status]['text'] .'</td>';
-        echo "\n    </tr>";
-    }
+        sort($usedStatus);
+        foreach ($usedStatus as $status) {
+            echo "\n    <tr>";
+            echo "\n      <td>". $configTestStatus[$status]['image'] .'</td>';
+            echo "\n     <td style=\"padding: 2px; ". $configTestStatus[$status]['border'] .'">'. $configTestStatus[$status]['text'] .'</td>';
+            echo "\n    </tr>";
+        }
 ?>
       </table>
     </div>
@@ -282,11 +286,11 @@
 ?>
         </div>
 <?php
-    echo gSubmit(
-        'go_next',
-        gTranslate('config', "_Next Step &gt;&gt;"),
-        array('disabled' => 'disabled')
-    );
+echo gSubmit(
+    'go_next',
+    gTranslate('config', "_Next Step &gt;&gt;"),
+    array('disabled' => 'disabled')
+);
 }
 ?>
     </div>

Modified: trunk/gallery/setup/check_versions.php
===================================================================
--- trunk/gallery/setup/check_versions.php	2006-10-28 15:10:22 UTC (rev 14992)
+++ trunk/gallery/setup/check_versions.php	2006-10-28 15:42:59 UTC (rev 14993)
@@ -92,9 +92,9 @@
 foreach($tests as $testname => $args) {
     if  (!empty($versionStatus[$testname])) { ?>
 <div class="g-notice left">
-    <a href="#" style="float: left;" onClick="gallery_toggle('<?php echo $testname; ?>'); return false;"><?php echo gImage('expand.gif', _("Show/hide more information"), array('id' => "toogleBut_$testname")); ?></a>
+    <a href="#" style="float: left;" onClick="gallery_toggle('<?php echo $testname; ?>'); return false;"><?php echo gImage('expand.gif', _("Show/hide more information"), array('id' => "toggleBut_$testname")); ?></a>
     <?php echo infobox(array(array('type' => $args['type'], 'text' => $args['text'])), '', false); ?>
-  <div style="width:100%; display:none;" id="toogleFrame_<?php echo $testname; ?>">
+  <div style="width:100%; display:none;" id="toggleFrame_<?php echo $testname; ?>">
     <table>
       <tr>
         <td class="g-sitedesc" colspan="2"><?php echo $args['hinttext']; ?></td>

Modified: trunk/gallery/setup/index.php
===================================================================
--- trunk/gallery/setup/index.php	2006-10-28 15:10:22 UTC (rev 14992)
+++ trunk/gallery/setup/index.php	2006-10-28 15:42:59 UTC (rev 14993)
@@ -44,35 +44,12 @@
 
 	<script language="JavaScript" type="text/javascript">
     <!--
-
-	function localGetElementsByTagName(tagName) {
-		var eleArray;
-		if (window.opera) eleArray = document.body.getElementsByTagName(tagName);
-		else if (document.getElementsByTagName) eleArray = document.getElementsByTagName(tagName);
-		else if (document.all) eleArray = document.all.tags(tagName);
-		else if (document.layers) {
-			eleArray = new Array();
-			nnGetAllLayers(window, eleArray, 0);
-		}
-		return eleArray;
-	}
-
-	function nnGetAllLayers(parent, layerArray, nextIndex) {
-		var i, layer;
-		for (i = 0; i < parent.document.layers.length; i++) {
-			layer = parent.document.layers[i];
-			layerArray[nextIndex++] = layer;
-			if (layer.document.layers.length) nextIndex = nnGetAllLayers(layer, layerArray, nextIndex);
-		}
-		return nextIndex;
-	}
-
 	function enableButtons() {
-		var buttons = localGetElementsByTagName("input");
+		var buttons = document.getElementsByTagName('input');
 
 		var i = 0;
 		while (buttons[i]) {
-			if (buttons[i].type == "submit" || buttons[i].type == "button") {
+			if (buttons[i].type == 'submit' || buttons[i].type == 'button') {
 				buttons[i].disabled = false;
 			}
 			i++;
@@ -93,9 +70,11 @@
 
 if (isset($go_defaults) || isset($refresh)) {
 	$setup_page = $this_page;
-} else if (isset($go_next)) {
+}
+else if (isset($go_next)) {
 	$setup_page = $next_page;
-} else if (isset($go_back)) {
+}
+else if (isset($go_back)) {
 	$setup_page = $back_page;
 }
 
@@ -148,11 +127,12 @@
 <?php
 
 if (array_key_exists($setup_page, $steps)) {
-	include(dirname(__FILE__) ."/$setup_page.inc");
-} else {
-	print _("Security violation") .".\n";
-	exit;
+    include(dirname(__FILE__) ."/$setup_page.inc");
 }
+else {
+    print _("Security violation") .".\n";
+    exit;
+}
 
 foreach ($preserve as $key => $val) {
 	if ($key && !isset($onThisPage[$key])) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14995
          http://svn.sourceforge.net/gallery/?rev=14995&view=rev
Author:   jenst
Date:     2006-10-28 15:48:10 -0700 (Sat, 28 Oct 2006)

Log Message:
-----------
2006-10-29 Jens Tkotz <jens@...> 1.6-alpha2-svn-b20

 * New: Progressbar
     - function addProgressbar().
     - javascript to update the progressbar.
     - css for progessbar.

 * Change: Use progressbar in album update.

Modified Paths:
--------------
    trunk/gallery/ChangeLog
    trunk/gallery/Version.php
    trunk/gallery/css/base.css.default
    trunk/gallery/css/screen.css.default
    trunk/gallery/lib/content.php
    trunk/gallery/popups/upgrade_album.php

Added Paths:
-----------
    trunk/gallery/js/progressbar.js

Modified: trunk/gallery/ChangeLog
===================================================================
--- trunk/gallery/ChangeLog	2006-10-28 15:54:37 UTC (rev 14994)
+++ trunk/gallery/ChangeLog	2006-10-28 22:48:10 UTC (rev 14995)
@@ -1,3 +1,12 @@
+2006-10-29 Jens Tkotz <jens@...> 1.6-alpha2-svn-b20
+
+ * New: Progressbar
+     - function addProgressbar().
+     - javascript to update the progressbar.
+     - css for progessbar.
+
+ * Change: Use progressbar in album update.
+
 2006-10-28 Jens Tkotz <jens@...> 1.6-alpha2-svn-b19
 
  * CHANGE: Removed Js function localGetElementsByTagName() and

Modified: trunk/gallery/Version.php
===================================================================
--- trunk/gallery/Version.php	2006-10-28 15:54:37 UTC (rev 14994)
+++ trunk/gallery/Version.php	2006-10-28 22:48:10 UTC (rev 14995)
@@ -22,7 +22,7 @@
 ?>
 <?php
 
-$gallery->version = '1.6-alpha2-svn-b19';
+$gallery->version = '1.6-alpha2-svn-b20';
 $gallery->config_version = 99;
 $gallery->album_version = 38;
 $gallery->user_version = 6;

Modified: trunk/gallery/css/base.css.default
===================================================================
--- trunk/gallery/css/base.css.default	2006-10-28 15:54:37 UTC (rev 14994)
+++ trunk/gallery/css/base.css.default	2006-10-28 22:48:10 UTC (rev 14995)
@@ -525,4 +525,12 @@
     width: 0%;
     background: green;
     height: 10px;
+}
+
+.albumUpgradeStatus {
+    margin-top: 3px;
+    padding: 2px;
+    overflow: scroll;
+    height: 200px;
+    border: 1px dashed red;
 }
\ No newline at end of file

Modified: trunk/gallery/css/screen.css.default
===================================================================
--- trunk/gallery/css/screen.css.default	2006-10-28 15:54:37 UTC (rev 14994)
+++ trunk/gallery/css/screen.css.default	2006-10-28 22:48:10 UTC (rev 14995)
@@ -751,4 +751,8 @@
     font-weight: bold;
 }
 
-/******************** End autocomplete *********************/
\ No newline at end of file
+/******************** End autocomplete *********************/
+
+.albumUpgradeStatus {
+    border: 1px dashed #669;
+}
\ No newline at end of file

Added: trunk/gallery/js/progressbar.js
===================================================================
--- trunk/gallery/js/progressbar.js	                        (rev 0)
+++ trunk/gallery/js/progressbar.js	2006-10-28 22:48:10 UTC (rev 14995)
@@ -0,0 +1,9 @@
+
+function updateProgressBar(htmlId, status, percentDone) {
+    var progressBar = document.getElementById(htmlId);
+    var progressBarDone = document.getElementById('progressBarDone_' + htmlId);
+    var progressDescription = document.getElementById('progressDescription_' + htmlId);
+
+    progressBarDone.style.width = percentDone + "%";
+    progressDescription.innerHTML = status;
+}
\ No newline at end of file


Property changes on: trunk/gallery/js/progressbar.js
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision
Name: svn:eol-style
   + native

Modified: trunk/gallery/lib/content.php
===================================================================
--- trunk/gallery/lib/content.php	2006-10-28 15:54:37 UTC (rev 14994)
+++ trunk/gallery/lib/content.php	2006-10-28 22:48:10 UTC (rev 14995)
@@ -1522,4 +1522,31 @@
     return $html;
 
 }
-?>
\ No newline at end of file
+
+/**
+ * Returns the HTML code for a progressbar.
+ *
+ * @param string  $id        HTML ID of the progressbar
+ * @param string  $label     A descriptive Label
+ * @return string $html
+ * @author Jens Tkotz <jens@...>
+ */
+function addProgressbar($id, $label = '') {
+    global $gallery;
+    static $jsSet = false;
+
+    $html = '';
+
+    if(!$jsSet) {
+        $jsUrl = $gallery->app->photoAlbumURL . '/js/progressbar.js';
+        $html .= "<script type=\"text/javascript\" src=\"$jsUrl\"></script>\n";
+        $jsSet = true;
+    }
+
+    $html .= "\n<div class=\"g-emphasis\">$label</div>\n";
+    $html .= "<div id=\"$id\" class=\"progressBar\"><div id=\"progressBarDone_$id\" class=\"progressBarDone\"></div></div>\n";
+    $html .= "<div id=\"progressDescription_$id\"></div>\n";
+
+    return $html;
+}
+?>

Modified: trunk/gallery/popups/upgrade_album.php
===================================================================
--- trunk/gallery/popups/upgrade_album.php	2006-10-28 15:54:37 UTC (rev 14994)
+++ trunk/gallery/popups/upgrade_album.php	2006-10-28 22:48:10 UTC (rev 14995)
@@ -31,7 +31,7 @@
  * we want to keep track to see  if we're in an include loop.  If so, return.
  */
 if (!isset($UPGRADE_LOOP)) {
-	$UPGRADE_LOOP=0;
+	$UPGRADE_LOOP = 0;
 }
 $UPGRADE_LOOP++;
 if ($UPGRADE_LOOP == 2) {
@@ -44,6 +44,12 @@
 
 list($upgrade_albumname, $upgradeall) = getRequestVar(array('upgrade_albumname', 'upgradeall'));
 
+// Hack check
+if (!$gallery->user->isAdmin() && empty($upgrade_albumname)) {
+	echo gTranslate('core', "You are not allowed to perform this action!");
+	exit;
+}
+
 /*
  * If we're not the admin, we can only upgrade the album that we're
  * looking at.
@@ -52,126 +58,125 @@
 	$upgrade_albumname = $gallery->session->albumName;
 }
 
-// Hack check
-if (!$gallery->user->isAdmin() && empty($upgrade_albumname)) {
-	echo gTranslate('core', "You are not allowed to perform this action!");
-	exit;
-}
-
 $albumDB = new AlbumDB(FALSE);
 
-function reload_button() {
-	print "<center>";
-	print "<form>";
-	echo gButton("done", gTranslate('core', "_Done"), 'location.reload()');
-	print "</form>";
-	print "</center>";
-}
+function process($album = null) {
+	global $albumDB;
 
-function end_file() {
-	print "\n</div>";
-	print "\n</body>";
-	print "\n</html>";
-}
+	echo addProgressbar('mainProgessbar', gTranslate('core', "Total Progress:"));
+	echo "\n<br>";
+	echo addProgressbar('albumProgessbar', gTranslate('core', "Album Progress:"));
 
-function process($album=null) {
-	global $albumDB;
+	if ($album) {
+		echo '<br><span class="g-emphasis">' .
+		  sprintf(gTranslate('core', "Album: %s"), $album->fields["title"]) .
+		  "</span>\n";
 
-	print "<br>";
-	print "<b>" . gTranslate('core', "Progress") .":</b>";
-	print "<ul>";
-	if ($album) {
-		print "<b>". gTranslate('core', "Album") . ": " . $album->fields["title"] . "</b><br>";
 		// Upgrade the album
 		if ($album->integrityCheck()) {
 			$album->save(array(), 0);
 		}
-		print "<br>";
-	} else {
+
+		echo "\n<script type=\"text/javascript\">updateProgressBar('mainProgessbar', '',100)</script>";
+		echo "\n<script type=\"text/javascript\">updateProgressBar('albumProgessbar', '',100)</script>";
+	}
+	else {
+	    $count = sizeof($albumDB->outOfDateAlbums);
+	    $onePercent = 100/$count;
+	    $i = 0;
+
+	    echo '<br><div class="g-emphasis"><i>' . gTranslate('core', "Statusbox") . '</i></div>';
+	    echo gTranslate('core', "Please ensure there are no errors.");
+	    echo '<div class="albumUpgradeStatus">';
 		foreach ($albumDB->outOfDateAlbums as $albumName) {
-
+            $i++;
 			// Retrieve the album
 			$album = $albumDB->getAlbumByName($albumName);
 
-			print "<b>". gTranslate('core', "Album") . ": " . $album->fields["title"] . "</b><br>";
+			echo "\n<div class=\"g-emphasis\">".
+			     sprintf(gTranslate('core', "Album: %s"), $album->fields["title"]) .
+			     "</div>";
 
 			// Upgrade the album
 			if ($album->integrityCheck()) {
 				$album->save(array(), 0);
 			}
 
-			print "<br>";
+			echo "\n<script type=\"text/javascript\">updateProgressBar('mainProgessbar', '',". ceil($i * $onePercent) .")</script>";
+			print "<br><br>";
 		}
+		echo "</div>";
 	}
-	print "</ul>";
 }
 
+/* Start HTML output */
 printPopupStart(gTranslate('core', "Upgrade Albums"), '', 'left');
 
-echo "<p>";
-echo gTranslate('core', "The following albums in your gallery were created with an older version of the software and are out of date.");
-echo '<br>';
-echo gTranslate('core', "This is not a problem!");
-echo '<p>';
-echo gTranslate('core', "We can upgrade them.  This may take some time for large albums but we'll try to keep you informed as we proceed.");
-echo '<br>';
-echo gTranslate('core', "None of your photos will be harmed in any way by this process.");
-echo '<br>';
-echo gTranslate('core', "Rest assured, that if this process takes a long time now, it's going to make your gallery run more efficiently in the future.");
-
-echo "\n</p>";
-
 if (isset($upgrade_albumname)) {
-	$album = new Album();
-	$album->load($upgrade_albumname);
-}
+    $album = new Album();
+    $album->load($upgrade_albumname);
 
-if (isset($album) && $album->versionOutOfDate()) {
-	process($album);
-	reload_button();
-	end_file();
-	exit;
+    if ($album->versionOutOfDate()) {
+        process($album);
+        $actionDone = true;
+    }
 }
-
-if (isset($upgradeall) && sizeof($albumDB->outOfDateAlbums)) {
-	process();
-	reload_button();
-	end_file();
-	exit;
+elseif (isset($upgradeall) && sizeof($albumDB->outOfDateAlbums)) {
+    process();
+    $actionDone = true;
 }
 
-
-if (!sizeof($albumDB->outOfDateAlbums)) {
+if (sizeof($albumDB->outOfDateAlbums) == 0) {
 	print "<b>". gTranslate('core', "All albums are up to date.") ."</b>";
-} else {
+}
+elseif (!isset($actionDone)) {
+    echo gTranslate('core', "Some albums in your gallery were created with an older version of the software and are out of date.");
+    echo '<br>';
+    echo gTranslate('core', "This is not a problem!");
+    echo '<p>';
+    echo gTranslate('core', "We can upgrade them.  This may take some time for large albums but we'll try to keep you informed as we proceed.");
+    echo '<br>';
+    echo gTranslate('core', "None of your photos will be harmed in any way by this process.");
+    echo '<br>';
+    echo gTranslate('core', "Rest assured, that if this process takes a long time now, it's going to make your gallery run more efficiently in the future.");
 
 	echo "\n<p>";
 	echo sprintf(gTranslate('core', "The following albums need to be upgraded.  You can process them individually by clicking the upgrade link next to the album that you desire, or you can just %s."),
 		'<a class="g-error" href="' . makeGalleryUrl("upgrade_album.php", array("upgradeall" => 1, 'type' => 'popup')) . '"><b>' . gTranslate('core', "upgrade them all at once") . '</b></a>');
 
 	echo '</p>';
-	echo "\n<table align=\"center\">";
+
+	$updateList = new galleryTable();
+
+	$updateList->setAttrs(array('align' => 'center'));
+
 	foreach ($albumDB->outOfDateAlbums as $albumName) {
 		$album = $albumDB->getAlbumByName($albumName);
-		echo "\n<tr>";
-		echo '<td><b>'. $album->fields["title"] . '</b></td>';
-		echo '<td>('. $album->numPhotos(1) .' '. gTranslate('core', "items"). ')</td>';
-		echo '<td>'. galleryLink(
-		  makeGalleryUrl("upgrade_album.php",
-		      array("upgrade_albumname" => $album->fields["name"], 'type' => 'popup')),
-		      gTranslate('core', "upgrade"), '', '', true
-		  ) .'</td>';
-		echo '</tr>';
+
+		$updateList->addElement(array(
+		  'content' => $album->fields["title"],
+		  'cellArgs' => array('class' => 'g-emphasis')));
+
+		$updateList->addElement(array(
+            'content' => gTranslate('core', "One item", "%s items", $album->numPhotos(1), gTranslate('core', "Empty"),true),
+            'cellArgs' => array('class' => 'right')));
+
+		$updateList->addElement(array('content' => galleryLink(
+            makeGalleryUrl('upgrade_album.php', array(
+                'upgrade_albumname' => $album->fields['name'],
+                'type' => 'popup')),
+            gTranslate('core', "upgrade"), '', '', true)));
 	}
-	echo "\n</table>\n";
+
+	echo $updateList->render();
 }
+?>
+    <form action="#" class="center">
+    <?php echo gButton("reloadButton", gTranslate('core', "_Reload"), 'location.reload()'); ?>
+    <?php echo gButton("closeButton", gTranslate('core', "_Close Window"), 'parent.close()'); ?>
+    </form>
 
-	print '<center><form name="close" action="#">';
-        echo gButton("close", gTranslate('core', "_Done"), 'opener.location.reload(); parent.close()');
-	print '</form></center>';
+</div>
 
-	echo "\n</div>";
-	print gallery_validation_link("upgrade_album.php");
-?>
 </body>
 </html>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14996
          http://svn.sourceforge.net/gallery/?rev=14996&view=rev
Author:   jenst
Date:     2006-10-29 06:20:02 -0800 (Sun, 29 Oct 2006)

Log Message:
-----------
2006-10-29 Jens Tkotz <jens@...> 1.6-alpha2-svn-b21

 * Fix: "disco1" is no ImageMagick binary ;)

Modified Paths:
--------------
    trunk/gallery/ChangeLog
    trunk/gallery/Version.php
    trunk/gallery/lib/setup.php

Modified: trunk/gallery/ChangeLog
===================================================================
--- trunk/gallery/ChangeLog	2006-10-28 22:48:10 UTC (rev 14995)
+++ trunk/gallery/ChangeLog	2006-10-29 14:20:02 UTC (rev 14996)
@@ -1,3 +1,7 @@
+2006-10-29 Jens Tkotz <jens@...> 1.6-alpha2-svn-b21
+
+ * Fix: "disco1" is no ImageMagick binary ;)
+
 2006-10-29 Jens Tkotz <jens@...> 1.6-alpha2-svn-b20
 
  * New: Progressbar

Modified: trunk/gallery/Version.php
===================================================================
--- trunk/gallery/Version.php	2006-10-28 22:48:10 UTC (rev 14995)
+++ trunk/gallery/Version.php	2006-10-29 14:20:02 UTC (rev 14996)
@@ -22,7 +22,7 @@
 ?>
 <?php
 
-$gallery->version = '1.6-alpha2-svn-b20';
+$gallery->version = '1.6-alpha2-svn-b21';
 $gallery->config_version = 99;
 $gallery->album_version = 38;
 $gallery->user_version = 6;

Modified: trunk/gallery/lib/setup.php
===================================================================
--- trunk/gallery/lib/setup.php	2006-10-28 22:48:10 UTC (rev 14995)
+++ trunk/gallery/lib/setup.php	2006-10-29 14:20:02 UTC (rev 14996)
@@ -652,7 +652,6 @@
 	$imagick = array(
 		fs_executable('identify'),
 		fs_executable('convert'),
-        fs_executable('disco1'),
 		fs_executable('composite'),
 	);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14999
          http://svn.sourceforge.net/gallery/?rev=14999&view=rev
Author:   jenst
Date:     2006-10-29 17:51:21 -0800 (Sun, 29 Oct 2006)

Log Message:
-----------
2006-10-30 Jens Tkotz <jens@...> 1.6-alpha2-svn-b22

 * Change: Added backround images for header and adminbar.

Modified Paths:
--------------
    trunk/gallery/ChangeLog
    trunk/gallery/Version.php
    trunk/gallery/css/screen.css.default

Added Paths:
-----------
    trunk/gallery/images/backgrounds/
    trunk/gallery/images/backgrounds/adminbar.png
    trunk/gallery/images/backgrounds/header.png

Modified: trunk/gallery/ChangeLog
===================================================================
--- trunk/gallery/ChangeLog	2006-10-29 23:21:28 UTC (rev 14998)
+++ trunk/gallery/ChangeLog	2006-10-30 01:51:21 UTC (rev 14999)
@@ -1,3 +1,7 @@
+2006-10-30 Jens Tkotz <jens@...> 1.6-alpha2-svn-b22
+
+ * Change: Added backround images for header and adminbar.
+
 2006-10-29 Jens Tkotz <jens@...> 1.6-alpha2-svn-b21
 
  * Fix: "disco1" is no ImageMagick binary ;)

Modified: trunk/gallery/Version.php
===================================================================
--- trunk/gallery/Version.php	2006-10-29 23:21:28 UTC (rev 14998)
+++ trunk/gallery/Version.php	2006-10-30 01:51:21 UTC (rev 14999)
@@ -22,9 +22,9 @@
 ?>
 <?php
 
-$gallery->version = '1.6-alpha2-svn-b21';
+$gallery->version = '1.6-alpha2-svn-b22';
 $gallery->config_version = 99;
-$gallery->album_version = 38;
+$gallery->album_version = 39;
 $gallery->user_version = 6;
 $gallery->url = "http://gallery.sourceforge.net";
 

Modified: trunk/gallery/css/screen.css.default
===================================================================
--- trunk/gallery/css/screen.css.default	2006-10-29 23:21:28 UTC (rev 14998)
+++ trunk/gallery/css/screen.css.default	2006-10-30 01:51:21 UTC (rev 14999)
@@ -57,9 +57,11 @@
     font-size: 9pt;
 }
 
-.g-header, .g-header-popup, .g-columnheader {
+
+.g-header, .g-header-popup {
     color: #fff;
-    background: #66a;
+    background-image:url(../images/backgrounds/header.png);
+    1background: #66a;
 }
 
 .g-header {
@@ -67,6 +69,7 @@
     height: 32px;
     padding: 5px 3px 3px 3px;
     margin-bottom: 1px;
+
 }
 
 .g-header-popup {
@@ -76,6 +79,11 @@
     margin-bottom: 1px;
 }
 
+.g-columnheader {
+    color: #fff;
+    background: #66a;
+}
+
 .g-pagetitle, .g-pagetitle-popup {
     margin-left: 20px;
     padding: 2px;
@@ -186,8 +194,8 @@
 .g-adminbar {
     font-size: 7.2pt;
     border: 1px solid #006;
-    background: #e9e9ff;
     font-weight: bold;
+    background-image:url(../images/backgrounds/adminbar.png);
 }
 
 .g-adminbartext {

Added: trunk/gallery/images/backgrounds/adminbar.png
===================================================================
(Binary files differ)


Property changes on: trunk/gallery/images/backgrounds/adminbar.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: trunk/gallery/images/backgrounds/header.png
===================================================================
(Binary files differ)


Property changes on: trunk/gallery/images/backgrounds/header.png
___________________________________________________________________
Name: svn:mime-type
   + image/png


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15000
          http://svn.sourceforge.net/gallery/?rev=15000&view=rev
Author:   jenst
Date:     2006-10-29 18:02:35 -0800 (Sun, 29 Oct 2006)

Log Message:
-----------
2006-10-30 Jens Tkotz <jens@...> 1.6-alpha2-svn-b23

 * CHANGE: description is now a fixed item field, not a custom
     - album version bump
     - tweaked edit_caption and photo view.
     - remoced description as default custom field from config
     - new methods getDescription() and setDescription

   NOTE: This means the description is CURRENTLY not migrated to G2

 * New: Implemented call of progressbar update for album updates.

 * Change: Better error display when adding items.

Modified Paths:
--------------
    trunk/gallery/ChangeLog
    trunk/gallery/Version.php
    trunk/gallery/classes/Album.php
    trunk/gallery/classes/AlbumItem.php
    trunk/gallery/includes/setup/defaults.inc
    trunk/gallery/popups/edit_caption.php
    trunk/gallery/templates/photo.tpl.default

Modified: trunk/gallery/ChangeLog
===================================================================
--- trunk/gallery/ChangeLog	2006-10-30 01:51:21 UTC (rev 14999)
+++ trunk/gallery/ChangeLog	2006-10-30 02:02:35 UTC (rev 15000)
@@ -1,3 +1,17 @@
+2006-10-30 Jens Tkotz <jens@...> 1.6-alpha2-svn-b23
+
+ * CHANGE: description is now a fixed item field, not a custom
+     - album version bump
+     - tweaked edit_caption and photo view.
+     - remoced description as default custom field from config
+     - new methods getDescription() and setDescription
+
+   NOTE: This means the description is CURRENTLY not migrated to G2
+  
+ * New: Implemented call of progressbar update for album updates.
+
+ * Change: Better error display when adding items.
+
 2006-10-30 Jens Tkotz <jens@...> 1.6-alpha2-svn-b22
 
  * Change: Added backround images for header and adminbar.

Modified: trunk/gallery/Version.php
===================================================================
--- trunk/gallery/Version.php	2006-10-30 01:51:21 UTC (rev 14999)
+++ trunk/gallery/Version.php	2006-10-30 02:02:35 UTC (rev 15000)
@@ -22,7 +22,7 @@
 ?>
 <?php
 
-$gallery->version = '1.6-alpha2-svn-b22';
+$gallery->version = '1.6-alpha2-svn-b23';
 $gallery->config_version = 99;
 $gallery->album_version = 39;
 $gallery->user_version = 6;

Modified: trunk/gallery/classes/Album.php
===================================================================
--- trunk/gallery/classes/Album.php	2006-10-30 01:51:21 UTC (rev 14999)
+++ trunk/gallery/classes/Album.php	2006-10-30 02:02:35 UTC (rev 15000)
@@ -97,7 +97,8 @@
             $value = trim($value);
             if (empty($value)) {
                 unset($this->fields["extra_fields"][$key]);
-            } else {
+            }
+            else {
                 $this->fields["extra_fields"][$key] = $value;
             }
         }
@@ -285,10 +286,13 @@
 
     function versionOutOfDate() {
         global $gallery;
+
         if (strcmp($this->version, $gallery->album_version)) {
-            return 1;
+            return true;
         }
-        return 0;
+	else {
+           return false;
+       }
     }
 
     /**
@@ -297,6 +301,7 @@
      */
     function integrityCheck() {
         global $gallery;
+
         $gallery->album = $this;
 
         if (!$this->transient->photosloaded) {
@@ -312,6 +317,7 @@
         my_flush();
 
         $changed = 0;
+
         $this->fields["last_quality"] = $gallery->app->jpegImageQuality;
         $check = array(
             'thumb_size',
@@ -358,7 +364,7 @@
         foreach ($check as $field) {
             if (!isset($this->fields[$field]) && isset($gallery->app->default[$field])) {
                 $this->fields[$field] = $gallery->app->default[$field];
-                $changed = 1;
+                $changed = true;
             }
         }
 
@@ -371,30 +377,30 @@
                 foreach ($this->fields['perms']['canRead'] as $uid => $p) {
                     $this->fields['perms']['canViewFullImages'][$uid] = $p;
                 }
-                $changed = 1;
+                $changed = true;
             }
         }
         if ($this->version < 10) {
             if (empty($this->fields['summary'])) {
                 $this->fields['summary']='';
-                $changed = 1;
+                $changed = true;
             }
             if (empty($this->fields['extra_fields']) || !is_array($this->fields['extra_fields'])) {
                 $this->fields['extra_fields']=array();
-                $changed = 1;
+                $changed = true;
             }
         }
         if ($this->version < 16) {
             if (empty($this->fields['votes'])) {
                 $this->fields['votes']=array();
-                $changed = 1;
+                $changed = true;
             }
         }
         if ($this->version < 17) {
             foreach ($this->fields['votes'] as $key => $value) {
                 unset($this->fields['votes'][$key]);
                 $this->fields['votes']["item.$key"]=$value;
-                $changed = 1;
+                $changed = true;
             }
         }
 
@@ -459,7 +465,7 @@
             // instance of this album, so we have to do it here also so that
             // when *this* instance gets saved the value is right
             $this->fields["name"] = $newName;
-            $changed = 1;
+            $changed = true;
         }
 
         /* Rebuild highlight */
@@ -472,7 +478,7 @@
 
         if ($this->version < 29) {
             $this->fields['guid'] = genGUID();
-            $changed = 1;
+            $changed = true;
         }
 
         if ($this->version < 30) {
@@ -498,7 +504,7 @@
                     $this->fields['print_photos']['shutterfly']['checked'] = 'checked';
                 }
                 unset($this->fields['print_photos']['ezprints']);
-                $changed = 1;
+                $changed = true;
             }
         }
         // In gallery 1.5.1 the Structure for print services was 'de-suck-ified' (quoted B.M.W.)
@@ -528,48 +534,81 @@
 			$changed = true;
         }
 
+        static $configWritten = false;
+        if ($this->version < 39) {
+            $translation1 = gTranslate('core', "description");
+            $translation2 = gTranslate('core', "Description");
+            $removeFields = array('description', 'Description', $translation1, $translation2);
+
+            if(!empty($this->fields['extra_fields'])) {
+                foreach($this->fields['extra_fields'] as $key => $fieldname) {
+                    if(in_array($fieldname, $removeFields)) {
+                        unset($this->fields['extra_fields'][$key]);
+                    }
+                }
+            }
+
+            if(!$configWritten) {
+                $configFile = dirname(dirname(__FILE__)) .'/config.php';
+
+                $config = fs_file_get_contents($configFile);
+                $pattern = '/(description|Description|$translation1|$translation2)\ *,?/';
+                $replacement = '';
+                $newconfig = preg_replace($pattern, '', $config);
+
+                if ($fd = fs_fopen($configFile, "w")) {
+                    fwrite($fd, $newconfig);
+                    fclose($fd);
+                }
+                $configWritten = true;
+            }
+            $changed = true;
+        }
+
         /* Special case for EXIF :-( */
         if (!$this->fields["use_exif"]) {
             if (!empty($gallery->app->use_exif)) {
                 $this->fields["use_exif"] = "yes";
-            } else {
+            }
+            else {
                 $this->fields["use_exif"] = "no";
             }
-            $changed = 1;
+            $changed = true;
         }
 
         /* Special case for serial number */
         if (!$this->fields["serial_number"]) {
             $this->fields["serial_number"] = 0;
-            $changed = 1;
+            $changed = true;
         }
 
-        print gTranslate('core', "done").".<br>";
-
         /* Check all items */
         $count = $this->numPhotos(1);
-        for ($i = 1; $i <= $count; $i++) {
-            set_time_limit(30);
-            print sprintf(gTranslate('core', "Upgrading item %d of %d . . . "), $i, $count);
-            my_flush();
+        if($count > 0) {
+            $onePercent = 100/$count;
+            for ($i = 1; $i <= $count; $i++) {
+                set_time_limit(30);
+                $status = sprintf(gTranslate('core', "Upgrading item %d of %d . . . "), $i, $count);
+                echo "\n<script type=\"text/javascript\">updateProgressBar('albumProgessbar', '$status',". ceil($i * $onePercent) .")</script>";
+                my_flush();
 
-            $photo = &$this->getPhoto($i);
-            if ($photo->integrityCheck($this->getAlbumDir())) {
-                $changed = 1;
-                $this->updateSerial = 1;
+                $photo = &$this->getPhoto($i);
+                if ($photo->integrityCheck($this->getAlbumDir())) {
+                    $changed = true;
+                    $this->updateSerial = 1;
+                }
             }
-
-            print gTranslate('core', "done").".<br>";
         }
 
         if (strcmp($this->version, $gallery->album_version)) {
             $this->version = $gallery->album_version;
-            $changed = 1;
+            $changed = true;
         }
 
         if ($changed) {
             $this->updateSerial = 1;
         }
+
         return $changed;
     }
 
@@ -871,7 +910,7 @@
         $this->fields['highlightIndex'] = $index;
     }
 
-    function load($name, $loadphotos=TRUE) {
+    function load($name, $loadphotos = true) {
         global $gallery;
 
         $this->transient->photosloaded = FALSE;
@@ -890,7 +929,7 @@
             if (!$this->loadFromFile("$dir/album.dat.bak") &&
             !$this->loadFromFile("$dir/album.bak")) {
                 /* Uh oh */
-                return 0;
+                return false;
             }
         }
 
@@ -900,12 +939,15 @@
             if ($loadphotos) {
                 $this->loadPhotos($dir);
             }
-        } else {
+        }
+        else {
             $this->transient->photosloaded = TRUE;
         }
+
         $this->fields["name"] = $name;
         $this->updateSerial = 0;
-        return 1;
+
+        return true;
     }
 
 
@@ -1014,10 +1056,12 @@
             if ($success) {
                 $this->fields["photos_separate"] = TRUE;
                 unset ($this->photos);
-            } else {
+            }
+            else {
                 $success = FALSE;
             }
-        } else {
+        }
+        else {
             $success = TRUE;
         }
 
@@ -1174,7 +1218,7 @@
         $this->updateSerial = 1;
         $dir = $this->getAlbumDir();
 
-        echo debugMessage(gTranslate('core', "Doing the naming"), __FILE__, __LINE__);
+        echo debugMessage(gTranslate('core', "Doing the naming of the physical file."), __FILE__, __LINE__);
 
         if ($gallery->app->default["useOriginalFileNames"] == 'yes') {
             $name = $originalFilename;
@@ -1194,7 +1238,8 @@
                     }
                 }
             }
-        } else {
+        }
+        else {
             $name = $this->newPhotoName();
             // do filename checking here, too... users could introduce a duplicate 3 letter
             // name if they switch original file names on and off.
@@ -1212,29 +1257,42 @@
         preprocessImage($dir, "$name.$tag");
 
         /* Resize original image if necessary */
-        echo debugMessage("&nbsp;&nbsp;&nbsp;". gTranslate('core', 'Resizing/compressing original image'), __FILE__, __LINE__,1);
+        echo debugMessage("&nbsp;&nbsp;&nbsp;". gTranslate('core', "Resizing/compressing original file"), __FILE__, __LINE__,1);
+
         if (isImage($tag)) {
             resize_image($newFile, $newFile, $this->fields['max_size'], $this->fields['max_file_size'], true, false);
-        } else {
-            processingMsg(gTranslate('core', 'Cannot resize/compress this filetype'));
         }
+        elseif (isMovie($tag)) {
+            processingMsg(gTranslate('core', "File is a movie, no resizing done."));
+        }
+        else {
+            processingMsg(sprintf(gTranslate('core', "Invalid filetype: %s. Skipping."), $tag));
+        }
 
         /* Add the photo to the photo list */
         $item = new AlbumItem();
-        $err = $item->setPhoto($dir, $name, $tag, $this->fields["thumb_size"], $this, $pathToThumb);
-        if ($err) {
+        $status = $item->setPhoto($dir, $name, $tag, $this->fields["thumb_size"], $this, $pathToThumb);
+
+        if (!$status) {
             if (fs_file_exists($newFile)) {
                 fs_unlink($newFile);
             }
-            return $err;
-        } else {
+            $errorMsg = infobox(array(array(
+                    'type' => 'error',
+                    'text' => gTranslate('core', "Item not added.")
+            )));
+
+            return array($status, $errorMsg);
+        }
+        else {
             $item->setCaption("$caption");
             /* Only try to get Capture Date if file could have it.
-            ** Otherwise use file creation time
+             * Otherwise use file creation time
             */
             if(hasExif($tag)) {
                 $originalItemCaptureDate = getItemCaptureDate($file);
-            } else {
+            }
+            else {
                 $originalItemCaptureDate = filemtime($file);
             }
 
@@ -1253,7 +1311,7 @@
         $this->photos[] = $item;
 
         /* If this is the only photo, make it the highlight */
-        if ($this->numPhotos(1) == 1 && !$item->isMovie()) {
+        if ($this->numPhotos(1) == 1 && !isMovie($tag)) {
             $this->setHighlight(1);
         }
 
@@ -1278,9 +1336,9 @@
             }
         }
 
-        /* auto-rotate the photo if needed */
         $index = $this->numPhotos(1);
 
+        /* auto-rotate the photo if needed */
         echo debugMessage(gTranslate('core', "Check if image needs to be rotated"), __FILE__, __LINE__);
         if ($exifRotate && hasExif($tag) &&
           !empty($gallery->app->autorotate) && $gallery->app->autorotate == 'yes'  &&
@@ -1292,9 +1350,11 @@
 
             if (isset($exifData['Orientation'])) {
                 $orientation = trim($exifData['Orientation']);
-            } else if (isset($exifData['Image Orientation'])) {
+            }
+            else if (isset($exifData['Image Orientation'])) {
                 $orientation = trim($exifData['Image Orientation']);
-            } else {
+            }
+            else {
                 $orientation = '';
             }
 
@@ -1359,7 +1419,12 @@
 
         $this->fields['guid'] = genGUID();
 
-        return 0;
+        $statusMsg = infobox(array(array(
+                    'type' => 'success',
+                    'text' => gTranslate('core', "Item successfully added.")
+            )));
+
+        return array(true, $statusMsg);
     }
 
     function addNestedAlbum($albumName) {
@@ -1803,6 +1868,29 @@
         }
     }
 
+    /**
+     * Returns the description of an album item
+     *
+     * @param integer $index
+     * @return string
+     * @author Jens Tkotz <jens@...>
+     */
+    function getDescription($index) {
+        $photo = $this->getPhoto($index);
+        return $photo->getDescription();
+    }
+
+    /**
+     * Sets the description of an album item
+     *
+     * @param integer   $index
+     * @param string    $description
+     */
+    function setDescription($index, $description) {
+        $photo = &$this->getPhoto($index);
+        $photo->setDescription($description);
+    }
+
     function getItemOwner($index) {
         $photo = $this->getPhoto($index);
         return $photo->getOwner();
@@ -2142,6 +2230,7 @@
 
         $dir = $this->getAlbumDir();
         $photo =& $this->getPhoto($index);
+
         list ($status, $exif, $needToSave) = $photo->getExif($dir, $forceRefresh);
 
         if ($status != 0) {
@@ -2509,29 +2598,37 @@
         return $gallery->userDB->getUserByUid($this->fields["owner"]);
     }
 
+    /**
+     * Returns an array with the names of all extrafields for itemes defined in an album
+     *
+     * @param boolean $all  if false, all fields except the AltText field.
+     * @return array
+     */
     function getExtraFields($all = true) {
+        $extra_fields = array();
+
         if ($all) {
-            return $this->fields["extra_fields"];
-        } else {
-            $return = array();
-            foreach($this->fields["extra_fields"] as $value) {
+            $extra_fields = $this->fields['extra_fields'];
+        }
+        else {
+            foreach($this->fields['extra_fields'] as $value) {
                 if ($value != 'AltText') {
-                    $return[]=$value;
+                    $extra_fields[] = $value;
                 }
             }
-            return $return;
         }
+        return $extra_fields;
     }
 
     function setExtraFields($extra_fields) {
-        $this->fields["extra_fields"] = $extra_fields;
+        $this->fields['extra_fields'] = $extra_fields;
     }
 
     /**
      * Returns the values of an extrafield from a photo.
-     * @param   $index		integer	albumitemIndex
-     * @param   $field		string	fieldname
-     * @return	$fieldvalue	string
+     * @param   integer     $index  albumitemIndex
+     * @param   string      $field  fieldname
+     * @return	string      $fieldvalue
      */
     function getExtraField($index, $field) {
        $photo = $this->getPhoto($index);

Modified: trunk/gallery/classes/AlbumItem.php
===================================================================
--- trunk/gallery/classes/AlbumItem.php	2006-10-30 01:51:21 UTC (rev 14999)
+++ trunk/gallery/classes/AlbumItem.php	2006-10-30 02:02:35 UTC (rev 15000)
@@ -26,6 +26,7 @@
     var $thumbnail;
     var $preview;
     var $caption;
+    var $description;
     var $hidden;
     var $highlight;
     var $highlightImage;
@@ -75,7 +76,7 @@
         }
     }
 
-    function setItemCaptureDate($itemCaptureDate="") {
+    function setItemCaptureDate($itemCaptureDate = '') {
         global $gallery;
         /* Before 1.4.5-cvs-b106 this was an associative array */
 
@@ -97,13 +98,15 @@
         // need to set this value for old photos that don't yet contain it.
         if (!$this->itemCaptureDate) {
             return 0;
-        } else {
+        }
+        else {
             return $this->itemCaptureDate;
         }
     }
 
     function getExif($dir, $forceRefresh = false) {
         global $gallery;
+
         $file = $dir . "/" . $this->image->name . "." . $this->image->type;
 
         echo debugMessage(sprintf(gTranslate('core', "Getting Exif of file '%s'"), $file), __FILE__, __LINE__);
@@ -117,14 +120,16 @@
             if (empty($this->exifData) || $forceRefresh) {
                 /* Cache the current EXIF data and update the item capture date */
                 list($status, $this->exifData) = getExif($file);
-                $this->setItemCaptureDate();
+                $this->setItemCaptureDate($this->exifData);
                 $needToSave = true;
-            } else {
+            }
+            else {
                 /* We have a cached value and are not forcing a refresh */
                 $status = 0;
             }
             $returnExifData = $this->exifData;
-        } else {
+        }
+        else {
             /* If the data is cached but the feature is disabled, remove the cache */
             if (!empty($this->exifData)) {
                 unset($this->exifData);
@@ -216,6 +221,39 @@
             $changed = 1;
         }
 
+        /* Move extrafield 'description', 'Description' or the translated Version into $description */
+        if ($this->version < 39 && !empty($this->extraFields)) {
+            $description = '';
+
+            $translation1 = gTranslate('core', "description");
+            $translation2 = gTranslate('core', "Description");
+
+            if(!empty($this->extraFields['description'])) {
+                $description .= $this->extraFields['description'];
+                unset($this->extraFields['description']);
+            }
+
+            if(!empty($this->extraFields['Description'])) {
+                $description .= $this->extraFields['Description'];
+                unset($this->extraFields['Description']);
+            }
+
+            if(!empty($this->extraFields[$translation1])) {
+                $description .= $this->extraFields[$translation1];
+                unset($this->extraFields[$translation1]);
+            }
+
+            if(!empty($this->extraFields[$translation2])) {
+                $description .= $this->extraFields[$translation2];
+                unset($this->extraFields[$translation2]);
+            }
+
+            if($description != '') {
+                $this->description = $description;
+                $changed = 1;
+            }
+        }
+
         if ($this->image) {
             if ($this->image->integrityCheck($dir)) {
                 $changed = 1;
@@ -239,10 +277,12 @@
                 }
             }
         }
+
         if (strcmp($this->version, $gallery->album_version)) {
             $this->version = $gallery->album_version;
             $changed = 1;
         }
+
         return $changed;
     }
 
@@ -485,7 +525,9 @@
 
         $name = $this->image->name;
         $type = $this->image->type;
+
         $retval = rotate_image("$dir/$name.$type", "$dir/$name.$type", $direction, $type);
+
         if ($clearexifrotate && isset($gallery->app->use_exif) && ($type === 'jpg' || $type === 'jpeg')) {
             $path = $gallery->app->use_exif;
             exec_internal(fs_import_filename($path, 1) . " -norot '$dir/$name.$type'");
@@ -494,6 +536,7 @@
         if (!$retval) {
             return $retval;
         }
+
         list($w, $h) = getDimensions("$dir/$name.$type");
         $this->image->setRawDimensions($w, $h);
 
@@ -506,13 +549,15 @@
 
             list($w, $h) = getDimensions("$dir/$name.sized.$type");
             $this->image->setDimensions($w, $h);
-        } else {
+        }
+        else {
             $this->image->setDimensions($w, $h);
         }
 
         /* Reset the thumbnail to the default before regenerating thumb */
         $this->image->setThumbRectangle(0, 0, 0, 0);
         $this->makeThumbnail($dir, $thumb_size, $album);
+
         return 1;
     }
 
@@ -600,7 +645,7 @@
         * Sanity: make sure we can handle the file first.
         */
         if (!isMovie($tag) && !valid_image("$dir/$name.$tag")) {
-            return _("Invalid image") .": $name.$tag";
+            return sprintf(gTranslate('core',"Invalid image: %s"), "$name.$tag");
         }
 
         /* Set our image. */
@@ -608,29 +653,41 @@
         $this->image->setFile($dir, $name, $tag);
 
         $ret = $this->makeThumbnail($dir, $thumb_size, $album, $pathToThumb);
+
         return $ret;
     }
 
-    function makeThumbnail($dir, $thumb_size, &$album, $pathToThumb = '') {
+     function makeThumbnail($dir, $thumb_size, &$album, $pathToThumb = '') {
         global $gallery;
         $name = $this->image->name;
         $tag = $this->image->type;
 
         $ratio = isset($album->fields["thumb_ratio"]) ? $album->fields["thumb_ratio"] : 0;
 
-        echo debugMessage(_("Generating thumbnail."),__FILE__, __LINE__);
+        echo debugMessage(gTranslate('core', "Generating thumbnail."),__FILE__, __LINE__);
 
-        debugMessage(sprintf(_("Saved Dimensions: x:%d y: %d"),
-          $this->image->raw_width, $this->image->raw_height), __FILE__, __LINE__, 3);
-
         if ($this->isMovie()) {
             /* Use a preset thumbnail */
-            fs_copy($gallery->app->movieThumbnail, "$dir/$name.thumb.jpg");
+            if(realpath($gallery->app->movieThumbnail)) {
+                fs_copy($gallery->app->movieThumbnail, "$dir/$name.thumb.jpg");
+            }
+            else {
+                echo infobox(array(array(
+                    'type' => 'error',
+                    'text' => sprintf(gTranslate('core', "Defined thumbnail does not exist. %s"),
+                                '<br>'. $gallery->app->movieThumbnail)
+                )));
+                return false;
+            }
+
             $this->thumbnail = new Image;
             $this->thumbnail->setFile($dir, "$name.thumb", "jpg");
             list($w, $h) = getDimensions("$dir/$name.thumb.jpg");
             $this->thumbnail->setDimensions($w, $h);
-        } else {
+        }
+        else {
+            debugMessage(sprintf(gTranslate('core', "Saved Dimensions: x:%d y: %d"),
+                $this->image->raw_width, $this->image->raw_height), __FILE__, __LINE__, 3);
             /* Make thumbnail (first crop it spec) */
             if ($pathToThumb) {
                 $ret = copy($pathToThumb,"$dir/$name.thumb.$tag");
@@ -654,7 +711,8 @@
                     	$gallery->app->thumbJpegImageQuality
                     );
                 }
-            } else {
+            }
+            else {
                 if(!empty($ratio)) {
                     $ret = cropImageToRatio(
                     	"$dir/$name.$tag",
@@ -672,7 +730,8 @@
                         	true,
                         	$gallery->app->thumbJpegImageQuality
                         );
-                    } else {
+                    }
+                    else {
                         $ret = resize_image(
                         	"$dir/$name.$tag",
                         	"$dir/$name.thumb.$tag",
@@ -685,7 +744,7 @@
                     }
                 }
                 else {
-                    debugMessage(_("Generating normal thumbs"), __FILE__, __LINE__);
+                    debugMessage(gTranslate('core', "Generating normal thumbs"), __FILE__, __LINE__);
                     // no resizing, use ratio for thumb as for the image itself;
                     $ret = resize_image(
                     	"$dir/$name.$tag",
@@ -711,18 +770,18 @@
                     $this->setHighlight($dir, 1, $album);
                 }
             } else {
-                return _("Unable to make thumbnail") ." ($ret)";
+                return gTranslate('core', "Unable to make thumbnail") ." ($ret)";
             }
         }
 
-        return 0;
+        return true;
     }
 
     function getPreviewTag($dir, $size = 0, $attrs = array()) {
         if ($this->preview) {
             return $this->preview->getTag($dir, 0, $size, $attrs);
         } else {
-            return "<i>". _("No preview") ."</i>";
+            return "<i>". gTranslate('core', "No preview") ."</i>";
         }
     }
 
@@ -753,7 +812,7 @@
         if ($this->thumbnail) {
             return $this->thumbnail->getTag($dir, false, $size, $attrs);
         } else {
-            return "<i>". _("No thumbnail") ."</i>";
+            return "<i>". gTranslate('core', "No thumbnail") ."</i>";
         }
     }
 
@@ -869,6 +928,14 @@
         $this->setCaption($caption);
     }
 
+    function getDescription() {
+        return $this->description;
+    }
+
+    function setDescription($description) {
+        $this->description = $description;
+    }
+
     function isAlbum() {
         return ($this->isAlbumName !== NULL) ? true : false;
     }

Modified: trunk/gallery/includes/setup/defaults.inc
===================================================================
--- trunk/gallery/includes/setup/defaults.inc	2006-10-30 01:51:21 UTC (rev 14999)
+++ trunk/gallery/includes/setup/defaults.inc	2006-10-30 02:02:35 UTC (rev 15000)
@@ -284,10 +284,10 @@
 	'extra_fields' => array(
 		'prompt' => gTranslate('config',"Custom Fields"),
 		'optional' => 1,
-		'desc' => gTranslate('config',"Custom fields that are available to describe each image.  They should be separated by commas.  E.g. <i>Description, Location, Film Type</i>"),
+		'desc' => gTranslate('config',"Custom fields that are available to describe each image.  They should be separated by commas.  E.g. <i>Location, Film Type</i>"),
 		'attrs' => array('size' => 80),
 		'type' => 'text',
-		'value' => 'Description',
+		'value' => '',
 		'inst_type' => 'advanced'
 	),
 	'showDimensions' => array(

Modified: trunk/gallery/popups/edit_caption.php
===================================================================
--- trunk/gallery/popups/edit_caption.php	2006-10-30 01:51:21 UTC (rev 14999)
+++ trunk/gallery/popups/edit_caption.php	2006-10-30 02:02:35 UTC (rev 15000)
@@ -2,17 +2,17 @@
 /*
  * Gallery - a web based photo album viewer and editor
  * Copyright (C) 2000-2006 Bharat Mediratta
- * 
+ *
  * This program is free software; 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.
- * 
+ *
  * This program 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 this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
@@ -24,27 +24,33 @@
 
 require_once(dirname(dirname(__FILE__)) . '/init.php');
 
-list($save, $data, $keywords, $index, $extra_fields) =
-    getRequestVar(array('save', 'data', 'keywords', 'index', 'extra_fields'));
-list($capture_year, $capture_mon, $capture_mday, $capture_hours, $capture_minutes, $capture_seconds) = 
+list($save, $saveclose) = getRequestVar(array('save', 'saveclose'));
+
+list($caption, $description, $keywords, $index, $extra_fields) =
+    getRequestVar(array('caption', 'description', 'keywords', 'index', 'extra_fields'));
+
+list($capture_year, $capture_mon, $capture_mday, $capture_hours, $capture_minutes, $capture_seconds) =
 	getRequestVar(array('capture_year', 'capture_mon', 'capture_mday', 'capture_hours', 'capture_minutes', 'capture_seconds'));
 
 // Hack check
-if (!$gallery->user->canChangeTextOfAlbum($gallery->album) && 
+if (!$gallery->user->canChangeTextOfAlbum($gallery->album) &&
     !($gallery->album->isItemOwner($gallery->user->getUid(), $index) &&
     $gallery->album->getItemOwnerModify())) {
 	echo gTranslate('core', "You are not allowed to perform this action!");
 	exit;
 }
-$err = '';
 
-if (isset($save)) {
+$infoMessages = array();
+
+if (isset($save) || isset($saveclose)) {
     // Only allow dates which mktime() will operate on.
     // 1970-2037 (Windows and some UNIXes) -- 1970-2069 (Some UNIXes)
     // Two digit values between 0-69 mapping to 2000-2069 and 70-99 to 1970-1999
-    if ((($capture_year < 2070) && ($capture_year > 1969)) || ($capture_year < 100)) {
-        $gallery->album->setCaption($index, $data);
+    if (((int)$capture_year < 2070 && (int)$capture_year > 1969) || (int)$capture_year < 100) {
+        $gallery->album->setCaption($index, $caption);
+        $gallery->album->setDescription($index, $description);
         $gallery->album->setKeywords($index, $keywords);
+
         $dateArray["year"] = $capture_year;
         $dateArray["mon"] = $capture_mon;
         $dateArray["mday"] = $capture_mday;
@@ -59,65 +65,110 @@
                 $gallery->album->setExtraField($index, $field, trim($value));
             }
         }
-        $gallery->album->save(array(i18n("Captions and/or custom fields modified for %s"),
-          makeAlbumURL($gallery->album->fields["name"], $gallery->album->getPhotoId($index))));
-        dismissAndReload();
-        if (!isDebugging()) {
-            return;
+        $status = $gallery->album->save(
+            array(
+                i18n("Captions and/or custom fields modified for %s"),
+                makeAlbumURL($gallery->album->fields["name"], $gallery->album->getPhotoId($index)))
+        );
+        if($status) {
+            if(isset($saveclose)) {
+                dismissAndReload();
+                exit;
+            }
+             $infoMessages[] = array(
+                'type' => 'success',
+                'text' => gTranslate('core', "Successfully saved.")
+            );
         }
-    } else {
-        $err = gTranslate('core', "Year must be between 1969 and 2070");
+        else {
+             $infoMessages[] = array(
+                'type' => 'error',
+                'text' => gTranslate('core', "Gallery was not able to save the data.")
+            );
+        }
     }
+    else {
+        $infoMessages[] = array(
+            'type' => 'error',
+            'text' => gTranslate('core', "Year must be between 1969 and 2070")
+        );
+    }
 }
 
 printPopupStart(gTranslate('core', "Edit Text"), gTranslate('core', "Edit Caption"));
 
+if(isset($save)) {
+    reload();
+}
+
 echo $gallery->album->getThumbnailTag($index);
+
+echo "\n<br>";
+echo infoBox($infoMessages);
+
 echo makeFormIntro('edit_caption.php', array(), array('type' => 'popup'));
 ?>
 
 <input type="hidden" name="index" value="<?php echo $index ?>">
 <table>
 <tr>
-	<td style="vertical-align: top"><b><?php echo gTranslate('core', "Caption") ?>:</b></td>
-	<td><textarea name="data" rows="4" cols="40"><?php echo $gallery->album->getCaption($index) ?></textarea></td>
+    <td colspan="2" class="g-double-bottom-border-spacer">&nbsp;<?php echo gTranslate('core', "Fixed fields"); ?></td>
 </tr>
+
+<tr>
+	<td style="vertical-align: top" class="g-emphasis"><?php echo gTranslate('core', "Caption") ?></td>
+	<td><textarea name="caption" rows="2" cols="38"><?php echo $gallery->album->getCaption($index) ?></textarea></td>
+</tr>
+<tr>
+	<td style="vertical-align: top" class="g-emphasis"><?php echo gTranslate('core', "Description") ?></td>
+	<td><textarea name="description" rows="5" cols="38"><?php echo $gallery->album->getdescription($index) ?></textarea></td>
+</tr>
+<tr>
+	<td valign=top><b><?php echo gTranslate('core', "Keywords") ?>:</b></td>
+	<td><textarea name="keywords" rows="1" cols="38"><?php echo $gallery->album->getKeywords($index) ?></textarea></td>
+</tr>
+
 <?php
 
 $translateableFields = translateableFields();
 
-foreach ($gallery->album->getExtraFields() as $field) {
-	if (in_array($field, array_keys(automaticFieldsList()))) {
-		continue;
-	}
-    $value = $gallery->album->getExtraField($index, $field);
+$extra_field_List = $gallery->album->getExtraFields();
+if(!empty($extra_field_List)) {
 
-	if (in_array($field, array_keys($translateableFields))) {
-		$fieldLabel = $translateableFields[$field];
-		$rows = 1;
-	} else {
-		$fieldLabel = $field;
-		$rows = 3;
-	}
+    foreach ($extra_field_List as $field) {
+?>
 
-	echo "\n<tr>";		
-	echo "\n\t". '<td style="vertical-align: top;" class="g-emphasis">'. $fieldLabel .':</td>';
-	echo "\n\t". '<td><textarea name="extra_fields['. $field .']" rows="'. $rows .'" cols="40">'. $value .'</textarea></td>';
-	echo "\n</tr>";
+    <!-- Custom Fields -->
+<tr>
+    <td colspan="2" class="g-double-bottom-border-spacer">&nbsp;<?php echo gTranslate('core', "Custom fields"); ?></td>
+</tr>
+<?php
+        if (in_array($field, array_keys(automaticFieldsList()))) {
+            continue;
+        }
+        $value = $gallery->album->getExtraField($index, $field);
+
+        if (in_array($field, array_keys($translateableFields))) {
+            $fieldLabel = $translateableFields[$field];
+            $rows = 1;
+        }
+        else {
+            $fieldLabel = $field;
+            $rows = 3;
+        }
+
+        echo "\n<tr>";
+        echo "\n\t". '<td style="vertical-align: top;" class="g-emphasis">'. $fieldLabel .':</td>';
+        echo "\n\t". '<td><textarea name="extra_fields['. $field .']" rows="'. $rows .'" cols="38">'. $value .'</textarea></td>';
+        echo "\n</tr>";
+    }
 }
 ?>
 
-<tr>
-	<td valign=top><b><?php echo gTranslate('core', "Keywords") ?>:</b></td>
-	<td><textarea name="keywords" rows="1" cols="40"><?php echo $gallery->album->getKeywords($index) ?></textarea></td>
-</tr>
 </table>
 
 <?php
 // get the itemCaptureDate
-if (!empty($err)) {
-	echo "\n<p>". gallery_error($err) . "</p>";
-}
 $itemCaptureDate = $gallery->album->getItemCaptureDate($index);
 
 $hours 	 = strftime('%H', $itemCaptureDate);
@@ -174,12 +225,13 @@
 
 <br>
   <?php echo gSubmit('save', gTranslate('core', "_Save")); ?>
+  <?php echo gSubmit('saveclose', gTranslate('core', "Save and _Close")); ?>
   <?php echo gButton('cancel', gTranslate('core', "_Cancel"), 'parent.close()'); ?>
 
 </form>
 
 <script language="javascript1.2" type="text/JavaScript">
-<!--   
+<!--
 // position cursor in top form field
 document.g1_form.data.focus();
 //-->

Modified: trunk/gallery/templates/photo.tpl.default
===================================================================
--- trunk/gallery/templates/photo.tpl.default	2006-10-30 01:51:21 UTC (rev 14999)
+++ trunk/gallery/templates/photo.tpl.default	2006-10-30 02:02:35 UTC (rev 15000)
@@ -176,6 +176,9 @@
 	<!-- caption -->
 	<p class="g-photo-caption"><?php echo editCaption($gallery->album, $index) ?></p>
 
+	<!-- description -->
+	<p class="g-photo-caption"><?php echo $gallery->album->getDescription($index) ?></p>
+
 	<!-- Custom Fields -->
 	<?php
 	displayPhotoFields($index, $extra_fields, true, in_array('EXIF', $extra_fields), $full);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15001
          http://svn.sourceforge.net/gallery/?rev=15001&view=rev
Author:   jenst
Date:     2006-10-29 18:18:18 -0800 (Sun, 29 Oct 2006)

Log Message:
-----------
2006-10-30 Jens Tkotz <jens@...> 1.6-alpha2-svn-b24

 * Change: Added field $initialized to albumDB()
    - Better error handling.

 * Change: Added $allowedInvalidAlbums to albumDB()
    - You can now easier define whats allowed. e.g. "lost+found"

 * Fix: removed -v from jhead call, as the structure is different.

 * New: function generateCaption()

 * Change: Little code cleanup in popups/save_photos.php

 * Change: Added additional param to getItemCaptureDate().

Modified Paths:
--------------
    trunk/gallery/ChangeLog
    trunk/gallery/Version.php
    trunk/gallery/albums.php
    trunk/gallery/classes/AlbumDB.php
    trunk/gallery/util.php

Modified: trunk/gallery/ChangeLog
===================================================================
--- trunk/gallery/ChangeLog	2006-10-30 02:02:35 UTC (rev 15000)
+++ trunk/gallery/ChangeLog	2006-10-30 02:18:18 UTC (rev 15001)
@@ -1,3 +1,19 @@
+2006-10-30 Jens Tkotz <jens@...> 1.6-alpha2-svn-b24
+
+ * Change: Added field $initialized to albumDB()
+    - Better error handling.
+
+ * Change: Added $allowedInvalidAlbums to albumDB()
+    - You can now easier define whats allowed. e.g. "lost+found"
+
+ * Fix: removed -v from jhead call, as the structure is different.
+
+ * New: function generateCaption()
+
+ * Change: Little code cleanup in popups/save_photos.php
+
+ * Change: Added additional param to getItemCaptureDate().
+
 2006-10-30 Jens Tkotz <jens@...> 1.6-alpha2-svn-b23
 
  * CHANGE: description is now a fixed item field, not a custom
@@ -94,8 +110,6 @@
 
  Thanks to Peter Schumacher for finding and reporting those bugs.
 
- * Fix: Remove -v from jhead, as the output has different structure.
-
  * Fix: Autorotate rotated in the wrong direction.
 
  * Fix: still some _(), converted to gTranslate()

Modified: trunk/gallery/Version.php
===================================================================
--- trunk/gallery/Version.php	2006-10-30 02:02:35 UTC (rev 15000)
+++ trunk/gallery/Version.php	2006-10-30 02:18:18 UTC (rev 15001)
@@ -22,7 +22,7 @@
 ?>
 <?php
 
-$gallery->version = '1.6-alpha2-svn-b23';
+$gallery->version = '1.6-alpha2-svn-b24';
 $gallery->config_version = 99;
 $gallery->album_version = 39;
 $gallery->user_version = 6;

Modified: trunk/gallery/albums.php
===================================================================
--- trunk/gallery/albums.php	2006-10-30 02:02:35 UTC (rev 15000)
+++ trunk/gallery/albums.php	2006-10-30 02:18:18 UTC (rev 15001)
@@ -42,7 +42,7 @@
                         }
                         fclose($fp);
                         printf("<!-- From %s, created at %s -->",
-				$cache_file_basename, strftime("%D %T", $cache_stat[9]));
+				            $cache_file_basename, strftime("%D %T", $cache_stat[9]));
                         return;
                     }
                 }
@@ -56,6 +56,10 @@
 /* Read the album list */
 $albumDB = new AlbumDB(FALSE);
 
+if(! $albumDB->isInitialized()) {
+    exit;
+}
+
 $galleryTitle = clearGalleryTitle();
 
 $gallery->session->albumName = '';
@@ -119,9 +123,11 @@
 }
 else if ($numAccess != $numAlbums) {
 	$adminText .= sprintf(gTranslate('core', "%s (%s), %s"), $toplevel_str, $total_str, $image_str);
-} else if ($maxPages > 1) {
+}
+else if ($maxPages > 1) {
 	$adminText .= sprintf(gTranslate('core', "%s, %s on %s"), $toplevel_str, $image_str, $page_str);
-} else {
+}
+else {
 	$adminText .= sprintf(gTranslate('core', "%s, %s"), $toplevel_str, $image_str);
 }
 
@@ -257,14 +263,16 @@
 
         if(sizeof($albumDB->outOfDateAlbums)) {
             $message = gTranslate('core',
-		"Gallery has detected that one of your albums is out of date.",
-		"Gallery has detected that %d of your albums are out of date.",
+                "Gallery has detected that one of your albums is out of date.",
+                "Gallery has detected that %d of your albums are out of date.",
                 sizeof($albumDB->outOfDateAlbums), '', true
             );
 
             $message .= "\n<br>";
             $message .= sprintf(gTranslate('core', "Please %s."),
-                popup_link(gTranslate('core', "perform an upgrade"), "upgrade_album.php",0,0,500,500,"g-error", '', '', false));
+                popup_link(
+                    gTranslate('core', "perform an upgrade"),
+                    "upgrade_album.php", 0, 0, 500, 500, 'g-error', '', '', false));
 
             $notice_messages[] = array(
                 'type' => 'warning',
@@ -276,7 +284,9 @@
     if (getRequestVar('gRedir') == 1 && ! $gallery->session->gRedirDone) {
         $message = sprintf(gTranslate('core', "The album or photo that you were attempting to view either does not exist, or requires user privileges that you do not possess. %s"),
             ($gallery->user->isLoggedIn() && !$GALLERY_EMBEDDED_INSIDE ? '' : sprintf(gTranslate('core', "Login at the %s and try again."),
-            popup_link(gTranslate('core', "Login page"), "login.php", false, true, 500, 500, 'g-emphasis','','', false))));
+            popup_link(
+                gTranslate('core', "Login page"),
+                'login.php', false, true, 500, 500, 'g-emphasis','','', false))));
 
         $notice_messages[] = array(
             'type' => 'error',

Modified: trunk/gallery/classes/AlbumDB.php
===================================================================
--- trunk/gallery/classes/AlbumDB.php	2006-10-30 02:02:35 UTC (rev 15000)
+++ trunk/gallery/classes/AlbumDB.php	2006-10-30 02:18:18 UTC (rev 15001)
@@ -24,15 +24,30 @@
 class AlbumDB {
     var $albumList;
     var $albumOrder;
+    var $initialized;
 
-    function AlbumDB($loadphotos=TRUE) {
+    function AlbumDB($loadphotos = true) {
         global $gallery;
+
         $changed = 0;
+        $this->initialized = false;
 
         $dir = $gallery->app->albumDir;
+        
+        $allowedInvalidAlbums = array('CVS', 'SVN', '_vti_cnf', 'lost+found');
 
+        if(!fs_is_dir($dir)) {
+            echo infoBox(array(array(
+                'type' => 'error',
+                'text' => sprintf("Albumdir (%s) not found! Please check the path to the albums folder in your config.php.",
+                    $dir)
+            )));
+            
+            return false;
+        }
+        
         $tmp = getFile("$dir/albumdb.dat");
-        if (strcmp($tmp, "")) {
+        if (strcmp($tmp, '')) {
             $this->albumOrder = unserialize($tmp);
 
             // albumdb.dat is corrupt, rebuild it
@@ -40,48 +55,62 @@
                 $this->albumOrder = array();
             }
             $changed = 1;
-        } else {
+        }
+        else {
             $this->albumOrder = array();
         }
 
         $this->albumList = array();
         $this->brokenAlbums = array();
         $this->outOfDateAlbums = array();
+        
+        /* Loop through all albums already found in the albumdb.dat */
         $i = 0;
         while ($i < sizeof($this->albumOrder)) {
             $name = $this->albumOrder[$i];
             if (ereg("^\.", $name)) { // how did this get here??
-            array_splice($this->albumOrder, $i, 1);
-            $changed = 1;
-            } else if (fs_is_dir("$dir/$name")) {
+                array_splice($this->albumOrder, $i, 1);
+                $changed = 1;
+            }
+            else if (fs_is_dir("$dir/$name")) {
                 $album = new Album;
-                if ($album->load($name,$loadphotos)) {
+                if ($album->load($name, $loadphotos)) {
                     array_push($this->albumList, $album);
                     if ($album->versionOutOfDate()) {
                         array_push($this->outOfDateAlbums, $name);
                     }
-                } else if ($name != 'CVS') {
+                }
+                else if (!in_array($name, $allowedInvalidAlbums)) {
                     array_push($this->brokenAlbums, $name);
                 }
                 $i++;
-            } else {
+            }
+            else {
                 /* Couldn't find the album -- delete it from order */
                 array_splice($this->albumOrder, $i, 1);
                 $changed = 1;
             }
         }
 
+        /* Now scan the albums folder */
         if ($fd = fs_opendir($dir)) {
             while ($file = readdir($fd)) {
                 if (!ereg("^\.", $file) &&
-                fs_is_dir("$dir/$file") &&
-                strcmp($file, "_vti_cnf") &&
-                !in_array($file, $this->albumOrder)) {
+                  fs_is_dir("$dir/$file") &&
+                  !in_array($file, $allowedInvalidAlbums) &&
+                  !in_array($file, $this->albumOrder)) {
                     $album = new Album;
-                    $album->load($file,$loadphotos);
-                    array_push($this->albumList, $album);
-                    array_push($this->albumOrder, $file);
+                    if ($album->load($file, $loadphotos)) {
+                        array_push($this->albumList, $album);
+                        if ($album->versionOutOfDate()) {
+                            array_push($this->outOfDateAlbums, $file);
+                        }
+                    }
+                    else {
+                        array_push($this->brokenAlbums, $file);
+                    }
                     $changed = 1;
+
                 }
             }
             closedir($fd);
@@ -90,29 +119,41 @@
         if ($changed) {
             $this->save();
         }
+        
+        $this->initialized = true;
     }
 
+    /**
+	 * Returns wether the AlbumDB was succesfully initialized or not
+	 *
+	 * @return boolean     true if succesfully initialized.
+	 * @author Jens Tkotz <jens@...>
+	 */
+	function isInitialized() {
+        return $this->initialized === true;
+	}
+	
     function sortByField($fieldname = '', $order = 'desc') {
-	$tmpOrder = array();
+        $tmpOrder = array();
 
-	if(!empty($fieldname)) {
-	    if($fieldname == 'name') {
-		if($order == 'asc') {
-		    sort($this->albumOrder);
-		}
-		else {
-		    rsort($this->albumOrder);
-		}
-	    }
-	    else {
-		array_sort_by_fields($this->albumList, $fieldname , $order, true, false, true);
-		foreach ($this->albumList as $album) {
-		    $tmpOrder[] = $album->fields["name"];
-		}
-		$this->albumOrder = $tmpOrder;
-	    }
-	    $this->save();
-	}
+        if(!empty($fieldname)) {
+            if($fieldname == 'name') {
+                if($order == 'asc') {
+                    sort($this->albumOrder);
+                }
+                else {
+                    rsort($this->albumOrder);
+                }
+            }
+            else {
+                array_sort_by_fields($this->albumList, $fieldname , $order, true, false, true);
+                foreach ($this->albumList as $album) {
+                    $tmpOrder[] = $album->fields["name"];
+                }
+                $this->albumOrder = $tmpOrder;
+            }
+            $this->save();
+        }
     }
 
     function renameAlbum($oldName, $newName) {

Modified: trunk/gallery/util.php
===================================================================
--- trunk/gallery/util.php	2006-10-30 02:02:35 UTC (rev 15000)
+++ trunk/gallery/util.php	2006-10-30 02:18:18 UTC (rev 15001)
@@ -163,7 +163,8 @@
 		print "\n<br>". gTranslate('core', "Results:") ."<pre>";
 		if ($results) {
 			print join("\n", $results);
-		} else {
+		}
+		else {
 			print "<b>" .gTranslate('core', "none") ."</b>";
 		}
 		print "</pre>";
@@ -194,7 +195,8 @@
 
     if ($status == $gallery->app->expectedExecStatus) {
         return true;
-    } else {
+    }
+    else {
         if ($results) {
             echo '<hr><p>'. gallery_error("") . join("<br>", $results) .'</p>';
         }
@@ -543,9 +545,11 @@
 
     if(isset($gallery->app->exiftags)) {
         return 'exiftags';
-    } elseif (isset($gallery->app->use_exif)) {
+    }
+    elseif (isset($gallery->app->use_exif)) {
         return 'jhead';
-    } else {
+    }
+    else {
         return false;
     }
 }
@@ -591,7 +595,7 @@
                 break;
             }
             $path = $gallery->app->use_exif;
-            list($return, $status) = @exec_internal(fs_import_filename($path, 1) .' -v ' .
+            list($return, $status) = @exec_internal(fs_import_filename($path, 1) .' ' . // -v removed as the structure is different.
             fs_import_filename($file, 1));
 
             $unwantedFields = array('File name');
@@ -630,47 +634,50 @@
  * If exif is not supported, or no date was gotten, then the file creation date is returned.
  * Note: i used switch/case because this is easier to extend later.
  */
-function getItemCaptureDate($file) {
-	$success = false;
-	$exifSupported = getExifDisplayTool();
+function getItemCaptureDate($file, $exifData = array()) {
+    $success = false;
+    $exifSupported = getExifDisplayTool();
 
-	if ($exifSupported) {
-		$return = getExif($file);
-		$exifData = $return[1];
-		switch($exifSupported) {
-                	case 'exiftags':
-				if (isset($exifData['Image Created'])) {
-					$tempDate = split(" ", $exifData['Image Created'], 2);
-				}
-                        	break;
-	                case 'jhead':
-				if (isset($exifData['Date/Time'])) {
-					$tempDate = split(" ", $exifData['Date/Time'], 2);
-				}
-        	                break;
-        	}
-		if (isset($tempDate)) {
-			$tempDay = strtr($tempDate[0], ':', '-');
-			$tempTime = $tempDate[1];
+    if ($exifSupported) {
+        if(empty($exifData)) {
+            list($status, $exifData) = getExif($file);
+        }
 
-			$itemCaptureTimeStamp = strtotime("$tempDay $tempTime");
+        switch($exifSupported) {
+            case 'exiftags':
+                if (isset($exifData['Image Created'])) {
+                    $tempDate = split(" ", $exifData['Image Created'], 2);
+                }
+                break;
+            case 'jhead':
+                if (isset($exifData['Date/Time'])) {
+                    $tempDate = split(" ", $exifData['Date/Time'], 2);
+                }
+                break;
+        }
 
-			if ($itemCaptureTimeStamp != 0) {
-				$success = true;
-			}
-		}
-	}
+        if (isset($tempDate)) {
+            $tempDay = strtr($tempDate[0], ':', '-');
+            $tempTime = $tempDate[1];
 
-	// we were not able to get the capture date from exif... use file creation time
-	if (!$success) {
-		$itemCaptureTimeStamp = filemtime($file);
-	}
+            $itemCaptureTimeStamp = strtotime("$tempDay $tempTime");
 
-	if (!isDebugging()) {
-		sprintf (gTranslate('core', "Item Capture Date : %s"), strftime('%Y', $itemCaptureTimeStamp));
-	}
+            if ($itemCaptureTimeStamp != 0) {
+                $success = true;
+            }
+        }
+    }
 
-	return $itemCaptureTimeStamp;
+    // we were not able to get the capture date from exif... use file creation time
+    if (!$success) {
+        $itemCaptureTimeStamp = filemtime($file);
+    }
+
+    if (!isDebugging()) {
+        sprintf (gTranslate('core', "Item Capture Date : %s"), strftime('%Y', $itemCaptureTimeStamp));
+    }
+
+    return $itemCaptureTimeStamp;
 }
 
 function doCommand($command, $args = array(), $returnTarget = '', $returnArgs = array()) {
@@ -1079,7 +1086,10 @@
                 fs_unlink($gallery->app->tmpDir . "/$pic");
             }
         }
-    } else {
+    }
+    else {
+        echo debugMessage(gTranslate('core', "Start Processing single file"), __FILE__, __LINE__);
+        echo debugMessage(gTranslate('core', "Filename processing."), __FILE__, __LINE__,3);
         /* Its a single file
          * remove %20 and the like from name
          */
@@ -1111,6 +1121,7 @@
 
         set_time_limit($gallery->app->timeLimit);
         if (acceptableFormat($ext)) {
+            echo debugMessage(gTranslate('core', "extension is accepted."), __FILE__, __LINE__, 3);
             /*
              * Move the uploaded image to our temporary directory
              * using move_uploaded_file so that we work around
@@ -1129,44 +1140,20 @@
             /* What should the caption be, if no caption was given by user ?
              * See captionOptions.inc.php for options
             */
-
-            if (isset($gallery->app->dateTimeString)) {
-                $dateTimeFormat = $gallery->app->dateTimeString;
-            } else {
-                $dateTimeFormat = "%D %T";
-            }
-
             if (empty($caption)) {
-                switch ($setCaption) {
-                    case 0:
-            			$caption = '';
-            		break;
-
-                    case 1:
-                    default:
-                        /* Use filename */
-                        $caption = strtr($originalFilename, '_', ' ');
-                    break;
-
-                    case 2:
-                        /* Use file cration date */
-                        $caption = strftime($dateTimeFormat, filectime($file));
-                    break;
-
-                    case 3:
-                        /* Use capture date */
-                        $caption = strftime($dateTimeFormat, getItemCaptureDate($file));
-                    break;
-                }
+                generateCaption($setCaption, $originalFilename, $file);
             }
 
-            echo "\n<p><b>******". sprintf(gTranslate('core', "Adding %s"), $name) ."*****</b></p>";
+            echo infobox(array(array(
+                    'type' => 'informationm',
+                    'text' => '<b>'. sprintf(gTranslate('core', "Adding %s"), $name) .'</b>'
+                )));
 
             /* After all the preprocessing, NOW ADD THE element
              * function addPhoto($file, $tag, $originalFilename, $caption, $pathToThumb="", $extraFields=array(), $owner="", $votes=NULL,
              *                   $wmName="", $wmAlign=0, $wmAlignX=0, $wmAlignY=0, $wmSelect=0)
             */
-            $err = $gallery->album->addPhoto(
+            list($status, $statusMsg) = $gallery->album->addPhoto(
                 $file,
                 $ext,
                 $mangledFilename,
@@ -1178,13 +1165,15 @@
                 $wmName, $wmAlign, $wmAlignX, $wmAlignY, $wmSelect
             );
 
-            if ($err) {
-                processingMsg(gallery_error($err));
+            echo $statusMsg;
+
+            if (!$status) {
                 processingMsg("<b>". sprintf(gTranslate('core', "Need help?  Look in the  %s%s FAQ%s"),
                 '<a href="http://gallery.sourceforge.net/faq.php" target=_new>', Gallery(), '</a>') .
                 "</b>");
             }
-        } else {
+        }
+        else {
             processingMsg(sprintf(gTranslate('core', "Skipping %s (can't handle %s format)"), $name, $ext));
         }
     }
@@ -1988,7 +1977,6 @@
  * @return string $ret
  * @author Jens Tkotz <jens@...>
  */
-
 function clearGalleryTitle($topic = '') {
     global $gallery;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15002
          http://svn.sourceforge.net/gallery/?rev=15002&view=rev
Author:   jenst
Date:     2006-10-29 18:21:03 -0800 (Sun, 29 Oct 2006)

Log Message:
-----------
2006-10-30 Jens Tkotz <jens@...> 1.6-alpha2-svn-b25

 * Fix: Upgrade message in welcome.inc was showed in too many cases.

 * Change: Little code cleanup in popups/save_photos.php

Modified Paths:
--------------
    trunk/gallery/ChangeLog
    trunk/gallery/Version.php
    trunk/gallery/popups/save_photos.php
    trunk/gallery/setup/welcome.inc

Modified: trunk/gallery/ChangeLog
===================================================================
--- trunk/gallery/ChangeLog	2006-10-30 02:18:18 UTC (rev 15001)
+++ trunk/gallery/ChangeLog	2006-10-30 02:21:03 UTC (rev 15002)
@@ -1,3 +1,9 @@
+2006-10-30 Jens Tkotz <jens@...> 1.6-alpha2-svn-b25
+
+ * Fix: Upgrade message in welcome.inc was showed in too many cases.
+
+ * Change: Little code cleanup in popups/save_photos.php
+
 2006-10-30 Jens Tkotz <jens@...> 1.6-alpha2-svn-b24
 
  * Change: Added field $initialized to albumDB()
@@ -10,8 +16,6 @@
 
  * New: function generateCaption()
 
- * Change: Little code cleanup in popups/save_photos.php
-
  * Change: Added additional param to getItemCaptureDate().
 
 2006-10-30 Jens Tkotz <jens@...> 1.6-alpha2-svn-b23

Modified: trunk/gallery/Version.php
===================================================================
--- trunk/gallery/Version.php	2006-10-30 02:18:18 UTC (rev 15001)
+++ trunk/gallery/Version.php	2006-10-30 02:21:03 UTC (rev 15002)
@@ -22,7 +22,7 @@
 ?>
 <?php
 
-$gallery->version = '1.6-alpha2-svn-b24';
+$gallery->version = '1.6-alpha2-svn-b25';
 $gallery->config_version = 99;
 $gallery->album_version = 39;
 $gallery->user_version = 6;

Modified: trunk/gallery/popups/save_photos.php
===================================================================
--- trunk/gallery/popups/save_photos.php	2006-10-30 02:18:18 UTC (rev 15001)
+++ trunk/gallery/popups/save_photos.php	2006-10-30 02:21:03 UTC (rev 15002)
@@ -277,8 +277,6 @@
 }
 } /* if ($urls) */
 
-$image_count = 0;
-
 // Begin Metadata fetching and preprocessing
 $image_info = array();
 // Get meta data
@@ -317,58 +315,66 @@
 
 echo "\n</div>";
 /* Now we start processing the given Files */
+$photoCount = sizeof($_FILES['userfile']['name']) -1;
 echo '<div class="g-content-popup left">';
-while (isset($_FILES['userfile']['tmp_name']) && sizeof($_FILES['userfile']['tmp_name'])) {
+echo infobox(array(array(
+            'type' => 'information',
+            'text' => gTranslate('core',
+                "Processing %d uploaded element.",
+                "Processing %d uploaded elements.",
+                $photoCount, 'Error, no photo uploaded.', true)
+        )));
+
+
+for($i = 0; $i < $photoCount; $i++) {
     $upload_started = true;
-    $name = array_shift($_FILES['userfile']['name']);
-    $file = array_shift($_FILES['userfile']['tmp_name']);
 
-    if ($name) {
-        if (!empty($usercaption) && is_array($usercaption)) {
-            $caption = array_shift($usercaption);
-        }
-        else {
-            $caption = '';
-        }
+    $name = $_FILES['userfile']['name'][$i];
+    $file = $_FILES['userfile']['tmp_name'][$i];
 
-        if (!isset($caption)) {
-            $caption = '';
-        }
+    if (!empty($usercaption) && is_array($usercaption)) {
+        $caption = array_shift($usercaption);
+    }
+    else {
+        $caption = '';
+    }
 
-        $extra_fields = array();
-        if (!isset($setCaption)) {
-            $setCaption = '';
-        }
+    if (!isset($caption)) {
+        $caption = '';
+    }
 
-        // Find in meta data array
-        foreach ($image_info as $info) {
-            if ($info[$fileNameKey] == $name) {
-                // Loop through fields
-                foreach ($captionMetaFields as $field) {
-                    // If caption isn't populated and current field is
-                    if (!strlen($caption) && strlen($info[$field])) {
-                        $caption = $info[$field];
-                    }
+    $extra_fields = array();
+    if (!isset($setCaption)) {
+        $setCaption = '';
+    }
+
+    // Find in meta data array
+    foreach ($image_info as $info) {
+        if ($info[$fileNameKey] == $name) {
+            // Loop through fields
+            foreach ($captionMetaFields as $field) {
+                // If caption isn't populated and current field is
+                if (!strlen($caption) && strlen($info[$field])) {
+                    $caption = $info[$field];
                 }
-                $extra_fields = $info;
-                if(isDebugging()) {
-                    echo gTranslate('common', "Extra fields:");
-                    print_r($extra_fields);
-                }
             }
+            $extra_fields = $info;
+            if(isDebugging()) {
+                echo gTranslate('common', "Extra fields:");
+                print_r($extra_fields);
+            }
         }
+    }
 
-        $path_parts = pathinfo($name);
-        $ext = strtolower($path_parts["extension"]);
+    $path_parts = pathinfo($name);
+    $ext = strtolower($path_parts["extension"]);
 
-        // Add new image
-        processNewImage($file, $ext, $name, $caption, $setCaption, $extra_fields, $wmName, $wmAlign, $wmAlignX, $wmAlignY, $wmSelect);
-        $image_count++;
-    }
+    // Add new image
+    processNewImage($file, $ext, $name, $caption, $setCaption, $extra_fields, $wmName, $wmAlign, $wmAlignX, $wmAlignY, $wmSelect);
 }
 
-if ($image_count) {
-    $gallery->album->save(array(i18n("%d files uploaded"), $image_count));
+if ($photoCount) {
+    $gallery->album->save(array(i18n("%d files uploaded"), $photoCount));
 }
 
 if (!empty($temp_files)) {
@@ -381,7 +387,7 @@
 echo "\n</div>";
 echo '<div class="g-content-popup center">';
 
-if (empty($image_count) && $upload_started) {
+if (empty($photoCount) && $upload_started) {
     print gTranslate('core', "No images uploaded!");
 }
 echo "\n<br>";

Modified: trunk/gallery/setup/welcome.inc
===================================================================
--- trunk/gallery/setup/welcome.inc	2006-10-30 02:18:18 UTC (rev 15001)
+++ trunk/gallery/setup/welcome.inc	2006-10-30 02:21:03 UTC (rev 15002)
@@ -90,14 +90,16 @@
 
             <?php
                 }
-                else if(!$install) {
+                else if(isset($gallery->app->config_version) &&
+                  $gallery->app->config_version != $gallery->config_version) {
+
                     echo infobox(array(array(
                         'type' => 'warning',
-                        'text' => gTranslate('config', "Your Gallery needs a reconfiguration,") .
-                                  '<p>' .
-                                   gTranslate('config', "Your Gallery settings were configured with an older version of Gallery, and are out of date. Please re-run the Configuration Wizard!") .
-                                  '</p>'
-                        )));
+                        'text' => gTranslate('config', "Your Gallery needs a reconfiguration.") .
+                        '<p>' .
+                        gTranslate('config', "Your Gallery settings were configured with an older version of Gallery, and are out of date. Please re-run the Configuration Wizard!") .
+                        '</p>'
+                    )));
                 }
             ?>
             <p>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15003
          http://svn.sourceforge.net/gallery/?rev=15003&view=rev
Author:   jenst
Date:     2006-10-29 18:32:55 -0800 (Sun, 29 Oct 2006)

Log Message:
-----------
2006-10-30 Jens Tkotz <jens@...> 1.6-alpha2-svn-b26

 * Fix: Removed wrong errormessages when uploading from server.

Modified Paths:
--------------
    trunk/gallery/ChangeLog
    trunk/gallery/Version.php
    trunk/gallery/popups/save_photos.php

Modified: trunk/gallery/ChangeLog
===================================================================
--- trunk/gallery/ChangeLog	2006-10-30 02:21:03 UTC (rev 15002)
+++ trunk/gallery/ChangeLog	2006-10-30 02:32:55 UTC (rev 15003)
@@ -1,3 +1,7 @@
+2006-10-30 Jens Tkotz <jens@...> 1.6-alpha2-svn-b26
+
+ * Fix: Removed wrong errormessages when uploading from server.
+
 2006-10-30 Jens Tkotz <jens@...> 1.6-alpha2-svn-b25
 
  * Fix: Upgrade message in welcome.inc was showed in too many cases.

Modified: trunk/gallery/Version.php
===================================================================
--- trunk/gallery/Version.php	2006-10-30 02:21:03 UTC (rev 15002)
+++ trunk/gallery/Version.php	2006-10-30 02:32:55 UTC (rev 15003)
@@ -22,7 +22,7 @@
 ?>
 <?php
 
-$gallery->version = '1.6-alpha2-svn-b25';
+$gallery->version = '1.6-alpha2-svn-b26';
 $gallery->config_version = 99;
 $gallery->album_version = 39;
 $gallery->user_version = 6;

Modified: trunk/gallery/popups/save_photos.php
===================================================================
--- trunk/gallery/popups/save_photos.php	2006-10-30 02:21:03 UTC (rev 15002)
+++ trunk/gallery/popups/save_photos.php	2006-10-30 02:32:55 UTC (rev 15003)
@@ -315,65 +315,68 @@
 
 echo "\n</div>";
 /* Now we start processing the given Files */
-$photoCount = sizeof($_FILES['userfile']['name']) -1;
-echo '<div class="g-content-popup left">';
-echo infobox(array(array(
-            'type' => 'information',
-            'text' => gTranslate('core',
-                "Processing %d uploaded element.",
-                "Processing %d uploaded elements.",
-                $photoCount, 'Error, no photo uploaded.', true)
-        )));
+if(!empty($_FILES['userfile']['name'])) {
+    $photoCount = sizeof($_FILES['userfile']['name']) -1;
 
+    echo '<div class="g-content-popup left">';
+    echo infobox(array(array(
+        'type' => 'information',
+        'text' => gTranslate('core',
+            "Processing %d uploaded element.",
+            "Processing %d uploaded elements.",
+            $photoCount, 'Error, no photo uploaded.', true)
+    )));
 
-for($i = 0; $i < $photoCount; $i++) {
-    $upload_started = true;
 
-    $name = $_FILES['userfile']['name'][$i];
-    $file = $_FILES['userfile']['tmp_name'][$i];
+    for($i = 0; $i < $photoCount; $i++) {
+        $upload_started = true;
 
-    if (!empty($usercaption) && is_array($usercaption)) {
-        $caption = array_shift($usercaption);
-    }
-    else {
-        $caption = '';
-    }
+        $name = $_FILES['userfile']['name'][$i];
+        $file = $_FILES['userfile']['tmp_name'][$i];
 
-    if (!isset($caption)) {
-        $caption = '';
-    }
+        if (!empty($usercaption) && is_array($usercaption)) {
+            $caption = array_shift($usercaption);
+        }
+        else {
+            $caption = '';
+        }
 
-    $extra_fields = array();
-    if (!isset($setCaption)) {
-        $setCaption = '';
-    }
+        if (!isset($caption)) {
+            $caption = '';
+        }
 
-    // Find in meta data array
-    foreach ($image_info as $info) {
-        if ($info[$fileNameKey] == $name) {
-            // Loop through fields
-            foreach ($captionMetaFields as $field) {
-                // If caption isn't populated and current field is
-                if (!strlen($caption) && strlen($info[$field])) {
-                    $caption = $info[$field];
+        $extra_fields = array();
+        if (!isset($setCaption)) {
+            $setCaption = '';
+        }
+
+        // Find in meta data array
+        foreach ($image_info as $info) {
+            if ($info[$fileNameKey] == $name) {
+                // Loop through fields
+                foreach ($captionMetaFields as $field) {
+                    // If caption isn't populated and current field is
+                    if (!strlen($caption) && strlen($info[$field])) {
+                        $caption = $info[$field];
+                    }
                 }
+                $extra_fields = $info;
+                if(isDebugging()) {
+                    echo gTranslate('common', "Extra fields:");
+                    print_r($extra_fields);
+                }
             }
-            $extra_fields = $info;
-            if(isDebugging()) {
-                echo gTranslate('common', "Extra fields:");
-                print_r($extra_fields);
-            }
         }
-    }
 
-    $path_parts = pathinfo($name);
-    $ext = strtolower($path_parts["extension"]);
+        $path_parts = pathinfo($name);
+        $ext = strtolower($path_parts["extension"]);
 
-    // Add new image
-    processNewImage($file, $ext, $name, $caption, $setCaption, $extra_fields, $wmName, $wmAlign, $wmAlignX, $wmAlignY, $wmSelect);
+        // Add new image
+        processNewImage($file, $ext, $name, $caption, $setCaption, $extra_fields, $wmName, $wmAlign, $wmAlignX, $wmAlignY, $wmSelect);
+    }
 }
 
-if ($photoCount) {
+if (!empty($photoCount)) {
     $gallery->album->save(array(i18n("%d files uploaded"), $photoCount));
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14990
          http://svn.sourceforge.net/gallery/?rev=14990&view=rev
Author:   andy_st
Date:     2006-10-28 04:52:50 -0700 (Sat, 28 Oct 2006)

Log Message:
-----------
Small style fixes

Modified Paths:
--------------
    trunk/gallery2/modules/core/classes/GalleryStorage/MSSqlStorage.class

Modified: trunk/gallery2/modules/core/classes/GalleryStorage/MSSqlStorage.class
===================================================================
--- trunk/gallery2/modules/core/classes/GalleryStorage/MSSqlStorage.class	2006-10-27 19:49:59 UTC (rev 14989)
+++ trunk/gallery2/modules/core/classes/GalleryStorage/MSSqlStorage.class	2006-10-28 11:52:50 UTC (rev 14990)
@@ -63,8 +63,7 @@
      */
     function _getSqlReplacements() {
 	/* For SQL Server versions pre-2005, use type NTEXT.  For 2005+, use NVARCHAR(MAX). */
-	if (! $this->_serverInfo) {
-	    /* At least one number, followed by at least one "one dot followed by at least one number" */
+	if (!$this->_serverInfo) {
 	    if (preg_match("/(\d+(\.\d+)+)/", $this->getVersion(), $matches)) {
 		$this->_serverInfo = $matches[0];
 	    } else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.