diff --git a/pandora_agents/win32/ChangeLog b/pandora_agents/win32/ChangeLog
index f5a76d7e2b..90b6ddcf35 100644
--- a/pandora_agents/win32/ChangeLog
+++ b/pandora_agents/win32/ChangeLog
@@ -1,3 +1,15 @@
+2006-11-27 Raul Mateos <raulofpandora@gmail.com>
+
+ * installer/Pandora_FMS_Windows_Agent-1.2-Setup.exe: Updated with last
+ binary file.
+
+ * installer/pandora.mpi: Update installer script file.
+
+ * installer/Pandora Windows Agent-1.2 Beta3-Setup.exe: deleted old file.
+
+ * bin/pandora_agent.conf: Changed path in server to
+ /var/spool/pandora/data_in.
+
2006-11-27 Esteban S�nchez <estebans@artica.es>
* pandora_strutils.h, pandora_strutils.cc: strtoulong() now returns an
diff --git a/pandora_agents/win32/bin/pandora_agent.conf b/pandora_agents/win32/bin/pandora_agent.conf
index 16464a2d3f..0d11e28499 100644
--- a/pandora_agents/win32/bin/pandora_agent.conf
+++ b/pandora_agents/win32/bin/pandora_agent.conf
@@ -14,8 +14,8 @@
# ==================
server_ip 127.0.0.1
-server_path /opt/pandora_server/data_in
-temporal "C:\temp"
+server_path /var/spool/pandora/data_in
+temporal "C:\windows\temp"
interval 10
agent_name localhost
pandora_debug 1
diff --git a/pandora_agents/win32/installer/Pandora Windows Agent-1.2 Beta3-Setup.exe b/pandora_agents/win32/installer/Pandora Windows Agent-1.2 Beta3-Setup.exe
deleted file mode 100644
index 261a8851f5..0000000000
Binary files a/pandora_agents/win32/installer/Pandora Windows Agent-1.2 Beta3-Setup.exe and /dev/null differ
diff --git a/pandora_agents/win32/installer/Pandora_FMS_Windows_Agent-1.2-Setup.exe b/pandora_agents/win32/installer/Pandora_FMS_Windows_Agent-1.2-Setup.exe
index ea9802bf5f..3b9dfa5179 100644
Binary files a/pandora_agents/win32/installer/Pandora_FMS_Windows_Agent-1.2-Setup.exe and b/pandora_agents/win32/installer/Pandora_FMS_Windows_Agent-1.2-Setup.exe differ
diff --git a/pandora_agents/win32/installer/pandora.mpi b/pandora_agents/win32/installer/pandora.mpi
index 35a600bead..048db18a07 100644
--- a/pandora_agents/win32/installer/pandora.mpi
+++ b/pandora_agents/win32/installer/pandora.mpi
@@ -51,7 +51,7 @@ IncludeDebugging
Yes
InstallVersion
-1.0.0.1
+1.0.0.2
LaunchApplication
Yes
@@ -60,7 +60,7 @@ ProjectID
9A2D5834-BB98-4916-89A5-06C81E368C0A
ProjectVersion
-1.0.3.0
+1.0.4.0
ShortAppName
{Pandora FMS}
@@ -184,7 +184,7 @@ InstallComponent 9595B40E-22BA-4E6D-AB81-1292E482FB6F -setup Install -title {Ins
InstallComponent 062A52B5-D9BA-43E7-A6B4-3C3FBD33ED83 -setup Install -title {Install Windows Shortcut} -component InstallWindowsShortcut -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623
InstallComponent 26BC0EC8-61D5-41BC-93EA-C4D5C62F25E4 -setup Install -title {Install Windows Shortcut} -component InstallWindowsShortcut -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623
InstallComponent E8082112-E869-4AAC-918A-3C5307CB6423 -setup Install -title {Message Box} -component MessageBox -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623
-InstallComponent 5A843D75-D3C0-4EA4-8C21-F29DBE168521 -setup Install -conditions {87FE38EB-DF8C-4DD6-8F4A-F09D4DD0ECB6 1FF15B8D-813C-40C8-876D-156505470C6B} -title {Execute External Program} -component ExecuteExternalProgram -command insert -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623
+InstallComponent 5A843D75-D3C0-4EA4-8C21-F29DBE168521 -setup Install -conditions {87FE38EB-DF8C-4DD6-8F4A-F09D4DD0ECB6 1FF15B8D-813C-40C8-876D-156505470C6B} -title {Execute External Program} -component ExecuteExternalProgram -command reorder -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623
Condition 87FE38EB-DF8C-4DD6-8F4A-F09D4DD0ECB6 -active Yes -parent 5A843D75-D3C0-4EA4-8C21-F29DBE168521 -title {Ask Yes or No} -component AskYesOrNo
Condition 1FF15B8D-813C-40C8-876D-156505470C6B -active Yes -parent 5A843D75-D3C0-4EA4-8C21-F29DBE168521 -title {String Is Condition} -component StringIsCondition
InstallComponent D651AEE7-E69C-44FD-B111-8DE881B83843 -setup Install -conditions 3E668536-AEF9-48A5-A5D0-1DE224E0D276 -title {Execute External Program} -component ExecuteExternalProgram -command insert -type action -active Yes -parent 661189B2-8DBD-4E1E-B2A5-FF7C435C1623
@@ -884,7 +884,7 @@ AC33C2B4-AB01-4572-802B-BA89E7661C04,Name
Pandora
AC33C2B4-AB01-4572-802B-BA89E7661C04,Size
-7669132
+7100188
B1313CDD-A5DA-4A72-ABCF-59E341F46E5A,FailureMessage
{Error initiating service}
@@ -1391,6 +1391,9 @@ E8082112-E869-4AAC-918A-3C5307CB6423,Message
E8082112-E869-4AAC-918A-3C5307CB6423,Title
{Public and Private Key Generation}
+F1A35B0F-4ED6-4687-8D6B-92BF1D209A25,Caption
+{Setup has enough information to start copying the program files. If you want to review or change any settings, click Back. If you are satisfied with the settings, click Next to begin copying files.}
+
FD4A35A5-930C-464A-BF60-2E721C498270,Text
<%CreateDesktopShortcutText%>
diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 09759bad51..4f5dd2f568 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-27 Raul Mateos <raulofpandora@gmail.com>
+
+ * general/footer.php: Add variable $time to get time from server which
+ PHP < 5.1. Style correction.
+
2006-11-23 Raul Mateos <raulofpandora@gmail.com>
* general/footer.php: Changed text from Pandora to Pandora FMS.
diff --git a/pandora_console/general/footer.php b/pandora_console/general/footer.php
index 0125f391ac..3383b6b302 100644
--- a/pandora_console/general/footer.php
+++ b/pandora_console/general/footer.php
@@ -20,14 +20,21 @@
<div id="foot">
<?php
- echo '<a target="_new" href="general/license/pandora_info_'.$language_code.'.html">Pandora FMS ';
- echo $pandora_version." Build ";
- echo $build_version." ";
+ echo '<a target="_new" href="general/license/pandora_info_'
+ .$language_code.'.html">Pandora FMS ';
+ echo $pandora_version." Build ".$build_version." ";
echo $lang_label["gpl_notice"];
echo '</a><br>';
if (isset($_SESSION['id_usuario'])) {
- echo $lang_label["gen_date"]." ".date("D F d, Y H:i:s",$_SERVER['REQUEST_TIME'])."<br>";
+
+ if (isset($_SERVER['REQUEST_TIME'])) {
+ $time = $_SERVER['REQUEST_TIME'];
+ } else {
+ $time = time();
+ }
+ echo $lang_label["gen_date"]." ".date("D F d, Y H:i:s", $time)."<br>";
}
?>
- <i>Pandora FMS is a <a target="_new" href="http://pandora.sourceforge.net">SourceForge registered project</a></i>
+ <i>Pandora FMS is a <a target="_new" href="http://pandora.sourceforge.net">
+ SourceForge registered project</a></i>
</div>
\ No newline at end of file
diff --git a/pandora_server/ChangeLog b/pandora_server/ChangeLog
index e01dcd9552..d33ece2514 100644
--- a/pandora_server/ChangeLog
+++ b/pandora_server/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-27 Raul Mateos <raulofpandora@gmail.com>
+
+ * pandora_server/data_in: Removed old directory.
+
+ * pandora_server/config/pandora_server.conf: Changed data_in directory to
+ /var/spool/pandora/data_in.
+
2006-11-27 Manuel Arostegui <marostegui@artica.es>
* pandora_server/specs/fedoracore5/perl-Pandora-1.2-beta3.spec:
diff --git a/pandora_server/conf/pandora_server.conf b/pandora_server/conf/pandora_server.conf
index 477cc8e8c7..4b1306ed55 100755
--- a/pandora_server/conf/pandora_server.conf
+++ b/pandora_server/conf/pandora_server.conf
@@ -7,7 +7,7 @@ servername localhost
# incomingdir: Defines directory where incoming data packets are stored
# You could set directory relative to base path or absolute, starting with /
-incomingdir ./data_in
+incomingdir /var/spool/pandora/data_in
# log_file: Main logfile for pandora_server
# You could set file relative to base path or absolute, starting with /