Fixes #1204 Sort listview addressed

modules/Calendar/models/ListView.php

@@ -203,8 +203,8 @@ class Calendar_ListView_Model extends Vtiger_ListView_Model {
 			$queryGenerator->addUserSearchConditions(array('search_field' => $searchKey, 'search_text' => $searchValue, 'operator' => $operator));
 		}
         
-        $orderBy = $this->get('orderby');
-		$sortOrder = $this->get('sortorder');
+        $orderBy = $this->getForSql('orderby');
+		$sortOrder = $this->getForSql('sortorder');
         if(empty($sortOrder)) {
             $sortOrder = 'DESC';
         }

modules/Documents/models/ListView.php

@@ -173,8 +173,8 @@ class Documents_ListView_Model extends Vtiger_ListView_Model {
 			$queryGenerator->addUserSearchConditions(array('search_field' => $searchKey, 'search_text' => $searchValue, 'operator' => $operator));
 		}
         
-        $orderBy = $this->get('orderby');
-		$sortOrder = $this->get('sortorder');
+        $orderBy = $this->getForSql('orderby');
+		$sortOrder = $this->getForSql('sortorder');
 
         if(!empty($orderBy)){
 			$queryGenerator = $this->get('query_generator');

modules/PriceBooks/models/ListView.php

@@ -73,8 +73,8 @@ class PriceBooks_ListView_Model extends Vtiger_ListView_Model {
 			$queryGenerator->addUserSearchConditions(array('search_field' => $searchKey, 'search_text' => $searchValue, 'operator' => $operator));
 		}
 
-        $orderBy = $this->get('orderby');
-		$sortOrder = $this->get('sortorder');
+        $orderBy = $this->getForSql('orderby');
+		$sortOrder = $this->getForSql('sortorder');
 
         if(!empty($orderBy)){
 			$queryGenerator = $this->get('query_generator');

modules/Products/models/ListView.php

@@ -43,8 +43,8 @@ class Products_ListView_Model extends Vtiger_ListView_Model {
 			$queryGenerator->addUserSearchConditions(array('search_field' => $searchKey, 'search_text' => $searchValue, 'operator' => $operator));
 		}
         
-        $orderBy = $this->get('orderby');
-		$sortOrder = $this->get('sortorder');
+        $orderBy = $this->getForSql('orderby');
+		$sortOrder = $this->getForSql('sortorder');
 		
         if(!empty($orderBy)){
 			$queryGenerator = $this->get('query_generator');

modules/Reports/models/ListView.php

@@ -95,7 +95,7 @@ class Reports_ListView_Model extends Vtiger_ListView_Model {
 		$reportFolderModel = Reports_Folder_Model::getInstance();
 		$reportFolderModel->set('folderid', $this->get('folderid'));
 
-		$orderBy = $this->get('orderby');
+		$orderBy = $this->getForSql('orderby');
 		if (!empty($orderBy) && $orderBy === 'smownerid') {
 			$fieldModel = Vtiger_Field_Model::getInstance('assigned_user_id', $moduleModel);
 			if ($fieldModel->getFieldDataType() == 'owner') {
@@ -104,7 +104,7 @@ class Reports_ListView_Model extends Vtiger_ListView_Model {
 		}
 		if(!empty($orderBy)) {
 			$reportFolderModel->set('orderby', $orderBy);
-			$reportFolderModel->set('sortby', $this->get('sortorder'));
+			$reportFolderModel->set('sortby', $this->getForSql('sortorder'));
 		}
 
 		$reportFolderModel->set('search_params', $this->get('search_params'));

modules/Vtiger/models/ListView.php

@@ -206,8 +206,8 @@ class Vtiger_ListView_Model extends Vtiger_Base_Model {
 			$queryGenerator->addUserSearchConditions(array('search_field' => $searchKey, 'search_text' => $searchValue, 'operator' => $operator));
 		}
 
-		$orderBy = $this->get('orderby');
-		$sortOrder = $this->get('sortorder');
+		$orderBy = $this->getForSql('orderby');
+		$sortOrder = $this->getForSql('sortorder');
 
 		if(!empty($orderBy)){
 			$queryGenerator = $this->get('query_generator');
@@ -238,8 +238,7 @@ class Vtiger_ListView_Model extends Vtiger_Base_Model {
 			if($orderBy == 'roleid' && $moduleName == 'Users'){
 				$listQuery .= ' ORDER BY vtiger_role.rolename '.' '. $sortOrder; 
 			} else {
-				$listQuery .= ' ORDER BY ? '.$sortOrder;
-				array_push($paramArray, $queryGenerator->getOrderByColumn($orderBy));
+				$listQuery .= ' ORDER BY '.$queryGenerator->getOrderByColumn($orderBy).' '.$sortOrder;
 			}
 
 			if ($orderBy == 'first_name' && $moduleName == 'Users') {

pkg/vtiger/modules/Import/modules/Import/models/ListView.php

@@ -62,8 +62,8 @@ class Import_ListView_Model extends Vtiger_ListView_Model {
 			$queryGenerator->addUserSearchConditions(array('search_field' => $searchKey, 'search_text' => $searchValue, 'operator' => 'c'));
 		}
 
-		$orderBy = $this->get('orderby');
-		$sortOrder = $this->get('sortorder');
+		$orderBy = $this->getForSql('orderby');
+		$sortOrder = $this->getForSql('sortorder');
 		if(!empty($orderBy)) {
 			$queryGenerator = $this->get('query_generator');
 			$fieldModels = $queryGenerator->getModuleFields();

pkg/vtiger/modules/RecycleBin/modules/RecycleBin/models/ListView.php

@@ -48,8 +48,8 @@ class RecycleBin_ListView_Model extends Vtiger_ListView_Model {
 		$queryGenerator = $this->get('query_generator');
 		$listViewContoller = $this->get('listview_controller');
 
-		$orderBy = $this->get('orderby');
-		$sortOrder = $this->get('sortorder');
+		$orderBy = $this->getForSql('orderby');
+		$sortOrder = $this->getForSql('sortorder');
 
 		$searchParams = $this->get('search_params');
 		if(empty($searchParams)) {