Merge pull request #39 from proditis/master

prep for release. this is getting way too long...

Author: proditis

htdocs/protected/models/Host.php

@@ -185,15 +185,19 @@ public function resolve()
 		}
 	}
 
+	
 	public function beforeSave()
 	{
 		if($this->isNewRecord || $this->ipoctet===NULL || (ip2long($this->ipoctet)!==false && $this->ip!=ip2long($this->ipoctet)))
 		{
-			//if(ip2long($this->ipoctet)!==false && ip2long($this->ipoctet)!=0 && $this->ip==0)
-				$this->ip=ip2long($this->ip);
+			$this->ip=ip2long($this->ip);
 		}
 		return parent::beforeSave();
 	}
+
+	/**
+	 * convert bit masks into cidr notation netmask 
+	 */
 	public static function netmask($cidr=0)
 	{
 		$parts=explode('.',$cidr);
@@ -204,22 +208,33 @@ public static function netmask($cidr=0)
 		return false;
 	}
 
+	/** 
+	 * strip any comparison symbols (such as <,>,=)
+	 * and return the $string without it. 
+	 */
 	public static function strip_comparison($string)
 	{
 		$rep=array('<','>','=');
 		return str_replace($rep,'',$string);
 	}
-	
+
+	/**
+	 * returns the comparison symbols from the string.
+	 * $string comes from the search filters of the admin views.
+	 * This function grabs the >,<,= and combinations such as <=,>=
+	 */
 	public static function get_comparison($string)
 	{
 		$ret="";
 
 		for($i=0;$i<strlen($string);$i++)
 			if( $string{$i}!='=' && $string{$i}!='<' && $string{$i}!='>')
-			break;
-			if(strlen(trim($string))==0 || $i==strlen($string))
-				return "";
-				return substr($string, 0,$i);
+				break;
+		
+		if(strlen(trim($string))==0 || $i==strlen($string))
+			return "";
+
+		return substr($string, 0,$i);
 	}
 
 }

schema/00_echofish-schema.sql

@@ -382,9 +382,10 @@ CREATE TABLE `host` (
 	id int unsigned primary key auto_increment,
 	ip int unsigned default 0,
 	fqdn varchar(255) NOT NULL,
-	short varchar(50) unique,
+	short varchar(50),
 	description text,
-	unique key `host_details` (fqdn,short,ip)
+	KEY (`short`),
+	UNIQUE KEY `host_details` (`short`,`fqdn`,`ip`)
 ) ENGINE=InnoDB CHARSET=utf8 COLLATE=utf8_unicode_ci;
 
 DROP TABLE IF EXISTS `trail`;

schema/updates/v0.4-to-v0.5.sql

@@ -15,8 +15,9 @@ ALTER TABLE `syslog` CHANGE `host` `host` INT UNSIGNED NOT NULL ;
 
 ALTER TABLE `host` DROP PRIMARY KEY;
 ALTER TABLE `host` ADD `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST ;
-ALTER TABLE `host` ADD UNIQUE ( `short` );
-ALTER TABLE `host` ADD UNIQUE key `host_details` (`fqdn`,`short`,`ip`);
+DROP INDEX `short` ON `host`; /* This is meant for the unique index */
+CREATE INDEX `short` on `host`(`short`);
+CREATE UNIQUE INDEX `host_details` ON `host`(`fqdn`,`short`,`ip`);
 
 UPDATE `syslog` as t1 LEFT JOIN host as t2 ON t1.host=t2.ip SET t1.host=t2.id; 
 UPDATE `archive` as t1 LEFT JOIN host as t2 ON t1.host=t2.ip SET t1.host=t2.id;