[Nagios-checkins] SF.net SVN: nagios:[72] nagiosvshell/branches/devel

[<dw...@us...>]

Revision: 72
          http://nagios.svn.sourceforge.net/nagios/?rev=72&view=rev
Author:   dworth
Date:     2010-12-26 16:50:29 +0000 (Sun, 26 Dec 2010)

Log Message:
-----------
optimizing calls to trim()

using a profiler I eliminated as many calls to trim as possible.  Data is trimmed as it is read and never again. User inputs are trimmed as needed

Modified Paths:
--------------
    nagiosvshell/branches/devel/controllers/status_functions.php
    nagiosvshell/branches/devel/data/NagiosData.php
    nagiosvshell/branches/devel/views/config_viewer.php

Modified: nagiosvshell/branches/devel/controllers/status_functions.php
===================================================================
--- nagiosvshell/branches/devel/controllers/status_functions.php	2010-12-26 16:50:22 UTC (rev 71)
+++ nagiosvshell/branches/devel/controllers/status_functions.php	2010-12-26 16:50:29 UTC (rev 72)
@@ -238,7 +238,6 @@
 	global $NagiosData;
 	$hosts = $NagiosData->getProperty('hosts');
 
-	$servicename = trim($servicename);
 	$hostname = trim($hostname);
 
 	$count = 0;
@@ -246,6 +245,7 @@
 	if ($hostname != '') {
 		if (isset($hosts[$hostname]) && isset($hosts[$hostname]['comments'])) {
 
+			$servicename = trim($servicename);
 			if ($servicename != '') {
 				foreach($hosts[$hostname]['comments'] as $comment) {
 					if ($comment['service_description'] == $servicename) {

Modified: nagiosvshell/branches/devel/data/NagiosData.php
===================================================================
--- nagiosvshell/branches/devel/data/NagiosData.php	2010-12-26 16:50:22 UTC (rev 71)
+++ nagiosvshell/branches/devel/data/NagiosData.php	2010-12-26 16:50:29 UTC (rev 72)
@@ -119,6 +119,7 @@
 	 */
 	public function get_details_by($type, $arg)
 	{
+		$arg = trim($arg);
 		$retval = NULL;
 
 		$details = NULL;
@@ -134,7 +135,7 @@
 			/* serviceID index no longer exists, had to call array by index 
 			 * number instead 
 			 */
-			$id = str_replace('service', '', trim($arg)); 
+			$id = str_replace('service', '', $arg); 
 			$retval = $details[$id];	//call service details by array index 
 	
 		}
@@ -142,7 +143,7 @@
 		{
 			foreach($details as $host_details)
 			{
-				if(trim($host_details['host_name']) == trim($arg)) 
+				if($host_details['host_name'] == $arg) 
 				{
 					$retval = $host_details;
 					break;

Modified: nagiosvshell/branches/devel/views/config_viewer.php
===================================================================
--- nagiosvshell/branches/devel/views/config_viewer.php	2010-12-26 16:50:22 UTC (rev 71)
+++ nagiosvshell/branches/devel/views/config_viewer.php	2010-12-26 16:50:29 UTC (rev 72)
@@ -107,8 +107,8 @@
 			 
 		}	
 		
-		$id = preg_replace('/\./', '_', $linkkey); //replacing dots with underscores
-		$id = preg_replace('/\ /', '_', $id);    //replacing spaces with underscores
+		$id = preg_replace('/[\. ]/', '_', $linkkey); //replacing dots with underscores
+		#$id = preg_replace('/\ /', '_', $id);    //replacing spaces with underscores
 		//using HEREDOC string syntax 
 		$confighead=<<<CONFIG
 				


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.