[Vtigercrm-commits] [vtiger-commits] r6134 - in /vtigercrm/trunk/modules: Emails/ListView.php Users/massdelete.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: allanbush
Date: Wed May 17 14:16:36 2006
New Revision: 6134

Log:
Fixes problems deleteing and searching emails.  Refs #752.

Modified:
    vtigercrm/trunk/modules/Emails/ListView.php
    vtigercrm/trunk/modules/Users/massdelete.php

Modified: vtigercrm/trunk/modules/Emails/ListView.php
==============================================================================
--- vtigercrm/trunk/modules/Emails/ListView.php (original)
+++ vtigercrm/trunk/modules/Emails/ListView.php Wed May 17 14:16:36 2006
@@ -137,9 +137,9 @@
 if(isset($_REQUEST['search']) && $_REQUEST['search'] != '' && $_REQUEST['search_text'] != '')
 {
 	if($_REQUEST['search_field'] != 'join')
-		$where = $_REQUEST['search_field'].' like "%'.$_REQUEST['search_text'].'%"';	
+		$where = $_REQUEST['search_field']." like '%".$_REQUEST['search_text']."%'";	
 	else
-		$where = '(subject like "%'.$_REQUEST['search_text'].'%" OR users.user_name like "%'.$_REQUEST['search_text'].'%")';	
+		$where = "(subject like '%".$_REQUEST['search_text']."%' OR users.user_name like '%".$_REQUEST['search_text']."%')";	
 }
 
 

Modified: vtigercrm/trunk/modules/Users/massdelete.php
==============================================================================
--- vtigercrm/trunk/modules/Users/massdelete.php (original)
+++ vtigercrm/trunk/modules/Users/massdelete.php Wed May 17 14:16:36 2006
@@ -21,12 +21,13 @@
 $returnmodule=$_REQUEST['return_module'];
 //split the string and store in an array
 $storearray = explode(";",$idlist);
+array_filter($storearray);
 $ids_list = array();
 foreach($storearray as $id)
 {
         if(isPermitted($returnmodule,'Delete',$id) == 'yes')
         {
-                $sql="update crmentity set crmentity.deleted=1 where crmentity.crmid='" .$id ."'";
+                $sql="update crmentity set deleted=1 where crmid='" .$id ."'";
                 $result = $adb->query($sql);
         }
         else