Compressing the View, preparing tested PgSQL Support

Author: t3chguy

SQL/iredmail+alias.sql

@@ -9,12 +9,6 @@ VIEW `global_addressbook` AS
                 UNIX_TIMESTAMP(`vmail`.`mailbox`.`created`),
             -(8)) AS `ID`,
         `vmail`.`mailbox`.`name` AS `name`,
-        SUBSTRING_INDEX(SUBSTRING_INDEX(`vmail`.`mailbox`.`name`, ' ', 1),
-                ' ',
-                -(1)) AS `firstname`,
-        SUBSTRING_INDEX(SUBSTRING_INDEX(`vmail`.`mailbox`.`name`, ' ', -(1)),
-                ' ',
-                -(1)) AS `surname`,
         (SELECT
                 GROUP_CONCAT(`vmail`.`alias`.`address`
                         SEPARATOR ',')
@@ -23,12 +17,6 @@ VIEW `global_addressbook` AS
             WHERE
                 ((`vmail`.`alias`.`goto` = `vmail`.`mailbox`.`username`)
                     AND (`vmail`.`alias`.`address` LIKE '%@%'))) AS `email`,
-        `vmail`.`mailbox`.`domain` AS `domain`,
-        (SELECT
-                CONCAT_WS(' ',
-                            `vmail`.`mailbox`.`name`,
-                            REPLACE(`email`, ',', ' '),
-                            `vmail`.`mailbox`.`domain`)
-            ) AS `words`
+        `vmail`.`mailbox`.`domain` AS `domain`
     FROM
         `vmail`.`mailbox`

SQL/iredmail.sql

@@ -9,19 +9,7 @@ VIEW `global_addressbook` AS
                 UNIX_TIMESTAMP(`vmail`.`mailbox`.`created`),
             -(8)) AS `ID`,
         `vmail`.`mailbox`.`name` AS `name`,
-        SUBSTRING_INDEX(SUBSTRING_INDEX(`vmail`.`mailbox`.`name`, ' ', 1),
-                ' ',
-                -(1)) AS `firstname`,
-        SUBSTRING_INDEX(SUBSTRING_INDEX(`vmail`.`mailbox`.`name`, ' ', -(1)),
-                ' ',
-                -(1)) AS `surname`,
         `vmail`.`mailbox`.`username` AS `email`,
-        `vmail`.`mailbox`.`domain` AS `domain`,
-        (SELECT
-                CONCAT_WS(' ',
-                            `vmail`.`mailbox`.`name`,
-                            `email`,
-                            `vmail`.`mailbox`.`domain`)
-            ) AS `words`
+        `vmail`.`mailbox`.`domain` AS `domain`
     FROM
         `vmail`.`mailbox`;

sql_global_addressbooks/sql_global_backend.php

@@ -86,6 +86,9 @@ public function list_records($cols=null, $subset=0) {
 
 		while ($ret = $db->fetch_assoc()) {
 			$ret['email'] = explode(',', $ret['email']);
+			//$names = explode(' ', $ret['name']);
+			//$ret['surname'] = array_push($names);
+			//$ret['firsname']= implode(' ', $names);
 			$this->result->add($ret);
 		}
 		return $this->result;
@@ -101,13 +104,13 @@ function list_groups($search = null, $mode=0) {
 		if ($search) {
 			switch (intval($mode)) {
 	            case 1:
-	                $x = $rc->db->ilike('name', $search);
+	                $x = $rc->db->ilike('domain', $search);
 	                break;
 	            case 2:
-	                $x = $rc->db->ilike('name', $search . '%');
+	                $x = $rc->db->ilike('domain', $search . '%');
 	                break;
 	            default:
-	                $x = $rc->db->ilike('name', '%' . $search . '%');
+	                $x = $rc->db->ilike('domain', '%' . $search . '%');
             }
             $x = ' WHERE ' . $x . ' ';
 		} else { $x = ' '; }
@@ -138,7 +141,7 @@ public function search($fields, $value, $strict=false, $select=true, $nocount=fa
         foreach ($fields as $idx => $col) {
 
         	if ($col == 'ID' || $col == $this->primary_key) {
-    			$ids     = !is_array($value) ? explode(self::SEPARATOR, $value) : $value;
+    			$ids     = !is_array($value) ? explode(',', $value) : $value;
                 $ids     = $db->array2list($ids, 'integer');
                 $where[] = 'c.' . $this->primary_key.' IN ('.$ids.')';
                 continue;
@@ -147,23 +150,30 @@ public function search($fields, $value, $strict=false, $select=true, $nocount=fa
         			foreach (explode($WS, rcube_utils::normalize_string($value)) as $word) {
         				switch ($mode) {
         					case 1: // Strict
-        						$words[] = '(' . $db->ilike('words', $word . '%')
-		                            . ' OR ' . $db->ilike('words', '%' . $WS . $word . $WS . '%')
-		                            . ' OR ' . $db->ilike('words', '%' . $WS . $word) . ')';
+        						$words[]='(' . $db->ilike('name', $word . '%')
+		                            . ' OR ' . $db->ilike('email',$word . '%')
+		                            . ' OR ' . $db->ilike('name', '%' . $WS . $word . $WS . '%')
+		                            . ' OR ' . $db->ilike('email','%' . $WS . $word . $WS . '%')
+		                            . ' OR ' . $db->ilike('name', '%' . $WS . $word)
+		                            . ' OR ' . $db->ilike('email','%' . $WS . $word). ')';
         						break;
 
         					case 2: // Prefix
-        						$words[] = '(' . $db->ilike('words', $word . '%')
-                            		. ' OR ' . $db->ilike('words', '%' . $WS . $word . '%') . ')';
+        						$words[]='(' . $db->ilike('name', $word . '%')
+                            		. ' OR ' . $db->ilike('email',$word . '%')
+                            		. ' OR ' . $db->ilike('name', '%' . $WS . $word . '%')
+                            		. ' OR ' . $db->ilike('email','%' . $WS . $word . '%') . ')';
 								break;
 
         					default: // Partial
-        						$words[] = $db->ilike('words', '%' . $word . '%');
+        						$words[]='(' . $db->ilike('name', '%' . $word . '%')
+        						    . ' OR ' . $db->ilike('email','%' . $word . '%') . ')';
         						break;
         				}
         			}
         			$where[] = '(' . join(' AND ', $words) . ')';
-        	} else {
+        	//} else {
+        	} elseif ($col !== 'firstname' && $col !== 'surname') {
         		$val = is_array($value) ? $value[$idx] : $value;
 
         		switch ($mode) {