Updating the module to support 3.2.X.

nglasl · Mar 15, 2016 · 5ffa00c · 5ffa00c
1 parent 7c15ddb
commit 5ffa00c
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 9 deletions.
diff --git a/code/dataobjects/MediaTag.php b/code/dataobjects/MediaTag.php
@@ -63,7 +63,10 @@ public function validate() {
 		if($result->valid() && !$this->Title) {
 			$result->error('"Title" required!');
 		}
-		else if($result->valid() && MediaTag::get_one('MediaTag', "ID != " . (int)$this->ID . " AND Title = '" . Convert::raw2sql($this->Title) . "'")) {
+		else if($result->valid() && MediaTag::get_one('MediaTag', array(
+			'ID != ?' => $this->ID,
+			'Title = ?' => $this->Title
+		))) {
 			$result->error('Tag already exists!');
 		}
 

diff --git a/code/dataobjects/MediaType.php b/code/dataobjects/MediaType.php
@@ -58,7 +58,9 @@ public function requireDefaultRecords() {
 
 			// Confirm that this media type doesn't already exist before creating it.
 
-			if(!MediaType::get_one('MediaType', "Title = '" . Convert::raw2sql($default) . "'")) {
+			if(!MediaType::get_one('MediaType', array(
+				'Title = ?' => $default
+			))) {
 				$type = MediaType::create();
 				$type->Title = $default;
 				$type->write();
@@ -139,12 +141,17 @@ public function getCMSFields() {
 
 			// Allow customisation of media type attributes if a respective media page exists, depending on the current CMS user permissions.
 
-			if(MediaPage::get()->innerJoin('MediaType', 'MediaPage.MediaTypeID = MediaType.ID')->where("MediaType.Title = '" . Convert::raw2sql($this->Title) . "'")->exists()) {
+			if(MediaPage::get()->innerJoin('MediaType', 'MediaPage.MediaTypeID = MediaType.ID')->where(array(
+				'MediaType.Title = ?' => $this->Title
+			))->exists()) {
 				$configuration = ($this->checkPermissions() === false) ? GridFieldConfig_RecordViewer::create() : GridFieldConfig_RecordEditor::create()->removeComponentsByType('GridFieldDeleteAction');
 				$fields->addFieldToTab('Root.Main', GridField::create(
 					'MediaAttributes',
 					'Custom Attributes',
-					MediaAttribute::get()->innerJoin('MediaPage', 'MediaAttribute.MediaPageID = MediaPage.ID')->innerJoin('MediaType', 'MediaPage.MediaTypeID = MediaType.ID')->where("MediaType.Title = '" . Convert::raw2sql($this->Title) . "' AND MediaAttribute.LinkID = -1"),
+					MediaAttribute::get()->innerJoin('MediaPage', 'MediaAttribute.MediaPageID = MediaPage.ID')->innerJoin('MediaType', 'MediaPage.MediaTypeID = MediaType.ID')->where(array(
+						'MediaType.Title = ?' => $this->Title,
+						'MediaAttribute.LinkID = ?' => -1
+					)),
 					$configuration
 				)->setModelClass('MediaAttribute'));
 			}
@@ -179,7 +186,10 @@ public function validate() {
 		if($result->valid() && !$this->Title) {
 			$result->error('"Title" required!');
 		}
-		else if($result->valid() && MediaType::get_one('MediaType', "ID != " . (int)$this->ID . " AND Title = '" . Convert::raw2sql($this->Title) . "'")) {
+		else if($result->valid() && MediaType::get_one('MediaType', array(
+			'ID != ?' => $this->ID,
+			'Title = ?' => $this->Title
+		))) {
 			$result->error('Type already exists!');
 		}
 

diff --git a/code/pages/MediaHolder.php b/code/pages/MediaHolder.php
@@ -219,7 +219,9 @@ public function getPaginatedChildren($limit = 5, $sort = 'Date', $order = 'DESC'
 			}
 			if($valid) {
 				$from = implode('-', $date);
-				$children = $children->where("Date >= '" . Convert::raw2sql("{$from} 00:00:00") . "'");
+				$children = $children->where(array(
+					'Date >= ?' => "{$from} 00:00:00"
+				));
 			}
 		}
 

diff --git a/code/pages/MediaPage.php b/code/pages/MediaPage.php
@@ -325,7 +325,10 @@ public function onBeforeWrite() {
 
 				// Retrieve existing attributes for the respective media type.
 
-				$attributes = MediaAttribute::get()->innerJoin('MediaPage', 'MediaAttribute.MediaPageID = MediaPage.ID')->innerJoin('MediaType', 'MediaPage.MediaTypeID = MediaType.ID')->where("MediaType.Title = '" . Convert::raw2sql($type) . "' AND MediaAttribute.LinkID = -1");
+				$attributes = MediaAttribute::get()->innerJoin('MediaPage', 'MediaAttribute.MediaPageID = MediaPage.ID')->innerJoin('MediaType', 'MediaPage.MediaTypeID = MediaType.ID')->where(array(
+					'MediaType.Title = ?' => $type,
+					'MediaAttribute.LinkID = ?' => -1
+				));
 				if($attributes->exists()) {
 					foreach($attributes as $attribute) {
 

diff --git a/templates/Layout/MediaPage.ss b/templates/Layout/MediaPage.ss
@@ -2,7 +2,7 @@
 	<h1>{$Title}</h1>
 	<% if $Images.first %>
 		<p class='media-page-main-image'>
-			<span><a href='$Images.first.Link'>{$Images.first.CroppedImage(200, 200)}</a></span>
+			<span><a href='$Images.first.Link'>{$Images.first.Fill(200, 200)}</a></span>
 		</p>
 	<% end_if %>
 	<% if $Categories %>
@@ -26,7 +26,7 @@
 		<p class='media-page-images'>
 			<% loop $Images %>
 				<% if not $first %>
-					<span><a href='{$Link}'>{$CroppedImage(100, 100)}</a></span>
+					<span><a href='{$Link}'>{$Fill(100, 100)}</a></span>
 				<% end_if %>
 			<% end_loop %>
 		</p>