From 764585c03f3af1e2146d3cc87c5ce245b0ac1d25 Mon Sep 17 00:00:00 2001
From: tbrehm <t.brehm@ispconfig.org>
Date: Wed, 06 Oct 2010 09:10:24 -0400
Subject: [PATCH] Several opensuse related fixes.
---
install/dist/lib/opensuse.lib.php | 2 +-
server/mods-available/monitor_core_module.inc.php | 2 +-
server/lib/app.inc.php | 4 ++--
install/sql/incremental/upd_0002.sql | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/install/dist/lib/opensuse.lib.php b/install/dist/lib/opensuse.lib.php
index 87a0601..ec01255 100644
--- a/install/dist/lib/opensuse.lib.php
+++ b/install/dist/lib/opensuse.lib.php
@@ -541,7 +541,7 @@
//copy('tpl/apache_ispconfig.conf.master',$vhost_conf_dir.'/ispconfig.conf');
$content = rf("tpl/apache_ispconfig.conf.master");
$records = $this->db->queryAllRecords("SELECT * FROM server_ip WHERE server_id = ".$conf["server_id"]." AND virtualhost = 'y'");
- if(count($records) > 0) {
+ if(is_array($records) && count($records) > 0) {
foreach($records as $rec) {
$content .= "NameVirtualHost ".$rec["ip_address"].":80\n";
$content .= "NameVirtualHost ".$rec["ip_address"].":443\n";
diff --git a/install/sql/incremental/upd_0002.sql b/install/sql/incremental/upd_0002.sql
index bebbcc2..e71e111 100644
--- a/install/sql/incremental/upd_0002.sql
+++ b/install/sql/incremental/upd_0002.sql
@@ -1,4 +1,4 @@
-CREATE TABLE `sys_session` (
+CREATE TABLE IF NOT EXISTS `sys_session` (
`session_id` varchar(32) NOT NULL default '',
`date_created` datetime NOT NULL default '0000-00-00 00:00:00',
`last_updated` datetime NOT NULL default '0000-00-00 00:00:00',
diff --git a/server/lib/app.inc.php b/server/lib/app.inc.php
index 0a6778e..fc2397c 100644
--- a/server/lib/app.inc.php
+++ b/server/lib/app.inc.php
@@ -127,10 +127,10 @@
break;
}
- if (!fwrite($fp, date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\r\n")) {
+ if (!fwrite($fp, @date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\r\n")) {
die('Unable to write to logfile.');
}
- echo date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\n";
+ echo @date('d.m.Y-H:i').' - '.$priority_txt.' - '. $msg."\n";
fclose($fp);
// Log to database
diff --git a/server/mods-available/monitor_core_module.inc.php b/server/mods-available/monitor_core_module.inc.php
index dcdeac7..2260eef 100644
--- a/server/mods-available/monitor_core_module.inc.php
+++ b/server/mods-available/monitor_core_module.inc.php
@@ -53,7 +53,7 @@
/*
* Do the monitor every n minutes and write the result to the db
*/
- $min = date('i');
+ $min = @date('i');
if (($min % $this->interval) == 0) {
$this->doMonitor();
}
--
Gitblit v1.9.1