diff --git a/.gitignore b/.gitignore index d7a1e80..bed2b56 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clienttools/Karoo clienttools/Office .gitmodules *.out +baobab/ diff --git a/bin/win32/winserv.exe b/bin/win32/winserv.exe new file mode 100644 index 0000000..f687daa --- /dev/null +++ b/bin/win32/winserv.exe diff --git a/plugins/thumbnails/templates/shadow.gif b/plugins/thumbnails/templates/shadow.gif new file mode 100644 index 0000000..af7f537 --- /dev/null +++ b/plugins/thumbnails/templates/shadow.gif diff --git a/plugins/thumbnails/templates/shadowAlpha.png b/plugins/thumbnails/templates/shadowAlpha.png new file mode 100644 index 0000000..a2561df --- /dev/null +++ b/plugins/thumbnails/templates/shadowAlpha.png diff --git a/plugins/thumbnails/templates/thumbnail_viewlet.smarty b/plugins/thumbnails/templates/thumbnail_viewlet.smarty index 804706e..6801153 100755 --- a/plugins/thumbnails/templates/thumbnail_viewlet.smarty +++ b/plugins/thumbnails/templates/thumbnail_viewlet.smarty @@ -1,3 +1,23 @@ -
| "; ?> | -Lucene Service Could not be started Started | +Lucene Service Could not be stopped Stopped | Refresh |
| "; ?> | -Scheduler Service Could not be started Started | +Scheduler Service Could not be stopped Stopped | Refresh |
| "; ?> | -OpenOffice Service Could not be started Started | +OpenOffice Service Could not be stopped Stopped | Refresh | diff --git a/setup/wizard/installUtil.php b/setup/wizard/installUtil.php index 441797e..67f3a07 100644 --- a/setup/wizard/installUtil.php +++ b/setup/wizard/installUtil.php @@ -40,6 +40,8 @@ * @version Version 0.1 */ class InstallUtil { + + private $salt = 'installers'; /** * Constructs installation object * @@ -508,11 +510,11 @@ class InstallUtil { * @return boolean */ public function getDataFromSession($class) { - if(empty($_SESSION[$class])) { + if(empty($_SESSION[$this->salt][$class])) { return false; } - return $_SESSION[$class]; + return $_SESSION[$this->salt][$class]; } /** diff --git a/setup/wizard/installer.php b/setup/wizard/installer.php index 96cb136..11dc112 100644 --- a/setup/wizard/installer.php +++ b/setup/wizard/installer.php @@ -646,7 +646,7 @@ class Installer { */ public function showSession() { echo '