X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=gosa-core%2Fupdate-gosa;h=c94fe9809fc0b7fc9212729fc86ed57d57cf831b;hb=7ce564d554053c9ff7ae13d00df50f5a1961357d;hp=73eb2c69f47a89d65dc48e2f5c69a5101f3c29c5;hpb=57c948f5230dcac0408be532f136e1ade3a2515f;p=gosa.git

diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index 73eb2c69f..c94fe9809 100755
--- a/gosa-core/update-gosa
+++ b/gosa-core/update-gosa
@@ -1,4 +1,4 @@
-#!/usr/bin/php5
+#!/usr/bin/php
 <?php
 /*
  * This code is part of GOsa (http://www.gosa-project.org)
@@ -35,7 +35,7 @@ Usage: update-gosa install dsc     Install the plugin using the dsc information
        update-gosa remove plugin   Remove the plugin named "plugin" from
                                    the current configuration.
 
-       update-gosa lists           Lists installed plugins
+       update-gosa list           Lists installed plugins
 
        update-gosa rescan-i18n     Rebuilds the translations
 
@@ -177,7 +177,7 @@ function rescan_i18n()
 		}
 
 		/* Cat all these po files into one single file */
-		system ("(cd ".LOCALE_DIR." && msgcat ".implode(" ", $po_files)." > compiled/${language}/LC_MESSAGES/messages.po)", $val);
+		system ("(cd ".LOCALE_DIR." && msgcat --use-first ".implode(" ", $po_files)." > compiled/${language}/LC_MESSAGES/messages.po)", $val);
 		if ($val != 0){
 			echo "Merging of message files failed - aborted";
 			exit (4);
@@ -188,6 +188,8 @@ function rescan_i18n()
 			exit (5);
 		}
 	}
+
+	echo "! Warning: you may need to reload your webservice!\n";
 }
 
 
@@ -218,13 +220,15 @@ function rescan_guide()
 		$master_guide_content.= file_get_contents($guide);
 	}
 	
-	$plugins= scandir('doc/plugins');
-	foreach($plugins as $key => $plugin) {
-		if($plugin != '.' && $plugin != '..') {
-			if(is_dir('doc/plugins/'.$plugin)) {
-				$guide= 'doc/plugins/'.$plugin.'/guide.xml';
-				if(file_exists($guide) && is_readable($guide)) {
-					$master_guide_content.= file_get_contents($guide);
+	if(file_exists('doc/plugins')) {
+		$plugins= scandir('doc/plugins');
+		foreach($plugins as $key => $plugin) {
+			if($plugin != '.' && $plugin != '..') {
+				if(is_dir('doc/plugins/'.$plugin)) {
+					$guide= 'doc/plugins/'.$plugin.'/guide.xml';
+					if(file_exists($guide) && is_readable($guide)) {
+						$master_guide_content.= file_get_contents($guide);
+					}
 				}
 			}
 		}
@@ -234,7 +238,7 @@ function rescan_guide()
 	
 	$master_guide_content= preg_replace("/[ \t][ \t]*/", " ", $master_guide_content);
 
-	if(is_writable($master_guide)) {
+	if((file_exists($master_guide) && is_writable($master_guide)) || is_writable('doc')) {
 		file_put_contents($master_guide, $master_guide_content);
 	}
 
@@ -253,9 +257,9 @@ function parse_ini($file)
 			$plugin= &$tmp['gosa-plugin'];
 			if (isset($plugin['name'])&& isset($plugin['description'])){
 				$res= $plugin['name'];
-				$provides[$res]= $plugin[$res];
 				$description[$res]= $plugin['description'];
 				$versions[$res]= $plugin['version'];
+				$provides[$res]= $res;
 				if (isset($plugin['depends'])){
 					$depends[$res]= explode(',', preg_replace('/\s+/', '', $plugin['depends']));
 				}
@@ -517,6 +521,241 @@ function remove_plugin($name)
 }
 
 
+function rescan_images($path, $theme)
+{
+  $widths= array();
+  $heights= array();
+  $paths= array();
+  $posX= array();
+  $posY= array();
+  $baseLength= strlen($path);
+  $heightStats= array();
+  $warnings= array();
+  $checksums= array();
+  $styles= array();
+  $duplicates= array();
+
+  // Check for image magick convert
+  if (!function_exists("imageFilter")){
+    exec("which convert", $res, $ret);
+    if ($ret != 0) {
+      die("Your system has no bundled gd support for imageFilter function. Please install imagemagick in order to use an external command.\n");
+    }
+  }
+  
+  // Scan for images in the given path
+  echo "Scanning for images";
+  flush();
+  foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path)) as $fileInfo) {
+  
+      // We're only interested in png files
+      $indexPath= substr($fileInfo->getPathname(), $baseLength + 1);
+      $path= $fileInfo->getPathname();
+      if (preg_match('/\.png$/', $indexPath) && !preg_match('/\.svn/', $path) && !preg_match('/themes\/[^\/]+\/img.png$/', $path)){
+  
+         // Grey image if it is not already one
+         if (preg_match('/grey/', $indexPath)) {
+           echo "!";
+           $warnings[]= "Warning: skipped possible *grey* image $path";
+           flush();
+           continue;
+         }
+
+         // New image if it is not already one
+         if (preg_match('/new/', $indexPath) && !preg_match('/new\.png$/', $indexPath)) {
+           echo "!";
+           $warnings[]= "Warning: skipped possible *new* image $path";
+           flush();
+           continue;
+         }
+
+         // Catch available themes
+         if (preg_match('/themes\//', $indexPath) && !preg_match('/themes\/'.$theme.'\//', $indexPath)) {
+           continue;
+         }
+
+         // Load image
+         $img= imageCreateFromPng($path);
+         $width= imageSX($img);
+         $height= imageSY($img);
+         imageDestroy($img);
+         $greyIndexPath= preg_replace('/\.png$/', '-grey.png', $indexPath);
+
+         // Is this image already there?
+         $checksum= md5_file($path);
+         if (in_array($checksum, $checksums)) {
+           $warnings[]= "Warning: images $indexPath seems to be a duplicate of ".array_search($checksum, $checksums);
+           $duplicates[$indexPath]= array_search($checksum, $checksums);
+           $duplicates[$greyIndexPath]= preg_replace('/\.png$/', '-grey.png', array_search($checksum, $checksums));
+           continue;
+         } else {
+           $checksums[$indexPath]= $checksum;
+         }
+
+         // Ordinary image
+         $widths[$indexPath]= $width;
+         $heights[$indexPath]= $height;
+         $paths[$indexPath]= $path;
+
+         // Grey image
+         $widths[$greyIndexPath]= $width;
+         $heights[$greyIndexPath]= $height;
+         $paths[$greyIndexPath]= $path;
+
+         // Feed height statistics
+         if (!isset($heightStats[$height])) {
+           $heightStats[$height]= 1;
+         } else {
+           $heightStats[$height]++;
+         }
+      }
+  
+    echo ".";
+    flush();
+  }
+  echo "\n";
+
+  // Do some stupid height calculation
+  arsort($heightStats, SORT_NUMERIC);
+  reset($heightStats);
+  $popular= current($heightStats);
+
+  krsort($heightStats);
+  reset($heightStats);
+  $max= current($heightStats);
+
+  $maxHeight= (floor($max / $popular) + 1) * $popular * 6;
+  
+  // Sort to get biggest values
+  arsort($widths, SORT_NUMERIC);
+  reset($widths);
+  echo "Calculating master image dimensions: ";
+  flush();
+  
+  // Build container image
+  $cursorX= 0;
+  $cursorY= 0;
+  $colWidth= 0;
+  $rowHeight= 0;
+  $colX= 0;
+  $colY= 0;
+  $maxY= 0;
+  $maxX= 0;
+
+  // Walk thru width sorted images
+  foreach ($widths as $imagePath => $imageWidth) {
+    $imageHeight= $heights[$imagePath];
+
+    // First element in this column
+    if ($colWidth == 0) {
+      $colWidth= $imageWidth;
+    }
+
+    // First element in this row
+    if ($rowHeight < $imageHeight) {
+      $rowHeight= $imageHeight;
+    }
+
+    // Does the image match here?
+    if ($cursorX + $imageWidth > $colX + $colWidth) {
+
+      if ($cursorY + $imageHeight >= $maxHeight) {
+
+        // Reached max height, move to the next column
+        $colX+= $colWidth;
+        $cursorX= $colX;
+        $colWidth= $imageWidth;
+        $rowHeight= $imageHeight;
+        $colY= $cursorY= 0;
+
+      } else {
+
+        // Next row
+        $colY+= $rowHeight;
+        $cursorY= $colY;
+        $cursorX= $colX;
+        $rowHeight= $imageHeight;
+      }
+
+      $maxY=($colY + $imageHeight > $maxY)?$colY+$imageHeight:$maxY;
+    }
+
+    // Save calculated position
+    $posX[$imagePath]= $cursorX;
+    $posY[$imagePath]= $cursorY;
+
+    // Move X cursor to the next position
+    $cursorX+= $imageWidth;
+
+    $maxX=($colX+$imageWidth > $maxX)?$colX+$imageWidth:$maxX;
+  }
+  
+  // Print maximum dimensions
+  echo $maxY."x".$maxX."\n";
+  echo "Processing";
+  flush();
+
+  // Create result image
+  $dst= imageCreateTrueColor($maxX, $maxY);
+  imageAlphaBlending($dst, true);
+  $transparent = imagecolorallocatealpha($dst, 0, 0, 0, 127);
+  imageFill($dst, 0, 0, $transparent);
+  imageSaveAlpha($dst, true);
+
+  // Finally assemble picture
+  foreach ($heights as $imagePath => $imageHeight) {
+    $imageWidth= $widths[$imagePath];
+    $x= $posX[$imagePath];
+    $y= $posY[$imagePath];
+
+    // Insert source image...
+
+    // Eventually convert it to grey before
+    if (preg_match('/-grey\.png$/', $imagePath)) {
+      if (!function_exists("imageFilter")){
+        exec("convert ".$paths[$imagePath]." -colorspace Gray /tmp/grey-converted.png");
+        $src= imageCreateFromPng("/tmp/grey-converted.png");
+      } else {
+        $src= imageCreateFromPng($paths[$imagePath]);
+        imageFilter($src, IMG_FILTER_GRAYSCALE);
+      }
+    } else {
+      $src= imageCreateFromPng($paths[$imagePath]);
+    }
+
+    // Merge image
+    imageCopyResampled($dst, $src, $x, $y, 0, 0, $imageWidth, $imageHeight, $imageWidth, $imageHeight);
+    imageDestroy($src);
+
+    // Store style
+    $styles[$imagePath]= "background-position:-".$x."px -".$y."px;width:".$imageWidth."px;height:".$imageHeight."px";
+
+    echo ".";
+    flush();
+  }
+
+  /* Add duplicates */
+  foreach ($duplicates as $imagePath => $realPath) {
+    $styles[$imagePath]= $styles[$realPath];
+  }
+
+  imagePNG($dst, "html/themes/$theme/img.png", 9);
+  imageDestroy($dst);
+
+  // Show warnings images
+  foreach ($warnings as $warn) {
+    echo "$warn\n";
+  }
+
+  // Write styles
+  echo "Writing styles...";
+  $fp = fopen("ihtml/themes/$theme/img.styles", 'w');
+  fwrite($fp, serialize($styles));
+  fclose($fp);
+
+  echo "\n";
+}
+
 
 /* Fill global values */
 $description= $provides= $depends= $versions= $conflicts= array();
@@ -526,6 +765,7 @@ if ($argc < 2){
 	rescan_classes();
 	rescan_i18n();
 	rescan_guide();
+        rescan_images("html", "modern");
         exit (0);
 }
 
@@ -555,6 +795,9 @@ switch ($argv[1]){
         case 'rescan-classes':
                 rescan_classes();
                 break;
+        case 'rescan-images':
+                rescan_images("html", "modern");
+                break;
         default:
                 echo "Error: Supplied command not known\n\n";
                 print_usage();