diff --git a/gosa-core/update-gosa b/gosa-core/update-gosa
index 6e5eece048256789a46f1e40a9ea5f6b78026f9c..2e54a2aa91df52e7754e3796cd2081bbfb45c1cb 100755 (executable)
--- a/gosa-core/update-gosa
+++ b/gosa-core/update-gosa
// 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)){
+ if (preg_match('/\.png$/', $indexPath) && !preg_match('/\.svn/', $path) && !preg_match('/themes\/[^\/]+\/images\/img.png$/', $path)){
// Grey image if it is not already one
if (preg_match('/grey/', $indexPath)) {
echo "!";
- $warnings[]= "Warning: skipped possible grey image $path";
+ $warnings[]= "Warning: skipped possible *grey* image $path";
flush();
continue;
}
- // Grey image if it is not already one
- if (preg_match('/new/', $indexPath)) {
+ // New image if it is not already one
+ if (preg_match('/new/', $indexPath) && !preg_match('/new\.png$/', $indexPath)) {
echo "!";
- $warnings[]= "Warning: skipped possible grey image $path";
+ $warnings[]= "Warning: skipped possible *new* image $path";
flush();
continue;
}
$styles[$imagePath]= $styles[$realPath];
}
- imagePNG($dst, "html/themes/$theme/img.png", 9);
+ imagePNG($dst, "html/themes/$theme/images/img.png", 9);
imageDestroy($dst);
// Show warnings images