From e8a29cf134f7df1a1e7637083f6d7adf64949b7c Mon Sep 17 00:00:00 2001
From: jmontoya <jmontoya@ispconfig3>
Date: Wed, 04 Aug 2010 12:57:28 -0400
Subject: [PATCH] Adding new functions to the Remoting class

---
 install/lib/install.lib.php |   99 +++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 91 insertions(+), 8 deletions(-)

diff --git a/install/lib/install.lib.php b/install/lib/install.lib.php
index d19a2dd..8793dba 100644
--- a/install/lib/install.lib.php
+++ b/install/lib/install.lib.php
@@ -56,6 +56,10 @@
 $FILE = realpath('../install.php');
 
 //** Get distribution identifier
+//** IMPORTANT!
+//   This is the same code as in /server/mods-available/monitor_core_module.inc.php
+//   So if you change it here, you also have to change it in
+//   /server/mods-available/monitor_core_module.inc.php!
 function get_distname() {
 	
 	$distname = '';
@@ -81,9 +85,9 @@
 		} elseif(strstr(trim(file_get_contents('/etc/debian_version')),'6.0') || trim(file_get_contents('/etc/debian_version')) == 'squeeze/sid') {
 			$distname = 'Debian';
 			$distver = 'Squeeze/Sid';
-			$distid = 'debian40';
+			$distid = 'debian60';
 			$distbaseid = 'debian';
-			swriteln("Operating System: Debian Squeeze/Sid or compatible\n");
+			swriteln("Operating System: Debian 6.0 (Squeeze/Sid) or compatible\n");
 		}  else {
 			$distname = 'Debian';
 			$distver = 'Unknown';
@@ -109,14 +113,14 @@
 			swriteln("Operating System: openSUSE 11.1 or compatible\n");
 		} elseif(stristr(file_get_contents('/etc/SuSE-release'),'11.2')) {
 			$distname = 'openSUSE';
-			$distver = '11.1';
-			$distid = 'opensuse110';
+			$distver = '11.2';
+			$distid = 'opensuse112';
 			$distbaseid = 'opensuse';
 			swriteln("Operating System: openSUSE 11.2 or compatible\n");
 		}  else {
 			$distname = 'openSUSE';
 			$distver = 'Unknown';
-			$distid = 'opensuse110';
+			$distid = 'opensuse112';
 			$distbaseid = 'opensuse';
 			swriteln("Operating System: openSUSE or compatible, unknown version.\n");
 		}
@@ -259,10 +263,14 @@
 
 function rf($file){
 	clearstatcache();
-	if(!$fp = fopen ($file, 'rb')){
-		ilog('WARNING: could not open file '.$file);
+	if(is_file($file)) {
+		if(!$fp = fopen ($file, 'rb')){
+			ilog('WARNING: could not open file '.$file);
+		}
+		return filesize($file) > 0 ? fread($fp, filesize($file)) : '';
+	} else {
+		return '';
 	}
-	return filesize($file) > 0 ? fread($fp, filesize($file)) : '';
 }
 
 function wf($file, $content){
@@ -632,6 +640,81 @@
 	}
 }
 
+/*
+ * Compare ISPConfig version number.
+ * return values:
+ * -1 $current version is newer then $new version (downgrade)
+ * 0 $current version = $new version
+ * 1 $current version is older then new version (update)
+
+*/
+function compare_ispconfig_version($current,$new) {
+	if( $current == $new) {
+		return 0;
+	}
+	
+	$p = explode('.',$current);
+	$tmp = '';
+	$tmp .= str_pad(intval($p[0]), 3, '0', STR_PAD_LEFT);
+	$tmp .= (isset($p[1]))?str_pad(intval($p[1]), 3, '0', STR_PAD_LEFT):'000';
+	$tmp .= (isset($p[2]))?str_pad(intval($p[2]), 3, '0', STR_PAD_LEFT):'000';
+	$tmp .= (isset($p[3]))?str_pad(intval($p[3]), 3, '0', STR_PAD_LEFT):'000';
+	$current = $tmp;
+	
+	$p = explode('.',$new);
+	$tmp = '';
+	$tmp .= str_pad(intval($p[0]), 3, '0', STR_PAD_LEFT);
+	$tmp .= (isset($p[1]))?str_pad(intval($p[1]), 3, '0', STR_PAD_LEFT):'000';
+	$tmp .= (isset($p[2]))?str_pad(intval($p[2]), 3, '0', STR_PAD_LEFT):'000';
+	$tmp .= (isset($p[3]))?str_pad(intval($p[3]), 3, '0', STR_PAD_LEFT):'000';
+	$new = $tmp;
+	
+	if($new > $current) {
+		return 1;
+	} else {
+		return -1;
+	}
+	
+}
+
+/*
+* Get the port number of the ISPConfig controlpanel vhost
+*/
+
+function get_ispconfig_port_number() {
+	global $conf;
+	$ispconfig_vhost_file = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost';
+
+	if(is_file($ispconfig_vhost_file)) {
+		$tmp = file_get_contents($ispconfig_vhost_file);
+		preg_match('/\<VirtualHost.*\:(\d{1,})\>/',$tmp,$matches);
+		$port_number = intval($matches[1]);
+		if($port_number > 0) {
+			return $port_number;
+		} else {
+			return '8080';
+		}
+	}
+}
+
+/*
+* Get the port number of the ISPConfig controlpanel vhost
+*/
+
+function is_ispconfig_ssl_enabled() {
+	global $conf;
+	$ispconfig_vhost_file = $conf['apache']['vhost_conf_dir'].'/ispconfig.vhost';
+
+	if(is_file($ispconfig_vhost_file)) {
+		$tmp = file_get_contents($ispconfig_vhost_file);
+		if(stristr($tmp,'SSLCertificateFile')) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+}
+
 
 
 ?>

--
Gitblit v1.9.1