Default sorting

ANSI compatibility
Removed unnecessary executable bit.

code/AssetManager.php

@@ -24,7 +24,7 @@ public function __construct($controller, $name, $sourceClass = "File", $headings
     $fields->push(new SimpleTreeDropdownField('ParentID','Folder',"Folder"));
     $fields->push(new HiddenField('ID','',$controller->ID));
 
-    parent::__construct($controller, $name, $sourceClass, null, $headings, $fields, "Classname != 'Folder'");
+    parent::__construct($controller, $name, $sourceClass, null, $headings, $fields, "\"ClassName\" != 'Folder'");
   }
 
 	function FieldHolder()

code/AssetManagerFolder.php

@@ -15,7 +15,7 @@ public function updateCMSFields(Fieldset $fields)
       'Title' => 30,
       'Filename' => 70
     ));
-    $folder_filter = "(Classname != 'Folder' AND ParentID = ".$this->owner->ID.")"; 
+    $folder_filter = "(\"ClassName\" != 'Folder' AND \"ParentID\" = ".$this->owner->ID.")"; 
     $filter = $a->sourceFilter ? "({$a->sourceFilter}) AND $folder_filter" : $folder_filter;
     $a->setSourceFilter($filter);
     $a->setParentClass("Folder");

code/DataObjectManager.php

@@ -201,10 +201,10 @@ protected function loadSort()
 
 		if($this->Sortable() && (!isset($_REQUEST['ctf'][$this->Name()]['sort']) || $_REQUEST['ctf'][$this->Name()]['sort'] == "SortOrder")) {
 			$this->sort = "SortOrder";
-			$this->sourceSort = "SortOrder ASC";
+			$this->sourceSort = "\"SortOrder\" ASC";
 		}
 		elseif(isset($_REQUEST['ctf'][$this->Name()]['sort']) && !empty($_REQUEST['ctf'][$this->Name()]['sort'])) {
-			$this->sourceSort = $_REQUEST['ctf'][$this->Name()]['sort'] . " " . $this->sort_dir;
+			$this->sourceSort = "\"" . $_REQUEST['ctf'][$this->Name()]['sort'] . "\" " . $this->sort_dir;
 		}
 		elseif($sort = singleton($this->sourceClass())->stat('default_sort')) {
 			$this->sourceSort = $sort;
@@ -752,7 +752,7 @@ public function dosort()
 	            if(!isset($relationName)) return false;
 	            list($parentClass, $componentClass, $parentField, $componentField, $table) = singleton($ownerClass)->many_many($relationName);            
 	            foreach($map as $sort => $id)
-	              DB::query("UPDATE `$table` SET SortOrder = $sort WHERE {$className}ID = $id AND {$ownerClass}ID = $controllerID");
+	              DB::query("UPDATE \"$table\" SET \"SortOrder\" = $sort WHERE \"{$className}ID\" = $id AND \"{$ownerClass}ID\" = $controllerID");
 	          }
 	          else {
 	            foreach($map as $sort => $id) {

code/FileDataObjectManager.php

@@ -139,11 +139,11 @@ protected function importLinkFor($file)
 	protected function getImportFolderHierarchy($parentID, $level = 0)
 	{
 		$options = array();		
-		if($children = DataObject::get("Folder", "ParentID = $parentID")) {
+		if($children = DataObject::get("Folder", "\"ParentID\" = $parentID")) {
 			foreach($children as $child) {
 				$indent="";
 				for($i=0;$i<$level;$i++) $indent .= "&nbsp;&nbsp;";
-				$files = DataObject::get($this->importClass, "ClassName != 'Folder' AND ParentID = $child->ID");
+				$files = DataObject::get($this->importClass, "\"ClassName\" != 'Folder' AND \"ParentID\" = $child->ID");
 				$count = $files ? $files->Count() : "0";
 				$options[$this->importLinkFor($child)] = $indent.$child->Title . " <span>($count files)</span>";
 				$options += $this->getImportFolderHierarchy($child->ID, $level+1);
@@ -155,7 +155,7 @@ protected function getImportFolderHierarchy($parentID, $level = 0)
 	protected function getUploadFolderHierarchy($parentID, $level = 0)
 	{
 		$options = array();		
-		if($children = DataObject::get("Folder", "ParentID = $parentID")) {
+		if($children = DataObject::get("Folder", "\"ParentID\" = $parentID")) {
 			foreach($children as $child) {
 				$indent="";
 				for($i=0;$i<$level;$i++) $indent .= "&nbsp;&nbsp;";
@@ -582,7 +582,7 @@ protected function getImportFields()
 	protected function ImportForm($folder_id = null)
 	{
 		$folder_id = isset($_POST['folder_id']) ? $_POST['folder_id'] : $this->importFolderID;;
-		if($files = DataObject::get($this->importClass, "ClassName != 'Folder' AND ParentID = $folder_id"))
+		if($files = DataObject::get($this->importClass, "\"ClassName\" != 'Folder' AND \"ParentID\" = $folder_id"))
 			$fields = $this->getImportFields();
 			$fields->push(new HiddenField('folder_id','',$folder_id));
 			$fields->push(new LiteralField('select','<div class="select"><span>Select</span>: <a href="javascript:void(0)" rel="all">all</a> | <a href="javascript:void(0)" rel="none">none</a></div>'));

code/HasManyDataObjectManager.php

@@ -62,9 +62,9 @@ public function setParentClass($class)
 	function getQuery($limitClause = null) {
 		if($this->customQuery) {
 			$query = $this->customQuery;
-			$query->select[] = "{$this->sourceClass}.ID AS ID";
-			$query->select[] = "{$this->sourceClass}.ClassName AS ClassName";
-			$query->select[] = "{$this->sourceClass}.ClassName AS RecordClassName";
+			$query->select[] = "\"{$this->sourceClass}\".\"ID\" AS \"ID\"";
+			$query->select[] = "\"{$this->sourceClass}\".\"ClassName\" AS \"ClassName\"";
+			$query->select[] = "\"{$this->sourceClass}\".\"ClassName\" AS \"RecordClassName\"";
 		}
 		else {
 			$query = singleton($this->sourceClass)->extendedSQL($this->sourceFilter, $this->sourceSort, $limitClause, $this->sourceJoin);

code/HasManyFileDataObjectManager.php

@@ -59,9 +59,9 @@ public function hasMarkingPermission()
 	function getQuery($limitClause = null) {
 		if($this->customQuery) {
 			$query = $this->customQuery;
-			$query->select[] = "{$this->sourceClass}.ID AS ID";
-			$query->select[] = "{$this->sourceClass}.ClassName AS ClassName";
-			$query->select[] = "{$this->sourceClass}.ClassName AS RecordClassName";
+			$query->select[] = "\"{$this->sourceClass}\".\"ID\" AS \"ID\"";
+			$query->select[] = "\"{$this->sourceClass}\".\"ClassName\" AS \"ClassName\"";
+			$query->select[] = "\"{$this->sourceClass}\".\"ClassName\" AS \"RecordClassName\"";
 		}
 		else {
 			$query = singleton($this->sourceClass)->extendedSQL($this->sourceFilter, $this->sourceSort, $limitClause, $this->sourceJoin);

code/HasOneDataObjectManager.php

@@ -37,7 +37,7 @@ function setOneToOne() {
 	}
 
 	function isChildSet($childID) {
-		return DataObject::get($this->controllerClass(), '`' . $this->joinField . "` = '$childID'");
+		return DataObject::get($this->controllerClass(), '"' . $this->joinField . "\" = '$childID'");
 	}
 
 	function ExtraData() {

code/HasOneFileDataObjectManager.php

@@ -37,7 +37,7 @@ function setOneToOne() {
 	}
 
 	function isChildSet($childID) {
-		return DataObject::get($this->controllerClass(), '`' . $this->joinField . "` = '$childID'");
+		return DataObject::get($this->controllerClass(), '"' . $this->joinField . "\" = '$childID'");
 	}
 
 	function ExtraData() {

code/ImageAssetManager.php

@@ -23,7 +23,7 @@ public function __construct($controller, $name, $sourceClass = "Image", $heading
     $fields->push(new SimpleTreeDropdownField('ParentID','Folder',"Folder"));
     $fields->push(new HiddenField('ID','',$controller->ID));
 
-    parent::__construct($controller, $name, $sourceClass, null, $headings, $fields, "Classname != 'Folder'");
+    parent::__construct($controller, $name, $sourceClass, null, $headings, $fields, "\"ClassName\" != 'Folder'");
   }
 
 }

code/ManyManyDataObjectManager.php

@@ -60,7 +60,7 @@ function __construct($controller, $name, $sourceClass, $fieldList = null, $detai
 			$sourceField = 'Child';
 		$parentID = $this->controller->ID;
 
-		$this->sourceJoin .= " LEFT JOIN `$manyManyTable` ON (`$source`.`ID` = `{$sourceField}ID` AND `$manyManyTable`.`{$this->manyManyParentClass}ID` = '$parentID')";
+		$this->sourceJoin .= " LEFT JOIN \"$manyManyTable\" ON (\"$source\".\"ID\" = \"{$sourceField}ID\" AND \"$manyManyTable\".\"{$this->manyManyParentClass}ID\" = '$parentID')";
 
 		$this->joinField = 'Checked';
 		if(isset($_REQUEST['ctf'][$this->Name()]['only_related']))
@@ -80,35 +80,35 @@ public function setParentClass($class)
 	}
 
 
-	protected function loadSort()
-	{
+	protected function loadSort() {
 
 		if($this->ShowAll()) 
 			$this->setPageSize(999);
 
+		$original_sort = $this->sourceSort;
 	    if(SortableDataObject::is_sortable_many_many($this->sourceClass(), $this->manyManyParentClass)) {
 	      list($parentClass, $componentClass, $parentField, $componentField, $table) = singleton($this->controllerClass())->many_many($this->Name());
 	      $sort_column = "MMSort";
 	      if(!isset($_REQUEST['ctf'][$this->Name()]['sort']) || $_REQUEST['ctf'][$this->Name()]['sort'] == $sort_column) {
 	        $this->sort = $sort_column;
-	        $this->sourceSort = "$sort_column " . SortableDataObject::$sort_dir;
-			$this->sourceSort .= ",Checked DESC";
+	        $this->sourceSort = "\"$sort_column\" " . SortableDataObject::$sort_dir;
+			$this->sourceSort .= ", \"Checked\" DESC";
 	      }
 	    }
 		elseif($this->Sortable() && (!isset($_REQUEST['ctf'][$this->Name()]['sort']) || $_REQUEST['ctf'][$this->Name()]['sort'] == "SortOrder")) {
 			$this->sort = "SortOrder";
-			$this->sourceSort = "SortOrder " . SortableDataObject::$sort_dir;
-			$this->sourceSort .= ", Checked DESC";
+			$this->sourceSort = "\"SortOrder\" " . SortableDataObject::$sort_dir;
+			$this->sourceSort .= ", \"Checked\" DESC";
 		}
 
 		elseif(isset($_REQUEST['ctf'][$this->Name()]['sort']) && !empty($_REQUEST['ctf'][$this->Name()]['sort'])) {
-			$this->sourceSort = $_REQUEST['ctf'][$this->Name()]['sort'] . " " . $this->sort_dir;
+			$this->sourceSort = "\"".$_REQUEST['ctf'][$this->Name()]['sort'] . "\" " . $this->sort_dir;
 		}
 		else {
 			$this->sourceSort = singleton($this->sourceClass())->stat('default_sort');
 		}
 
-
+		if ($original_sort && $original_sort != $this->sourceSort) $this->sourceSort .= ', '.$original_sort;
 	}
 
 
@@ -143,9 +143,9 @@ public function AllRecordsLink()
 	function getQuery($limitClause = null) {
 		if($this->customQuery) {
 			$query = $this->customQuery;
-			$query->select[] = "{$this->sourceClass}.ID AS ID";
-			$query->select[] = "{$this->sourceClass}.ClassName AS ClassName";
-			$query->select[] = "{$this->sourceClass}.ClassName AS RecordClassName";
+			$query->select[] = "\"{$this->sourceClass}\".\"ID\" AS \"ID\"";
+			$query->select[] = "\"{$this->sourceClass}\".\"ClassName\" AS \"ClassName\"";
+			$query->select[] = "\"{$this->sourceClass}\".\"ClassName\" AS \"RecordClassName\"";
 		}
 		else {
 			$query = singleton($this->sourceClass)->extendedSQL($this->sourceFilter, $this->sourceSort, $limitClause, $this->sourceJoin);
@@ -154,18 +154,27 @@ function getQuery($limitClause = null) {
 
 			$SNG = singleton($this->sourceClass);
 			foreach($this->FieldList() as $k => $title) {
-				if(! $SNG->hasField($k) && ! $SNG->hasMethod('get' . $k))
+				if(! $SNG->hasField($k) && ! $SNG->hasMethod('get' . $k)) {
+					// everything we add to select must be added to groupby too...
 					$query->select[] = $k;
+					$query->groupby[] = $k;
+				}
 			}
 			$parent = $this->controllerClass();
 			$mm = $this->manyManyTable;
-			$if_clause = "IF(`$mm`.`{$this->manyManyParentClass}ID` IS NULL, '0', '1')";
-			$query->select[] = "$if_clause AS Checked";
-		    if(SortableDataObject::is_sortable_many_many($this->sourceClass(), $this->manyManyParentClass))
-				$query->select[] = "IFNULL(`$mm`.SortOrder,9999999) AS MMSort";
+			$when_clause = "CASE WHEN \"$mm\".\"{$this->manyManyParentClass}ID\" IS NULL THEN '0' ELSE '1' END";
+			$query->select[] = "$when_clause AS \"Checked\"";
+			// everything we add to select must be added to groupby too...
+			$query->groupby[] = $when_clause;
+
+		    if (SortableDataObject::is_sortable_many_many($this->sourceClass(), $this->manyManyParentClass)) {
+				$query->select[] = "COALESCE(\"$mm\".\"SortOrder\",9999999) AS \"MMSort\"";
+				// everything we add to select must be added to groupby too...
+				$query->groupby[] = "COALESCE(\"$mm\".\"SortOrder\",9999999)";
+			}
 
 			if($this->OnlyRelated())
-			 $query->where[] = $if_clause;
+				$query->where[] = "(\"$mm\".\"{$this->manyManyParentClass}ID\" IS NOT NULL)";
 		}
 		return clone $query;
 	}

code/ManyManyFileDataObjectManager.php

@@ -56,7 +56,7 @@ function __construct($controller, $name, $sourceClass, $fileFieldName = null, $f
 			$sourceField = 'Child';
 		$parentID = $this->controller->ID;
 
-		$this->sourceJoin .= " LEFT JOIN `$manyManyTable` ON (`$source`.`ID` = `{$sourceField}ID` AND `$manyManyTable`.`{$this->manyManyParentClass}ID` = '$parentID')";
+		$this->sourceJoin .= " LEFT JOIN \"$manyManyTable\" ON (\"$source\".\"ID\" = \"{$sourceField}ID\" AND \"$manyManyTable\".\"{$this->manyManyParentClass}ID\" = '$parentID')";
 
 		$this->joinField = 'Checked';
 		if(isset($_REQUEST['ctf'][$this->Name()]['only_related']))
@@ -77,33 +77,31 @@ public function setParentClass($class)
 	}
 
 
-	protected function loadSort()
-	{
+	protected function loadSort() {
 
 		if($this->ShowAll()) 
 			$this->setPageSize(999);
 
-    if(SortableDataObject::is_sortable_many_many($this->sourceClass(), $this->manyManyParentClass)) {
-      list($parentClass, $componentClass, $parentField, $componentField, $table) = singleton($this->controllerClass())->many_many($this->Name());
-      $sort_column = "`$table`.SortOrder";
-      if(!isset($_REQUEST['ctf'][$this->Name()]['sort']) || $_REQUEST['ctf'][$this->Name()]['sort'] == $sort_column) {
-        $this->sort = $sort_column;
-        $this->sourceSort = "$sort_column " . SortableDataObject::$sort_dir;
-      }
-    }
-
-		elseif($this->Sortable() && (!isset($_REQUEST['ctf'][$this->Name()]['sort']) || $_REQUEST['ctf'][$this->Name()]['sort'] == "SortOrder")) {
+		$original_sort = $this->sourceSort;
+    	if (SortableDataObject::is_sortable_many_many($this->sourceClass(), $this->manyManyParentClass)) {
+			list($parentClass, $componentClass, $parentField, $componentField, $table) = singleton($this->controllerClass())->many_many($this->Name());
+			$sort_column = "$table.SortOrder";
+			if (!isset($_REQUEST['ctf'][$this->Name()]['sort']) || $_REQUEST['ctf'][$this->Name()]['sort'] == $sort_column) {
+				$this->sort = $sort_column;
+				$this->sourceSort = "\"$table\".\"SortOrder\" " . SortableDataObject::$sort_dir;
+			}
+		} elseif ($this->Sortable() && (!isset($_REQUEST['ctf'][$this->Name()]['sort']) || $_REQUEST['ctf'][$this->Name()]['sort'] == "SortOrder")) {
 			$this->sort = "SortOrder";
-			$this->sourceSort = "SortOrder " . SortableDataObject::$sort_dir;
-		}
-
-		elseif(isset($_REQUEST['ctf'][$this->Name()]['sort']) && !empty($_REQUEST['ctf'][$this->Name()]['sort'])) {
+			$this->sourceSort = "\"SortOrder\" " . SortableDataObject::$sort_dir;
+		} elseif (isset($_REQUEST['ctf'][$this->Name()]['sort'])) {
+			$this->sourceSort = "\"" . $_REQUEST['ctf'][$this->Name()]['sort'] . "\" " . $this->sort_dir;
+		} elseif(isset($_REQUEST['ctf'][$this->Name()]['sort']) && !empty($_REQUEST['ctf'][$this->Name()]['sort'])) {
 			$this->sourceSort = $_REQUEST['ctf'][$this->Name()]['sort'] . " " . $this->sort_dir;
-		}
-		else {
+		} else {
 			$this->sourceSort = singleton($this->sourceClass())->stat('default_sort');
 		}
-
+
+		if ($original_sort && $original_sort != $this->sourceSort) $this->sourceSort .= ', '.$original_sort;
 	}
 
 
@@ -138,9 +136,9 @@ public function AllRecordsLink()
 	function getQuery($limitClause = null) {
 		if($this->customQuery) {
 			$query = $this->customQuery;
-			$query->select[] = "{$this->sourceClass}.ID AS ID";
-			$query->select[] = "{$this->sourceClass}.ClassName AS ClassName";
-			$query->select[] = "{$this->sourceClass}.ClassName AS RecordClassName";
+			$query->select[] = "\"{$this->sourceClass}\".\"ID\" AS \"ID\"";
+			$query->select[] = "\"{$this->sourceClass}\".\"ClassName\" AS \"ClassName\"";
+			$query->select[] = "\"{$this->sourceClass}\".\"ClassName\" AS \"RecordClassName\"";
 		}
 		else {
 			$query = singleton($this->sourceClass)->extendedSQL($this->sourceFilter, $this->sourceSort, $limitClause, $this->sourceJoin);
@@ -149,16 +147,21 @@ function getQuery($limitClause = null) {
 
 			$SNG = singleton($this->sourceClass);
 			foreach($this->FieldList() as $k => $title) {
-				if(! $SNG->hasField($k) && ! $SNG->hasMethod('get' . $k))
+				if(! $SNG->hasField($k) && ! $SNG->hasMethod('get' . $k)) {
 					$query->select[] = $k;
+					// everything we add to select must be added to groupby too...
+					$query->groupby[] = $k;
+				}
 			}
 			$parent = $this->controllerClass();
 			$mm = $this->manyManyTable;
-			$if_clause = "IF(`$mm`.`{$this->manyManyParentClass}ID` IS NULL, '0', '1')";
-			$query->select[] = "$if_clause AS Checked";
+			$when_clause = "CASE WHEN \"$mm\".\"{$this->manyManyParentClass}ID\" IS NULL THEN '0' ELSE '1' END";
+			$query->select[] = "$when_clause AS \"Checked\"";
+			// everything we add to select must be added to groupby too...
+			$query->groupby[] = $when_clause;
 
 			if($this->OnlyRelated())
-			 $query->where[] = $if_clause;
+				$query->where[] = "(\"$mm\".\"{$this->manyManyParentClass}ID\" IS NOT NULL)";
 		}
 		return clone $query;
 	}

code/SortableDataObject.php

@@ -99,13 +99,13 @@ public function augmentSQL(SQLQuery &$query)
           if($sort_field) break;
           foreach($join_tables as $join_table) {
             if(stristr($from,$join_table)) {
-              $sort_field = "`$join_table`.SortOrder";
+              $sort_field = "\"$join_table\".\"SortOrder\"";
               break;
             }
           }
        }
 	   }
-	   if(!$sort_field) $sort_field = "SortOrder";
+	   if(!$sort_field) $sort_field = "\"SortOrder\"";
 
 	   if(!$query->orderby || ($query->orderby == $this->owner->stat('default_sort')))
 	     $query->orderby = "$sort_field " . self::$sort_dir;

code/dropdown_fields/SimpleTreeDropdownField.php

@@ -57,7 +57,7 @@ private function getHierarchy($parentID, $level = 0)
 	{
 		$options = array();
 		$class = ($this->sourceClass == "SiteTree" || is_subclass_of($this->sourceClass, "SiteTree")) ? "SiteTree" : $this->sourceClass;
-		$filter = ($this->filter) ? "ParentID = $parentID AND $this->filter" : "ParentID = $parentID";
+		$filter = ($this->filter) ? "\"ParentID\" = $parentID AND $this->filter" : "\"ParentID\" = $parentID";
 		if($children = DataObject::get($class, $filter)) {
 			foreach($children as $child) {
 				$indent="";

code/flv/FLV.php

@@ -189,7 +189,7 @@ private function hasFLV()
 
 	public function getThumbnail()
 	{
-	 if($img = DataObject::get_one("Image","Title = 'flv_thumb_{$this->ID}'"))
+	 if($img = DataObject::get_one("Image","\"Title\" = 'flv_thumb_{$this->ID}'"))
 	   return Director::fileExists($img->Filename) ? $img : false;
 	 return false;
 	}
@@ -209,7 +209,7 @@ private function createFLV()
 	private function createThumbnail()
 	{
       $img_title = "flv_thumb_".$this->ID;
-      if($existing = DataObject::get("Image","Title = '$img_title'")) {
+      if($existing = DataObject::get("Image","\"Title\" = '$img_title'")) {
         foreach($existing as $file) $file->delete();
       }
 			$folder = Folder::findOrMake(self::$thumbnail_folder);