Merge remote-tracking branch 'origin/3.0'

Conflicts:
	control/Cookie.php
	control/Director.php
	control/HTTPResponse.php
	model/Database.php
	model/MySQLDatabase.php
	model/SQLQuery.php
	view/Requirements.php
	view/SSViewer.php

.travis.yml

@@ -15,11 +15,14 @@ matrix:
       env: TESTDB=SQLITE
 
 before_script:
+ - pear install pear/PHP_CodeSniffer
+ - phpenv rehash
  - ./tests/travis/before_script ~/builds/ss 
  - cd ~/builds/ss
 
 script: 
  - phpunit -c phpunit.xml.dist 
+ - phpcs --encoding=utf-8 --tab-width=4 --standard=framework/tests/phpcs -np framework
 
 branches:
   except:

_register_database.php

@@ -18,7 +18,9 @@
 		'title' => 'SQL Server 2008',
 		'helperPath' => 'mssql/code/MSSQLDatabaseConfigurationHelper.php',
 		'supported' => (function_exists('mssql_connect') || function_exists('sqlsrv_connect')),
-		'missingExtensionText' => 'Neither the <a href="http://php.net/mssql">mssql</a> or <a href="http://www.microsoft.com/sqlserver/2005/en/us/PHP-Driver.aspx">sqlsrv</a> PHP extensions are available. Please install or enable one of them and refresh this page.'
+		'missingExtensionText' => 'Neither the <a href="http://php.net/mssql">mssql</a> or'
+			. ' <a href="http://www.microsoft.com/sqlserver/2005/en/us/PHP-Driver.aspx">sqlsrv</a> PHP extensions are'
+			. ' available. Please install or enable one of them and refresh this page.'
 	)
 );
 
@@ -28,7 +30,8 @@
 		'title' => 'PostgreSQL 8.3+',
 		'helperPath' => 'postgresql/code/PostgreSQLDatabaseConfigurationHelper.php',
 		'supported' => function_exists('pg_query'),
-		'missingExtensionText' => 'The <a href="http://php.net/pgsql">pgsql</a> PHP extension is not available. Please install or enable it and refresh this page.'
+		'missingExtensionText' => 'The <a href="http://php.net/pgsql">pgsql</a> PHP extension is not available. Please'
+			. ' install or enable it and refresh this page.'
 	)
 );
 
@@ -38,11 +41,15 @@
 		'title' => 'SQLite 3.3+',
 		'helperPath' => 'sqlite3/code/SQLiteDatabaseConfigurationHelper.php',
 		'supported' => (class_exists('SQLite3') || class_exists('PDO')),
-		'missingExtensionText' => 'The <a href="http://php.net/manual/en/book.sqlite3.php">SQLite3</a> and <a href="http://php.net/manual/en/book.pdo.php">PDO</a> classes are not available. Please install or enable one of them and refresh this page.',
+		'missingExtensionText' => 'The <a href="http://php.net/manual/en/book.sqlite3.php">SQLite3</a> and'
+			. ' <a href="http://php.net/manual/en/book.pdo.php">PDO</a> classes are not available. Please install or'
+			. ' enable one of them and refresh this page.',
 		'fields' => array(
 			'path' => array(
-				'title' => 'Database path<br /><small>Absolute path, writeable by the webserver user.<br />Recommended to be outside of your webroot</small>',
-				'default' => realpath(dirname($_SERVER['SCRIPT_FILENAME'])) . DIRECTORY_SEPARATOR . 'assets' . DIRECTORY_SEPARATOR . '.db'
+				'title' => 'Database path<br /><small>Absolute path, writeable by the webserver user.<br />'
+					. 'Recommended to be outside of your webroot</small>',
+				'default' => realpath(dirname($_SERVER['SCRIPT_FILENAME'])) . DIRECTORY_SEPARATOR . 'assets' 
+					. DIRECTORY_SEPARATOR . '.db'
 			),
 			'database' => array(
 				'title' => 'Database name', 

admin/_config.php

@@ -11,16 +11,33 @@
 	'cleanup_callback' => "sapphiremce_cleanup",
 
 	'use_native_selects' => true, // fancy selects are bug as of SS 2.3.0
-	'valid_elements' => "@[id|class|style|title],#a[id|rel|rev|dir|tabindex|accesskey|type|name|href|target|title|class],-strong/-b[class],-em/-i[class],-strike[class],-u[class],#p[id|dir|class|align|style],-ol[class],-ul[class],-li[class],br,img[id|dir|longdesc|usemap|class|src|border|alt=|title|width|height|align],-sub[class],-sup[class],-blockquote[dir|class],-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|dir|id|style],-tr[id|dir|class|rowspan|width|height|align|valign|bgcolor|background|bordercolor|style],tbody[id|class|style],thead[id|class|style],tfoot[id|class|style],#td[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],-th[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],caption[id|dir|class],-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align],address[class|align],-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],-h3[id|dir|class|align|style],-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|dir|class|align|style],hr[class],dd[id|class|title|dir],dl[id|class|title|dir],dt[id|class|title|dir],@[id,style,class]",
-	'extended_valid_elements' => "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|usemap],iframe[src|name|width|height|align|frameborder|marginwidth|marginheight|scrolling],object[width|height|data|type],param[name|value],map[class|name|id],area[shape|coords|href|target|alt]",
+	'valid_elements' => "@[id|class|style|title],#a[id|rel|rev|dir|tabindex|accesskey|type|name|href|target|title"
+		. "|class],-strong/-b[class],-em/-i[class],-strike[class],-u[class],#p[id|dir|class|align|style],-ol[class],"
+		. "-ul[class],-li[class],br,img[id|dir|longdesc|usemap|class|src|border|alt=|title|width|height|align],"
+		. "-sub[class],-sup[class],-blockquote[dir|class],"
+		. "-table[border=0|cellspacing|cellpadding|width|height|class|align|summary|dir|id|style],"
+		. "-tr[id|dir|class|rowspan|width|height|align|valign|bgcolor|background|bordercolor|style],"
+		. "tbody[id|class|style],thead[id|class|style],tfoot[id|class|style],"
+		. "#td[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],"
+		. "-th[id|dir|class|colspan|rowspan|width|height|align|valign|scope|style],caption[id|dir|class],"
+		. "-div[id|dir|class|align|style],-span[class|align|style],-pre[class|align],address[class|align],"
+		. "-h1[id|dir|class|align|style],-h2[id|dir|class|align|style],-h3[id|dir|class|align|style],"
+		. "-h4[id|dir|class|align|style],-h5[id|dir|class|align|style],-h6[id|dir|class|align|style],hr[class],"
+		. "dd[id|class|title|dir],dl[id|class|title|dir],dt[id|class|title|dir],@[id,style,class]",
+	'extended_valid_elements' => "img[class|src|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name"
+		. "|usemap],iframe[src|name|width|height|align|frameborder|marginwidth|marginheight|scrolling],"
+		. "object[width|height|data|type],param[name|value],map[class|name|id],area[shape|coords|href|target|alt]",
 	'spellchecker_rpc_url' => THIRDPARTY_DIR . '/tinymce-spellchecker/rpc.php'
 ));
 
 HtmlEditorConfig::get('cms')->enablePlugins('media', 'fullscreen', 'inlinepopups');
-HtmlEditorConfig::get('cms')->enablePlugins(array('ssbuttons' => sprintf('../../../%s/tinymce_ssbuttons/editor_plugin_src.js', THIRDPARTY_DIR)));
+HtmlEditorConfig::get('cms')->enablePlugins(array(
+	'ssbuttons' => sprintf('../../../%s/tinymce_ssbuttons/editor_plugin_src.js', THIRDPARTY_DIR)
+));
 
 HtmlEditorConfig::get('cms')->insertButtonsBefore('formatselect', 'styleselect');
-HtmlEditorConfig::get('cms')->addButtonsToLine(2, 'ssmedia', 'ssflash', 'sslink', 'unlink', 'anchor', 'separator','code', 'fullscreen', 'separator');
+HtmlEditorConfig::get('cms')->addButtonsToLine(2, 
+	'ssmedia', 'ssflash', 'sslink', 'unlink', 'anchor', 'separator','code', 'fullscreen', 'separator');
 
 HtmlEditorConfig::get('cms')->removeButtons('tablecontrols');
 HtmlEditorConfig::get('cms')->addButtonsToLine(3, 'tablecontrols');

admin/code/AdminRootController.php

@@ -13,7 +13,8 @@ class AdminRootController extends Controller {
 	/**
 	 * @var string
 	 * @config
-	 * The LeftAndMain child that will be used as the initial panel to display if none is selected (i.e. if you visit /admin)
+	 * The LeftAndMain child that will be used as the initial panel to display if none is selected (i.e. if you
+	 * visit /admin)
 	 */
 	static $default_panel = 'SecurityAdmin';
 

admin/code/CMSBatchActionHandler.php

@@ -85,7 +85,9 @@ public function handleAction($request) {
 		foreach($ids as $k => $v) if(!is_numeric($v)) unset($ids[$k]);
 
 		if($ids) {
-			if(class_exists('Translatable') && Object::has_extension('SiteTree','Translatable')) Translatable::disable_locale_filter();
+			if(class_exists('Translatable') && Object::has_extension('SiteTree','Translatable')) {
+				Translatable::disable_locale_filter();
+			}
 
 			$pages = DataObject::get(
 				$this->recordClass, 
@@ -96,7 +98,9 @@ public function handleAction($request) {
 				)
 			);
 
-			if(class_exists('Translatable') && Object::has_extension('SiteTree','Translatable')) Translatable::enable_locale_filter();
+			if(class_exists('Translatable') && Object::has_extension('SiteTree','Translatable')) {
+				Translatable::enable_locale_filter();
+			}
 
 			if(Object::has_extension($this->recordClass, 'Versioned')) {
 				// If we didn't query all the pages, then find the rest on the live site

admin/code/CMSMenu.php

@@ -77,7 +77,8 @@ protected static function menuitem_for_controller($controllerClass) {
 	 * @param string $code A unique identifier (used to create a CSS ID and its key in {@link $menu_items})
 	 * @param string $menuTitle The link's title in the CMS menu
 	 * @param string $url The url of the link
-	 * @param integer $priority The menu priority (sorting order) of the menu item.  Higher priorities will be further left.
+	 * @param integer $priority The menu priority (sorting order) of the menu item.  Higher priorities will be further
+	 *                          left.
 	 * @return boolean The result of the operation.
 	 */
 	public static function add_link($code, $menuTitle, $url, $priority = -1) {

admin/code/GroupImportForm.php

@@ -17,17 +17,20 @@ public function __construct($controller, $name, $fields = null, $actions = null,
 		if(!$fields) {
 			$helpHtml = _t(
 				'GroupImportForm.Help1', 
-				'<p>Import one or more groups in <em>CSV</em> format (comma-separated values). <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
+				'<p>Import one or more groups in <em>CSV</em> format (comma-separated values).'
+				. ' <small><a href="#" class="toggle-advanced">Show advanced usage</a></small></p>'
 			);
 			$helpHtml .= _t(
 				'GroupImportForm.Help2', 
 '<div class="advanced">
 	<h4>Advanced usage</h4>
 	<ul>
 	<li>Allowed columns: <em>%s</em></li>
-	<li>Existing groups are matched by their unique <em>Code</em> value, and updated with any new values from the imported file</li>
+	<li>Existing groups are matched by their unique <em>Code</em> value, and updated with any new values from the 
+	imported file</li>
 	<li>Group hierarchies can be created by using a <em>ParentCode</em> column.</li>
-	<li>Permission codes can be assigned by the <em>PermissionCode</em> column. Existing permission codes are not cleared.</li>
+	<li>Permission codes can be assigned by the <em>PermissionCode</em> column. Existing permission codes are not
+	cleared.</li>
 	</ul>
 </div>');
 
@@ -48,12 +51,12 @@ public function __construct($controller, $name, $fields = null, $actions = null,
 			$fileField->getValidator()->setAllowedExtensions(array('csv'));
 		}
 
-		if(!$actions) $actions = new FieldList(
-			$importAction = new FormAction('doImport', _t('SecurityAdmin_MemberImportForm.BtnImport', 'Import from CSV'))
-		);
-
-		$importAction->addExtraClass('ss-ui-button');
-
+		if(!$actions) {
+			$action = new FormAction('doImport', _t('SecurityAdmin_MemberImportForm.BtnImport', 'Import from CSV'));
+			$action->addExtraClass('ss-ui-button');
+			$actions = new FieldList($action);
+		}
+	
 		if(!$validator) $validator = new RequiredFields('CsvFile');
 
 		parent::__construct($controller, $name, $fields, $actions, $validator);

admin/code/LeftAndMain.php

@@ -200,9 +200,14 @@ public function init() {
 
 			// if no alternate menu items have matched, return a permission error
 			$messageSet = array(
-				'default' => _t('LeftAndMain.PERMDEFAULT',"Please choose an authentication method and enter your credentials to access the CMS."),
-				'alreadyLoggedIn' => _t('LeftAndMain.PERMALREADY',"I'm sorry, but you can't access that part of the CMS.  If you want to log in as someone else, do so below"),
-				'logInAgain' => _t('LeftAndMain.PERMAGAIN',"You have been logged out of the CMS.  If you would like to log in again, enter a username and password below."),
+				'default' => _t('LeftAndMain.PERMDEFAULT',
+					"Please choose an authentication method and enter your credentials to access the CMS."),
+				'alreadyLoggedIn' => _t('LeftAndMain.PERMALREADY',
+					"I'm sorry, but you can't access that part of the CMS.  If you want to log in as someone else, do"
+					. " so below"),
+				'logInAgain' => _t('LeftAndMain.PERMAGAIN',
+					"You have been logged out of the CMS.  If you would like to log in again, enter a username and"
+					. " password below."),
 			);
 
 			return Security::permissionFailure($this, $messageSet);
@@ -683,7 +688,9 @@ public function SiteTreeAsUL() {
 	 *  Children, AllChildrenIncludingDeleted, or AllHistoricalChildren
 	 * @return String Nested unordered list with links to each page
 	 */
-	public function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $numChildrenMethod = null, $filterFunction = null, $minNodeCount = 30) {
+	public function getSiteTreeFor($className, $rootID = null, $childrenMethod = null, $numChildrenMethod = null,
+			$filterFunction = null, $minNodeCount = 30) {
+
 		// Filter criteria
 		$params = $this->request->getVar('q');
 		if(isset($params['FilterClass']) && $filterClass = $params['FilterClass']){
@@ -696,7 +703,10 @@ public function getSiteTreeFor($className, $rootID = null, $childrenMethod = nul
 		}
 
 		// Default childrenMethod and numChildrenMethod
-		if(!$childrenMethod) $childrenMethod = ($filter && $filter->getChildrenMethod()) ? $filter->getChildrenMethod() : 'AllChildrenIncludingDeleted';
+		if(!$childrenMethod) $childrenMethod = ($filter && $filter->getChildrenMethod())
+			? $filter->getChildrenMethod() 
+			: 'AllChildrenIncludingDeleted';
+
 		if(!$numChildrenMethod) $numChildrenMethod = 'numChildren';
 		if(!$filterFunction) $filterFunction = ($filter) ? array($filter, 'isPageIncluded') : null;
 
@@ -714,7 +724,8 @@ public function getSiteTreeFor($className, $rootID = null, $childrenMethod = nul
 
 		// NOTE: SiteTree/CMSMain coupling :-(
 		if(class_exists('SiteTree')) {
-			SiteTree::prepopulate_permission_cache('CanEditType', $obj->markedNodeIDs(), 'SiteTree::can_edit_multiple');
+			SiteTree::prepopulate_permission_cache('CanEditType', $obj->markedNodeIDs(),
+				'SiteTree::can_edit_multiple');
 		}
 
 		// getChildrenAsUL is a flexible and complex way of traversing the tree
@@ -789,20 +800,31 @@ public function updatetreenodes($request) {
 		$ids = explode(',', $request->getVar('ids'));
 		foreach($ids as $id) {
 			$record = $this->getRecord($id);
-			$recordController = ($this->stat('tree_class') == 'SiteTree') ?  singleton('CMSPageEditController') : $this;
+			$recordController = ($this->stat('tree_class') == 'SiteTree') 
+				?  singleton('CMSPageEditController') 
+				: $this;
 
 			// Find the next & previous nodes, for proper positioning (Sort isn't good enough - it's not a raw offset)
 			// TODO: These methods should really be in hierarchy - for a start it assumes Sort exists
 			$next = $prev = null;
 
 			$className = $this->stat('tree_class');
-			$next = DataObject::get($className)->filter('ParentID', $record->ParentID)->filter('Sort:GreaterThan', $record->Sort)->first();
+			$next = DataObject::get($className)
+				->filter('ParentID', $record->ParentID)
+				->filter('Sort:GreaterThan', $record->Sort)
+				->first();
+
 			if (!$next) {
-				$prev = DataObject::get($className)->filter('ParentID', $record->ParentID)->filter('Sort:LessThan', $record->Sort)->reverse()->first();
+				$prev = DataObject::get($className)
+					->filter('ParentID', $record->ParentID)
+					->filter('Sort:LessThan', $record->Sort)
+					->reverse()
+					->first();
 			}
 
 			$link = Controller::join_links($recordController->Link("show"), $record->ID);
-			$html = LeftAndMain_TreeNode::create($record, $link, $this->isCurrentPage($record))->forTemplate() . '</li>';
+			$html = LeftAndMain_TreeNode::create($record, $link, $this->isCurrentPage($record))
+				->forTemplate() . '</li>';
 
 			$data[$id] = array(
 				'html' => $html, 
@@ -874,7 +896,8 @@ public function savetreenode($request) {
 		if (!Permission::check('SITETREE_REORGANISE') && !Permission::check('ADMIN')) {
 			$this->response->setStatusCode(
 				403,
-				_t('LeftAndMain.CANT_REORGANISE',"You do not have permission to rearange the site tree. Your change was not saved.")
+				_t('LeftAndMain.CANT_REORGANISE',
+					"You do not have permission to rearange the site tree. Your change was not saved.")
 			);
 			return;
 		}
@@ -889,7 +912,8 @@ public function savetreenode($request) {
 			if(($parentID == '0' || $root == 'root') && !SiteConfig::current_site_config()->canCreateTopLevel()){
 				$this->response->setStatusCode(
 					403,
-						_t('LeftAndMain.CANT_REORGANISE',"You do not have permission to alter Top level pages. Your change was not saved.")
+					_t('LeftAndMain.CANT_REORGANISE',
+						"You do not have permission to alter Top level pages. Your change was not saved.")
 					);
 				return;
 			}
@@ -905,8 +929,7 @@ public function savetreenode($request) {
 		if(!$node) {
 			$this->response->setStatusCode(
 				500,
-				_t(
-					'LeftAndMain.PLEASESAVE',
+				_t('LeftAndMain.PLEASESAVE',
 					"Please Save Page: This page could not be upated because it hasn't been saved yet."
 				)
 			);
@@ -933,7 +956,8 @@ public function savetreenode($request) {
 				}
 			}
 
-			$this->response->addHeader('X-Status', rawurlencode(_t('LeftAndMain.REORGANISATIONSUCCESSFUL', 'Reorganised the site tree successfully.')));
+			$this->response->addHeader('X-Status',
+				rawurlencode(_t('LeftAndMain.REORGANISATIONSUCCESSFUL', 'Reorganised the site tree successfully.')));
 		}
 
 		// Update sorting
@@ -950,11 +974,13 @@ public function savetreenode($request) {
 					// Nodes that weren't "actually moved" shouldn't be registered as 
 					// having been edited; do a direct SQL update instead
 					++$counter;
-					DB::query(sprintf("UPDATE \"%s\" SET \"Sort\" = %d WHERE \"ID\" = '%d'", $className, $counter, $id));
+					DB::query(sprintf("UPDATE \"%s\" SET \"Sort\" = %d WHERE \"ID\" = '%d'",
+						$className, $counter, $id));
 				}
 			}
 
-			$this->response->addHeader('X-Status', rawurlencode(_t('LeftAndMain.REORGANISATIONSUCCESSFUL', 'Reorganised the site tree successfully.')));
+			$this->response->addHeader('X-Status',
+				rawurlencode(_t('LeftAndMain.REORGANISATIONSUCCESSFUL', 'Reorganised the site tree successfully.')));
 		}
 
 		return Convert::raw2json($statusUpdates);
@@ -1527,7 +1553,8 @@ public function __construct($params = null) {
 		// We need to recurse up the tree, 
 		// finding ParentIDs for each ID until we run out of parents
 		while (!empty($parents)) {
-			$res = DB::query('SELECT "ParentID", "ID" FROM "SiteTree" WHERE "ID" in ('.implode(',',array_keys($parents)).')');
+			$res = DB::query('SELECT "ParentID", "ID" FROM "SiteTree"'
+				. ' WHERE "ID" in ('.implode(',',array_keys($parents)).')');
 			$parents = array();
 
 			foreach($res as $row) {
@@ -1623,12 +1650,11 @@ public function __construct($obj, $link = null, $isCurrent = false) {
 	 */
 	public function forTemplate() {
 		$obj = $this->obj;
-		return "<li id=\"record-$obj->ID\" data-id=\"$obj->ID\" data-pagetype=\"$obj->ClassName\" class=\"" . $this->getClasses() . "\">" .
-			"<ins class=\"jstree-icon\">&nbsp;</ins>" .
-			"<a href=\"" . $this->getLink() . "\" title=\"" .
-			_t('LeftAndMain.PAGETYPE','Page type: ') .
-			"$obj->class\" ><ins class=\"jstree-icon\">&nbsp;</ins><span class=\"text\">" . ($obj->TreeTitle). 
-			"</span></a>";
+		return "<li id=\"record-$obj->ID\" data-id=\"$obj->ID\" data-pagetype=\"$obj->ClassName\" class=\""
+			. $this->getClasses() . "\">" . "<ins class=\"jstree-icon\">&nbsp;</ins>"
+			. "<a href=\"" . $this->getLink() . "\" title=\"" . _t('LeftAndMain.PAGETYPE','Page type: ')
+			. "$obj->class\" ><ins class=\"jstree-icon\">&nbsp;</ins><span class=\"text\">" . ($obj->TreeTitle)
+			. "</span></a>";
 	}
 
 	public function getClasses() {