Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

MINOR Code formatting fixes for default Page pagetype (from r100734)

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/phpinstaller/trunk@112199 467b73ca-7a2a-4603-9d3b-597d59a354a9
  • Loading branch information...
commit 7f9d4872a78e2a08b0e32828236a84368a4711d8 1 parent 03edb8b
sminnee authored
Showing with 30 additions and 32 deletions.
  1. +30 −32 mysite/code/Page.php
View
62 mysite/code/Page.php
@@ -1,17 +1,15 @@
<?php
-
class Page extends SiteTree {
-
+
public static $db = array(
);
-
+
public static $has_one = array(
);
-
-}
+}
class Page_Controller extends ContentController {
-
+
/**
* An array of actions that can be accessed via a request. Each array element should be an action name, and the
* permissions or conditions required to allow the user to access it.
@@ -30,46 +28,46 @@ class Page_Controller extends ContentController {
public static $allowed_actions = array (
'SearchForm'
);
-
+
public function init() {
parent::init();
// Note: you should use SS template require tags inside your templates
// instead of putting Requirements calls here. However these are
// included so that our older themes still work
- Requirements::themedCSS("layout");
- Requirements::themedCSS("typography");
- Requirements::themedCSS("form");
+ Requirements::themedCSS('layout');
+ Requirements::themedCSS('typography');
+ Requirements::themedCSS('form');
}
-
+
/**
- * Site search form
- */
+ * Site search form
+ */
function SearchForm() {
$searchText = isset($_REQUEST['Search']) ? $_REQUEST['Search'] : 'Search';
$fields = new FieldSet(
- new TextField("Search", "", $searchText)
- );
+ new TextField('Search', '', $searchText)
+ );
$actions = new FieldSet(
- new FormAction('results', 'Search')
- );
-
- return new SearchForm($this, "SearchForm", $fields, $actions);
+ new FormAction('results', 'Search')
+ );
+ return new SearchForm($this, 'SearchForm', $fields, $actions);
}
-
+
/**
- * Process and render search results
+ * Process and render search results.
+ *
+ * @param array $data The raw request data generated from post
+ * @param SearchForm $form The form instance that was submitted
+ * @param SS_HTTPRequest $request Request generated for this action
*/
- function results($data, $form){
- $data = array(
- 'Results' => $form->getResults(),
- 'Query' => $form->getSearchQuery(),
- 'Title' => 'Search Results'
- );
-
- return $this->customise($data)->renderWith(array('Page_results', 'Page'));
+ function results($data, $form, $request) {
+ $data = array(
+ 'Results' => $form->getResults(),
+ 'Query' => $form->getSearchQuery(),
+ 'Title' => 'Search Results'
+ );
+ return $this->customise($data)->renderWith(array('Page_results', 'Page'));
}
-
-}
-?>
+}
Please sign in to comment.
Something went wrong with that request. Please try again.