From be2be872030777211006a2f22b7c760720c4e7b6 Mon Sep 17 00:00:00 2001
From: IT-B-IT <alejandro.vargas@islandtug.com>
Date: Tue, 25 Sep 2012 13:59:57 -0700
Subject: Update config/freeradius2/freeradius.inc

Added the option to edit the default XMLRPC timeout from the GUI
also added the option to activate or deactivate the servers that it is going to replicate to by adding a check mark to each server
---
 config/freeradius2/freeradius.inc | 35 +++++++++++++++++++++++++----------
 1 file changed, 25 insertions(+), 10 deletions(-)

(limited to 'config/freeradius2')

diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc
index 8932d7ca..92ec2e4f 100644
--- a/config/freeradius2/freeradius.inc
+++ b/config/freeradius2/freeradius.inc
@@ -2459,24 +2459,31 @@ conf_mount_ro();
 function freeradius_sync_on_changes() {
 	global $config, $g;
 	$varsyncenablexmlrpc = $config['installedpackages']['freeradiussync']['config'][0]['varsyncenablexmlrpc'];	
-	
+
 	// if checkbox is NOT checked do nothing
 	if(!$varsyncenablexmlrpc) {
 		return;
 	}
-	
-	log_error("FreeRADIUS: Starting XMLRPC process (freeradius_do_xmlrpc_sync).");	
+ 
+	log_error("FreeRADIUS: Starting XMLRPC process (freeradius_do_xmlrpc_sync).");
+	log_error("FreeRADIUS: Starting XMLRPC with time out: {$varsynctimeout}.");
 	
 	// if checkbox is checked get IP and password of the destination hosts
 	foreach ($config['installedpackages']['freeradiussync']['config'] as $rs ){
 		foreach($rs['row'] as $sh){
+			// if checkbox is NOT checked do nothing
+			if($sh['varsyncdestinenable']) {
 			$varsyncprotocol 	= $sh['varsyncprotocol'];
 			$sync_to_ip 		= $sh['varsyncipaddress'];
-			$password   		= $sh['varsyncpassword'];
+                        $password   		= $sh['varsyncpassword'];
 			$varsyncport 		= $sh['varsyncport'];
 			if($password && $sync_to_ip && $varsyncport && $varsyncprotocol)
 				freeradius_do_xmlrpc_sync($sync_to_ip, $password, $varsyncport, $varsyncprotocol);
-		}
+		    }
+                    else {
+                    log_error("FreeRADIUS: Sync with {$sh['varsyncipaddress']} is disable");
+                    }
+        }
 	}
 	log_error("FreeRADIUS: Finished XMLRPC process (freeradius_do_xmlrpc_sync).");
 }
@@ -2485,6 +2492,14 @@ function freeradius_sync_on_changes() {
 function freeradius_do_xmlrpc_sync($sync_to_ip, $password, $varsyncport, $varsyncprotocol) {
 	global $config, $g;
 
+	$varsynctimeout = $config['installedpackages']['freeradiussync']['config'][0]['varsynctimeout'];
+
+        if($varsynctimeout == '' || $varsynctimeout == 0) {
+		$varsynctimeout = 150;
+	}
+
+	log_error("FreeRADIUS: Starting XMLRPC with time out: {$varsynctimeout}.");
+
 	if(!$password)
 		return;
 
@@ -2524,15 +2539,15 @@ function freeradius_do_xmlrpc_sync($sync_to_ip, $password, $varsyncport, $varsyn
 	$cli->setCredentials('admin', $password);
 		if($g['debug'])
 			$cli->setDebug(1);
-		/* send our XMLRPC message and timeout after 150 seconds */
-		$resp = $cli->send($msg, "150");
+		/* send our XMLRPC message and timeout after $varsynctimeout seconds */
+		$resp = $cli->send($msg, $varsynctimeout);
 		if(!$resp) {
 			$error = "A communications error occurred while FreeRADIUS was attempting XMLRPC sync with {$url}:{$port}.";
 			log_error("FreeRADIUS: $error");
 			file_notice("sync_settings", $error, "freeradius Settings Sync", "");
 		} elseif($resp->faultCode()) {
 			$cli->setDebug(1);
-			$resp = $cli->send($msg, "150");
+			$resp = $cli->send($msg, $varsynctimeout);
 			$error = "An error code was received while FreeRADIUS XMLRPC was attempting to sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
 			log_error("FreeRADIUS: $error");
 			file_notice("sync_settings", $error, "freeradius Settings Sync", "");
@@ -2556,14 +2571,14 @@ function freeradius_do_xmlrpc_sync($sync_to_ip, $password, $varsyncport, $varsyn
 	$msg = new XML_RPC_Message($method, $params);
 	$cli = new XML_RPC_Client('/xmlrpc.php', $url, $port);
 	$cli->setCredentials('admin', $password);
-		$resp = $cli->send($msg, "150");
+		$resp = $cli->send($msg, $varsynctimeout);
 		if(!$resp) {
 			$error = "A communications error occurred while FreeRADIUS was attempting XMLRPC sync with {$url}:{$port} (exec_php).";
 			log_error($error);
 			file_notice("sync_settings", $error, "freeradius Settings Sync", "");
 		} elseif($resp->faultCode()) {
 			$cli->setDebug(1);
-			$resp = $cli->send($msg, "150");
+			$resp = $cli->send($msg, $varsynctimeout);
 			$error = "An error code was received while FreeRADIUS XMLRPC was attempting to sync with {$url}:{$port} - Code " . $resp->faultCode() . ": " . $resp->faultString();
 			log_error($error);
 			file_notice("sync_settings", $error, "freeradius Settings Sync", "");
-- 
cgit v1.2.3