From fc5dd2994caac9b6c476911de616ea0782911408 Mon Sep 17 00:00:00 2001 From: Simon Welsh Date: Sun, 9 Dec 2012 00:20:20 +1300 Subject: [PATCH 1/2] Add codesniffer that ensures indentation is with tabs. --- .travis.yml | 3 +- admin/code/ModelAdmin.php | 2 +- admin/javascript/LeftAndMain.AddForm.js | 10 +- admin/javascript/LeftAndMain.Tree.js | 4 +- admin/javascript/LeftAndMain.js | 2 +- admin/javascript/lib.js | 6 +- api/FormEncodedDataFormatter.php | 6 +- api/RSSFeed.php | 8 +- api/RestfulService.php | 6 +- cli-script.php | 28 +- conf/ConfigureFromEnv.php | 4 +- control/ContentNegotiator.php | 4 +- control/Controller.php | 4 +- control/Director.php | 56 +- control/HTTP.php | 4 +- control/HTTPRequest.php | 48 +- control/HTTPResponse.php | 46 +- control/RequestHandler.php | 2 +- control/injector/AopProxyService.php | 4 +- core/ArrayLib.php | 36 +- core/Diff.php | 872 +++++----- dev/BulkLoader.php | 9 +- dev/DevelopmentAdmin.php | 20 +- dev/FunctionalTest.php | 24 +- dev/Profiler.php | 392 ++--- dev/SapphireTestReporter.php | 34 +- dev/SilverStripeListener.php | 4 +- dev/TeamCityListener.php | 4 +- dev/TestListener.php | 12 +- dev/phpunit/PhpUnitWrapper.php | 16 +- dev/phpunit/PhpUnitWrapper_3_5.php | 6 +- email/Email.php | 12 +- email/Mailer.php | 30 +- filesystem/GD.php | 94 +- forms/AjaxUniqueTextField.php | 2 +- forms/CheckboxSetField.php | 2 +- forms/ComplexTableField.php | 64 +- forms/CompositeField.php | 4 +- forms/CreditCardField.php | 2 +- forms/DateField.php | 96 +- forms/FieldGroup.php | 14 +- forms/Form.php | 8 +- forms/FormField.php | 18 +- forms/HtmlEditorField.php | 10 +- forms/ManyManyComplexTableField.php | 2 +- forms/NumericField.php | 4 +- forms/PhoneNumberField.php | 12 +- forms/RequiredFields.php | 14 +- forms/SimpleImageField.php | 42 +- forms/TableField.php | 15 +- forms/TableListField.php | 164 +- forms/gridfield/GridField.php | 2 +- javascript/ComplexTableField.js | 6 +- javascript/GridField.js | 1 - javascript/HtmlEditorField.js | 10 +- javascript/ImageFormAction.js | 6 +- javascript/TableField.js | 2 +- javascript/TableListField.js | 12 +- javascript/i18n.js | 4 +- javascript/jquery-ondemand/jquery.ondemand.js | 4 +- javascript/tree/tree.js | 46 +- model/DataList.php | 32 +- model/DataObject.php | 156 +- model/DataQuery.php | 140 +- model/Database.php | 6 +- model/DatabaseAdmin.php | 4 +- model/HasManyList.php | 16 +- model/Hierarchy.php | 26 +- model/ManyManyList.php | 22 +- model/MySQLDatabase.php | 44 +- model/SQLQuery.php | 10 +- model/Transliterator.php | 2 +- model/Versioned.php | 4 +- model/fieldtypes/Date.php | 10 +- model/fieldtypes/Text.php | 2 +- model/fieldtypes/Varchar.php | 8 +- parsers/BBCodeParser.php | 4 +- parsers/HTML/HTMLBBCodeParser.php | 1517 ++++++++--------- search/SearchContext.php | 8 +- security/Authenticator.php | 276 +-- security/Group.php | 6 +- security/Member.php | 50 +- security/MemberAuthenticator.php | 216 +-- security/MemberLoginForm.php | 16 +- security/Permission.php | 4 +- security/PermissionCheckboxSetField.php | 4 +- security/Security.php | 62 +- tests/api/RestfulServiceTest.php | 6 +- .../features/bootstrap/FeatureContext.php | 36 +- .../Test/Behaviour/CmsFormsContext.php | 144 +- .../Framework/Test/Behaviour/CmsUiContext.php | 496 +++--- tests/bootstrap.php | 26 +- tests/control/HTTPTest.php | 12 +- tests/core/ArrayDataTest.php | 2 +- .../module/classes/ClassB.php | 2 +- tests/dev/CsvBulkLoaderTest.php | 2 +- tests/forms/FileFieldTest.php | 20 +- tests/forms/RequirementsTest.php | 4 +- tests/forms/TableListFieldTest.php | 34 +- tests/forms/uploadfield/UploadFieldTest.php | 2 +- tests/injector/testservices/SampleService.php | 4 +- .../TreeDropDownField/TreeDropdownField.js | 10 +- tests/model/ComponentSetTest.php | 1 - tests/model/DataListTest.php | 2 +- tests/model/DataObjectTest.php | 1 - tests/model/MoneyTest.php | 16 +- tests/model/PaginatedListTest.php | 8 +- tests/model/VersionedTest.php | 10 +- tests/phpcs/tabs.xml | 18 + tests/search/SearchContextTest.php | 44 +- tests/security/GroupTest.php | 128 +- tests/security/MemberTest.php | 4 +- tests/view/ViewableDataTest.php | 6 +- view/ArrayData.php | 2 +- view/Requirements.php | 16 +- view/SSTemplateParser.php.inc | 4 +- view/SSViewer.php | 10 +- 117 files changed, 3053 insertions(+), 3040 deletions(-) create mode 100644 tests/phpcs/tabs.xml diff --git a/.travis.yml b/.travis.yml index d2d94d077..1f49fe992 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,8 @@ before_script: script: - phpunit -c phpunit.xml.dist - - phpcs --encoding=utf-8 --tab-width=4 --standard=framework/tests/phpcs -np framework + - phpcs --encoding=utf-8 --tab-width=4 --standard=framework/tests/phpcs/ruleset.xml -np framework + - phpcs --encoding=utf-8 --standard=framework/tests/phpcs/tabs.xml -np framework branches: except: diff --git a/admin/code/ModelAdmin.php b/admin/code/ModelAdmin.php index 15accc263..353e2f9c4 100644 --- a/admin/code/ModelAdmin.php +++ b/admin/code/ModelAdmin.php @@ -296,7 +296,7 @@ abstract class ModelAdmin extends LeftAndMain { * * @return array Map of model class names to importer instances */ - public function getModelImporters() { + public function getModelImporters() { $importerClasses = $this->stat('model_importers'); // fallback to all defined models if not explicitly defined diff --git a/admin/javascript/LeftAndMain.AddForm.js b/admin/javascript/LeftAndMain.AddForm.js index 8f7c20c26..48d749095 100644 --- a/admin/javascript/LeftAndMain.AddForm.js +++ b/admin/javascript/LeftAndMain.AddForm.js @@ -123,7 +123,7 @@ refresh: function(selectedNode) { var tree = this.getTree(), - selectedNode = selectedNode || $(tree).jstree('get_selected') + selectedNode = selectedNode || $(tree).jstree('get_selected') origOptions = this.getOrigOptions(), dropdown = this.find('select[name=PageType]'), disallowed = [], @@ -142,10 +142,10 @@ } $.each(origOptions, function(i, optProps) { - if ($.inArray(i, disallowed) === -1 && optProps) { - dropdown.append($('')); - disableDropDown = false; - } + if ($.inArray(i, disallowed) === -1 && optProps) { + dropdown.append($('')); + disableDropDown = false; + } }); // Disable dropdown if no elements are selectable diff --git a/admin/javascript/LeftAndMain.Tree.js b/admin/javascript/LeftAndMain.Tree.js index 97fa80bee..67780c50b 100644 --- a/admin/javascript/LeftAndMain.Tree.js +++ b/admin/javascript/LeftAndMain.Tree.js @@ -153,8 +153,8 @@ "select_limit" : 1, 'initially_select': [this.find('.current').attr('id')] }, - "crrm": { - 'move': { + "crrm": { + 'move': { // Check if a node is allowed to be moved. // Caution: Runs on every drag over a new node 'check_move': function(data) { diff --git a/admin/javascript/LeftAndMain.js b/admin/javascript/LeftAndMain.js index e87f0f627..d5b9fe708 100644 --- a/admin/javascript/LeftAndMain.js +++ b/admin/javascript/LeftAndMain.js @@ -230,7 +230,7 @@ jQuery.noConflict(); */ submitForm: function(form, button, callback, ajaxOptions) { var self = this; - + // look for save button if(!button) button = this.find('.Actions :submit[name=action_save]'); // default to first button if none given - simulates browser behaviour diff --git a/admin/javascript/lib.js b/admin/javascript/lib.js index c6437cc7e..d4b989610 100644 --- a/admin/javascript/lib.js +++ b/admin/javascript/lib.js @@ -170,8 +170,8 @@ convertUrlToDataUrl: function( absUrl ) { var u = path.parseUrl( absUrl ); if ( path.isEmbeddedPage( u ) ) { - // For embedded pages, remove the dialog hash key as in getFilePath(), - // otherwise the Data Url won't match the id of the embedded Page. + // For embedded pages, remove the dialog hash key as in getFilePath(), + // otherwise the Data Url won't match the id of the embedded Page. return u.hash.split( dialogHashKey )[0].replace( /^#/, "" ); } else if ( path.isSameDomain( u, documentBase ) ) { return u.hrefNoHash.replace( documentBase.domain, "" ); @@ -232,4 +232,4 @@ }; $.path = path; -}(jQuery)); \ No newline at end of file +}(jQuery)); diff --git a/api/FormEncodedDataFormatter.php b/api/FormEncodedDataFormatter.php index 4db470227..f59d22f23 100644 --- a/api/FormEncodedDataFormatter.php +++ b/api/FormEncodedDataFormatter.php @@ -30,9 +30,9 @@ class FormEncodedDataFormatter extends XMLDataFormatter { } public function convertStringToArray($strData) { - $postArray = array(); - parse_str($strData, $postArray); - return $postArray; + $postArray = array(); + parse_str($strData, $postArray); + return $postArray; //TODO: It would be nice to implement this function in Convert.php //return Convert::querystr2array($strData); } diff --git a/api/RSSFeed.php b/api/RSSFeed.php index c565310ec..163a93e2f 100644 --- a/api/RSSFeed.php +++ b/api/RSSFeed.php @@ -106,9 +106,9 @@ class RSSFeed extends ViewableData { * every time the representation does */ public function __construct(SS_List $entries, $link, $title, - $description = null, $titleField = "Title", - $descriptionField = "Content", $authorField = null, - $lastModified = null, $etag = null) { + $description = null, $titleField = "Title", + $descriptionField = "Content", $authorField = null, + $lastModified = null, $etag = null) { $this->entries = $entries; $this->link = $link; $this->description = $description; @@ -269,7 +269,7 @@ class RSSFeed_Entry extends ViewableData { * Create a new RSSFeed entry. */ public function __construct($entry, $titleField, $descriptionField, - $authorField) { + $authorField) { $this->failover = $entry; $this->titleField = $titleField; $this->descriptionField = $descriptionField; diff --git a/api/RestfulService.php b/api/RestfulService.php index 569026ec6..8a333afec 100644 --- a/api/RestfulService.php +++ b/api/RestfulService.php @@ -65,7 +65,7 @@ class RestfulService extends ViewableData { * @param string $password The proxy auth password * @param boolean $socks Set true to use socks5 proxy instead of http */ - public function setProxy($proxy, $port = 80, $user = "", $password = "", $socks = false) { + public function setProxy($proxy, $port = 80, $user = "", $password = "", $socks = false) { $this->proxy = array( CURLOPT_PROXY => $proxy, CURLOPT_PROXYUSERPWD => "{$user}:{$password}", @@ -337,14 +337,14 @@ class RestfulService extends ViewableData { $child_count++; $k = ($parent == "") ? (string)$key : $parent . "_" . (string)$key; if($this->getRecurseValues($value,$data,$k) == 0){ // no childern, aka "leaf node" - $conv_value = Convert::raw2xml($value); + $conv_value = Convert::raw2xml($value); } //Review the fix for similar node names overriding it's predecessor if(array_key_exists($k, $data) == true) { $data[$k] = $data[$k] . ",". $conv_value; } else { - $data[$k] = $conv_value; + $data[$k] = $conv_value; } diff --git a/cli-script.php b/cli-script.php index 93e009c49..131060785 100755 --- a/cli-script.php +++ b/cli-script.php @@ -37,19 +37,19 @@ chdir(dirname($_SERVER['SCRIPT_FILENAME'])); * fourth => val */ if(isset($_SERVER['argv'][2])) { - $args = array_slice($_SERVER['argv'],2); - if(!isset($_GET)) $_GET = array(); - if(!isset($_REQUEST)) $_REQUEST = array(); - foreach($args as $arg) { - if(strpos($arg,'=') == false) { - $_GET['args'][] = $arg; - } else { - $newItems = array(); - parse_str( (substr($arg,0,2) == '--') ? substr($arg,2) : $arg, $newItems ); - $_GET = array_merge($_GET, $newItems); - } - } - $_REQUEST = array_merge($_REQUEST, $_GET); + $args = array_slice($_SERVER['argv'],2); + if(!isset($_GET)) $_GET = array(); + if(!isset($_REQUEST)) $_REQUEST = array(); + foreach($args as $arg) { + if(strpos($arg,'=') == false) { + $_GET['args'][] = $arg; + } else { + $newItems = array(); + parse_str( (substr($arg,0,2) == '--') ? substr($arg,2) : $arg, $newItems ); + $_GET = array_merge($_GET, $newItems); + } + } + $_REQUEST = array_merge($_REQUEST, $_GET); } // Set 'url' GET parameter @@ -76,7 +76,7 @@ DB::connect($databaseConfig); $url = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : null; if(!$url) { echo 'Please specify an argument to cli-script.php/sake. For more information, visit' - . ' http://doc.silverstripe.org/framework/en/topics/commandline'; + . ' http://doc.silverstripe.org/framework/en/topics/commandline'; die(); } diff --git a/conf/ConfigureFromEnv.php b/conf/ConfigureFromEnv.php index f07e39fa7..a994f2880 100644 --- a/conf/ConfigureFromEnv.php +++ b/conf/ConfigureFromEnv.php @@ -100,8 +100,8 @@ if(defined('SS_DATABASE_USERNAME') && defined('SS_DATABASE_PASSWORD')) { } // For schema enabled drivers: - if(defined('SS_DATABASE_SCHEMA')) - $databaseConfig["schema"] = SS_DATABASE_SCHEMA; + if(defined('SS_DATABASE_SCHEMA')) + $databaseConfig["schema"] = SS_DATABASE_SCHEMA; } if(defined('SS_SEND_ALL_EMAILS_TO')) { diff --git a/control/ContentNegotiator.php b/control/ContentNegotiator.php index 515489777..f877b9845 100644 --- a/control/ContentNegotiator.php +++ b/control/ContentNegotiator.php @@ -45,7 +45,7 @@ class ContentNegotiator { * that need to specify the character set make use of this function. */ public static function get_encoding() { - return self::$encoding; + return self::$encoding; } /** @@ -96,7 +96,7 @@ class ContentNegotiator { } else { // The W3C validator doesn't send an HTTP_ACCEPT header, but it can support xhtml. We put this special // case in here so that designers don't get worried that their templates are HTML4. - if(isset($_SERVER['HTTP_USER_AGENT']) && substr($_SERVER['HTTP_USER_AGENT'], 0, 14) == 'W3C_Validator/') { + if(isset($_SERVER['HTTP_USER_AGENT']) && substr($_SERVER['HTTP_USER_AGENT'], 0, 14) == 'W3C_Validator/') { $chosenFormat = "xhtml"; } else { diff --git a/control/Controller.php b/control/Controller.php index 9ffea9ff0..b0e8727e7 100644 --- a/control/Controller.php +++ b/control/Controller.php @@ -164,7 +164,7 @@ class Controller extends RequestHandler implements TemplateGlobalProvider { Debug::message("Request handler $body->class object to $this->class controller;" . "rendering with template returned by $body->class::getViewer()"); } - $body = $body->getViewer($request->latestParam('Action'))->process($body); + $body = $body->getViewer($request->latestParam('Action'))->process($body); } $this->response->setBody($body); @@ -367,7 +367,7 @@ class Controller extends RequestHandler implements TemplateGlobalProvider { return $template->process($obj); } - + /** * Call this to disable site-wide basic authentication for a specific contoller. * This must be called before Controller::init(). That is, you must call it in your controller's diff --git a/control/Director.php b/control/Director.php index 023433c17..86684bc67 100644 --- a/control/Director.php +++ b/control/Director.php @@ -376,8 +376,8 @@ class Director implements TemplateGlobalProvider { $url = dirname($_SERVER['REQUEST_URI'] . 'x') . '/' . $url; } - if(substr($url,0,4) != "http") { - if($url[0] != "/") $url = Director::baseURL() . $url; + if(substr($url,0,4) != "http") { + if($url[0] != "/") $url = Director::baseURL() . $url; // Sometimes baseURL() can return a full URL instead of just a path if(substr($url,0,4) != "http") $url = self::protocolAndHost() . $url; } @@ -583,23 +583,23 @@ class Director implements TemplateGlobalProvider { */ public static function is_absolute_url($url) { $colonPosition = strpos($url, ':'); - return ( - // Base check for existence of a host on a compliant URL - parse_url($url, PHP_URL_HOST) - // Check for more than one leading slash without a protocol. - // While not a RFC compliant absolute URL, it is completed to a valid URL by some browsers, - // and hence a potential security risk. Single leading slashes are not an issue though. - || preg_match('/\s*[\/]{2,}/', $url) - || ( - // If a colon is found, check if it's part of a valid scheme definition - // (meaning its not preceded by a slash, hash or questionmark). - // URLs in query parameters are assumed to be correctly urlencoded based on RFC3986, - // in which case no colon should be present in the parameters. - $colonPosition !== FALSE - && !preg_match('![/?#]!', substr($url, 0, $colonPosition)) - ) - - ); + return ( + // Base check for existence of a host on a compliant URL + parse_url($url, PHP_URL_HOST) + // Check for more than one leading slash without a protocol. + // While not a RFC compliant absolute URL, it is completed to a valid URL by some browsers, + // and hence a potential security risk. Single leading slashes are not an issue though. + || preg_match('/\s*[\/]{2,}/', $url) + || ( + // If a colon is found, check if it's part of a valid scheme definition + // (meaning its not preceded by a slash, hash or questionmark). + // URLs in query parameters are assumed to be correctly urlencoded based on RFC3986, + // in which case no colon should be present in the parameters. + $colonPosition !== FALSE + && !preg_match('![/?#]!', substr($url, 0, $colonPosition)) + ) + + ); } /** @@ -681,21 +681,21 @@ class Director implements TemplateGlobalProvider { /** * Returns the Absolute URL of the site root. */ - public static function absoluteBaseURL() { - return Director::absoluteURL(Director::baseURL()); - } - + public static function absoluteBaseURL() { + return Director::absoluteURL(Director::baseURL()); + } + /** * Returns the Absolute URL of the site root, embedding the current basic-auth credentials into the URL. */ - public static function absoluteBaseURLWithAuth() { + public static function absoluteBaseURLWithAuth() { $s = ""; $login = ""; - if(isset($_SERVER['PHP_AUTH_USER'])) $login = "$_SERVER[PHP_AUTH_USER]:$_SERVER[PHP_AUTH_PW]@"; + if(isset($_SERVER['PHP_AUTH_USER'])) $login = "$_SERVER[PHP_AUTH_USER]:$_SERVER[PHP_AUTH_PW]@"; - return Director::protocol() . $login . $_SERVER['HTTP_HOST'] . Director::baseURL(); - } + return Director::protocol() . $login . $_SERVER['HTTP_HOST'] . Director::baseURL(); + } /** * Force the site to run on SSL. @@ -926,7 +926,7 @@ class Director implements TemplateGlobalProvider { $result = $_GET['isDev']; } else { if($firstTimeCheckingGetVar && DB::connection_attempted()) { - echo "

Sorry, you can't use ?isDev=1 until your Member and Group tables database are available. Perhaps your database connection is failing?

"; diff --git a/control/HTTP.php b/control/HTTP.php index e85daa8bd..03e776efa 100644 --- a/control/HTTP.php +++ b/control/HTTP.php @@ -171,8 +171,8 @@ class HTTP { if($regexes) foreach($regexes as $regex) { if(preg_match_all($regex, $content, $matches)) { $result = array_merge_recursive($result, (isset($matches[2]) ? $matches[2] : $matches[1])); - } - } + } + } return count($result) ? $result : null; } diff --git a/control/HTTPRequest.php b/control/HTTPRequest.php index 210c4af9b..753594588 100644 --- a/control/HTTPRequest.php +++ b/control/HTTPRequest.php @@ -252,21 +252,21 @@ class SS_HTTPRequest implements ArrayAccess { public function getURL($includeGetVars = false) { $url = ($this->getExtension()) ? $this->url . '.' . $this->getExtension() : $this->url; - if ($includeGetVars) { - // if we don't unset $vars['url'] we end up with /my/url?url=my/url&foo=bar etc - - $vars = $this->getVars(); - unset($vars['url']); + if ($includeGetVars) { + // if we don't unset $vars['url'] we end up with /my/url?url=my/url&foo=bar etc + + $vars = $this->getVars(); + unset($vars['url']); - if (count($vars)) { - $url .= '?' . http_build_query($vars); - } - } - else if(strpos($url, "?") !== false) { - $url = substr($url, 0, strpos($url, "?")); - } + if (count($vars)) { + $url .= '?' . http_build_query($vars); + } + } + else if(strpos($url, "?") !== false) { + $url = substr($url, 0, strpos($url, "?")); + } - return $url; + return $url; } /** @@ -444,9 +444,9 @@ class SS_HTTPRequest implements ArrayAccess { * @return string */ public function shiftAllParams() { - $keys = array_keys($this->allParams); - $values = array_values($this->allParams); - $value = array_shift($values); + $keys = array_keys($this->allParams); + $values = array_values($this->allParams); + $value = array_shift($values); // push additional unparsed URL parts onto the parameter stack if(array_key_exists($this->unshiftedButParsedParts, $this->dirParts)) { @@ -558,10 +558,10 @@ class SS_HTTPRequest implements ArrayAccess { */ public function getIP() { if (!empty($_SERVER['HTTP_CLIENT_IP'])) { - //check ip from share internet + //check ip from share internet return $_SERVER['HTTP_CLIENT_IP']; } elseif (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) { - //to check ip is pass from proxy + //to check ip is pass from proxy return $_SERVER['HTTP_X_FORWARDED_FOR']; } elseif(isset($_SERVER['REMOTE_ADDR'])) { return $_SERVER['REMOTE_ADDR']; @@ -577,12 +577,12 @@ class SS_HTTPRequest implements ArrayAccess { * @return array */ public function getAcceptMimetypes($includeQuality = false) { - $mimetypes = array(); - $mimetypesWithQuality = explode(',',$this->getHeader('Accept')); - foreach($mimetypesWithQuality as $mimetypeWithQuality) { - $mimetypes[] = ($includeQuality) ? $mimetypeWithQuality : preg_replace('/;.*/', '', $mimetypeWithQuality); - } - return $mimetypes; + $mimetypes = array(); + $mimetypesWithQuality = explode(',',$this->getHeader('Accept')); + foreach($mimetypesWithQuality as $mimetypeWithQuality) { + $mimetypes[] = ($includeQuality) ? $mimetypeWithQuality : preg_replace('/;.*/', '', $mimetypeWithQuality); + } + return $mimetypes; } /** diff --git a/control/HTTPResponse.php b/control/HTTPResponse.php index 24cf76b7b..16a801838 100644 --- a/control/HTTPResponse.php +++ b/control/HTTPResponse.php @@ -277,28 +277,28 @@ class SS_HTTPResponse_Exception extends Exception { /** * @see SS_HTTPResponse::__construct(); */ - public function __construct($body = null, $statusCode = null, $statusDescription = null) { - if($body instanceof SS_HTTPResponse) { - $this->setResponse($body); - } else { - $this->setResponse(new SS_HTTPResponse($body, $statusCode, $statusDescription)); - } - - parent::__construct($this->getResponse()->getBody(), $this->getResponse()->getStatusCode()); - } - - /** - * @return SS_HTTPResponse - */ - public function getResponse() { - return $this->response; - } - - /** - * @param SS_HTTPResponse $response - */ - public function setResponse(SS_HTTPResponse $response) { - $this->response = $response; - } + public function __construct($body = null, $statusCode = null, $statusDescription = null) { + if($body instanceof SS_HTTPResponse) { + $this->setResponse($body); + } else { + $this->setResponse(new SS_HTTPResponse($body, $statusCode, $statusDescription)); + } + + parent::__construct($this->getResponse()->getBody(), $this->getResponse()->getStatusCode()); + } + + /** + * @return SS_HTTPResponse + */ + public function getResponse() { + return $this->response; + } + + /** + * @param SS_HTTPResponse $response + */ + public function setResponse(SS_HTTPResponse $response) { + $this->response = $response; + } } diff --git a/control/RequestHandler.php b/control/RequestHandler.php index aecabf90b..c67793762 100644 --- a/control/RequestHandler.php +++ b/control/RequestHandler.php @@ -94,7 +94,7 @@ class RequestHandler extends ViewableData { * or by defining $allowed_actions in your {@link Form} class. */ static $allowed_actions = null; - + public function __construct() { $this->brokenOnConstruct = false; diff --git a/control/injector/AopProxyService.php b/control/injector/AopProxyService.php index 2bff1f5a4..aba7fa8a5 100644 --- a/control/injector/AopProxyService.php +++ b/control/injector/AopProxyService.php @@ -36,6 +36,6 @@ class AopProxyService { return $result; } - } + } } -} \ No newline at end of file +} diff --git a/core/ArrayLib.php b/core/ArrayLib.php index 72d59b857..039f0eb70 100644 --- a/core/ArrayLib.php +++ b/core/ArrayLib.php @@ -69,18 +69,18 @@ class ArrayLib { * @todo Improve documentation */ public static function array_values_recursive($arr) { - $lst = array(); - foreach(array_keys($arr) as $k){ - $v = $arr[$k]; - if (is_scalar($v)) { - $lst[] = $v; - } elseif (is_array($v)) { - $lst = array_merge( $lst, - self::array_values_recursive($v) - ); - } - } - return $lst; + $lst = array(); + foreach(array_keys($arr) as $k){ + $v = $arr[$k]; + if (is_scalar($v)) { + $lst[] = $v; + } elseif (is_array($v)) { + $lst = array_merge( $lst, + self::array_values_recursive($v) + ); + } + } + return $lst; } /** @@ -110,12 +110,12 @@ class ArrayLib { */ public static function is_associative($arr) { if(is_array($arr) && ! empty($arr)) { - for($iterator = count($arr) - 1; $iterator; $iterator--) { - if (!array_key_exists($iterator, $arr)) return true; - } - return !array_key_exists(0, $arr); - } - return false; + for($iterator = count($arr) - 1; $iterator; $iterator--) { + if (!array_key_exists($iterator, $arr)) return true; + } + return !array_key_exists(0, $arr); + } + return false; } /** diff --git a/core/Diff.php b/core/Diff.php index 1bfcd07f0..7fd94771a 100644 --- a/core/Diff.php +++ b/core/Diff.php @@ -27,21 +27,21 @@ define('USE_ASSERTS', function_exists('assert')); * @access private */ class _DiffOp { - var $type; - var $orig; - var $final; + var $type; + var $orig; + var $final; - public function reverse() { - trigger_error("pure virtual", E_USER_ERROR); - } + public function reverse() { + trigger_error("pure virtual", E_USER_ERROR); + } - public function norig() { - return $this->orig ? sizeof($this->orig) : 0; - } + public function norig() { + return $this->orig ? sizeof($this->orig) : 0; + } - public function nfinal() { - return $this->final ? sizeof($this->final) : 0; - } + public function nfinal() { + return $this->final ? sizeof($this->final) : 0; + } } /** @@ -50,18 +50,18 @@ class _DiffOp { * @access private */ class _DiffOp_Copy extends _DiffOp { - var $type = 'copy'; + var $type = 'copy'; - public function _DiffOp_Copy ($orig, $final = false) { - if (!is_array($final)) - $final = $orig; - $this->orig = $orig; - $this->final = $final; - } + public function _DiffOp_Copy ($orig, $final = false) { + if (!is_array($final)) + $final = $orig; + $this->orig = $orig; + $this->final = $final; + } - public function reverse() { - return new _DiffOp_Copy($this->final, $this->orig); - } + public function reverse() { + return new _DiffOp_Copy($this->final, $this->orig); + } } /** @@ -70,16 +70,16 @@ class _DiffOp_Copy extends _DiffOp { * @access private */ class _DiffOp_Delete extends _DiffOp { - var $type = 'delete'; + var $type = 'delete'; - public function _DiffOp_Delete ($lines) { - $this->orig = $lines; - $this->final = false; - } + public function _DiffOp_Delete ($lines) { + $this->orig = $lines; + $this->final = false; + } - public function reverse() { - return new _DiffOp_Add($this->orig); - } + public function reverse() { + return new _DiffOp_Add($this->orig); + } } /** @@ -88,16 +88,16 @@ class _DiffOp_Delete extends _DiffOp { * @access private */ class _DiffOp_Add extends _DiffOp { - var $type = 'add'; + var $type = 'add'; - public function _DiffOp_Add ($lines) { - $this->final = $lines; - $this->orig = false; - } + public function _DiffOp_Add ($lines) { + $this->final = $lines; + $this->orig = false; + } - public function reverse() { - return new _DiffOp_Delete($this->final); - } + public function reverse() { + return new _DiffOp_Delete($this->final); + } } /** @@ -106,16 +106,16 @@ class _DiffOp_Add extends _DiffOp { * @access private */ class _DiffOp_Change extends _DiffOp { - var $type = 'change'; + var $type = 'change'; - public function _DiffOp_Change ($orig, $final) { - $this->orig = $orig; - $this->final = $final; - } + public function _DiffOp_Change ($orig, $final) { + $this->orig = $orig; + $this->final = $final; + } - public function reverse() { - return new _DiffOp_Change($this->final, $this->orig); - } + public function reverse() { + return new _DiffOp_Change($this->final, $this->orig); + } } @@ -143,126 +143,126 @@ class _DiffOp_Change extends _DiffOp { */ class _DiffEngine { - public function diff ($from_lines, $to_lines) { - $n_from = sizeof($from_lines); - $n_to = sizeof($to_lines); + public function diff ($from_lines, $to_lines) { + $n_from = sizeof($from_lines); + $n_to = sizeof($to_lines); - $this->xchanged = $this->ychanged = array(); - $this->xv = $this->yv = array(); - $this->xind = $this->yind = array(); - unset($this->seq); - unset($this->in_seq); - unset($this->lcs); + $this->xchanged = $this->ychanged = array(); + $this->xv = $this->yv = array(); + $this->xind = $this->yind = array(); + unset($this->seq); + unset($this->in_seq); + unset($this->lcs); - // Skip leading common lines. - for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) { - if ($from_lines[$skip] != $to_lines[$skip]) - break; - $this->xchanged[$skip] = $this->ychanged[$skip] = false; - } - // Skip trailing common lines. - $xi = $n_from; $yi = $n_to; - for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) { - if ($from_lines[$xi] != $to_lines[$yi]) - break; - $this->xchanged[$xi] = $this->ychanged[$yi] = false; - } + // Skip leading common lines. + for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++) { + if ($from_lines[$skip] != $to_lines[$skip]) + break; + $this->xchanged[$skip] = $this->ychanged[$skip] = false; + } + // Skip trailing common lines. + $xi = $n_from; $yi = $n_to; + for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++) { + if ($from_lines[$xi] != $to_lines[$yi]) + break; + $this->xchanged[$xi] = $this->ychanged[$yi] = false; + } - // Ignore lines which do not exist in both files. - for ($xi = $skip; $xi < $n_from - $endskip; $xi++) - $xhash[$from_lines[$xi]] = 1; - for ($yi = $skip; $yi < $n_to - $endskip; $yi++) { - $line = $to_lines[$yi]; - if ( ($this->ychanged[$yi] = empty($xhash[$line])) ) - continue; - $yhash[$line] = 1; - $this->yv[] = $line; - $this->yind[] = $yi; - } - for ($xi = $skip; $xi < $n_from - $endskip; $xi++) { - $line = $from_lines[$xi]; - if ( ($this->xchanged[$xi] = empty($yhash[$line])) ) - continue; - $this->xv[] = $line; - $this->xind[] = $xi; - } + // Ignore lines which do not exist in both files. + for ($xi = $skip; $xi < $n_from - $endskip; $xi++) + $xhash[$from_lines[$xi]] = 1; + for ($yi = $skip; $yi < $n_to - $endskip; $yi++) { + $line = $to_lines[$yi]; + if ( ($this->ychanged[$yi] = empty($xhash[$line])) ) + continue; + $yhash[$line] = 1; + $this->yv[] = $line; + $this->yind[] = $yi; + } + for ($xi = $skip; $xi < $n_from - $endskip; $xi++) { + $line = $from_lines[$xi]; + if ( ($this->xchanged[$xi] = empty($yhash[$line])) ) + continue; + $this->xv[] = $line; + $this->xind[] = $xi; + } - // Find the LCS. - $this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv)); + // Find the LCS. + $this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv)); - // Merge edits when possible - $this->_shift_boundaries($from_lines, $this->xchanged, $this->ychanged); - $this->_shift_boundaries($to_lines, $this->ychanged, $this->xchanged); + // Merge edits when possible + $this->_shift_boundaries($from_lines, $this->xchanged, $this->ychanged); + $this->_shift_boundaries($to_lines, $this->ychanged, $this->xchanged); - // Compute the edit operations. - $edits = array(); - $xi = $yi = 0; - while ($xi < $n_from || $yi < $n_to) { - USE_ASSERTS && assert($yi < $n_to || $this->xchanged[$xi]); - USE_ASSERTS && assert($xi < $n_from || $this->ychanged[$yi]); + // Compute the edit operations. + $edits = array(); + $xi = $yi = 0; + while ($xi < $n_from || $yi < $n_to) { + USE_ASSERTS && assert($yi < $n_to || $this->xchanged[$xi]); + USE_ASSERTS && assert($xi < $n_from || $this->ychanged[$yi]); - // Skip matching "snake". - $copy = array(); - while ( $xi < $n_from && $yi < $n_to - && !$this->xchanged[$xi] && !$this->ychanged[$yi]) { - $copy[] = $from_lines[$xi++]; - ++$yi; - } - if ($copy) - $edits[] = new _DiffOp_Copy($copy); + // Skip matching "snake". + $copy = array(); + while ( $xi < $n_from && $yi < $n_to + && !$this->xchanged[$xi] && !$this->ychanged[$yi]) { + $copy[] = $from_lines[$xi++]; + ++$yi; + } + if ($copy) + $edits[] = new _DiffOp_Copy($copy); - // Find deletes & adds. - $delete = array(); - while ($xi < $n_from && $this->xchanged[$xi]) - $delete[] = $from_lines[$xi++]; + // Find deletes & adds. + $delete = array(); + while ($xi < $n_from && $this->xchanged[$xi]) + $delete[] = $from_lines[$xi++]; - $add = array(); - while ($yi < $n_to && $this->ychanged[$yi]) - $add[] = $to_lines[$yi++]; + $add = array(); + while ($yi < $n_to && $this->ychanged[$yi]) + $add[] = $to_lines[$yi++]; - if ($delete && $add) - $edits[] = new _DiffOp_Change($delete, $add); - elseif ($delete) - $edits[] = new _DiffOp_Delete($delete); - elseif ($add) - $edits[] = new _DiffOp_Add($add); - } - return $edits; - } + if ($delete && $add) + $edits[] = new _DiffOp_Change($delete, $add); + elseif ($delete) + $edits[] = new _DiffOp_Delete($delete); + elseif ($add) + $edits[] = new _DiffOp_Add($add); + } + return $edits; + } - /* Divide the Largest Common Subsequence (LCS) of the sequences - * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally - * sized segments. - * - * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an - * array of NCHUNKS+1 (X, Y) indexes giving the diving points between - * sub sequences. The first sub-sequence is contained in [X0, X1), - * [Y0, Y1), the second in [X1, X2), [Y1, Y2) and so on. Note - * that (X0, Y0) == (XOFF, YOFF) and - * (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM). - * - * This function assumes that the first lines of the specified portions - * of the two files do not match, and likewise that the last lines do not - * match. The caller must trim matching lines from the beginning and end - * of the portions it is going to specify. - */ - public function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) { + /* Divide the Largest Common Subsequence (LCS) of the sequences + * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally + * sized segments. + * + * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an + * array of NCHUNKS+1 (X, Y) indexes giving the diving points between + * sub sequences. The first sub-sequence is contained in [X0, X1), + * [Y0, Y1), the second in [X1, X2), [Y1, Y2) and so on. Note + * that (X0, Y0) == (XOFF, YOFF) and + * (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM). + * + * This function assumes that the first lines of the specified portions + * of the two files do not match, and likewise that the last lines do not + * match. The caller must trim matching lines from the beginning and end + * of the portions it is going to specify. + */ + public function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) { $flip = false; if ($xlim - $xoff > $ylim - $yoff) { - // Things seems faster (I'm not sure I understand why) - // when the shortest sequence in X. - $flip = true; - list ($xoff, $xlim, $yoff, $ylim) + // Things seems faster (I'm not sure I understand why) + // when the shortest sequence in X. + $flip = true; + list ($xoff, $xlim, $yoff, $ylim) = array( $yoff, $ylim, $xoff, $xlim); - } + } if ($flip) - for ($i = $ylim - 1; $i >= $yoff; $i--) + for ($i = $ylim - 1; $i >= $yoff; $i--) $ymatches[$this->xv[$i]][] = $i; else - for ($i = $ylim - 1; $i >= $yoff; $i--) + for ($i = $ylim - 1; $i >= $yoff; $i--) $ymatches[$this->yv[$i]][] = $i; $this->lcs = 0; @@ -273,70 +273,70 @@ class _DiffEngine $numer = $xlim - $xoff + $nchunks - 1; $x = $xoff; for ($chunk = 0; $chunk < $nchunks; $chunk++) { - if ($chunk > 0) + if ($chunk > 0) for ($i = 0; $i <= $this->lcs; $i++) - $ymids[$i][$chunk-1] = $this->seq[$i]; + $ymids[$i][$chunk-1] = $this->seq[$i]; - $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks); - for ( ; $x < $x1; $x++) { - $line = $flip ? $this->yv[$x] : $this->xv[$x]; - if (empty($ymatches[$line])) - continue; + $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks); + for ( ; $x < $x1; $x++) { + $line = $flip ? $this->yv[$x] : $this->xv[$x]; + if (empty($ymatches[$line])) + continue; $matches = $ymatches[$line]; - reset($matches); + reset($matches); while (list ($junk, $y) = each($matches)) - if (empty($this->in_seq[$y])) { + if (empty($this->in_seq[$y])) { $k = $this->_lcs_pos($y); USE_ASSERTS && assert($k > 0); $ymids[$k] = $ymids[$k-1]; break; - } + } while (list ($junk, $y) = each($matches)) { - if ($y > $this->seq[$k-1]) { + if ($y > $this->seq[$k-1]) { USE_ASSERTS && assert($y < $this->seq[$k]); // Optimization: this is a common case: // next match is just replacing previous match. $this->in_seq[$this->seq[$k]] = false; $this->seq[$k] = $y; $this->in_seq[$y] = 1; - } - else if (empty($this->in_seq[$y])) { + } + else if (empty($this->in_seq[$y])) { $k = $this->_lcs_pos($y); USE_ASSERTS && assert($k > 0); $ymids[$k] = $ymids[$k-1]; - } - } - } - } + } + } + } + } $seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff); $ymid = $ymids[$this->lcs]; for ($n = 0; $n < $nchunks - 1; $n++) { - $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks); - $y1 = $ymid[$n] + 1; - $seps[] = $flip ? array($y1, $x1) : array($x1, $y1); - } + $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks); + $y1 = $ymid[$n] + 1; + $seps[] = $flip ? array($y1, $x1) : array($x1, $y1); + } $seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim); return array($this->lcs, $seps); - } + } - public function _lcs_pos ($ypos) { + public function _lcs_pos ($ypos) { $end = $this->lcs; if ($end == 0 || $ypos > $this->seq[$end]) { - $this->seq[++$this->lcs] = $ypos; - $this->in_seq[$ypos] = 1; - return $this->lcs; - } + $this->seq[++$this->lcs] = $ypos; + $this->in_seq[$ypos] = 1; + return $this->lcs; + } $beg = 1; while ($beg < $end) { - $mid = (int)(($beg + $end) / 2); - if ( $ypos > $this->seq[$mid] ) + $mid = (int)(($beg + $end) / 2); + if ( $ypos > $this->seq[$mid] ) $beg = $mid + 1; - else + else $end = $mid; - } + } USE_ASSERTS && assert($ypos != $this->seq[$end]); @@ -344,77 +344,77 @@ class _DiffEngine $this->seq[$end] = $ypos; $this->in_seq[$ypos] = 1; return $end; - } + } - /* Find LCS of two sequences. - * - * The results are recorded in the vectors $this->{x,y}changed[], by - * storing a 1 in the element for each line that is an insertion - * or deletion (ie. is not in the LCS). - * - * The subsequence of file 0 is [XOFF, XLIM) and likewise for file 1. - * - * Note that XLIM, YLIM are exclusive bounds. - * All line numbers are origin-0 and discarded lines are not counted. - */ - public function _compareseq ($xoff, $xlim, $yoff, $ylim) { + /* Find LCS of two sequences. + * + * The results are recorded in the vectors $this->{x,y}changed[], by + * storing a 1 in the element for each line that is an insertion + * or deletion (ie. is not in the LCS). + * + * The subsequence of file 0 is [XOFF, XLIM) and likewise for file 1. + * + * Note that XLIM, YLIM are exclusive bounds. + * All line numbers are origin-0 and discarded lines are not counted. + */ + public function _compareseq ($xoff, $xlim, $yoff, $ylim) { // Slide down the bottom initial diagonal. while ($xoff < $xlim && $yoff < $ylim - && $this->xv[$xoff] == $this->yv[$yoff]) { - ++$xoff; - ++$yoff; - } + && $this->xv[$xoff] == $this->yv[$yoff]) { + ++$xoff; + ++$yoff; + } // Slide up the top initial diagonal. while ($xlim > $xoff && $ylim > $yoff - && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) { - --$xlim; - --$ylim; - } + && $this->xv[$xlim - 1] == $this->yv[$ylim - 1]) { + --$xlim; + --$ylim; + } if ($xoff == $xlim || $yoff == $ylim) - $lcs = 0; + $lcs = 0; else { - // This is ad hoc but seems to work well. - //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5); - //$nchunks = max(2,min(8,(int)$nchunks)); - $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1; - list ($lcs, $seps) + // This is ad hoc but seems to work well. + //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5); + //$nchunks = max(2,min(8,(int)$nchunks)); + $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1; + list ($lcs, $seps) = $this->_diag($xoff,$xlim,$yoff, $ylim,$nchunks); - } + } if ($lcs == 0) { - // X and Y sequences have no common subsequence: - // mark all changed. - while ($yoff < $ylim) + // X and Y sequences have no common subsequence: + // mark all changed. + while ($yoff < $ylim) $this->ychanged[$this->yind[$yoff++]] = 1; - while ($xoff < $xlim) + while ($xoff < $xlim) $this->xchanged[$this->xind[$xoff++]] = 1; - } + } else { - // Use the partitions to split this problem into subproblems. - reset($seps); - $pt1 = $seps[0]; - while ($pt2 = next($seps)) { + // Use the partitions to split this problem into subproblems. + reset($seps); + $pt1 = $seps[0]; + while ($pt2 = next($seps)) { $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]); $pt1 = $pt2; - } - } - } + } + } + } - /* Adjust inserts/deletes of identical lines to join changes - * as much as possible. - * - * We do something when a run of changed lines include a - * line at one end and has an excluded, identical line at the other. - * We are free to choose which identical line is included. - * 'compareseq' usually chooses the one at the beginning, - * but usually it is cleaner to consider the following identical line - * to be the "change". - * - * This is extracted verbatim from analyze.c (GNU diffutils-2.7). - */ - public function _shift_boundaries ($lines, &$changed, $other_changed) { + /* Adjust inserts/deletes of identical lines to join changes + * as much as possible. + * + * We do something when a run of changed lines include a + * line at one end and has an excluded, identical line at the other. + * We are free to choose which identical line is included. + * 'compareseq' usually chooses the one at the beginning, + * but usually it is cleaner to consider the following identical line + * to be the "change". + * + * This is extracted verbatim from analyze.c (GNU diffutils-2.7). + */ + public function _shift_boundaries ($lines, &$changed, $other_changed) { $i = 0; $j = 0; @@ -423,37 +423,37 @@ class _DiffEngine $other_len = sizeof($other_changed); while (1) { - /* - * Scan forwards to find beginning of another run of changes. - * Also keep track of the corresponding point in the other file. - * - * Throughout this code, $i and $j are adjusted together so that - * the first $i elements of $changed and the first $j elements - * of $other_changed both contain the same number of zeros - * (unchanged lines). - * Furthermore, $j is always kept so that $j == $other_len or - * $other_changed[$j] == false. - */ - while ($j < $other_len && $other_changed[$j]) + /* + * Scan forwards to find beginning of another run of changes. + * Also keep track of the corresponding point in the other file. + * + * Throughout this code, $i and $j are adjusted together so that + * the first $i elements of $changed and the first $j elements + * of $other_changed both contain the same number of zeros + * (unchanged lines). + * Furthermore, $j is always kept so that $j == $other_len or + * $other_changed[$j] == false. + */ + while ($j < $other_len && $other_changed[$j]) $j++; - while ($i < $len && ! $changed[$i]) { + while ($i < $len && ! $changed[$i]) { USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]'); $i++; $j++; while ($j < $other_len && $other_changed[$j]) - $j++; - } + $j++; + } - if ($i == $len) + if ($i == $len) break; - $start = $i; + $start = $i; - // Find the end of this run of changes. - while (++$i < $len && $changed[$i]) + // Find the end of this run of changes. + while (++$i < $len && $changed[$i]) continue; - do { + do { /* * Record the length of this run of changes, so that * we can later determine whether the run has grown. @@ -466,15 +466,15 @@ class _DiffEngine * This merges with previous changed regions. */ while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) { - $changed[--$start] = 1; - $changed[--$i] = false; - while ($start > 0 && $changed[$start - 1]) + $changed[--$start] = 1; + $changed[--$i] = false; + while ($start > 0 && $changed[$start - 1]) $start--; - USE_ASSERTS && assert('$j > 0'); - while ($other_changed[--$j]) + USE_ASSERTS && assert('$j > 0'); + while ($other_changed[--$j]) continue; - USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]'); - } + USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]'); + } /* * Set CORRESPONDING to the end of the changed run, at the last @@ -491,35 +491,35 @@ class _DiffEngine * the changed region is moved forward as far as possible. */ while ($i < $len && $lines[$start] == $lines[$i]) { - $changed[$start++] = false; - $changed[$i++] = 1; - while ($i < $len && $changed[$i]) + $changed[$start++] = false; + $changed[$i++] = 1; + while ($i < $len && $changed[$i]) $i++; - USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]'); - $j++; - if ($j < $other_len && $other_changed[$j]) { + USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]'); + $j++; + if ($j < $other_len && $other_changed[$j]) { $corresponding = $i; while ($j < $other_len && $other_changed[$j]) - $j++; - } - } - } while ($runlength != $i - $start); + $j++; + } + } + } while ($runlength != $i - $start); - /* - * If possible, move the fully-merged run of changes - * back to a corresponding run in the other file. - */ - while ($corresponding < $i) { + /* + * If possible, move the fully-merged run of changes + * back to a corresponding run in the other file. + */ + while ($corresponding < $i) { $changed[--$start] = 1; $changed[--$i] = 0; USE_ASSERTS && assert('$j > 0'); while ($other_changed[--$j]) - continue; + continue; USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]'); - } - } - } + } + } + } } /** @@ -531,138 +531,138 @@ class Diff { public static $html_cleaner_class = null; - var $edits; + var $edits; - /** - * Constructor. - * Computes diff between sequences of strings. - * - * @param $from_lines array An array of strings. - * (Typically these are lines from a file.) - * @param $to_lines array An array of strings. - */ - public function Diff($from_lines, $to_lines) { - $eng = new _DiffEngine; - $this->edits = $eng->diff($from_lines, $to_lines); - //$this->_check($from_lines, $to_lines); - } + /** + * Constructor. + * Computes diff between sequences of strings. + * + * @param $from_lines array An array of strings. + * (Typically these are lines from a file.) + * @param $to_lines array An array of strings. + */ + public function Diff($from_lines, $to_lines) { + $eng = new _DiffEngine; + $this->edits = $eng->diff($from_lines, $to_lines); + //$this->_check($from_lines, $to_lines); + } - /** - * Compute reversed Diff. - * - * SYNOPSIS: - * - * $diff = new Diff($lines1, $lines2); - * $rev = $diff->reverse(); - * @return object A Diff object representing the inverse of the - * original diff. - */ - public function reverse () { + /** + * Compute reversed Diff. + * + * SYNOPSIS: + * + * $diff = new Diff($lines1, $lines2); + * $rev = $diff->reverse(); + * @return object A Diff object representing the inverse of the + * original diff. + */ + public function reverse () { $rev = $this; - $rev->edits = array(); - foreach ($this->edits as $edit) { - $rev->edits[] = $edit->reverse(); - } + $rev->edits = array(); + foreach ($this->edits as $edit) { + $rev->edits[] = $edit->reverse(); + } return $rev; - } + } - /** - * Check for empty diff. - * - * @return bool True iff two sequences were identical. - */ - public function isEmpty () { - foreach ($this->edits as $edit) { - if ($edit->type != 'copy') - return false; - } - return true; - } + /** + * Check for empty diff. + * + * @return bool True iff two sequences were identical. + */ + public function isEmpty () { + foreach ($this->edits as $edit) { + if ($edit->type != 'copy') + return false; + } + return true; + } - /** - * Compute the length of the Longest Common Subsequence (LCS). - * - * This is mostly for diagnostic purposed. - * - * @return int The length of the LCS. - */ - public function lcs () { + /** + * Compute the length of the Longest Common Subsequence (LCS). + * + * This is mostly for diagnostic purposed. + * + * @return int The length of the LCS. + */ + public function lcs () { $lcs = 0; - foreach ($this->edits as $edit) { - if ($edit->type == 'copy') - $lcs += sizeof($edit->orig); - } + foreach ($this->edits as $edit) { + if ($edit->type == 'copy') + $lcs += sizeof($edit->orig); + } return $lcs; - } + } - /** - * Get the original set of lines. - * - * This reconstructs the $from_lines parameter passed to the - * constructor. - * - * @return array The original sequence of strings. - */ - public function orig() { - $lines = array(); + /** + * Get the original set of lines. + * + * This reconstructs the $from_lines parameter passed to the + * constructor. + * + * @return array The original sequence of strings. + */ + public function orig() { + $lines = array(); - foreach ($this->edits as $edit) { - if ($edit->orig) - array_splice($lines, sizeof($lines), 0, $edit->orig); - } - return $lines; - } + foreach ($this->edits as $edit) { + if ($edit->orig) + array_splice($lines, sizeof($lines), 0, $edit->orig); + } + return $lines; + } - /** - * Get the final set of lines. - * - * This reconstructs the $to_lines parameter passed to the - * constructor. - * - * @return array The sequence of strings. - */ - public function finaltext() { - $lines = array(); + /** + * Get the final set of lines. + * + * This reconstructs the $to_lines parameter passed to the + * constructor. + * + * @return array The sequence of strings. + */ + public function finaltext() { + $lines = array(); - foreach ($this->edits as $edit) { - if ($edit->final) - array_splice($lines, sizeof($lines), 0, $edit->final); - } - return $lines; - } + foreach ($this->edits as $edit) { + if ($edit->final) + array_splice($lines, sizeof($lines), 0, $edit->final); + } + return $lines; + } - /** - * Check a Diff for validity. - * - * This is here only for debugging purposes. - */ - public function _check ($from_lines, $to_lines) { - if (serialize($from_lines) != serialize($this->orig())) - trigger_error("Reconstructed original doesn't match", E_USER_ERROR); - if (serialize($to_lines) != serialize($this->finaltext())) - trigger_error("Reconstructed final doesn't match", E_USER_ERROR); + /** + * Check a Diff for validity. + * + * This is here only for debugging purposes. + */ + public function _check ($from_lines, $to_lines) { + if (serialize($from_lines) != serialize($this->orig())) + trigger_error("Reconstructed original doesn't match", E_USER_ERROR); + if (serialize($to_lines) != serialize($this->finaltext())) + trigger_error("Reconstructed final doesn't match", E_USER_ERROR); - $rev = $this->reverse(); - if (serialize($to_lines) != serialize($rev->orig())) - trigger_error("Reversed original doesn't match", E_USER_ERROR); - if (serialize($from_lines) != serialize($rev->finaltext())) - trigger_error("Reversed final doesn't match", E_USER_ERROR); + $rev = $this->reverse(); + if (serialize($to_lines) != serialize($rev->orig())) + trigger_error("Reversed original doesn't match", E_USER_ERROR); + if (serialize($from_lines) != serialize($rev->finaltext())) + trigger_error("Reversed final doesn't match", E_USER_ERROR); - $prevtype = 'none'; - foreach ($this->edits as $edit) { - if ( $prevtype == $edit->type ) - trigger_error("Edit sequence is non-optimal", E_USER_ERROR); - $prevtype = $edit->type; - } + $prevtype = 'none'; + foreach ($this->edits as $edit) { + if ( $prevtype == $edit->type ) + trigger_error("Edit sequence is non-optimal", E_USER_ERROR); + $prevtype = $edit->type; + } - $lcs = $this->lcs(); - trigger_error("Diff okay: LCS = $lcs", E_USER_NOTICE); - } - - - - /** + $lcs = $this->lcs(); + trigger_error("Diff okay: LCS = $lcs", E_USER_NOTICE); + } + + + + /** * Attempt to clean invalid HTML, which messes up diffs. * This cleans code if possible, using an instance of HTMLCleaner * @@ -750,7 +750,7 @@ class Diff else $rechunked[$listName][] = $item; if($lookForTag && !$tagStack[$listName] && isset($item[0]) && $item[0] == "<" - && substr($item,0,2) != "Diff($mapped_from_lines, $mapped_to_lines); + $this->Diff($mapped_from_lines, $mapped_to_lines); - $xi = $yi = 0; - // Optimizing loop invariants: - // http://phplens.com/lens/php-book/optimizing-debugging-php.php - for ($i = 0, $max = sizeof($this->edits); $i < $max; $i++) { - $orig = &$this->edits[$i]->orig; - if (is_array($orig)) { - $orig = array_slice($from_lines, $xi, sizeof($orig)); - $xi += sizeof($orig); - } + $xi = $yi = 0; + // Optimizing loop invariants: + // http://phplens.com/lens/php-book/optimizing-debugging-php.php + for ($i = 0, $max = sizeof($this->edits); $i < $max; $i++) { + $orig = &$this->edits[$i]->orig; + if (is_array($orig)) { + $orig = array_slice($from_lines, $xi, sizeof($orig)); + $xi += sizeof($orig); + } - $final = &$this->edits[$i]->final; - if (is_array($final)) { - $final = array_slice($to_lines, $yi, sizeof($final)); - $yi += sizeof($final); - } - } - } + $final = &$this->edits[$i]->final; + if (is_array($final)) { + $final = array_slice($to_lines, $yi, sizeof($final)); + $yi += sizeof($final); + } + } + } } diff --git a/dev/BulkLoader.php b/dev/BulkLoader.php index bcd0652e0..7db06dfc6 100644 --- a/dev/BulkLoader.php +++ b/dev/BulkLoader.php @@ -140,7 +140,7 @@ abstract class BulkLoader extends ViewableData { //get all instances of the to be imported data object if($this->deleteExistingRecords) { - DataObject::get($this->objectClass)->removeAll(); + DataObject::get($this->objectClass)->removeAll(); } return $this->processAll($filepath); @@ -273,12 +273,12 @@ class BulkLoader_Result extends Object { * */ protected $created = array(); - + /** * @var array (see {@link $created}) */ protected $updated = array(); - + /** * @var array (see {@link $created}) */ @@ -290,7 +290,7 @@ class BulkLoader_Result extends Object { * one of 3 strings: "created", "updated", or "deleted" */ protected $lastChange = array(); - + /** * Returns the count of all objects which were * created or updated. @@ -408,5 +408,4 @@ class BulkLoader_Result extends Object { return $set; } - } diff --git a/dev/DevelopmentAdmin.php b/dev/DevelopmentAdmin.php index 531150708..07d0874e7 100644 --- a/dev/DevelopmentAdmin.php +++ b/dev/DevelopmentAdmin.php @@ -18,15 +18,15 @@ class DevelopmentAdmin extends Controller { ); static $allowed_actions = array( - 'index', - 'tests', - 'jstests', - 'tasks', - 'viewmodel', - 'build', - 'reset', - 'viewcode' - ); + 'index', + 'tests', + 'jstests', + 'tasks', + 'viewmodel', + 'build', + 'reset', + 'viewcode' + ); public function init() { parent::init(); @@ -56,7 +56,7 @@ class DevelopmentAdmin extends Controller { $matched = false; if(isset($_FILE_TO_URL_MAPPING[$testPath])) { $matched = true; - break; + break; } $testPath = dirname($testPath); } diff --git a/dev/FunctionalTest.php b/dev/FunctionalTest.php index c95f4919b..351d95e35 100644 --- a/dev/FunctionalTest.php +++ b/dev/FunctionalTest.php @@ -8,14 +8,14 @@ * * * public function testMyForm() { - * // Visit a URL - * $this->get("your/url"); + * // Visit a URL + * $this->get("your/url"); * - * // Submit a form on the page that you get in response - * $this->submitForm("MyForm_ID", array("Email" => "invalid email ^&*&^")); + * // Submit a form on the page that you get in response + * $this->submitForm("MyForm_ID", array("Email" => "invalid email ^&*&^")); * - * // Validate the content that is returned - * $this->assertExactMatchBySelector("#MyForm_ID p.error", array("That email address is invalid.")); + * // Validate the content that is returned + * $this->assertExactMatchBySelector("#MyForm_ID p.error", array("That email address is invalid.")); * } * * @@ -70,10 +70,10 @@ class FunctionalTest extends SapphireTest { if($this->stat('use_draft_site')) { $this->useDraftSite(); } - - // Unprotect the site, tests are running with the assumption it's off. They will enable it on a case-by-case - // basis. - BasicAuth::protect_entire_site(false); + + // Unprotect the site, tests are running with the assumption it's off. They will enable it on a case-by-case + // basis. + BasicAuth::protect_entire_site(false); SecurityToken::disable(); } @@ -193,8 +193,8 @@ class FunctionalTest extends SapphireTest { foreach($expectedMatches as $match) { $this->assertTrue( isset($actuals[$match]), - "Failed asserting the CSS selector '$selector' has a partial match to the expected elements:\n'" - . implode("'\n'", $expectedMatches) . "'\n\n" + "Failed asserting the CSS selector '$selector' has a partial match to the expected elements:\n'" + . implode("'\n'", $expectedMatches) . "'\n\n" . "Instead the following elements were found:\n'" . implode("'\n'", array_keys($actuals)) . "'" ); return false; diff --git a/dev/Profiler.php b/dev/Profiler.php index 6353f0a87..ad805b4b4 100644 --- a/dev/Profiler.php +++ b/dev/Profiler.php @@ -14,223 +14,223 @@ * @subpackage misc */ class Profiler { - var $description; - var $startTime; - var $endTime; - var $initTime; - var $cur_timer; - var $stack; - var $trail; - var $trace; - var $count; - var $running; - - protected static $inst; + var $description; + var $startTime; + var $endTime; + var $initTime; + var $cur_timer; + var $stack; + var $trail; + var $trace; + var $count; + var $running; + + protected static $inst; - /** - * Initialise the timer. with the current micro time - */ - public function Profiler( $output_enabled=false, $trace_enabled=false) - { - $this->description = array(); - $this->startTime = array(); - $this->endTime = array(); - $this->initTime = 0; - $this->cur_timer = ""; - $this->stack = array(); - $this->trail = ""; - $this->trace = ""; - $this->count = array(); - $this->running = array(); - $this->initTime = $this->getMicroTime(); - $this->output_enabled = $output_enabled; - $this->trace_enabled = $trace_enabled; - $this->startTimer('unprofiled'); - } + /** + * Initialise the timer. with the current micro time + */ + public function Profiler( $output_enabled=false, $trace_enabled=false) + { + $this->description = array(); + $this->startTime = array(); + $this->endTime = array(); + $this->initTime = 0; + $this->cur_timer = ""; + $this->stack = array(); + $this->trail = ""; + $this->trace = ""; + $this->count = array(); + $this->running = array(); + $this->initTime = $this->getMicroTime(); + $this->output_enabled = $output_enabled; + $this->trace_enabled = $trace_enabled; + $this->startTimer('unprofiled'); + } - // Public Methods - - public static function init() { - if(!self::$inst) self::$inst = new Profiler(true,true); - } - - public static function mark($name, $level2 = "", $desc = "") { - if($level2 && $_GET['debug_profile'] > 1) $name .= " $level2"; - - if(!self::$inst) self::$inst = new Profiler(true,true); - - self::$inst->startTimer($name, $desc); - } - public static function unmark($name, $level2 = "", $desc = "") { - if($level2 && $_GET['debug_profile'] > 1) $name .= " $level2"; - - if(!self::$inst) self::$inst = new Profiler(true,true); - - self::$inst->stopTimer($name, $desc); - } - public static function show($showTrace = false) { - if(!self::$inst) self::$inst = new Profiler(true,true); - - echo "
"; - echo "

" - . "(Click to close)

"; - self::$inst->printTimers(); - if($showTrace) self::$inst->printTrace(); - echo "
"; - } + // Public Methods + + public static function init() { + if(!self::$inst) self::$inst = new Profiler(true,true); + } + + public static function mark($name, $level2 = "", $desc = "") { + if($level2 && $_GET['debug_profile'] > 1) $name .= " $level2"; + + if(!self::$inst) self::$inst = new Profiler(true,true); + + self::$inst->startTimer($name, $desc); + } + public static function unmark($name, $level2 = "", $desc = "") { + if($level2 && $_GET['debug_profile'] > 1) $name .= " $level2"; + + if(!self::$inst) self::$inst = new Profiler(true,true); + + self::$inst->stopTimer($name, $desc); + } + public static function show($showTrace = false) { + if(!self::$inst) self::$inst = new Profiler(true,true); + + echo "
"; + echo "

" + . "(Click to close)

"; + self::$inst->printTimers(); + if($showTrace) self::$inst->printTrace(); + echo "
"; + } - /** - * Start an individual timer - * This will pause the running timer and place it on a stack. - * @param string $name name of the timer - * @param string optional $desc description of the timer - */ - public function startTimer($name, $desc="" ){ - $this->trace.="start $name\n"; - $n=array_push( $this->stack, $this->cur_timer ); - $this->__suspendTimer( $this->stack[$n-1] ); - $this->startTime[$name] = $this->getMicroTime(); - $this->cur_timer=$name; - $this->description[$name] = $desc; - if (!array_key_exists($name,$this->count)) - $this->count[$name] = 1; - else - $this->count[$name]++; - } + /** + * Start an individual timer + * This will pause the running timer and place it on a stack. + * @param string $name name of the timer + * @param string optional $desc description of the timer + */ + public function startTimer($name, $desc="" ){ + $this->trace.="start $name\n"; + $n=array_push( $this->stack, $this->cur_timer ); + $this->__suspendTimer( $this->stack[$n-1] ); + $this->startTime[$name] = $this->getMicroTime(); + $this->cur_timer=$name; + $this->description[$name] = $desc; + if (!array_key_exists($name,$this->count)) + $this->count[$name] = 1; + else + $this->count[$name]++; + } - /** - * Stop an individual timer - * Restart the timer that was running before this one - * @param string $name name of the timer - */ - public function stopTimer($name){ - $this->trace.="stop $name\n"; - $this->endTime[$name] = $this->getMicroTime(); - if (!array_key_exists($name, $this->running)) - $this->running[$name] = $this->elapsedTime($name); - else - $this->running[$name] += $this->elapsedTime($name); - $this->cur_timer=array_pop($this->stack); - $this->__resumeTimer($this->cur_timer); - } + /** + * Stop an individual timer + * Restart the timer that was running before this one + * @param string $name name of the timer + */ + public function stopTimer($name){ + $this->trace.="stop $name\n"; + $this->endTime[$name] = $this->getMicroTime(); + if (!array_key_exists($name, $this->running)) + $this->running[$name] = $this->elapsedTime($name); + else + $this->running[$name] += $this->elapsedTime($name); + $this->cur_timer=array_pop($this->stack); + $this->__resumeTimer($this->cur_timer); + } - /** - * measure the elapsed time of a timer without stoping the timer if - * it is still running - */ - public function elapsedTime($name){ - // This shouldn't happen, but it does once. - if (!array_key_exists($name,$this->startTime)) - return 0; + /** + * measure the elapsed time of a timer without stoping the timer if + * it is still running + */ + public function elapsedTime($name){ + // This shouldn't happen, but it does once. + if (!array_key_exists($name,$this->startTime)) + return 0; - if(array_key_exists($name,$this->endTime)){ - return ($this->endTime[$name] - $this->startTime[$name]); - } else { - $now=$this->getMicroTime(); - return ($now - $this->startTime[$name]); - } - }//end start_time + if(array_key_exists($name,$this->endTime)){ + return ($this->endTime[$name] - $this->startTime[$name]); + } else { + $now=$this->getMicroTime(); + return ($now - $this->startTime[$name]); + } + }//end start_time - /** - * Measure the elapsed time since the profile class was initialised - * - */ - public function elapsedOverall(){ - $oaTime = $this->getMicroTime() - $this->initTime; - return($oaTime); - }//end start_time + /** + * Measure the elapsed time since the profile class was initialised + * + */ + public function elapsedOverall(){ + $oaTime = $this->getMicroTime() - $this->initTime; + return($oaTime); + }//end start_time - /** - * print out a log of all the timers that were registered - * - */ - public function printTimers($enabled=false) - { - if($this->output_enabled||$enabled){ - $TimedTotal = 0; - $tot_perc = 0; - ksort($this->description); - print("
\n");
-            $oaTime = $this->getMicroTime() - $this->initTime;
-            echo"============================================================================\n";
-            echo "                              PROFILER OUTPUT\n";
-            echo"============================================================================\n";
-            print( "Calls                    Time  Routine\n");
-            echo"-----------------------------------------------------------------------------\n";
-            while (list ($key, $val) = each ($this->description)) {
-                $t = $this->elapsedTime($key);
-                $total = $this->running[$key];
-                $count = $this->count[$key];
-                $TimedTotal += $total;
-                $perc = ($total/$oaTime)*100;
-                $tot_perc+=$perc;
-                // $perc=sprintf("%3.2f", $perc );
-                $lines[ sprintf( "%3d    %3.4f ms (%3.2f %%)  %s\n", $count, $total*1000, $perc, $key) ] = $total;
-            }
+	/**
+	*   print out a log of all the timers that were registered
+	*
+	*/
+	public function printTimers($enabled=false)
+	{
+		if($this->output_enabled||$enabled){
+			$TimedTotal = 0;
+			$tot_perc = 0;
+			ksort($this->description);
+			print("
\n");
+			$oaTime = $this->getMicroTime() - $this->initTime;
+			echo"============================================================================\n";
+			echo "                              PROFILER OUTPUT\n";
+			echo"============================================================================\n";
+			print( "Calls                    Time  Routine\n");
+			echo"-----------------------------------------------------------------------------\n";
+			while (list ($key, $val) = each ($this->description)) {
+				$t = $this->elapsedTime($key);
+				$total = $this->running[$key];
+				$count = $this->count[$key];
+				$TimedTotal += $total;
+				$perc = ($total/$oaTime)*100;
+				$tot_perc+=$perc;
+				// $perc=sprintf("%3.2f", $perc );
+				$lines[ sprintf( "%3d    %3.4f ms (%3.2f %%)  %s\n", $count, $total*1000, $perc, $key) ] = $total;
+			}
 			arsort($lines);
 			foreach($lines as $line => $total) {
 				echo $line;
 			}
 
-            echo "\n";
+			echo "\n";
 
-            $missed=$oaTime-$TimedTotal;
-            $perc = ($missed/$oaTime)*100;
-            $tot_perc+=$perc;
-            // $perc=sprintf("%3.2f", $perc );
-            printf( "       %3.4f ms (%3.2f %%)  %s\n", $missed*1000,$perc, "Missed");
+			$missed=$oaTime-$TimedTotal;
+			$perc = ($missed/$oaTime)*100;
+			$tot_perc+=$perc;
+			// $perc=sprintf("%3.2f", $perc );
+			printf( "       %3.4f ms (%3.2f %%)  %s\n", $missed*1000,$perc, "Missed");
 
-            echo"============================================================================\n";
+			echo"============================================================================\n";
 
-            printf( "       %3.4f ms (%3.2f %%)  %s\n", $oaTime*1000,$tot_perc, "OVERALL TIME");
+			printf( "       %3.4f ms (%3.2f %%)  %s\n", $oaTime*1000,$tot_perc, "OVERALL TIME");
 
-            echo"============================================================================\n";
+			echo"============================================================================\n";
 
-            print("
");
-        }
-    }
+			print("
"); + } + } - public function printTrace( $enabled=false ) - { - if($this->trace_enabled||$enabled){ - print("
");
-            print("Trace\n$this->trace\n\n");
-            print("
"); - } - } + public function printTrace( $enabled=false ) + { + if($this->trace_enabled||$enabled){ + print("
");
+			print("Trace\n$this->trace\n\n");
+			print("
"); + } + } - /// Internal Use Only Functions + /// Internal Use Only Functions - /** - * Get the current time as accuratly as possible - * - */ - public function getMicroTime(){ - $tmp=explode(' ', microtime()); - $rt=$tmp[0]+$tmp[1]; - return $rt; - } + /** + * Get the current time as accuratly as possible + * + */ + public function getMicroTime(){ + $tmp=explode(' ', microtime()); + $rt=$tmp[0]+$tmp[1]; + return $rt; + } - /** - * resume an individual timer - * - */ - public function __resumeTimer($name){ - $this->trace.="resume $name\n"; - $this->startTime[$name] = $this->getMicroTime(); - } + /** + * resume an individual timer + * + */ + public function __resumeTimer($name){ + $this->trace.="resume $name\n"; + $this->startTime[$name] = $this->getMicroTime(); + } - /** - * suspend an individual timer - * - */ - public function __suspendTimer($name){ - $this->trace.="suspend $name\n"; - $this->endTime[$name] = $this->getMicroTime(); - if (!array_key_exists($name, $this->running)) - $this->running[$name] = $this->elapsedTime($name); - else - $this->running[$name] += $this->elapsedTime($name); - } + /** + * suspend an individual timer + * + */ + public function __suspendTimer($name){ + $this->trace.="suspend $name\n"; + $this->endTime[$name] = $this->getMicroTime(); + if (!array_key_exists($name, $this->running)) + $this->running[$name] = $this->elapsedTime($name); + else + $this->running[$name] += $this->elapsedTime($name); + } } diff --git a/dev/SapphireTestReporter.php b/dev/SapphireTestReporter.php index 36af8b18f..84da76c72 100644 --- a/dev/SapphireTestReporter.php +++ b/dev/SapphireTestReporter.php @@ -83,17 +83,17 @@ class SapphireTestReporter implements PHPUnit_Framework_TestListener { public function __construct() { @include_once 'Benchmark/Timer.php'; if(class_exists('Benchmark_Timer')) { - $this->timer = new Benchmark_Timer(); - $this->hasTimer = true; + $this->timer = new Benchmark_Timer(); + $this->hasTimer = true; } else { - $this->hasTimer = false; + $this->hasTimer = false; } - $this->suiteResults = array( - 'suites' => array(), // array of suites run - 'hasTimer' => $this->hasTimer, // availability of PEAR Benchmark_Timer - 'totalTests' => 0 // total number of tests run - ); + $this->suiteResults = array( + 'suites' => array(), // array of suites run + 'hasTimer' => $this->hasTimer, // availability of PEAR Benchmark_Timer + 'totalTests' => 0 // total number of tests run + ); } /** @@ -117,14 +117,14 @@ class SapphireTestReporter implements PHPUnit_Framework_TestListener { public function startTestSuite( PHPUnit_Framework_TestSuite $suite) { if(strlen($suite->getName())) { $this->endCurrentTestSuite(); - $this->currentSuite = array( - 'suite' => $suite, // the test suite - 'tests' => array(), // the tests in the suite - 'errors' => 0, // number of tests with errors (including setup errors) - 'failures' => 0, // number of tests which failed - 'incomplete' => 0, // number of tests that were not completed correctly + $this->currentSuite = array( + 'suite' => $suite, // the test suite + 'tests' => array(), // the tests in the suite + 'errors' => 0, // number of tests with errors (including setup errors) + 'failures' => 0, // number of tests which failed + 'incomplete' => 0, // number of tests that were not completed correctly 'error' => null); // Any error encountered during setup of the test suite - } + } } /** @@ -226,7 +226,7 @@ class SapphireTestReporter implements PHPUnit_Framework_TestListener { $this->currentSuite['incomplete']++; $this->addStatus(TEST_INCOMPLETE, $e->toString(), $this->getTestException($test, $e), $e->getTrace()); } - + /** * Not used * @@ -257,7 +257,7 @@ class SapphireTestReporter implements PHPUnit_Framework_TestListener { $this->currentTest = null; } - /** + /** * Upon completion of a test, records the execution time (if available) and adds the test to * the tests performed in the current suite. * diff --git a/dev/SilverStripeListener.php b/dev/SilverStripeListener.php index c6c5c01a1..009591f82 100644 --- a/dev/SilverStripeListener.php +++ b/dev/SilverStripeListener.php @@ -27,13 +27,13 @@ class SilverStripeListener implements PHPUnit_Framework_TestListener { public function startTest(PHPUnit_Framework_Test $test) { } - + public function endTest(PHPUnit_Framework_Test $test, $time) { } public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) { } - + public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) { } diff --git a/dev/TeamCityListener.php b/dev/TeamCityListener.php index e924ed8a4..7af8a6c52 100644 --- a/dev/TeamCityListener.php +++ b/dev/TeamCityListener.php @@ -27,7 +27,7 @@ class TeamCityListener implements PHPUnit_Framework_TestListener { $class = get_class($test); echo "##teamcity[testStarted name='{$class}.{$test->getName()}']\n"; } - + public function endTest(PHPUnit_Framework_Test $test, $time) { $class = get_class($test); echo "##teamcity[testFinished name='{$class}.{$test->getName()}' duration='$time']\n"; @@ -40,7 +40,7 @@ class TeamCityListener implements PHPUnit_Framework_TestListener { echo "##teamcity[testFailed type='exception' name='{$class}.{$test->getName()}' message='$message'" . " details='$trace']\n"; } - + public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) { $class = get_class($test); $message = $this->escape($e->getMessage()); diff --git a/dev/TestListener.php b/dev/TestListener.php index 5fcd93cfe..5494dfd89 100644 --- a/dev/TestListener.php +++ b/dev/TestListener.php @@ -13,15 +13,15 @@ class SS_TestListener implements PHPUnit_Framework_TestListener { public function addError(PHPUnit_Framework_Test $test, Exception $e, $time) {} - public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) {} + public function addFailure(PHPUnit_Framework_Test $test, PHPUnit_Framework_AssertionFailedError $e, $time) {} - public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) {} + public function addIncompleteTest(PHPUnit_Framework_Test $test, Exception $e, $time) {} - public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) {} + public function addSkippedTest(PHPUnit_Framework_Test $test, Exception $e, $time) {} - public function startTest(PHPUnit_Framework_Test $test) {} + public function startTest(PHPUnit_Framework_Test $test) {} - public function endTest(PHPUnit_Framework_Test $test, $time) {} + public function endTest(PHPUnit_Framework_Test $test, $time) {} public function startTestSuite(PHPUnit_Framework_TestSuite $suite) { $name = $suite->getName(); @@ -29,7 +29,7 @@ class SS_TestListener implements PHPUnit_Framework_TestListener { $this->class = new $name(); $this->class->setUpOnce(); - } + } public function endTestSuite(PHPUnit_Framework_TestSuite $suite) { $name = $suite->getName(); diff --git a/dev/phpunit/PhpUnitWrapper.php b/dev/phpunit/PhpUnitWrapper.php index 0af2fefea..194339ea7 100644 --- a/dev/phpunit/PhpUnitWrapper.php +++ b/dev/phpunit/PhpUnitWrapper.php @@ -138,14 +138,14 @@ class PhpUnitWrapper implements IPhpUnitWrapper { public static function inst() { if (self::$phpunit_wrapper == null) { - if (fileExistsInIncludePath("/PHPUnit/Autoload.php")) { - self::$phpunit_wrapper = new PhpUnitWrapper_3_5(); - } else - if (fileExistsInIncludePath("/PHPUnit/Framework.php")) { - self::$phpunit_wrapper = new PhpUnitWrapper_3_4(); - } else { - self::$phpunit_wrapper = new PhpUnitWrapper(); - } + if (fileExistsInIncludePath("/PHPUnit/Autoload.php")) { + self::$phpunit_wrapper = new PhpUnitWrapper_3_5(); + } else + if (fileExistsInIncludePath("/PHPUnit/Framework.php")) { + self::$phpunit_wrapper = new PhpUnitWrapper_3_4(); + } else { + self::$phpunit_wrapper = new PhpUnitWrapper(); + } self::$phpunit_wrapper->init(); } diff --git a/dev/phpunit/PhpUnitWrapper_3_5.php b/dev/phpunit/PhpUnitWrapper_3_5.php index fdfe61dac..3085ad572 100644 --- a/dev/phpunit/PhpUnitWrapper_3_5.php +++ b/dev/phpunit/PhpUnitWrapper_3_5.php @@ -35,11 +35,11 @@ class PhpUnitWrapper_3_5 extends PhpUnitWrapper { protected function beforeRunTests() { if($this->getCoverageStatus()) { - $this->coverage = new PHP_CodeCoverage(); + $this->coverage = new PHP_CodeCoverage(); $coverage = $this->coverage; - $filter = $coverage->filter(); - $modules = $this->moduleDirectories(); + $filter = $coverage->filter(); + $modules = $this->moduleDirectories(); foreach(TestRunner::$coverage_filter_dirs as $dir) { if($dir[0] == '*') { diff --git a/email/Email.php b/email/Email.php index 59466b565..0a95099be 100644 --- a/email/Email.php +++ b/email/Email.php @@ -363,12 +363,12 @@ class Email extends ViewableData { * @desc Validates the email address. Returns true of false */ public static function validEmailAddress($address) { - if (function_exists('filter_var')) { - return filter_var($address, FILTER_VALIDATE_EMAIL); - } else { - return preg_match('#^([a-zA-Z0-9_+\.\-]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)' - . '|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$#', $address); - } + if (function_exists('filter_var')) { + return filter_var($address, FILTER_VALIDATE_EMAIL); + } else { + return preg_match('#^([a-zA-Z0-9_+\.\-]+)@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.)' + . '|(([a-zA-Z0-9\-]+\.)+))([a-zA-Z]{2,4}|[0-9]{1,3})(\]?)$#', $address); + } } /** diff --git a/email/Mailer.php b/email/Mailer.php index 6f055ff42..734771916 100644 --- a/email/Mailer.php +++ b/email/Mailer.php @@ -41,7 +41,7 @@ class Mailer extends Object { /* * Sends an email as a both HTML and plaintext * $attachedFiles should be an array of file names - * - if you pass the entire $_FILES entry, the user-uploaded filename will be preserved + * - if you pass the entire $_FILES entry, the user-uploaded filename will be preserved * use $plainContent to override default plain-content generation * * @return bool @@ -54,9 +54,9 @@ function htmlEmail($to, $from, $subject, $htmlContent, $attachedFiles = false, $ dieprintr($customheaders); } - + $bodyIsUnicode = (strpos($htmlContent,"&#") !== false); - $plainEncoding = ""; + $plainEncoding = ""; // We generate plaintext content by default, but you can pass custom stuff $plainEncoding = ''; @@ -80,7 +80,7 @@ function htmlEmail($to, $from, $subject, $htmlContent, $attachedFiles = false, $ // Make the HTML part $headers["Content-Type"] = "text/html; charset=utf-8"; - + // Add basic wrapper tags if the body tag hasn't been given if(stripos($htmlContent, ']*)<([^<>]+)> *$/', $bounceAddress, $parts)) $bounceAddress = $parts[2]; + // Strip the human name from the bounce address + if(preg_match('/^([^<>]*)<([^<>]+)> *$/', $bounceAddress, $parts)) $bounceAddress = $parts[2]; // $headers["Sender"] = $from; $headers["X-Mailer"] = X_MAILER; @@ -406,9 +406,9 @@ function encodeFileForEmail($file, $destFileName = false, $disposition = NULL, $ $file['contents'] = QuotedPrintable_encode($file['contents']); } - $headers = "Content-type: $mimeType;\n\tname=\"$base\"\n". - "Content-Transfer-Encoding: $encoding\n". - "Content-Disposition: $disposition;\n\tfilename=\"$base\"\n" ; + $headers = "Content-type: $mimeType;\n\tname=\"$base\"\n". + "Content-Transfer-Encoding: $encoding\n". + "Content-Disposition: $disposition;\n\tfilename=\"$base\"\n"; if ( isset($file['contentLocation']) ) $headers .= 'Content-Location: ' . $file['contentLocation'] . "\n" ; @@ -443,4 +443,4 @@ function validEmailAddr($emailAddress) { } return $emailAddress; -} \ No newline at end of file +} diff --git a/filesystem/GD.php b/filesystem/GD.php index abb1d0a92..655bae201 100644 --- a/filesystem/GD.php +++ b/filesystem/GD.php @@ -116,9 +116,9 @@ class GD extends Object { * @todo This method isn't very efficent */ public function fittedResize($width, $height) { - $gd = $this->resizeByHeight($height); - if($gd->width > $width) $gd = $gd->resizeByWidth($width); - return $gd; + $gd = $this->resizeByHeight($height); + if($gd->width > $width) $gd = $gd->resizeByWidth($width); + return $gd; } public function hasGD() { @@ -169,9 +169,9 @@ class GD extends Object { if(!$this->gd) return; if(function_exists("imagerotate")) { - $newGD = imagerotate($this->gd, $angle,0); + $newGD = imagerotate($this->gd, $angle,0); } else { - //imagerotate is not included in PHP included in Ubuntu + //imagerotate is not included in PHP included in Ubuntu $newGD = $this->rotatePixelByPixel($angle); } $output = clone $this; @@ -180,45 +180,45 @@ class GD extends Object { } /** - * Rotates image by given angle. It's slow because makes it pixel by pixel rather than - * using built-in function. Used when imagerotate function is not available(i.e. Ubuntu) - * - * @param angle - * - * @return GD - */ + * Rotates image by given angle. It's slow because makes it pixel by pixel rather than + * using built-in function. Used when imagerotate function is not available(i.e. Ubuntu) + * + * @param angle + * + * @return GD + */ - public function rotatePixelByPixel($angle) { - $sourceWidth = imagesx($this->gd); - $sourceHeight = imagesy($this->gd); - if ($angle == 180) { - $destWidth = $sourceWidth; - $destHeight = $sourceHeight; - } else { - $destWidth = $sourceHeight; - $destHeight = $sourceWidth; - } - $rotate=imagecreatetruecolor($destWidth,$destHeight); - imagealphablending($rotate, false); - for ($x = 0; $x < ($sourceWidth); $x++) { - for ($y = 0; $y < ($sourceHeight); $y++) { - $color = imagecolorat($this->gd, $x, $y); - switch ($angle) { - case 90: - imagesetpixel($rotate, $y, $destHeight - $x - 1, $color); - break; - case 180: - imagesetpixel($rotate, $destWidth - $x - 1, $destHeight - $y - 1, $color); - break; - case 270: - imagesetpixel($rotate, $destWidth - $y - 1, $x, $color); - break; - default: $rotate = $this->gd; - }; - } - } - return $rotate; - } + public function rotatePixelByPixel($angle) { + $sourceWidth = imagesx($this->gd); + $sourceHeight = imagesy($this->gd); + if ($angle == 180) { + $destWidth = $sourceWidth; + $destHeight = $sourceHeight; + } else { + $destWidth = $sourceHeight; + $destHeight = $sourceWidth; + } + $rotate=imagecreatetruecolor($destWidth,$destHeight); + imagealphablending($rotate, false); + for ($x = 0; $x < ($sourceWidth); $x++) { + for ($y = 0; $y < ($sourceHeight); $y++) { + $color = imagecolorat($this->gd, $x, $y); + switch ($angle) { + case 90: + imagesetpixel($rotate, $y, $destHeight - $x - 1, $color); + break; + case 180: + imagesetpixel($rotate, $destWidth - $x - 1, $destHeight - $y - 1, $color); + break; + case 270: + imagesetpixel($rotate, $destWidth - $y - 1, $x, $color); + break; + default: $rotate = $this->gd; + }; + } + } + return $rotate; + } /** @@ -241,7 +241,7 @@ class GD extends Object { return $output; } - /** + /** * Method return width of image. * * @return integer width. @@ -304,9 +304,9 @@ class GD extends Object { /** * Resize to fit fully within the given box, without resizing. Extra space left around * the image will be padded with the background color. - * @param width - * @param height - * @param backgroundColour + * @param width + * @param height + * @param backgroundColour */ public function paddedResize($width, $height, $backgroundColor = "FFFFFF") { if(!$this->gd) return; diff --git a/forms/AjaxUniqueTextField.php b/forms/AjaxUniqueTextField.php index 952f507f5..4d76a3239 100644 --- a/forms/AjaxUniqueTextField.php +++ b/forms/AjaxUniqueTextField.php @@ -29,7 +29,7 @@ class AjaxUniqueTextField extends TextField { parent::__construct($name, $title, $value); } - + public function Field($properties = array()) { Requirements::javascript(THIRDPARTY_DIR . "/prototype/prototype.js"); Requirements::javascript(THIRDPARTY_DIR . "/behaviour/behaviour.js"); diff --git a/forms/CheckboxSetField.php b/forms/CheckboxSetField.php index 9db5c51d6..9d174706c 100644 --- a/forms/CheckboxSetField.php +++ b/forms/CheckboxSetField.php @@ -79,7 +79,7 @@ class CheckboxSetField extends OptionsetField { if(is_a($object, 'DataObject')) { $items[] = $object->ID; } - } + } } elseif($values && is_string($values)) { $items = explode(',', $values); $items = str_replace('{comma}', ',', $items); diff --git a/forms/ComplexTableField.php b/forms/ComplexTableField.php index 3ec2deb1a..147674aa5 100644 --- a/forms/ComplexTableField.php +++ b/forms/ComplexTableField.php @@ -35,7 +35,7 @@ class ComplexTableField extends TableListField { * - A method name, eg, 'getCMSFields': Call that method on the child object to get the fields. */ protected $addTitle; - + protected $detailFormFields; protected $viewAction; @@ -176,7 +176,7 @@ class ComplexTableField extends TableListField { public function PopupWidth() { return $this->popupWidth; } - + public function PopupHeight() { return $this->popupHeight; } @@ -286,13 +286,13 @@ JS; public function setDetailFormValidator( Validator $validator ) { $this->detailFormValidator = $validator; } - - public function setAddTitle($addTitle) { + + public function setAddTitle($addTitle) { if(is_string($addTitle)) $this->addTitle = $addTitle; } - - public function Title() { + + public function Title() { return $this->addTitle ? $this->addTitle : parent::Title(); } @@ -326,8 +326,8 @@ JS; // this is a workaround for a bug where each subsequent popup-call didn't have ID // of the parent set, and so didn't properly save the relation return ($idField) ? $idField->Value() : (isset($_REQUEST['ctf']['ID']) ? $_REQUEST['ctf']['ID'] : null); - } - + } + public function AddLink() { @@ -397,7 +397,7 @@ JS; $detailFields->push(new HiddenField('ctf[childID]', '', $childData->ID)); } - /* TODO: Figure out how to implement this + /* TODO: Figure out how to implement this if($this->getParentClass()) { $detailFields->push(new HiddenField('ctf[parentClass]', '', $this->getParentClass())); @@ -591,9 +591,9 @@ class ComplexTableField_ItemRequest extends TableListField_ItemRequest { public function dataObj() { // used to discover fields if requested and for population of field if(is_numeric($this->itemID)) { - // we have to use the basedataclass, otherwise we might exclude other subclasses - return DataObject::get_by_id( - ClassInfo::baseDataClass(Object::getCustomClass($this->ctf->sourceClass())), $this->itemID); + // we have to use the basedataclass, otherwise we might exclude other subclasses + return DataObject::get_by_id( + ClassInfo::baseDataClass(Object::getCustomClass($this->ctf->sourceClass())), $tis->itemID); } } @@ -723,31 +723,31 @@ class ComplexTableField_ItemRequest extends TableListField_ItemRequest { } /** - * Method handles pagination in asset popup. - * - * @return Object SS_List - */ + * Method handles pagination in asset popup. + * + * @return Object SS_List + */ public function Pagination() { $this->pageSize = 9; $currentItem = $this->PopupCurrentItem(); $result = new ArrayList(); - if($currentItem < 6) { - $offset = 1; - } elseif($this->TotalCount() - $currentItem <= 4) { - $offset = $currentItem - (10 - ($this->TotalCount() - $currentItem)); - $offset = $offset <= 0 ? 1 : $offset; - } else { - $offset = $currentItem - 5; - } - for($i = $offset;$i <= $offset + $this->pageSize && $i <= $this->TotalCount();$i++) { - $start = $i - 1; - $links['link'] = Controller::join_links($this->Link() . "$this->methodName?ctf[start]={$start}"); - $links['number'] = $i; - $links['active'] = $i == $currentItem ? false : true; - $result->push(new ArrayData($links)); + if($currentItem < 6) { + $offset = 1; + } elseif($this->TotalCount() - $currentItem <= 4) { + $offset = $currentItem - (10 - ($this->TotalCount() - $currentItem)); + $offset = $offset <= 0 ? 1 : $offset; + } else { + $offset = $currentItem - 5; } - return $result; + for($i = $offset;$i <= $offset + $this->pageSize && $i <= $this->TotalCount();$i++) { + $start = $i - 1; + $links['link'] = Controller::join_links($this->Link() . "$this->methodName?ctf[start]={$start}"); + $links['number'] = $i; + $links['active'] = $i == $currentItem ? false : true; + $result->push(new ArrayData($links)); + } + return $result; } public function ShowPagination() { @@ -768,7 +768,7 @@ class ComplexTableField_ItemRequest extends TableListField_ItemRequest { * @param String $str Example: FamilyID (when one Individual has_one Family) */ public function setParentIdName($str) { - throw new Exception("setParentIdName is no longer necessary"); + throw new Exception("setParentIdName is no longer necessary"); } public function setTemplatePopup($template) { diff --git a/forms/CompositeField.php b/forms/CompositeField.php index 37923a7f8..5a9c933e9 100644 --- a/forms/CompositeField.php +++ b/forms/CompositeField.php @@ -171,8 +171,8 @@ class CompositeField extends FormField { $formName = (isset($this->form)) ? $this->form->FormName() : '(unknown form)'; if(isset($list[$name])) { user_error("collateDataFields() I noticed that a field called '$name' appears twice in" - . " your form: '{$formName}'. One is a '{$field->class}' and the other is a" - . " '{$list[$name]->class}'", E_USER_ERROR); + . " your form: '{$formName}'. One is a '{$field->class}' and the other is a" + . " '{$list[$name]->class}'", E_USER_ERROR); } $list[$name] = $field; } diff --git a/forms/CreditCardField.php b/forms/CreditCardField.php index 9f1f1f886..7e157cc2e 100644 --- a/forms/CreditCardField.php +++ b/forms/CreditCardField.php @@ -52,7 +52,7 @@ class CreditCardField extends TextField { if($this->value) foreach($this->value as $part){ if(!$part || !(strlen($part) == 4) || !preg_match("/([0-9]{4})/", $part)){ switch($i){ - case 0: $number = _t('CreditCardField.FIRST', 'first'); break; + case 0: $number = _t('CreditCardField.FIRST', 'first'); break; case 1: $number = _t('CreditCardField.SECOND', 'second'); break; case 2: $number = _t('CreditCardField.THIRD', 'third'); break; case 3: $number = _t('CreditCardField.FOURTH', 'fourth'); break; diff --git a/forms/DateField.php b/forms/DateField.php index 0b6d5c11f..753c08f6b 100644 --- a/forms/DateField.php +++ b/forms/DateField.php @@ -43,9 +43,9 @@ require_once 'Zend/Date.php'; * * ## Example: German dates with separate fields for day, month, year * - * $f = new DateField('MyDate'); - * $f->setLocale('de_DE'); - * $f->setConfig('dmyfields'); + * $f = new DateField('MyDate'); + * $f->setLocale('de_DE'); + * $f->setConfig('dmyfields'); * * # Validation * @@ -306,11 +306,11 @@ class DateField extends TextField { * @return boolean */ public static function set_default_config($k, $v) { - if (array_key_exists($k,self::$default_config)) { - self::$default_config[$k]=$v; - return true; - } - return false; + if (array_key_exists($k,self::$default_config)) { + self::$default_config[$k]=$v; + return true; + } + return false; } /** @@ -559,7 +559,7 @@ class DateField_View_JQuery extends Object { // Include language files (if required) if ($this->jqueryLocaleFile){ Requirements::javascript($this->jqueryLocaleFile); - } + } Requirements::javascript(FRAMEWORK_DIR . "/javascript/DateField.js"); } @@ -601,51 +601,51 @@ class DateField_View_JQuery extends Object { public static function convert_iso_to_jquery_format($format) { $convert = array( '/([^d])d([^d])/' => '$1d$2', - '/^d([^d])/' => 'd$1', - '/([^d])d$/' => '$1d', - '/dd/' => 'dd', - '/SS/' => '', - '/eee/' => 'd', - '/e/' => 'N', - '/D/' => '', - '/EEEE/' => 'DD', - '/EEE/' => 'D', - '/w/' => '', + '/^d([^d])/' => 'd$1', + '/([^d])d$/' => '$1d', + '/dd/' => 'dd', + '/SS/' => '', + '/eee/' => 'd', + '/e/' => 'N', + '/D/' => '', + '/EEEE/' => 'DD', + '/EEE/' => 'D', + '/w/' => '', // make single "M" lowercase - '/([^M])M([^M])/' => '$1m$2', + '/([^M])M([^M])/' => '$1m$2', // make single "M" at start of line lowercase - '/^M([^M])/' => 'm$1', + '/^M([^M])/' => 'm$1', // make single "M" at end of line lowercase - '/([^M])M$/' => '$1m', + '/([^M])M$/' => '$1m', // match exactly three capital Ms not preceeded or followed by an M - '/(? 'M', + '/(? 'M', // match exactly two capital Ms not preceeded or followed by an M - '/(? 'mm', + '/(? 'mm', // match four capital Ms (maximum allowed) - '/MMMM/' => 'MM', - '/l/' => '', - '/YYYY/' => 'yy', - '/yyyy/' => 'yy', - // See http://open.silverstripe.org/ticket/7669 - '/y{1,3}/' => 'yy', - '/a/' => '', - '/B/' => '', - '/hh/' => '', - '/h/' => '', - '/([^H])H([^H])/' => '', - '/^H([^H])/' => '', - '/([^H])H$/' => '', - '/HH/' => '', - // '/mm/' => '', - '/ss/' => '', - '/zzzz/' => '', - '/I/' => '', - '/ZZZZ/' => '', - '/Z/' => '', - '/z/' => '', - '/X/' => '', - '/r/' => '', - '/U/' => '', + '/MMMM/' => 'MM', + '/l/' => '', + '/YYYY/' => 'yy', + '/yyyy/' => 'yy', + // See http://open.silverstripe.org/ticket/7669 + '/y{1,3}/' => 'yy', + '/a/' => '', + '/B/' => '', + '/hh/' => '', + '/h/' => '', + '/([^H])H([^H])/' => '', + '/^H([^H])/' => '', + '/([^H])H$/' => '', + '/HH/' => '', + // '/mm/' => '', + '/ss/' => '', + '/zzzz/' => '', + '/I/' => '', + '/ZZZZ/' => '', + '/Z/' => '', + '/z/' => '', + '/X/' => '', + '/r/' => '', + '/U/' => '', ); $patterns = array_keys($convert); $replacements = array_values($convert); diff --git a/forms/FieldGroup.php b/forms/FieldGroup.php index 3ce94e97d..f3da6571f 100644 --- a/forms/FieldGroup.php +++ b/forms/FieldGroup.php @@ -90,12 +90,12 @@ class FieldGroup extends CompositeField { * * @param string $zebra one of odd or even. */ - public function setZebra($zebra) { - if($zebra == 'odd' || $zebra == 'even') $this->zebra = $zebra; - else user_error("setZebra passed '$zebra'. It should be passed 'odd' or 'even'", E_USER_WARNING); - return $this; - } - + public function setZebra($zebra) { + if($zebra == 'odd' || $zebra == 'even') $this->zebra = $zebra; + else user_error("setZebra passed '$zebra'. It should be passed 'odd' or 'even'", E_USER_WARNING); + return $this; + } + /** * @return string */ @@ -132,4 +132,4 @@ class FieldGroup extends CompositeField { public function php($data) { return; } -} \ No newline at end of file +} diff --git a/forms/Form.php b/forms/Form.php index d1cf61b03..258b82ba3 100644 --- a/forms/Form.php +++ b/forms/Form.php @@ -1065,7 +1065,7 @@ class Form extends RequestHandler { * * @return boolean */ - public function validate(){ + public function validate(){ if($this->validator){ $errors = $this->validator->validate(); @@ -1533,7 +1533,7 @@ class Form extends RequestHandler { $result .= ""; if( $this->validator ) - $result .= '

'._t('Form.VALIDATOR', 'Validator').'

' . $this->validator->debug(); + $result .= '

'._t('Form.VALIDATOR', 'Validator').'

' . $this->validator->debug(); return $result; } @@ -1550,8 +1550,8 @@ class Form extends RequestHandler { */ public function testSubmission($action, $data) { $data['action_' . $action] = true; - - return Director::test($this->FormAction(), $data, Controller::curr()->getSession()); + + return Director::test($this->FormAction(), $data, Controller::curr()->getSession()); //$response = $this->controller->run($data); //return $response; diff --git a/forms/FormField.php b/forms/FormField.php index 7b86b1fd5..1e1111e20 100644 --- a/forms/FormField.php +++ b/forms/FormField.php @@ -85,7 +85,7 @@ class FormField extends RequestHandler { protected $template, $fieldHolderTemplate, - $smallFieldHolderTemplate; + $smallFieldHolderTemplate; /** * @var array All attributes on the form field (not the field holder). @@ -597,14 +597,14 @@ class FormField extends RequestHandler { return $obj->renderWith($this->getFieldHolderTemplates()); } - /** - * Returns a restricted field holder used within things like FieldGroups. - * - * @param array $properties - * - * @return string - */ - public function SmallFieldHolder($properties = array()) { + /** + * Returns a restricted field holder used within things like FieldGroups. + * + * @param array $properties + * + * @return string + */ + public function SmallFieldHolder($properties = array()) { $obj = ($properties) ? $this->customise($properties) : $this; return $obj->renderWith($this->getSmallFieldHolderTemplates()); diff --git a/forms/HtmlEditorField.php b/forms/HtmlEditorField.php index e577e4cef..1d906697b 100644 --- a/forms/HtmlEditorField.php +++ b/forms/HtmlEditorField.php @@ -181,8 +181,8 @@ class HtmlEditorField extends TextareaField { // Save file & link tracking data. if(class_exists('SiteTree')) { if($record->ID && $record->many_many('LinkTracking') && $tracker = $record->LinkTracking()) { - $tracker->removeByFilter(sprintf('"FieldName" = \'%s\' AND "SiteTreeID" = %d', - $this->name, $record->ID)); + $tracker->removeByFilter(sprintf('"FieldName" = \'%s\' AND "SiteTreeID" = %d', + $this->name, $record->ID)); if($linkedPages) foreach($linkedPages as $item) { $SQL_fieldName = Convert::raw2sql($this->name); @@ -192,9 +192,9 @@ class HtmlEditorField extends TextareaField { } if($record->ID && $record->many_many('ImageTracking') && $tracker = $record->ImageTracking()) { - $tracker->where( - sprintf('"FieldName" = \'%s\' AND "SiteTreeID" = %d', $this->name, $record->ID) - )->removeAll(); + $tracker->where( + sprintf('"FieldName" = \'%s\' AND "SiteTreeID" = %d', $this->name, $record->ID) + )->removeAll(); $fieldName = $this->name; if($linkedFiles) foreach($linkedFiles as $item) { diff --git a/forms/ManyManyComplexTableField.php b/forms/ManyManyComplexTableField.php index fbd1e505d..12dde229e 100644 --- a/forms/ManyManyComplexTableField.php +++ b/forms/ManyManyComplexTableField.php @@ -59,7 +59,7 @@ class ManyManyComplexTableField extends HasManyComplexTableField { break; } $belongsManyManyRelations = $singleton->uninherited( 'belongs_many_many', true ); - if( isset( $belongsManyManyRelations ) && array_key_exists( $this->name, $belongsManyManyRelations ) ) { + if( isset( $belongsManyManyRelations ) && array_key_exists( $this->name, $belongsManyManyRelations ) ) { $this->manyManyParentClass = $class; $manyManyTable = $belongsManyManyRelations[$this->name] . '_' . $this->name; break; diff --git a/forms/NumericField.php b/forms/NumericField.php index a506960d6..ba519dae6 100644 --- a/forms/NumericField.php +++ b/forms/NumericField.php @@ -14,8 +14,8 @@ class NumericField extends TextField{ /** PHP Validation **/ public function validate($validator){ if($this->value && !is_numeric(trim($this->value))){ - $validator->validationError( - $this->name, + $validator->validationError( + $this->name, _t( 'NumericField.VALIDATION', "'{value}' is not a number, only numbers can be accepted for this field", array('value' => $this->value) diff --git a/forms/PhoneNumberField.php b/forms/PhoneNumberField.php index b2f0e599d..93c138bfb 100644 --- a/forms/PhoneNumberField.php +++ b/forms/PhoneNumberField.php @@ -33,11 +33,11 @@ class PhoneNumberField extends FormField { list($countryCode, $areaCode, $phoneNumber, $extension) = $this->parseValue(); $hasTitle = false; - if ($this->value=="") { - $countryCode=$this->countryCode; - $areaCode=$this->areaCode; - $extension=$this->ext; - } + if ($this->value=="") { + $countryCode=$this->countryCode; + $areaCode=$this->areaCode; + $extension=$this->ext; + } if($this->countryCode !== null) { $fields->push(new NumericField($this->name.'[Country]', '+', $countryCode, 4)); @@ -94,7 +94,7 @@ class PhoneNumberField extends FormField { preg_match( '/^(?:(?:\+(\d+))?\s*\((\d+)\))?\s*([0-9A-Za-z]*)\s*(?:[#]\s*(\d+))?$/', $this->value, $parts); else return array( '', '', $this->value, '' ); - + if(is_array($parts)) array_shift( $parts ); for ($x=0;$x<=3;$x++) { diff --git a/forms/RequiredFields.php b/forms/RequiredFields.php index abcaebe94..536140d9c 100644 --- a/forms/RequiredFields.php +++ b/forms/RequiredFields.php @@ -42,15 +42,15 @@ class RequiredFields extends Validator { * Debug helper */ public function debug() { - if(!is_array($this->required)) return false; + if(!is_array($this->required)) return false; - $result = ""; + return $result; } /** diff --git a/forms/SimpleImageField.php b/forms/SimpleImageField.php index 56c4fce38..5ecda60a2 100644 --- a/forms/SimpleImageField.php +++ b/forms/SimpleImageField.php @@ -51,7 +51,7 @@ * function doform($data, $form) { * $file = new File(); * $file->loadUploaded($_FILES['FileTypeID']); - * + * * // Redirect to a page thanking people for registering * $this->redirect('thanks-for-your-submission/'); * } @@ -85,19 +85,19 @@ class SimpleImageField extends FileField { } public function Field($properties = array()) { - if($this->form) $record = $this->form->getRecord(); - $fieldName = $this->name; - if(isset($record)&&$record) { - $imageField = $record->$fieldName(); - } else { - $imageField = ""; - } - + if($this->form) $record = $this->form->getRecord(); + $fieldName = $this->name; + if(isset($record)&&$record) { + $imageField = $record->$fieldName(); + } else { + $imageField = ""; + } + $html = "
"; if($imageField && $imageField->exists()) { $html .= '
'; if($imageField->hasMethod('Thumbnail') && $imageField->Thumbnail()) { - $html .= "Thumbnail()->getURL()."\" />"; + $html .= "Thumbnail()->getURL()."\" />"; } else if($imageField->CMSThumbnail()) { $html .= "CMSThumbnail()->getURL()."\" />"; } @@ -124,7 +124,7 @@ class SimpleImageField extends FileField { return $html; } - + /** * Returns a readonly version of this field */ @@ -149,25 +149,25 @@ class SimpleImageField_Disabled extends FormField { public function Field($properties = array()) { $record = $this->form->getRecord(); - $fieldName = $this->name; + $fieldName = $this->name; - $field = "
"; + $field = "
"; if($this->value) { // Only the case for DataDifferencer $field .= $this->value; } else { if($record) $imageField = $record->$fieldName(); if($imageField && $imageField->exists()) { - if($imageField->hasMethod('Thumbnail')) $field .= "Thumbnail()->URL."\" />"; - elseif($imageField->CMSThumbnail()) $field .= "CMSThumbnail()->URL."\" />"; - else {} // This shouldn't be called but it sometimes is for some reason, so we don't do anything - }else{ - $field .= ""; - } + if($imageField->hasMethod('Thumbnail')) $field .= "Thumbnail()->URL."\" />"; + elseif($imageField->CMSThumbnail()) $field .= "CMSThumbnail()->URL."\" />"; + else {} // This shouldn't be called but it sometimes is for some reason, so we don't do anything + }else{ + $field .= ""; } - $field .= "
"; + } + $field .= "
"; - return $field; + return $field; } } diff --git a/forms/TableField.php b/forms/TableField.php index c017bed36..9f58deced 100644 --- a/forms/TableField.php +++ b/forms/TableField.php @@ -16,7 +16,7 @@ * @package forms * @subpackage fields-relational */ - + class TableField extends TableListField { protected $fieldList; @@ -244,9 +244,9 @@ class TableField extends TableListField { $dataObjects = $this->sortData($value, $record->ID); // New fields are nested in their own sub-array, and need to be sorted separately - if(isset($dataObjects['new']) && $dataObjects['new']) { - $newFields = $this->sortData($dataObjects['new'], $record->ID); - } + if(isset($dataObjects['new']) && $dataObjects['new']) { + $newFields = $this->sortData($dataObjects['new'], $record->ID); + } // Update existing fields // @todo Should this be in an else{} statement? @@ -255,7 +255,7 @@ class TableField extends TableListField { // Save newly added record if($savedObjIds || $newFields) { $savedObjIds = $this->saveData($newFields,false); - } + } // Add the new records to the DataList if($savedObjIds) foreach($savedObjIds as $id => $status) { @@ -416,7 +416,7 @@ class TableField extends TableListField { } return $savedObjIds; - } + } /** * Organises the data in the appropriate manner for saving @@ -444,8 +444,7 @@ class TableField extends TableListField { // TODO ADD stuff for removing rows with incomplete data } - - return $sortedData; + return $sortedData; } /** diff --git a/forms/TableListField.php b/forms/TableListField.php index 82196c021..112bc2cba 100644 --- a/forms/TableListField.php +++ b/forms/TableListField.php @@ -102,12 +102,12 @@ class TableListField extends FormField { * Actions can be disabled through $permissions. * Format (key is used for the methodname and CSS-class): * array( - * 'delete' => array( - * 'label' => 'Delete', - * 'icon' => 'framework/images/delete.gif', - * 'icon_disabled' => 'framework/images/delete_disabled.gif', - * 'class' => 'deletelink', - * ) + * 'delete' => array( + * 'label' => 'Delete', + * 'icon' => 'framework/images/delete.gif', + * 'icon_disabled' => 'framework/images/delete_disabled.gif', + * 'class' => 'deletelink', + * ) * ) */ public $actions = array( @@ -178,14 +178,14 @@ class TableListField extends FormField { * * Example: * array( - * array( - * "rule" => '$Flag == "red"', - * "class" => "red" - * ), - * array( - * "rule" => '$Flag == "orange"', - * "class" => "orange" - * ) + * array( + * "rule" => '$Flag == "red"', + * "class" => "red" + * ), + * array( + * "rule" => '$Flag == "orange"', + * "class" => "orange" + * ) * ) */ public $highlightConditions = array(); @@ -269,10 +269,10 @@ class TableListField extends FormField { ); public function sourceClass() { - $list = $this->getDataList(); - if(method_exists($list, 'dataClass')) return $list->dataClass(); - // Failover for SS_List - else return get_class($list->First()); + $list = $this->getDataList(); + if(method_exists($list, 'dataClass')) return $list->dataClass(); + // Failover for SS_List + else return get_class($list->First()); } public function handleItem($request) { @@ -423,7 +423,7 @@ JS // The type-hinting above doesn't seem to work consistently if($items instanceof SS_List) { - $this->dataList = $items; + $this->dataList = $items; } else { user_error('TableList::setCustomSourceItems() should be passed a SS_List', E_USER_WARNING); } @@ -440,29 +440,29 @@ JS // TODO: Sorting could be implemented on regular SS_Lists. if(method_exists($items,'canSortBy') && isset($_REQUEST['ctf'][$this->getName()]['sort'])) { - $sort = $_REQUEST['ctf'][$this->getName()]['sort']; - // TODO: sort direction + $sort = $_REQUEST['ctf'][$this->getName()]['sort']; + // TODO: sort direction if($items->canSortBy($sort)) $items = $items->sort($sort); } // Determine pagination limit, offset // To disable pagination, set $this->showPagination to false. if($this->showPagination && $this->pageSize) { - $SQL_limit = (int)$this->pageSize; - if(isset($_REQUEST['ctf'][$this->getName()]['start']) - && is_numeric($_REQUEST['ctf'][$this->getName()]['start'])) { + $SQL_limit = (int)$this->pageSize; + if(isset($_REQUEST['ctf'][$this->getName()]['start']) + && is_numeric($_REQUEST['ctf'][$this->getName()]['start'])) { - if(isset($_REQUEST['ctf'][$this->getName()]['start'])) { + if(isset($_REQUEST['ctf'][$this->getName()]['start'])) { $SQL_start = intval($_REQUEST['ctf'][$this->getName()]['start']); } else { $SQL_start = "0"; } - } else { - $SQL_start = 0; - } + } else { + $SQL_start = 0; + } - $items = $items->limit($SQL_limit, $SQL_start); - } + $items = $items->limit($SQL_limit, $SQL_start); + } return $items; } @@ -484,7 +484,7 @@ JS public function getDataList() { // If we weren't passed in a DataList to begin with, try and get the datalist from the form if($this->form && $this->getDataListFromForm) { - $this->getDataListFromForm = false; + $this->getDataListFromForm = false; $relation = $this->name; if($record = $this->form->getRecord()) { if($record->hasMethod($relation)) $this->dataList = $record->$relation(); @@ -508,10 +508,10 @@ JS */ public function getQuery() { Deprecation::notice('3.0', 'Use getDataList() instead.'); - $list = $this->getDataList(); - if(method_exists($list,'dataQuery')) { - return $this->getDataList()->dataQuery()->query(); - } + $list = $this->getDataList(); + if(method_exists($list,'dataQuery')) { + return $this->getDataList()->dataQuery()->query(); + } } /** @@ -519,10 +519,10 @@ JS */ public function getCsvQuery() { Deprecation::notice('3.0', 'Use getCsvDataList() instead.'); - $list = $this->getCsvDataList(); - if(method_exists($list,'dataQuery')) { - return $list->dataQuery()->query(); - } + $list = $this->getCsvDataList(); + if(method_exists($list,'dataQuery')) { + return $list->dataQuery()->query(); + } } public function FieldList() { @@ -581,20 +581,20 @@ JS $childId = Convert::raw2sql($_REQUEST['ctf']['childID']); if (is_numeric($childId)) { - $this->getDataList()->removeById($childId); + $this->getDataList()->removeById($childId); } // TODO return status in JSON etc. //return $this->renderWith($this->template); } - - + + /** * ################################# * Summary-Row * ################################# */ - + /** * Can utilize some built-in summary-functions, with optional casting. * Currently supported: @@ -710,7 +710,7 @@ JS return array_sum($values)/count($values); } - + /** * ################################# * Permissions @@ -770,14 +770,14 @@ JS } public function setPageSize($pageSize) { - $this->pageSize = $pageSize; - return $this; + $this->pageSize = $pageSize; + return $this; } - - public function PageSize() { + + public function PageSize() { return $this->pageSize; } - + public function ListStart() { return $_REQUEST['ctf'][$this->getName()]['start']; } @@ -937,9 +937,9 @@ JS * Return the total number of items in the source DataList */ public function TotalCount() { - if($this->_cache_TotalCount === null) { - $this->_cache_TotalCount = $this->getDataList()->Count(); - } + if($this->_cache_TotalCount === null) { + $this->_cache_TotalCount = $this->getDataList()->Count(); + } return $this->_cache_TotalCount; } @@ -951,13 +951,13 @@ JS * * @todo Not fully implemented at the moment */ - - /** - * Compile all request-parameters for search and pagination - * (except the actual list-positions) as a query-string. - * - * @return String URL-parameters - */ + + /** + * Compile all request-parameters for search and pagination + * (except the actual list-positions) as a query-string. + * + * @return String URL-parameters + */ public function filterString() { } @@ -969,10 +969,10 @@ JS * CSV Export * ################################# */ - public function setFieldListCsv($fields) { - $this->fieldListCsv = $fields; - return $this; - } + public function setFieldListCsv($fields) { + $this->fieldListCsv = $fields; + return $this; + } /** * Set the CSV separator character. Defaults to , @@ -996,7 +996,7 @@ JS $this->csvHasHeader = false; return $this; } - + /** * Exports a given set of comma-separated IDs (from a previous search-query, stored in a HiddenField). * Uses {$csv_columns} if present, and falls back to {$result_columns}. @@ -1181,24 +1181,24 @@ JS } public function Title() { - // adding translating functionality - // this is a bit complicated, because this parameter is passed to this class - // and should come here translated already - // adding this to TODO probably add a method to the classes - // to return they're translated string - // added by ruibarreiros @ 27/11/2007 + // adding translating functionality + // this is a bit complicated, because this parameter is passed to this class + // and should come here translated already + // adding this to TODO probably add a method to the classes + // to return they're translated string + // added by ruibarreiros @ 27/11/2007 return $this->sourceClass() ? singleton($this->sourceClass())->singular_name() : $this->getName(); } public function NameSingular() { - // same as Title() - // added by ruibarreiros @ 27/11/2007 - return $this->sourceClass() ? singleton($this->sourceClass())->singular_name() : $this->getName(); + // same as Title() + // added by ruibarreiros @ 27/11/2007 + return $this->sourceClass() ? singleton($this->sourceClass())->singular_name() : $this->getName(); } public function NamePlural() { - // same as Title() - // added by ruibarreiros @ 27/11/2007 + // same as Title() + // added by ruibarreiros @ 27/11/2007 return $this->sourceClass() ? singleton($this->sourceClass())->plural_name() : $this->getName(); } @@ -1232,7 +1232,7 @@ JS */ public function Link($action = null) { $form = $this->getForm(); - if($form) { + if($form) { $token = $form->getSecurityToken(); $parentUrlParts = parse_url(parent::Link($action)); $queryPart = (isset($parentUrlParts['query'])) ? '?' . $parentUrlParts['query'] : null; @@ -1302,7 +1302,7 @@ JS return $value; } - + public function setHighlightConditions($conditions) { $this->highlightConditions = $conditions; return $this; @@ -1476,7 +1476,7 @@ class TableListField_Item extends ViewableData { public function Link($action = null) { $form = $this->parent->getForm(); - if($form) { + if($form) { $token = $form->getSecurityToken(); $parentUrlParts = parse_url($this->parent->Link()); $queryPart = (isset($parentUrlParts['query'])) ? '?' . $parentUrlParts['query'] : null; @@ -1516,7 +1516,7 @@ class TableListField_Item extends ViewableData { return $allowedActions; } - + public function BaseLink() { user_error("TableListField_Item::BaseLink() deprecated, use Link() instead", E_USER_NOTICE); return $this->Link(); @@ -1567,7 +1567,7 @@ class TableListField_Item extends ViewableData { if(isset($condition['exclusive']) && $condition['exclusive']) { return $condition['class']; } else { - $classes[] = $condition['class']; + $classes[] = $condition['class']; } } } @@ -1628,8 +1628,8 @@ class TableListField_ItemRequest extends RequestHandler { public function dataObj() { // used to discover fields if requested and for population of field if(is_numeric($this->itemID)) { - // we have to use the basedataclass, otherwise we might exclude other subclasses - return $this->ctf->getDataList()->byId($this->itemID); + // we have to use the basedataclass, otherwise we might exclude other subclasses + return $this->ctf->getDataList()->byId($this->itemID); } } diff --git a/forms/gridfield/GridField.php b/forms/gridfield/GridField.php index 16e1215af..33d23100d 100644 --- a/forms/gridfield/GridField.php +++ b/forms/gridfield/GridField.php @@ -211,7 +211,7 @@ class GridField extends FormField { public function getManipulatedList() { $list = $this->getList(); foreach($this->getComponents() as $item) { - if($item instanceof GridField_DataManipulator) { + if($item instanceof GridField_DataManipulator) { $list = $item->getManipulatedData($this, $list); } } diff --git a/javascript/ComplexTableField.js b/javascript/ComplexTableField.js index 1ffc8f7d6..2735e21f6 100644 --- a/javascript/ComplexTableField.js +++ b/javascript/ComplexTableField.js @@ -151,6 +151,6 @@ ComplexTableField.applyTo('div.ComplexTableField'); * Get first letter as uppercase */ String.prototype.ucfirst = function () { - var firstLetter = this.substr(0,1).toUpperCase() - return this.substr(0,1).toUpperCase() + this.substr(1,this.length); -} \ No newline at end of file + var firstLetter = this.substr(0,1).toUpperCase() + return this.substr(0,1).toUpperCase() + this.substr(1,this.length); +} diff --git a/javascript/GridField.js b/javascript/GridField.js index bbe020550..a458a2773 100644 --- a/javascript/GridField.js +++ b/javascript/GridField.js @@ -244,7 +244,6 @@ this._super(); this.selectable('destroy'); } - }); /** diff --git a/javascript/HtmlEditorField.js b/javascript/HtmlEditorField.js index 5b380b2bc..d33afd4c5 100644 --- a/javascript/HtmlEditorField.js +++ b/javascript/HtmlEditorField.js @@ -6,15 +6,15 @@ * ajax / iframe submissions */ - var ss = ss || {}; +var ss = ss || {}; /** * Wrapper for HTML WYSIWYG libraries, which abstracts library internals * from interface concerns like inserting and editing links. * Caution: Incomplete and unstable API. */ - ss.editorWrappers = {}; - ss.editorWrappers.initial - ss.editorWrappers.tinyMCE = (function() { +ss.editorWrappers = {}; +ss.editorWrappers.initial +ss.editorWrappers.tinyMCE = (function() { return { init: function(config) { if(!ss.editorWrappers.tinyMCE.initialized) { @@ -798,7 +798,7 @@ ss.editorWrappers['default'] = ss.editorWrappers.tinyMCE; if(header) header[(hasItems) ? 'show' : 'hide'](); // Disable "insert" button if no files are selected - this.find('.Actions :submit') + this.find('.Actions :submit') .button(hasItems ? 'enable' : 'disable') .toggleClass('ui-state-disabled', !hasItems); diff --git a/javascript/ImageFormAction.js b/javascript/ImageFormAction.js index 5e1b85128..e379bf1d1 100644 --- a/javascript/ImageFormAction.js +++ b/javascript/ImageFormAction.js @@ -1,6 +1,6 @@ (function($) { $(document).ready(function() { - $("input.rollover").live('mouseover', function(){ + $("input.rollover").live('mouseover', function(){ if(!this.overSrc) { var srcParts = $(this).attr('src').match( /(.*)\.([a-zA-Z]+)$/ ); var fileName = srcParts[1]; @@ -11,8 +11,8 @@ $(this).attr('src', this.overSrc); }); - $("input.rollover").live('mouseout', function(){ + $("input.rollover").live('mouseout', function(){ $(this).attr('src', this.outSrc); }); }); -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/javascript/TableField.js b/javascript/TableField.js index d78bf440f..3ca030cf1 100644 --- a/javascript/TableField.js +++ b/javascript/TableField.js @@ -126,7 +126,7 @@ TableField.prototype = { var tbody = table.tBodies[0]; var numRows = tbody.rows.length; var newRow = tbody.rows[0].cloneNode(true); - + // Get the input elements in this new row var inputs = newRow.getElementsByTagName('input'); // For every input, set it's value to blank if it is not hidden diff --git a/javascript/TableListField.js b/javascript/TableListField.js index e2fcbe88d..6b15f0f47 100644 --- a/javascript/TableListField.js +++ b/javascript/TableListField.js @@ -36,7 +36,7 @@ TableListField.prototype = { rules['#'+this.id+' table.data tr td.markingcheckbox'] = { onclick : function(e) { - // do nothing for clicks in marking box cells (e.g. if checkbox is missed) + // do nothing for clicks in marking box cells (e.g. if checkbox is missed) } }; @@ -176,15 +176,15 @@ TableListField.prototype = { } if(el.getAttribute('href')) { - jQuery.ajax({ + jQuery.ajax({ 'url': el.getAttribute('href'), 'data': {'update': 1}, - 'success': function(response) { + 'success': function(response) { jQuery('#' + self.id).replaceWith(response) // reapply behaviour and reattach methods to TF container node // e.g.
- Behaviour.apply(jQuery('#' + self.id)[0], true); - } + Behaviour.apply(jQuery('#' + self.id)[0], true); + } }); } @@ -371,4 +371,4 @@ Number.prototype.toCurrency = function(iso) { if(!iso) iso = SS_DEFAULT_ISO; // TODO stub, please implement properly return "$" + this.toFixed(2); -} \ No newline at end of file +} diff --git a/javascript/i18n.js b/javascript/i18n.js index cb99aa58b..ab8be9003 100644 --- a/javascript/i18n.js +++ b/javascript/i18n.js @@ -108,7 +108,7 @@ ss.i18n = { * @return string result : Stripped string * */ - stripStr: function(str) { + stripStr: function(str) { return str.replace(/^\s*/, "").replace(/\s*$/, ""); }, @@ -228,4 +228,4 @@ ss.i18n = { ss.i18n.addEvent(window, "load", function() { ss.i18n.init(); -}); \ No newline at end of file +}); diff --git a/javascript/jquery-ondemand/jquery.ondemand.js b/javascript/jquery-ondemand/jquery.ondemand.js index 6653cdce3..cbe6529df 100644 --- a/javascript/jquery-ondemand/jquery.ondemand.js +++ b/javascript/jquery-ondemand/jquery.ondemand.js @@ -23,7 +23,7 @@ // loaded files list - to protect against loading existed file again (by PGA) _ondemand_loaded_list : null, - + /** * Returns true if the given CSS or JS script has already been loaded */ @@ -160,4 +160,4 @@ }); -})(jQuery); \ No newline at end of file +})(jQuery); diff --git a/javascript/tree/tree.js b/javascript/tree/tree.js index c945bd29b..909fd95d1 100644 --- a/javascript/tree/tree.js +++ b/javascript/tree/tree.js @@ -212,7 +212,7 @@ Tree.prototype = { } // Update the helper classes accordingly - if(!hasChildren) this.removeNodeClass('children'); + if(!hasChildren) this.removeNodeClass('children'); else this.lastTreeNode().addNodeClass('last'); // Update the helper variables @@ -303,8 +303,8 @@ TreeNode.prototype = { // Move all the nodes up until that point into spanC for(j=startingPoint;jdataQuery()->query()->canSortBy($fieldName); + return $this->dataQuery()->query()->canSortBy($fieldName); } /** @@ -673,7 +673,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab * @return mixed */ public function max($fieldName) { - return $this->dataQuery->max($fieldName); + return $this->dataQuery->max($fieldName); } /** @@ -683,7 +683,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab * @return mixed */ public function min($fieldName) { - return $this->dataQuery->min($fieldName); + return $this->dataQuery->min($fieldName); } /** @@ -693,7 +693,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab * @return mixed */ public function avg($fieldName) { - return $this->dataQuery->avg($fieldName); + return $this->dataQuery->avg($fieldName); } /** @@ -703,7 +703,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab * @return mixed */ public function sum($fieldName) { - return $this->dataQuery->sum($fieldName); + return $this->dataQuery->sum($fieldName); } @@ -833,7 +833,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab // Index current data foreach($this->column() as $id) { - $has[$id] = true; + $has[$id] = true; } // Keep track of items to delete @@ -951,7 +951,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab */ public function newObject($initialFields = null) { $class = $this->dataClass; - return Injector::inst()->create($class, $initialFields, false, $this->model); + return Injector::inst()->create($class, $initialFields, false, $this->model); } /** @@ -967,14 +967,14 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab } - /** - * Remove an item from this DataList by ID + /** + * Remove an item from this DataList by ID * * @param int $itemID - The primary ID - */ + */ public function removeByID($itemID) { - $item = $this->byID($itemID); - if($item) return $item->delete(); + $item = $this->byID($itemID); + if($item) return $item->delete(); } /** @@ -1046,7 +1046,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab * @return bool */ public function offsetExists($key) { - return ($this->limit(1,$key)->First() != null); + return ($this->limit(1,$key)->First() != null); } /** @@ -1056,7 +1056,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab * @return DataObject */ public function offsetGet($key) { - return $this->limit(1, $key)->First(); + return $this->limit(1, $key)->First(); } /** @@ -1066,7 +1066,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab * @param mixed $value */ public function offsetSet($key, $value) { - user_error("Can't alter items in a DataList using array-access", E_USER_ERROR); + user_error("Can't alter items in a DataList using array-access", E_USER_ERROR); } /** @@ -1075,7 +1075,7 @@ class DataList extends ViewableData implements SS_List, SS_Filterable, SS_Sortab * @param mixed $key */ public function offsetUnset($key) { - user_error("Can't alter items in a DataList using array-access", E_USER_ERROR); + user_error("Can't alter items in a DataList using array-access", E_USER_ERROR); } } diff --git a/model/DataObject.php b/model/DataObject.php index b4c73f639..27ae22fe0 100644 --- a/model/DataObject.php +++ b/model/DataObject.php @@ -13,46 +13,46 @@ * * * class Article extends DataObject implements PermissionProvider { - * static $api_access = true; - * - * function canView($member = false) { - * return Permission::check('ARTICLE_VIEW'); - * } - * function canEdit($member = false) { - * return Permission::check('ARTICLE_EDIT'); - * } - * function canDelete() { - * return Permission::check('ARTICLE_DELETE'); - * } - * function canCreate() { - * return Permission::check('ARTICLE_CREATE'); - * } - * function providePermissions() { - * return array( - * 'ARTICLE_VIEW' => 'Read an article object', - * 'ARTICLE_EDIT' => 'Edit an article object', - * 'ARTICLE_DELETE' => 'Delete an article object', - * 'ARTICLE_CREATE' => 'Create an article object', - * ); - * } + * static $api_access = true; + * + * function canView($member = false) { + * return Permission::check('ARTICLE_VIEW'); + * } + * function canEdit($member = false) { + * return Permission::check('ARTICLE_EDIT'); + * } + * function canDelete() { + * return Permission::check('ARTICLE_DELETE'); + * } + * function canCreate() { + * return Permission::check('ARTICLE_CREATE'); + * } + * function providePermissions() { + * return array( + * 'ARTICLE_VIEW' => 'Read an article object', + * 'ARTICLE_EDIT' => 'Edit an article object', + * 'ARTICLE_DELETE' => 'Delete an article object', + * 'ARTICLE_CREATE' => 'Create an article object', + * ); + * } * } * * * Object-level access control by {@link Group} membership: * * class Article extends DataObject { - * static $api_access = true; - * - * function canView($member = false) { - * if(!$member) $member = Member::currentUser(); - * return $member->inGroup('Subscribers'); - * } - * function canEdit($member = false) { - * if(!$member) $member = Member::currentUser(); - * return $member->inGroup('Editors'); - * } - * - * // ... + * static $api_access = true; + * + * function canView($member = false) { + * if(!$member) $member = Member::currentUser(); + * return $member->inGroup('Subscribers'); + * } + * function canEdit($member = false) { + * if(!$member) $member = Member::currentUser(); + * return $member->inGroup('Editors'); + * } + * + * // ... * } * * @@ -813,7 +813,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity * @param $priority String left|right Determines who wins in case of a conflict (optional) * @param $includeRelations Boolean Merge any existing relations (optional) * @param $overwriteWithEmpty Boolean Overwrite existing left values with empty right values. - * Only applicable with $priority='right'. (optional) + * Only applicable with $priority='right'. (optional) * @return Boolean */ public function merge($rightObj, $priority = 'right', $includeRelations = true, $overwriteWithEmpty = false) { @@ -992,7 +992,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity if($defaults && !is_array($defaults)) { user_error("Bad '$this->class' defaults given: " . var_export($defaults, true), - E_USER_WARNING); + E_USER_WARNING); $defaults = null; } @@ -1238,8 +1238,8 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity . " Make sure that you call parent::onBeforeDelete().", E_USER_ERROR); } - // Deleting a record without an ID shouldn't do anything - if(!$this->ID) throw new LogicException("DataObject::delete() called on a DataObject without an ID"); + // Deleting a record without an ID shouldn't do anything + if(!$this->ID) throw new LogicException("DataObject::delete() called on a DataObject without an ID"); // TODO: This is quite ugly. To improve: // - move the details of the delete code in the DataQuery system @@ -1844,8 +1844,8 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity * Used by {@link SearchContext}. * * @param array $_params - * 'fieldClasses': Associative array of field names as keys and FormField classes as values - * 'restrictFields': Numeric array of a field name whitelist + * 'fieldClasses': Associative array of field names as keys and FormField classes as values + * 'restrictFields': Numeric array of a field name whitelist * @return FieldList */ public function scaffoldSearchFields($_params = null) { @@ -1936,14 +1936,14 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity * or extended onto it by using {@link DataExtension->updateCMSFields()}. * * - * klass MyCustomClass extends DataObject { - * static $db = array('CustomProperty'=>'Boolean'); + * class MyCustomClass extends DataObject { + * static $db = array('CustomProperty'=>'Boolean'); * - * function getCMSFields() { - * $fields = parent::getCMSFields(); - * $fields->addFieldToTab('Root.Content',new CheckboxField('CustomProperty')); - * return $fields; - * } + * function getCMSFields() { + * $fields = parent::getCMSFields(); + * $fields->addFieldToTab('Root.Content',new CheckboxField('CustomProperty')); + * return $fields; + * } * } * * @@ -3227,8 +3227,8 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity // var_dump("{$ancestorClass}.{$type}_{$name}"); $autoLabels[$name] = _t("{$ancestorClass}.{$type}_{$name}",FormField::name_to_label($name)); } - } - } + } + } $labels = array_merge((array)$autoLabels, (array)$customLabels); $this->extend('updateFieldLabels', $labels); @@ -3366,7 +3366,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity * * * array( - * 'MySQLDatabase' => 'ENGINE=MyISAM' + * 'MySQLDatabase' => 'ENGINE=MyISAM' * ) * * @@ -3409,8 +3409,8 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity * * Example: * array( - * array('Title' => "DefaultPage1", 'PageTitle' => 'page1'), - * array('Title' => "DefaultPage2") + * array('Title' => "DefaultPage1", 'PageTitle' => 'page1'), + * array('Title' => "DefaultPage2") * ). * * @var array @@ -3466,7 +3466,7 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity * Example code: * * public static $many_many_extraFields = array( - * 'Members' => array( + * 'Members' => array( * 'Role' => 'Varchar(100)' * ) * ); @@ -3496,8 +3496,8 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity * * Overriding the default filter, with a custom defined filter: * - * static $searchable_fields = array( - * "Name" => "PartialMatchFilter" + * static $searchable_fields = array( + * "Name" => "PartialMatchFilter" * ); * * @@ -3505,21 +3505,21 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity * The 'filter' parameter will be generated from {@link DBField::$default_search_filter_class}. * The 'title' parameter will be generated from {@link DataObject->fieldLabels()}. * - * static $searchable_fields = array( - * "Name" => array( - * "field" => "TextField" - * ) + * static $searchable_fields = array( + * "Name" => array( + * "field" => "TextField" + * ) * ); * * * Overriding the default form field, filter and title: * - * static $searchable_fields = array( - * "Organisation.ZipCode" => array( - * "field" => "TextField", - * "filter" => "PartialMatchFilter", - * "title" => 'Organisation ZIP' - * ) + * static $searchable_fields = array( + * "Organisation.ZipCode" => array( + * "field" => "TextField", + * "filter" => "PartialMatchFilter", + * "title" => 'Organisation ZIP' + * ) * ); * */ @@ -3571,21 +3571,21 @@ class DataObject extends ViewableData implements DataObjectInterface, i18nEntity } /** - * Returns true if the given method/parameter has a value - * (Uses the DBField::hasValue if the parameter is a database field) - * + * Returns true if the given method/parameter has a value + * (Uses the DBField::hasValue if the parameter is a database field) + * * @param string $field The field name * @param array $arguments * @param bool $cache - * @return boolean - */ - public function hasValue($field, $arguments = null, $cache = true) { - $obj = $this->dbObject($field); - if($obj) { - return $obj->exists(); - } else { - return parent::hasValue($field, $arguments, $cache); - } - } + * @return boolean + */ + public function hasValue($field, $arguments = null, $cache = true) { + $obj = $this->dbObject($field); + if($obj) { + return $obj->exists(); + } else { + return parent::hasValue($field, $arguments, $cache); + } + } } diff --git a/model/DataQuery.php b/model/DataQuery.php index e1aade7f5..61c738a3d 100644 --- a/model/DataQuery.php +++ b/model/DataQuery.php @@ -334,8 +334,8 @@ class DataQuery { * * @param String $field Unquoted database column name (will be escaped automatically) */ -public function max($field) { - return $this->aggregate(sprintf('MAX("%s")', Convert::raw2sql($field))); + public function max($field) { + return $this->aggregate(sprintf('MAX("%s")', Convert::raw2sql($field))); } /** @@ -344,7 +344,7 @@ public function max($field) { * @param String $field Unquoted database column name (will be escaped automatically) */ public function min($field) { - return $this->aggregate(sprintf('MIN("%s")', Convert::raw2sql($field))); + return $this->aggregate(sprintf('MIN("%s")', Convert::raw2sql($field))); } /** @@ -353,7 +353,7 @@ public function max($field) { * @param String $field Unquoted database column name (will be escaped automatically) */ public function avg($field) { - return $this->aggregate(sprintf('AVG("%s")', Convert::raw2sql($field))); + return $this->aggregate(sprintf('AVG("%s")', Convert::raw2sql($field))); } /** @@ -362,14 +362,14 @@ public function max($field) { * @param String $field Unquoted database column name (will be escaped automatically) */ public function sum($field) { - return $this->aggregate(sprintf('SUM("%s")', Convert::raw2sql($field))); + return $this->aggregate(sprintf('SUM("%s")', Convert::raw2sql($field))); } /** * Runs a raw aggregate expression. Please handle escaping yourself */ public function aggregate($expression) { - return $this->getFinalisedQuery()->aggregate($expression)->execute()->value(); + return $this->getFinalisedQuery()->aggregate($expression)->execute()->value(); } /** @@ -582,74 +582,74 @@ public function max($field) { * @return The model class of the related item */ public function applyRelation($relation) { - // NO-OP - if(!$relation) return $this->dataClass; - - if(is_string($relation)) $relation = explode(".", $relation); - - $modelClass = $this->dataClass; - - foreach($relation as $rel) { - $model = singleton($modelClass); - if ($component = $model->has_one($rel)) { - if(!$this->query->isJoinedTo($component)) { - $foreignKey = $model->getReverseAssociation($component); - $this->query->addLeftJoin($component, - "\"$component\".\"ID\" = \"{$modelClass}\".\"{$foreignKey}ID\""); + // NO-OP + if(!$relation) return $this->dataClass; + + if(is_string($relation)) $relation = explode(".", $relation); + + $modelClass = $this->dataClass; + + foreach($relation as $rel) { + $model = singleton($modelClass); + if ($component = $model->has_one($rel)) { + if(!$this->query->isJoinedTo($component)) { + $foreignKey = $model->getReverseAssociation($component); + $this->query->addLeftJoin($component, + "\"$component\".\"ID\" = \"{$modelClass}\".\"{$foreignKey}ID\""); - /** - * add join clause to the component's ancestry classes so that the search filter could search on - * its ancestor fields. - */ - $ancestry = ClassInfo::ancestry($component, true); - if(!empty($ancestry)){ - $ancestry = array_reverse($ancestry); - foreach($ancestry as $ancestor){ - if($ancestor != $component){ - $this->query->addInnerJoin($ancestor, "\"$component\".\"ID\" = \"$ancestor\".\"ID\""); - } - } - } - } - $modelClass = $component; + /** + * add join clause to the component's ancestry classes so that the search filter could search on + * its ancestor fields. + */ + $ancestry = ClassInfo::ancestry($component, true); + if(!empty($ancestry)){ + $ancestry = array_reverse($ancestry); + foreach($ancestry as $ancestor){ + if($ancestor != $component){ + $this->query->addInnerJoin($ancestor, "\"$component\".\"ID\" = \"$ancestor\".\"ID\""); + } + } + } + } + $modelClass = $component; - } elseif ($component = $model->has_many($rel)) { - if(!$this->query->isJoinedTo($component)) { - $ancestry = $model->getClassAncestry(); - $foreignKey = $model->getRemoteJoinField($rel); - $this->query->addLeftJoin($component, - "\"$component\".\"{$foreignKey}\" = \"{$ancestry[0]}\".\"ID\""); - /** - * add join clause to the component's ancestry classes so that the search filter could search on - * its ancestor fields. - */ - $ancestry = ClassInfo::ancestry($component, true); - if(!empty($ancestry)){ - $ancestry = array_reverse($ancestry); - foreach($ancestry as $ancestor){ - if($ancestor != $component){ - $this->query->addInnerJoin($ancestor, "\"$component\".\"ID\" = \"$ancestor\".\"ID\""); - } - } - } - } - $modelClass = $component; + } elseif ($component = $model->has_many($rel)) { + if(!$this->query->isJoinedTo($component)) { + $ancestry = $model->getClassAncestry(); + $foreignKey = $model->getRemoteJoinField($rel); + $this->query->addLeftJoin($component, + "\"$component\".\"{$foreignKey}\" = \"{$ancestry[0]}\".\"ID\""); + /** + * add join clause to the component's ancestry classes so that the search filter could search on + * its ancestor fields. + */ + $ancestry = ClassInfo::ancestry($component, true); + if(!empty($ancestry)){ + $ancestry = array_reverse($ancestry); + foreach($ancestry as $ancestor){ + if($ancestor != $component){ + $this->query->addInnerJoin($ancestor, "\"$component\".\"ID\" = \"$ancestor\".\"ID\""); + } + } + } + } + $modelClass = $component; - } elseif ($component = $model->many_many($rel)) { - list($parentClass, $componentClass, $parentField, $componentField, $relationTable) = $component; - $parentBaseClass = ClassInfo::baseDataClass($parentClass); - $componentBaseClass = ClassInfo::baseDataClass($componentClass); - $this->query->addInnerJoin($relationTable, - "\"$relationTable\".\"$parentField\" = \"$parentBaseClass\".\"ID\""); - $this->query->addLeftJoin($componentBaseClass, - "\"$relationTable\".\"$componentField\" = \"$componentBaseClass\".\"ID\""); - if(ClassInfo::hasTable($componentClass)) { - $this->query->addLeftJoin($componentClass, - "\"$relationTable\".\"$componentField\" = \"$componentClass\".\"ID\""); - } - $modelClass = $componentClass; + } elseif ($component = $model->many_many($rel)) { + list($parentClass, $componentClass, $parentField, $componentField, $relationTable) = $component; + $parentBaseClass = ClassInfo::baseDataClass($parentClass); + $componentBaseClass = ClassInfo::baseDataClass($componentClass); + $this->query->addInnerJoin($relationTable, + "\"$relationTable\".\"$parentField\" = \"$parentBaseClass\".\"ID\""); + $this->query->addLeftJoin($componentBaseClass, + "\"$relationTable\".\"$componentField\" = \"$componentBaseClass\".\"ID\""); + if(ClassInfo::hasTable($componentClass)) { + $this->query->addLeftJoin($componentClass, + "\"$relationTable\".\"$componentField\" = \"$componentClass\".\"ID\""); + } + $modelClass = $componentClass; - } + } } return $modelClass; diff --git a/model/Database.php b/model/Database.php index 788c751c9..30c36e49d 100644 --- a/model/Database.php +++ b/model/Database.php @@ -422,7 +422,7 @@ abstract class SS_Database { //Indexes specified as arrays cannot be checked with this line: (it flattens out the array) if(!is_array($spec)) { $spec = preg_replace('/\s*,\s*/', ',', $spec); - } + } if(!isset($this->tableList[strtolower($table)])) $newTable = true; @@ -1136,7 +1136,7 @@ abstract class SS_Query implements Iterator { $result .= ""; foreach($record as $k => $v) { $result .= "" . Convert::raw2xml($k) . " "; - } + } $result .= " \n"; } @@ -1213,7 +1213,7 @@ abstract class SS_Query implements Iterator { */ public function valid() { if(!$this->queryHasBegun) $this->next(); - return $this->currentRecord !== false; + return $this->currentRecord !== false; } /** diff --git a/model/DatabaseAdmin.php b/model/DatabaseAdmin.php index a62bb94d0..090b77ad3 100644 --- a/model/DatabaseAdmin.php +++ b/model/DatabaseAdmin.php @@ -308,8 +308,8 @@ class DatabaseAdmin extends Controller { foreach($subclasses as $subclass) { $id = $record['ID']; if(($record['ClassName'] != $subclass) && - (!is_subclass_of($record['ClassName'], $subclass)) && - (isset($recordExists[$subclass][$id]))) { + (!is_subclass_of($record['ClassName'], $subclass)) && + (isset($recordExists[$subclass][$id]))) { $sql = "DELETE FROM \"$subclass\" WHERE \"ID\" = $record[ID]"; echo "
  • $sql"; DB::query($sql); diff --git a/model/HasManyList.php b/model/HasManyList.php index 290f8955a..c39efceb4 100644 --- a/model/HasManyList.php +++ b/model/HasManyList.php @@ -66,10 +66,10 @@ class HasManyList extends RelationList { * @param $itemID The ID of the item to be removed */ public function removeByID($itemID) { - $item = $this->byID($itemID); - return $this->remove($item); - } - + $item = $this->byID($itemID); + return $this->remove($item); + } + /** * Remove an item from this relation. * Doesn't actually remove the item, it just clears the foreign key value. @@ -77,10 +77,10 @@ class HasManyList extends RelationList { * @todo Maybe we should delete the object instead? */ public function remove($item) { - if(!($item instanceof $this->dataClass)) { - throw new InvalidArgumentException("HasManyList::remove() expecting a $this->dataClass object, or ID", - E_USER_ERROR); - } + if(!($item instanceof $this->dataClass)) { + throw new InvalidArgumentException("HasManyList::remove() expecting a $this->dataClass object, or ID", + E_USER_ERROR); + } $fk = $this->foreignKey; $item->$fk = null; diff --git a/model/Hierarchy.php b/model/Hierarchy.php index cd9d990f7..4fa8f98d9 100644 --- a/model/Hierarchy.php +++ b/model/Hierarchy.php @@ -434,14 +434,14 @@ class Hierarchy extends DataExtension { public function Children() { if(!(isset($this->_cache_children) && $this->_cache_children)) { $result = $this->owner->stageChildren(false); - if(isset($result)) { - $this->_cache_children = new ArrayList(); - foreach($result as $child) { - if($child->canView()) { - $this->_cache_children->push($child); - } - } - } + if(isset($result)) { + $this->_cache_children = new ArrayList(); + foreach($result as $child) { + if($child->canView()) { + $this->_cache_children->push($child); + } + } + } } return $this->_cache_children; } @@ -487,10 +487,10 @@ class Hierarchy extends DataExtension { // Next, go through the live children. Only some of these will be listed $liveChildren = $this->owner->liveChildren(true, true); if($liveChildren) { - $merged = new ArrayList(); - $merged->merge($stageChildren); - $merged->merge($liveChildren); - $stageChildren = $merged; + $merged = new ArrayList(); + $merged->merge($stageChildren); + $merged->merge($liveChildren); + $stageChildren = $merged; } } @@ -526,7 +526,7 @@ class Hierarchy extends DataExtension { throw new Exception('Hierarchy->AllHistoricalChildren() only works with Versioned extension applied'); } - return Versioned::get_including_deleted(ClassInfo::baseDataClass($this->owner->class), + return Versioned::get_including_deleted(ClassInfo::baseDataClass($this->owner->class), "\"ParentID\" = " . (int)$this->owner->ID)->count(); } diff --git a/model/ManyManyList.php b/model/ManyManyList.php index e3e1a1b27..1cfb5069c 100644 --- a/model/ManyManyList.php +++ b/model/ManyManyList.php @@ -117,11 +117,11 @@ class ManyManyList extends RelationList { * @param $itemID The ID of the item to remove. */ public function remove($item) { - if(!($item instanceof $this->dataClass)) { - throw new InvalidArgumentException("ManyManyList::remove() expecting a $this->dataClass object"); - } - - return $this->removeByID($item->ID); + if(!($item instanceof $this->dataClass)) { + throw new InvalidArgumentException("ManyManyList::remove() expecting a $this->dataClass object"); + } + + return $this->removeByID($item->ID); } /** @@ -130,7 +130,7 @@ class ManyManyList extends RelationList { * @param $itemID The item it */ public function removeByID($itemID) { - if(!is_numeric($itemID)) throw new InvalidArgumentException("ManyManyList::removeById() expecting an ID"); + if(!is_numeric($itemID)) throw new InvalidArgumentException("ManyManyList::removeById() expecting an ID"); $query = new SQLQuery("*", array("\"$this->joinTable\"")); $query->setDelete(true); @@ -145,16 +145,16 @@ class ManyManyList extends RelationList { $query->execute(); } - /** - * Remove all items from this many-many join. To remove a subset of items, filter it first. - */ - public function removeAll() { + /** + * Remove all items from this many-many join. To remove a subset of items, filter it first. + */ + public function removeAll() { $query = $this->dataQuery()->query(); $query->setDelete(true); $query->setSelect(array('*')); $query->setFrom("\"$this->joinTable\""); $query->execute(); - } + } /** * Find the extra field data for a single row of the relationship diff --git a/model/MySQLDatabase.php b/model/MySQLDatabase.php index a0881104f..3ab1846e0 100644 --- a/model/MySQLDatabase.php +++ b/model/MySQLDatabase.php @@ -269,8 +269,8 @@ class MySQLDatabase extends SS_Database { if($alteredIndexes) foreach($alteredIndexes as $k => $v) { $alterList[] .= "DROP INDEX \"$k\""; $alterList[] .= "ADD ". $this->getIndexSqlDefinition($k, $v); - } - + } + if($alteredOptions && isset($alteredOptions[get_class($this)])) { if(!isset($this->indexList[$tableName])) { $this->indexList[$tableName] = $this->indexList($tableName); @@ -298,7 +298,7 @@ class MySQLDatabase extends SS_Database { } } - $alterations = implode(",\n", $alterList); + $alterations = implode(",\n", $alterList); $this->query("ALTER TABLE \"$tableName\" $alterations"); } @@ -467,9 +467,9 @@ class MySQLDatabase extends SS_Database { $indexSpec = trim($indexSpec); if($indexSpec[0] != '(') list($indexType, $indexFields) = explode(' ',$indexSpec,2); - else $indexFields = $indexSpec; + else $indexFields = $indexSpec; - if(!isset($indexType)) + if(!isset($indexType)) $indexType = "index"; if($indexType=='using') @@ -499,15 +499,15 @@ class MySQLDatabase extends SS_Database { $indexSpec=$this->convertIndexSpec($indexSpec); $indexSpec = trim($indexSpec); - if($indexSpec[0] != '(') { - list($indexType, $indexFields) = explode(' ',$indexSpec,2); - } else { - $indexFields = $indexSpec; - } + if($indexSpec[0] != '(') { + list($indexType, $indexFields) = explode(' ',$indexSpec,2); + } else { + $indexFields = $indexSpec; + } - if(!$indexType) { - $indexType = "index"; - } + if(!$indexType) { + $indexType = "index"; + } $this->query("ALTER TABLE \"$tableName\" DROP INDEX \"$indexName\""); $this->query("ALTER TABLE \"$tableName\" ADD $indexType \"$indexName\" $indexFields"); @@ -822,19 +822,19 @@ class MySQLDatabase extends SS_Database { if(!class_exists('File')) throw new Exception('MySQLDatabase->searchEngine() requires "File" class'); $fileFilter = ''; - $keywords = Convert::raw2sql($keywords); + $keywords = Convert::raw2sql($keywords); $htmlEntityKeywords = htmlentities($keywords, ENT_NOQUOTES, 'UTF-8'); $extraFilters = array('SiteTree' => '', 'File' => ''); - if($booleanSearch) $boolean = "IN BOOLEAN MODE"; + if($booleanSearch) $boolean = "IN BOOLEAN MODE"; - if($extraFilter) { - $extraFilters['SiteTree'] = " AND $extraFilter"; + if($extraFilter) { + $extraFilters['SiteTree'] = " AND $extraFilter"; - if($alternativeFileFilter) $extraFilters['File'] = " AND $alternativeFileFilter"; - else $extraFilters['File'] = $extraFilters['SiteTree']; - } + if($alternativeFileFilter) $extraFilters['File'] = " AND $alternativeFileFilter"; + else $extraFilters['File'] = $extraFilters['SiteTree']; + } // Always ensure that only pages with ShowInSearch = 1 can be searched $extraFilters['SiteTree'] .= " AND ShowInSearch <> 0"; @@ -984,7 +984,7 @@ class MySQLDatabase extends SS_Database { $boolean = $booleanSearch ? "IN BOOLEAN MODE" : ""; $fieldNames = '"' . implode('", "', $fields) . '"'; - $SQL_keywords = Convert::raw2sql($keywords); + $SQL_keywords = Convert::raw2sql($keywords); $SQL_htmlEntityKeywords = Convert::raw2sql(htmlentities($keywords, ENT_NOQUOTES, 'UTF-8')); return "(MATCH ($fieldNames) AGAINST ('$SQL_keywords' $boolean) + MATCH ($fieldNames)" @@ -1131,7 +1131,7 @@ class MySQLDatabase extends SS_Database { * @param string $date2 to be substracted of $date1, can be either 'now', literal datetime like * '1973-10-14 10:30:00' or field name, e.g. '"SiteTree"."Created"' * @return string SQL datetime expression to query for the interval between $date1 and $date2 in seconds which - * is the result of the substraction + * is the result of the substraction */ public function datetimeDifferenceClause($date1, $date2) { diff --git a/model/SQLQuery.php b/model/SQLQuery.php index 020473101..33e81f43d 100644 --- a/model/SQLQuery.php +++ b/model/SQLQuery.php @@ -915,11 +915,11 @@ class SQLQuery { * @return string */ public function __toString() { - try { - return $this->sql(); - } catch(Exception $e) { - return ""; - } + try { + return $this->sql(); + } catch(Exception $e) { + return ""; + } } /** diff --git a/model/Transliterator.php b/model/Transliterator.php index f8753bc3e..4a8a5018f 100644 --- a/model/Transliterator.php +++ b/model/Transliterator.php @@ -53,6 +53,6 @@ class SS_Transliterator extends Object { * Transliteration using iconv() */ protected function useIconv($source) { - return iconv("utf-8", "us-ascii//IGNORE//TRANSLIT", $source); + return iconv("utf-8", "us-ascii//IGNORE//TRANSLIT", $source); } } diff --git a/model/Versioned.php b/model/Versioned.php index 11409f209..8148f0956 100644 --- a/model/Versioned.php +++ b/model/Versioned.php @@ -136,8 +136,8 @@ class Versioned extends DataExtension { * @todo Should this all go into VersionedDataQuery? */ public function augmentSQL(SQLQuery &$query, DataQuery &$dataQuery = null) { - $baseTable = ClassInfo::baseDataClass($dataQuery->dataClass()); - + $baseTable = ClassInfo::baseDataClass($dataQuery->dataClass()); + switch($dataQuery->getQueryParam('Versioned.mode')) { // Noop case '': diff --git a/model/fieldtypes/Date.php b/model/fieldtypes/Date.php index 5e3851cd4..f789dd82c 100644 --- a/model/fieldtypes/Date.php +++ b/model/fieldtypes/Date.php @@ -330,23 +330,23 @@ class Date extends DBField { public function days_between($fyear, $fmonth, $fday, $tyear, $tmonth, $tday){ - return abs((mktime ( 0, 0, 0, $fmonth, $fday, $fyear) - mktime ( 0, 0, 0, $tmonth, $tday, $tyear))/(60*60*24)); + return abs((mktime ( 0, 0, 0, $fmonth, $fday, $fyear) - mktime ( 0, 0, 0, $tmonth, $tday, $tyear))/(60*60*24)); } public function day_before($fyear, $fmonth, $fday){ - return date ("Y-m-d", mktime (0,0,0,$fmonth,$fday-1,$fyear)); + return date ("Y-m-d", mktime (0,0,0,$fmonth,$fday-1,$fyear)); } public function next_day($fyear, $fmonth, $fday){ - return date ("Y-m-d", mktime (0,0,0,$fmonth,$fday+1,$fyear)); + return date ("Y-m-d", mktime (0,0,0,$fmonth,$fday+1,$fyear)); } public function weekday($fyear, $fmonth, $fday){ // 0 is a Monday - return (((mktime ( 0, 0, 0, $fmonth, $fday, $fyear) - mktime ( 0, 0, 0, 7, 17, 2006))/(60*60*24))+700000) % 7; + return (((mktime ( 0, 0, 0, $fmonth, $fday, $fyear) - mktime ( 0, 0, 0, 7, 17, 2006))/(60*60*24))+700000) % 7; } public function prior_monday($fyear, $fmonth, $fday){ - return date ("Y-m-d", mktime (0,0,0,$fmonth,$fday-$this->weekday($fyear, $fmonth, $fday),$fyear)); + return date ("Y-m-d", mktime (0,0,0,$fmonth,$fday-$this->weekday($fyear, $fmonth, $fday),$fyear)); } /** diff --git a/model/fieldtypes/Text.php b/model/fieldtypes/Text.php index 392bafa02..771d8536a 100644 --- a/model/fieldtypes/Text.php +++ b/model/fieldtypes/Text.php @@ -33,7 +33,7 @@ class Text extends StringField { 'NoHTML' => 'Text', ); - /** + /** * (non-PHPdoc) * @see DBField::requireField() */ diff --git a/model/fieldtypes/Varchar.php b/model/fieldtypes/Varchar.php index 6cf02aec8..98f8eba0a 100644 --- a/model/fieldtypes/Varchar.php +++ b/model/fieldtypes/Varchar.php @@ -17,8 +17,8 @@ class Varchar extends StringField { ); protected $size; - - /** + + /** * Construct a new short text field * * @param $name string The name of the field @@ -27,12 +27,12 @@ class Varchar extends StringField { * See {@link StringField::setOptions()} for information on the available options * @return unknown_type */ - public function __construct($name = null, $size = 50, $options = array()) { + public function __construct($name = null, $size = 50, $options = array()) { $this->size = $size ? $size : 50; parent::__construct($name, $options); } - /** + /** * (non-PHPdoc) * @see DBField::requireField() */ diff --git a/parsers/BBCodeParser.php b/parsers/BBCodeParser.php index e3352c3ef..72fce426c 100644 --- a/parsers/BBCodeParser.php +++ b/parsers/BBCodeParser.php @@ -27,7 +27,7 @@ class BBCodeParser extends TextParser { * @var Boolean */ protected static $allowSimilies = false; - + /** * Set the location of the smiles folder. By default use the ones in framework * but this can be overridden by setting BBCodeParser::set_icon_folder('themes/yourtheme/images/'); @@ -165,7 +165,7 @@ class BBCodeParser extends TextParser { '#(? " ", // :( '#(? " ", // :-( '#(? " ", // :p - '#(? " ", // 8-) + '#(? " ", // 8-) '#(? " " // :^) ); $this->content = preg_replace(array_keys($smilies), array_values($smilies), $this->content); diff --git a/parsers/HTML/HTMLBBCodeParser.php b/parsers/HTML/HTMLBBCodeParser.php index b09ce64e2..e9cfdacf6 100644 --- a/parsers/HTML/HTMLBBCodeParser.php +++ b/parsers/HTML/HTMLBBCodeParser.php @@ -55,819 +55,818 @@ */ class SSHTMLBBCodeParser { - /** - * An array of tags parsed by the engine, should be overwritten by filters - * - * @access private - * @var array - */ - var $_definedTags = array(); + /** + * An array of tags parsed by the engine, should be overwritten by filters + * + * @access private + * @var array + */ + var $_definedTags = array(); - /** - * A string containing the input - * - * @access private - * @var string - */ - var $_text = ''; + /** + * A string containing the input + * + * @access private + * @var string + */ + var $_text = ''; - /** - * A string containing the preparsed input - * - * @access private - * @var string - */ - var $_preparsed = ''; + /** + * A string containing the preparsed input + * + * @access private + * @var string + */ + var $_preparsed = ''; - /** - * An array tags and texts build from the input text - * - * @access private - * @var array - */ - var $_tagArray = array(); + /** + * An array tags and texts build from the input text + * + * @access private + * @var array + */ + var $_tagArray = array(); - /** - * A string containing the parsed version of the text - * - * @access private - * @var string - */ - var $_parsed = ''; + /** + * A string containing the parsed version of the text + * + * @access private + * @var string + */ + var $_parsed = ''; - /** - * An array of options, filled by an ini file or through the contructor - * - * @access private - * @var array - */ - var $_options = array( - 'quotestyle' => 'double', - 'quotewhat' => 'all', - 'open' => '[', - 'close' => ']', - 'xmlclose' => true, - 'filters' => 'Basic' - ); + /** + * An array of options, filled by an ini file or through the contructor + * + * @access private + * @var array + */ + var $_options = array( + 'quotestyle' => 'double', + 'quotewhat' => 'all', + 'open' => '[', + 'close' => ']', + 'xmlclose' => true, + 'filters' => 'Basic' + ); - /** - * An array of filters used for parsing - * - * @access private - * @var array - */ - var $_filters = array(); + /** + * An array of filters used for parsing + * + * @access private + * @var array + */ + var $_filters = array(); - /** - * Constructor, initialises the options and filters - * - * Sets the private variable _options with base options defined with - * &PEAR::getStaticProperty(), overwriting them with (if present) - * the argument to this method. - * Then it sets the extra options to properly escape the tag - * characters in preg_replace() etc. The set options are - * then stored back with &PEAR::getStaticProperty(), so that the filter - * classes can use them. - * All the filters in the options are initialised and their defined tags - * are copied into the private variable _definedTags. - * - * @param array options to use, can be left out - * @return none - * @access public - * @author Stijn de Reede - */ - public function SSHTMLBBCodeParser($options = array()) - { - // set the already set options - $baseoptions = &SSHTMLBBCodeParser::getStaticProperty('SSHTMLBBCodeParser', '_options'); - if (is_array($baseoptions)) { - foreach ($baseoptions as $k => $v) { - $this->_options[$k] = $v; - } - } + /** + * Constructor, initialises the options and filters + * + * Sets the private variable _options with base options defined with + * &PEAR::getStaticProperty(), overwriting them with (if present) + * the argument to this method. + * Then it sets the extra options to properly escape the tag + * characters in preg_replace() etc. The set options are + * then stored back with &PEAR::getStaticProperty(), so that the filter + * classes can use them. + * All the filters in the options are initialised and their defined tags + * are copied into the private variable _definedTags. + * + * @param array options to use, can be left out + * @return none + * @access public + * @author Stijn de Reede + */ + public function SSHTMLBBCodeParser($options = array()) + { + // set the already set options + $baseoptions = &SSHTMLBBCodeParser::getStaticProperty('SSHTMLBBCodeParser', '_options'); + if (is_array($baseoptions)) { + foreach ($baseoptions as $k => $v) { + $this->_options[$k] = $v; + } + } - // set the options passed as an argument - foreach ($options as $k => $v ) { - $this->_options[$k] = $v; - } + // set the options passed as an argument + foreach ($options as $k => $v ) { + $this->_options[$k] = $v; + } - // add escape open and close chars to the options for preg escaping - $preg_escape = '\^$.[]|()?*+{}'; - if ($this->_options['open'] != '' && strpos($preg_escape, $this->_options['open'])) { - $this->_options['open_esc'] = "\\".$this->_options['open']; - } else { - $this->_options['open_esc'] = $this->_options['open']; - } - if ($this->_options['close'] != '' && strpos($preg_escape, $this->_options['close'])) { - $this->_options['close_esc'] = "\\".$this->_options['close']; - } else { - $this->_options['close_esc'] = $this->_options['close']; - } + // add escape open and close chars to the options for preg escaping + $preg_escape = '\^$.[]|()?*+{}'; + if ($this->_options['open'] != '' && strpos($preg_escape, $this->_options['open'])) { + $this->_options['open_esc'] = "\\".$this->_options['open']; + } else { + $this->_options['open_esc'] = $this->_options['open']; + } + if ($this->_options['close'] != '' && strpos($preg_escape, $this->_options['close'])) { + $this->_options['close_esc'] = "\\".$this->_options['close']; + } else { + $this->_options['close_esc'] = $this->_options['close']; + } - // set the options back so that child classes can use them */ - $baseoptions = $this->_options; - unset($baseoptions); + // set the options back so that child classes can use them */ + $baseoptions = $this->_options; + unset($baseoptions); - // return if this is a subclass - if (is_subclass_of($this, 'SSHTMLBBCodeParser_Filter')) { - return; - } + // return if this is a subclass + if (is_subclass_of($this, 'SSHTMLBBCodeParser_Filter')) { + return; + } - // extract the definedTags from subclasses */ - $this->addFilters($this->_options['filters']); - } - - static function &getStaticProperty($class, $var) - { - static $properties; - if (!isset($properties[$class])) { - $properties[$class] = array(); - } - if (!array_key_exists($var, $properties[$class])) { - $properties[$class][$var] = null; - } - return $properties[$class][$var]; - } + // extract the definedTags from subclasses */ + $this->addFilters($this->_options['filters']); + } + + static function &getStaticProperty($class, $var) + { + static $properties; + if (!isset($properties[$class])) { + $properties[$class] = array(); + } + if (!array_key_exists($var, $properties[$class])) { + $properties[$class][$var] = null; + } + return $properties[$class][$var]; + } - /** - * Option setter - * - * @param string option name - * @param mixed option value - * @author Lorenzo Alberton - */ - public function setOption($name, $value) - { - $this->_options[$name] = $value; - } + /** + * Option setter + * + * @param string option name + * @param mixed option value + * @author Lorenzo Alberton + */ + public function setOption($name, $value) + { + $this->_options[$name] = $value; + } - /** - * Add a new filter - * - * @param string filter - * @author Lorenzo Alberton - */ - public function addFilter($filter) - { - - $filter = ucfirst($filter); - if (!array_key_exists($filter, $this->_filters)) { - $class = 'SSHTMLBBCodeParser_Filter_'.$filter; - if (fopen('BBCodeParser/Filter/'.$filter.'.php','r',true)) { - include_once 'BBCodeParser/Filter/'.$filter.'.php'; - } - if (!class_exists($class)) { + /** + * Add a new filter + * + * @param string filter + * @author Lorenzo Alberton + */ + public function addFilter($filter) + { + $filter = ucfirst($filter); + if (!array_key_exists($filter, $this->_filters)) { + $class = 'SSHTMLBBCodeParser_Filter_'.$filter; + if (fopen('BBCodeParser/Filter/'.$filter.'.php','r',true)) { + include_once 'BBCodeParser/Filter/'.$filter.'.php'; + } + if (!class_exists($class)) { - //PEAR::raiseError("Failed to load filter $filter", null, PEAR_ERROR_DIE); - } + //PEAR::raiseError("Failed to load filter $filter", null, PEAR_ERROR_DIE); + } else { $this->_filters[$filter] = new $class; - $this->_definedTags = array_merge( - $this->_definedTags, - $this->_filters[$filter]->_definedTags - ); + $this->_definedTags = array_merge( + $this->_definedTags, + $this->_filters[$filter]->_definedTags + ); } - } + } - } + } - /** - * Remove an existing filter - * - * @param string $filter - * @author Lorenzo Alberton - */ - public function removeFilter($filter) - { - $filter = ucfirst(trim($filter)); - if (!empty($filter) && array_key_exists($filter, $this->_filters)) { - unset($this->_filters[$filter]); - } - // also remove the related $this->_definedTags for this filter, - // preserving the others - $this->_definedTags = array(); - foreach (array_keys($this->_filters) as $filter) { - $this->_definedTags = array_merge( - $this->_definedTags, - $this->_filters[$filter]->_definedTags - ); - } - } + /** + * Remove an existing filter + * + * @param string $filter + * @author Lorenzo Alberton + */ + public function removeFilter($filter) + { + $filter = ucfirst(trim($filter)); + if (!empty($filter) && array_key_exists($filter, $this->_filters)) { + unset($this->_filters[$filter]); + } + // also remove the related $this->_definedTags for this filter, + // preserving the others + $this->_definedTags = array(); + foreach (array_keys($this->_filters) as $filter) { + $this->_definedTags = array_merge( + $this->_definedTags, + $this->_filters[$filter]->_definedTags + ); + } + } - /** - * Add new filters - * - * @param mixed (array or string) - * @return boolean true if all ok, false if not. - * @author Lorenzo Alberton - */ - public function addFilters($filters) - { - if (is_string($filters)) { - //comma-separated list - if (strpos($filters, ',') !== false) { - $filters = explode(',', $filters); - } else { - $filters = array($filters); - } - } - if (!is_array($filters)) { - //invalid format - return false; - } - foreach ($filters as $filter) { - if (trim($filter)){ - $this->addFilter($filter); - } - } - return true; - } + /** + * Add new filters + * + * @param mixed (array or string) + * @return boolean true if all ok, false if not. + * @author Lorenzo Alberton + */ + public function addFilters($filters) + { + if (is_string($filters)) { + //comma-separated list + if (strpos($filters, ',') !== false) { + $filters = explode(',', $filters); + } else { + $filters = array($filters); + } + } + if (!is_array($filters)) { + //invalid format + return false; + } + foreach ($filters as $filter) { + if (trim($filter)){ + $this->addFilter($filter); + } + } + return true; + } - /** - * Executes statements before the actual array building starts - * - * This method should be overwritten in a filter if you want to do - * something before the parsing process starts. This can be useful to - * allow certain short alternative tags which then can be converted into - * proper tags with preg_replace() calls. - * The main class walks through all the filters and and calls this - * method. The filters should modify their private $_preparsed - * variable, with input from $_text. - * - * @return none - * @access private - * @see $_text - * @author Stijn de Reede - */ - public function _preparse() - { - // default: assign _text to _preparsed, to be overwritten by filters - $this->_preparsed = $this->_text; + /** + * Executes statements before the actual array building starts + * + * This method should be overwritten in a filter if you want to do + * something before the parsing process starts. This can be useful to + * allow certain short alternative tags which then can be converted into + * proper tags with preg_replace() calls. + * The main class walks through all the filters and and calls this + * method. The filters should modify their private $_preparsed + * variable, with input from $_text. + * + * @return none + * @access private + * @see $_text + * @author Stijn de Reede + */ + public function _preparse() + { + // default: assign _text to _preparsed, to be overwritten by filters + $this->_preparsed = $this->_text; - // return if this is a subclass - if (is_subclass_of($this, 'SSHTMLBBCodeParser')) { - return; - } + // return if this is a subclass + if (is_subclass_of($this, 'SSHTMLBBCodeParser')) { + return; + } - // walk through the filters and execute _preparse - foreach ($this->_filters as $filter) { - $filter->setText($this->_preparsed); - $filter->_preparse(); - $this->_preparsed = $filter->getPreparsed(); - } - } + // walk through the filters and execute _preparse + foreach ($this->_filters as $filter) { + $filter->setText($this->_preparsed); + $filter->_preparse(); + $this->_preparsed = $filter->getPreparsed(); + } + } - /** - * Builds the tag array from the input string $_text - * - * An array consisting of tag and text elements is contructed from the - * $_preparsed variable. The method uses _buildTag() to check if a tag is - * valid and to build the actual tag to be added to the tag array. - * - * @todo - rewrite whole method, as this one is old and probably slow - * - see if a recursive method would be better than an iterative one - * - * @return none - * @access private - * @see _buildTag() - * @see $_text - * @see $_tagArray - * @author Stijn de Reede - */ - public function _buildTagArray() - { - $this->_tagArray = array(); - $str = $this->_preparsed; - $strPos = 0; - $strLength = strlen($str); + /** + * Builds the tag array from the input string $_text + * + * An array consisting of tag and text elements is contructed from the + * $_preparsed variable. The method uses _buildTag() to check if a tag is + * valid and to build the actual tag to be added to the tag array. + * + * @todo - rewrite whole method, as this one is old and probably slow + * - see if a recursive method would be better than an iterative one + * + * @return none + * @access private + * @see _buildTag() + * @see $_text + * @see $_tagArray + * @author Stijn de Reede + */ + public function _buildTagArray() + { + $this->_tagArray = array(); + $str = $this->_preparsed; + $strPos = 0; + $strLength = strlen($str); - while (($strPos < $strLength)) { - $tag = array(); - $openPos = strpos($str, $this->_options['open'], $strPos); - if ($openPos === false) { - $openPos = $strLength; - $nextOpenPos = $strLength; - } - if ($openPos + 1 > $strLength) { - $nextOpenPos = $strLength; - } else { - $nextOpenPos = strpos($str, $this->_options['open'], $openPos + 1); - if ($nextOpenPos === false) { - $nextOpenPos = $strLength; - } - } - $closePos = strpos($str, $this->_options['close'], $strPos); - if ($closePos === false) { - $closePos = $strLength + 1; - } + while (($strPos < $strLength)) { + $tag = array(); + $openPos = strpos($str, $this->_options['open'], $strPos); + if ($openPos === false) { + $openPos = $strLength; + $nextOpenPos = $strLength; + } + if ($openPos + 1 > $strLength) { + $nextOpenPos = $strLength; + } else { + $nextOpenPos = strpos($str, $this->_options['open'], $openPos + 1); + if ($nextOpenPos === false) { + $nextOpenPos = $strLength; + } + } + $closePos = strpos($str, $this->_options['close'], $strPos); + if ($closePos === false) { + $closePos = $strLength + 1; + } - if ($openPos == $strPos) { - if (($nextOpenPos < $closePos)) { - // new open tag before closing tag: treat as text - $newPos = $nextOpenPos; - $tag['text'] = substr($str, $strPos, $nextOpenPos - $strPos); - $tag['type'] = 0; - } else { - // possible valid tag - $newPos = $closePos + 1; - $newTag = $this->_buildTag(substr($str, $strPos, $closePos - $strPos + 1)); - if (($newTag !== false)) { - $tag = $newTag; - } else { - // no valid tag after all - $tag['text'] = substr($str, $strPos, $closePos - $strPos + 1); - $tag['type'] = 0; - } - } - } else { - // just text - $newPos = $openPos; - $tag['text'] = substr($str, $strPos, $openPos - $strPos); - $tag['type'] = 0; - } + if ($openPos == $strPos) { + if (($nextOpenPos < $closePos)) { + // new open tag before closing tag: treat as text + $newPos = $nextOpenPos; + $tag['text'] = substr($str, $strPos, $nextOpenPos - $strPos); + $tag['type'] = 0; + } else { + // possible valid tag + $newPos = $closePos + 1; + $newTag = $this->_buildTag(substr($str, $strPos, $closePos - $strPos + 1)); + if (($newTag !== false)) { + $tag = $newTag; + } else { + // no valid tag after all + $tag['text'] = substr($str, $strPos, $closePos - $strPos + 1); + $tag['type'] = 0; + } + } + } else { + // just text + $newPos = $openPos; + $tag['text'] = substr($str, $strPos, $openPos - $strPos); + $tag['type'] = 0; + } - // join 2 following text elements - if ($tag['type'] === 0 && isset($prev) && $prev['type'] === 0) { - $tag['text'] = $prev['text'].$tag['text']; - array_pop($this->_tagArray); - } + // join 2 following text elements + if ($tag['type'] === 0 && isset($prev) && $prev['type'] === 0) { + $tag['text'] = $prev['text'].$tag['text']; + array_pop($this->_tagArray); + } - $this->_tagArray[] = $tag; - $prev = $tag; - $strPos = $newPos; - } - } + $this->_tagArray[] = $tag; + $prev = $tag; + $strPos = $newPos; + } + } - /** - * Builds a tag from the input string - * - * This method builds a tag array based on the string it got as an - * argument. If the tag is invalid, is returned. The tag - * attributes are extracted from the string and stored in the tag - * array as an associative array. - * - * @param string string to build tag from - * @return array tag in array format - * @access private - * @see _buildTagArray() - * @author Stijn de Reede - */ - public function _buildTag($str) - { - $tag = array('text' => $str, 'attributes' => array()); + /** + * Builds a tag from the input string + * + * This method builds a tag array based on the string it got as an + * argument. If the tag is invalid, is returned. The tag + * attributes are extracted from the string and stored in the tag + * array as an associative array. + * + * @param string string to build tag from + * @return array tag in array format + * @access private + * @see _buildTagArray() + * @author Stijn de Reede + */ + public function _buildTag($str) + { + $tag = array('text' => $str, 'attributes' => array()); - if (substr($str, 1, 1) == '/') { // closing tag + if (substr($str, 1, 1) == '/') { // closing tag - $tag['tag'] = strtolower(substr($str, 2, strlen($str) - 3)); - if (!in_array($tag['tag'], array_keys($this->_definedTags))) { - return false; // nope, it's not valid - } else { - $tag['type'] = 2; - return $tag; - } - } else { // opening tag + $tag['tag'] = strtolower(substr($str, 2, strlen($str) - 3)); + if (!in_array($tag['tag'], array_keys($this->_definedTags))) { + return false; // nope, it's not valid + } else { + $tag['type'] = 2; + return $tag; + } + } else { // opening tag - $tag['type'] = 1; - if (strpos($str, ' ') && (strpos($str, '=') === false)) { - return false; // nope, it's not valid - } + $tag['type'] = 1; + if (strpos($str, ' ') && (strpos($str, '=') === false)) { + return false; // nope, it's not valid + } - // tnx to Onno for the regex - // split the tag with arguments and all - $oe = $this->_options['open_esc']; - $ce = $this->_options['close_esc']; - $tagArray = array(); - if (preg_match("!$oe([a-z0-9]+)[^$ce]*$ce!i", $str, $tagArray) == 0) { - return false; - } - $tag['tag'] = strtolower($tagArray[1]); - if (!in_array($tag['tag'], array_keys($this->_definedTags))) { - return false; // nope, it's not valid - } + // tnx to Onno for the regex + // split the tag with arguments and all + $oe = $this->_options['open_esc']; + $ce = $this->_options['close_esc']; + $tagArray = array(); + if (preg_match("!$oe([a-z0-9]+)[^$ce]*$ce!i", $str, $tagArray) == 0) { + return false; + } + $tag['tag'] = strtolower($tagArray[1]); + if (!in_array($tag['tag'], array_keys($this->_definedTags))) { + return false; // nope, it's not valid + } - // tnx to Onno for the regex - // validate the arguments - $attributeArray = array(); - $regex = "![\s$oe]([a-z0-9]+)=(\"[^\s$ce]+\"|[^\s$ce]"; - if ($tag['tag'] != 'url') { - $regex .= "[^=]"; - } - $regex .= "+)(?=[\s$ce])!i"; - preg_match_all($regex, $str, $attributeArray, PREG_SET_ORDER); - foreach ($attributeArray as $attribute) { - $attNam = strtolower($attribute[1]); - if (in_array($attNam, array_keys($this->_definedTags[$tag['tag']]['attributes']))) { - if ($attribute[2][0] == '"' && $attribute[2][strlen($attribute[2])-1] == '"') { - $tag['attributes'][$attNam] = substr($attribute[2], 1, -1); - } else { - $tag['attributes'][$attNam] = $attribute[2]; - } - } - } - return $tag; - } - } + // tnx to Onno for the regex + // validate the arguments + $attributeArray = array(); + $regex = "![\s$oe]([a-z0-9]+)=(\"[^\s$ce]+\"|[^\s$ce]"; + if ($tag['tag'] != 'url') { + $regex .= "[^=]"; + } + $regex .= "+)(?=[\s$ce])!i"; + preg_match_all($regex, $str, $attributeArray, PREG_SET_ORDER); + foreach ($attributeArray as $attribute) { + $attNam = strtolower($attribute[1]); + if (in_array($attNam, array_keys($this->_definedTags[$tag['tag']]['attributes']))) { + if ($attribute[2][0] == '"' && $attribute[2][strlen($attribute[2])-1] == '"') { + $tag['attributes'][$attNam] = substr($attribute[2], 1, -1); + } else { + $tag['attributes'][$attNam] = $attribute[2]; + } + } + } + return $tag; + } + } - /** - * Validates the tag array, regarding the allowed tags - * - * While looping through the tag array, two following text tags are - * joined, and it is checked that the tag is allowed inside the - * last opened tag. - * By remembering what tags have been opened it is checked that - * there is correct (xml compliant) nesting. - * In the end all still opened tags are closed. - * - * @return none - * @access private - * @see _isAllowed() - * @see $_tagArray - * @author Stijn de Reede , Seth Price - */ - public function _validateTagArray() - { - $newTagArray = array(); - $openTags = array(); - foreach ($this->_tagArray as $tag) { - $prevTag = end($newTagArray); - switch ($tag['type']) { - case 0: - if (($child = $this->_childNeeded(end($openTags), 'text')) && - $child !== false && - /* - * No idea what to do in this case: A child is needed, but - * no valid one is returned. We'll ignore it here and live - * with it until someone reports a valid bug. - */ - $child !== true ) - { - if (trim($tag['text']) == '') { - //just an empty indentation or newline without value? - continue; - } - $newTagArray[] = $child; - $openTags[] = $child['tag']; - } - if ($prevTag['type'] === 0) { - $tag['text'] = $prevTag['text'].$tag['text']; - array_pop($newTagArray); - } - $newTagArray[] = $tag; - break; + /** + * Validates the tag array, regarding the allowed tags + * + * While looping through the tag array, two following text tags are + * joined, and it is checked that the tag is allowed inside the + * last opened tag. + * By remembering what tags have been opened it is checked that + * there is correct (xml compliant) nesting. + * In the end all still opened tags are closed. + * + * @return none + * @access private + * @see _isAllowed() + * @see $_tagArray + * @author Stijn de Reede , Seth Price + */ + public function _validateTagArray() + { + $newTagArray = array(); + $openTags = array(); + foreach ($this->_tagArray as $tag) { + $prevTag = end($newTagArray); + switch ($tag['type']) { + case 0: + if (($child = $this->_childNeeded(end($openTags), 'text')) && + $child !== false && + /* + * No idea what to do in this case: A child is needed, but + * no valid one is returned. We'll ignore it here and live + * with it until someone reports a valid bug. + */ + $child !== true ) + { + if (trim($tag['text']) == '') { + //just an empty indentation or newline without value? + continue; + } + $newTagArray[] = $child; + $openTags[] = $child['tag']; + } + if ($prevTag['type'] === 0) { + $tag['text'] = $prevTag['text'].$tag['text']; + array_pop($newTagArray); + } + $newTagArray[] = $tag; + break; - case 1: - if (!$this->_isAllowed(end($openTags), $tag['tag']) || - ($parent = $this->_parentNeeded(end($openTags), $tag['tag'])) === true || - ($child = $this->_childNeeded(end($openTags), $tag['tag'])) === true) { - $tag['type'] = 0; - if ($prevTag['type'] === 0) { - $tag['text'] = $prevTag['text'].$tag['text']; - array_pop($newTagArray); - } - } else { - if ($parent) { - /* - * Avoid use of parent if we can help it. If we are - * trying to insert a new parent, but the current tag is - * the same as the previous tag, then assume that the - * previous tag structure is valid, and add this tag as - * a sibling. To add as a sibling, we need to close the - * current tag. - */ - if ($tag['tag'] == end($openTags)){ - $newTagArray[] = $this->_buildTag('[/'.$tag['tag'].']'); - array_pop($openTags); - } else { - $newTagArray[] = $parent; - $openTags[] = $parent['tag']; - } - } - if ($child) { - $newTagArray[] = $child; - $openTags[] = $child['tag']; - } - $openTags[] = $tag['tag']; - } - $newTagArray[] = $tag; - break; + case 1: + if (!$this->_isAllowed(end($openTags), $tag['tag']) || + ($parent = $this->_parentNeeded(end($openTags), $tag['tag'])) === true || + ($child = $this->_childNeeded(end($openTags), $tag['tag'])) === true) { + $tag['type'] = 0; + if ($prevTag['type'] === 0) { + $tag['text'] = $prevTag['text'].$tag['text']; + array_pop($newTagArray); + } + } else { + if ($parent) { + /* + * Avoid use of parent if we can help it. If we are + * trying to insert a new parent, but the current tag is + * the same as the previous tag, then assume that the + * previous tag structure is valid, and add this tag as + * a sibling. To add as a sibling, we need to close the + * current tag. + */ + if ($tag['tag'] == end($openTags)){ + $newTagArray[] = $this->_buildTag('[/'.$tag['tag'].']'); + array_pop($openTags); + } else { + $newTagArray[] = $parent; + $openTags[] = $parent['tag']; + } + } + if ($child) { + $newTagArray[] = $child; + $openTags[] = $child['tag']; + } + $openTags[] = $tag['tag']; + } + $newTagArray[] = $tag; + break; - case 2: - if (($tag['tag'] == end($openTags) || $this->_isAllowed(end($openTags), $tag['tag']))) { - if (in_array($tag['tag'], $openTags)) { - $tmpOpenTags = array(); - while (end($openTags) != $tag['tag']) { - $newTagArray[] = $this->_buildTag('[/'.end($openTags).']'); - $tmpOpenTags[] = end($openTags); - array_pop($openTags); - } - $newTagArray[] = $tag; - array_pop($openTags); - /* why is this here? it just seems to break things - * (nested lists where closing tags need to be - * generated) - while (end($tmpOpenTags)) { - $tmpTag = $this->_buildTag('['.end($tmpOpenTags).']'); - $newTagArray[] = $tmpTag; - $openTags[] = $tmpTag['tag']; - array_pop($tmpOpenTags); - }*/ - } - } else { - $tag['type'] = 0; - if ($prevTag['type'] === 0) { - $tag['text'] = $prevTag['text'].$tag['text']; - array_pop($newTagArray); - } - $newTagArray[] = $tag; - } - break; - } - } - while (end($openTags)) { - $newTagArray[] = $this->_buildTag('[/'.end($openTags).']'); - array_pop($openTags); - } - $this->_tagArray = $newTagArray; - } + case 2: + if (($tag['tag'] == end($openTags) || $this->_isAllowed(end($openTags), $tag['tag']))) { + if (in_array($tag['tag'], $openTags)) { + $tmpOpenTags = array(); + while (end($openTags) != $tag['tag']) { + $newTagArray[] = $this->_buildTag('[/'.end($openTags).']'); + $tmpOpenTags[] = end($openTags); + array_pop($openTags); + } + $newTagArray[] = $tag; + array_pop($openTags); + /* why is this here? it just seems to break things + * (nested lists where closing tags need to be + * generated) + while (end($tmpOpenTags)) { + $tmpTag = $this->_buildTag('['.end($tmpOpenTags).']'); + $newTagArray[] = $tmpTag; + $openTags[] = $tmpTag['tag']; + array_pop($tmpOpenTags); + }*/ + } + } else { + $tag['type'] = 0; + if ($prevTag['type'] === 0) { + $tag['text'] = $prevTag['text'].$tag['text']; + array_pop($newTagArray); + } + $newTagArray[] = $tag; + } + break; + } + } + while (end($openTags)) { + $newTagArray[] = $this->_buildTag('[/'.end($openTags).']'); + array_pop($openTags); + } + $this->_tagArray = $newTagArray; + } - /** - * Checks to see if a parent is needed - * - * Checks to see if the current $in tag has an appropriate parent. If it - * does, then it returns false. If a parent is needed, then it returns the - * first tag in the list to add to the stack. - * - * @param array tag that is on the outside - * @param array tag that is on the inside - * @return boolean false if not needed, tag if needed, true if out - * of our minds - * @access private - * @see _validateTagArray() - * @author Seth Price - */ - public function _parentNeeded($out, $in) - { - if (!isset($this->_definedTags[$in]['parent']) || - ($this->_definedTags[$in]['parent'] == 'all') - ) { - return false; - } + /** + * Checks to see if a parent is needed + * + * Checks to see if the current $in tag has an appropriate parent. If it + * does, then it returns false. If a parent is needed, then it returns the + * first tag in the list to add to the stack. + * + * @param array tag that is on the outside + * @param array tag that is on the inside + * @return boolean false if not needed, tag if needed, true if out + * of our minds + * @access private + * @see _validateTagArray() + * @author Seth Price + */ + public function _parentNeeded($out, $in) + { + if (!isset($this->_definedTags[$in]['parent']) || + ($this->_definedTags[$in]['parent'] == 'all') + ) { + return false; + } - $ar = explode('^', $this->_definedTags[$in]['parent']); - $tags = explode(',', $ar[1]); - if ($ar[0] == 'none'){ - if ($out && in_array($out, $tags)) { - return false; - } - //Create a tag from the first one on the list - return $this->_buildTag('['.$tags[0].']'); - } - if ($ar[0] == 'all' && $out && !in_array($out, $tags)) { - return false; - } - // Tag is needed, we don't know which one. We could make something up, - // but it would be so random, I think that it would be worthless. - return true; - } + $ar = explode('^', $this->_definedTags[$in]['parent']); + $tags = explode(',', $ar[1]); + if ($ar[0] == 'none'){ + if ($out && in_array($out, $tags)) { + return false; + } + //Create a tag from the first one on the list + return $this->_buildTag('['.$tags[0].']'); + } + if ($ar[0] == 'all' && $out && !in_array($out, $tags)) { + return false; + } + // Tag is needed, we don't know which one. We could make something up, + // but it would be so random, I think that it would be worthless. + return true; + } - /** - * Checks to see if a child is needed - * - * Checks to see if the current $out tag has an appropriate child. If it - * does, then it returns false. If a child is needed, then it returns the - * first tag in the list to add to the stack. - * - * @param array tag that is on the outside - * @param array tag that is on the inside - * @return boolean false if not needed, tag if needed, true if out - * of our minds - * @access private - * @see _validateTagArray() - * @author Seth Price - */ - public function _childNeeded($out, $in) - { - if (!isset($this->_definedTags[$out]['child']) || - ($this->_definedTags[$out]['child'] == 'all') - ) { - return false; - } + /** + * Checks to see if a child is needed + * + * Checks to see if the current $out tag has an appropriate child. If it + * does, then it returns false. If a child is needed, then it returns the + * first tag in the list to add to the stack. + * + * @param array tag that is on the outside + * @param array tag that is on the inside + * @return boolean false if not needed, tag if needed, true if out + * of our minds + * @access private + * @see _validateTagArray() + * @author Seth Price + */ + public function _childNeeded($out, $in) + { + if (!isset($this->_definedTags[$out]['child']) || + ($this->_definedTags[$out]['child'] == 'all') + ) { + return false; + } - $ar = explode('^', $this->_definedTags[$out]['child']); - $tags = explode(',', $ar[1]); - if ($ar[0] == 'none'){ - if ($in && in_array($in, $tags)) { - return false; - } - //Create a tag from the first one on the list - return $this->_buildTag('['.$tags[0].']'); - } - if ($ar[0] == 'all' && $in && !in_array($in, $tags)) { - return false; - } - // Tag is needed, we don't know which one. We could make something up, - // but it would be so random, I think that it would be worthless. - return true; - } + $ar = explode('^', $this->_definedTags[$out]['child']); + $tags = explode(',', $ar[1]); + if ($ar[0] == 'none'){ + if ($in && in_array($in, $tags)) { + return false; + } + //Create a tag from the first one on the list + return $this->_buildTag('['.$tags[0].']'); + } + if ($ar[0] == 'all' && $in && !in_array($in, $tags)) { + return false; + } + // Tag is needed, we don't know which one. We could make something up, + // but it would be so random, I think that it would be worthless. + return true; + } - /** - * Checks to see if a tag is allowed inside another tag - * - * The allowed tags are extracted from the private _definedTags array. - * - * @param array tag that is on the outside - * @param array tag that is on the inside - * @return boolean return true if the tag is allowed, false - * otherwise - * @access private - * @see _validateTagArray() - * @author Stijn de Reede - */ - public function _isAllowed($out, $in) - { - if (!$out || ($this->_definedTags[$out]['allowed'] == 'all')) { - return true; - } - if ($this->_definedTags[$out]['allowed'] == 'none') { - return false; - } + /** + * Checks to see if a tag is allowed inside another tag + * + * The allowed tags are extracted from the private _definedTags array. + * + * @param array tag that is on the outside + * @param array tag that is on the inside + * @return boolean return true if the tag is allowed, false + * otherwise + * @access private + * @see _validateTagArray() + * @author Stijn de Reede + */ + public function _isAllowed($out, $in) + { + if (!$out || ($this->_definedTags[$out]['allowed'] == 'all')) { + return true; + } + if ($this->_definedTags[$out]['allowed'] == 'none') { + return false; + } - $ar = explode('^', $this->_definedTags[$out]['allowed']); - $tags = explode(',', $ar[1]); - if ($ar[0] == 'none' && in_array($in, $tags)) { - return true; - } - if ($ar[0] == 'all' && in_array($in, $tags)) { - return false; - } - return false; - } + $ar = explode('^', $this->_definedTags[$out]['allowed']); + $tags = explode(',', $ar[1]); + if ($ar[0] == 'none' && in_array($in, $tags)) { + return true; + } + if ($ar[0] == 'all' && in_array($in, $tags)) { + return false; + } + return false; + } - /** - * Builds a parsed string based on the tag array - * - * The correct html and attribute values are extracted from the private - * _definedTags array. - * - * @return none - * @access private - * @see $_tagArray - * @see $_parsed - * @author Stijn de Reede - */ - public function _buildParsedString() - { - $this->_parsed = ''; - foreach ($this->_tagArray as $tag) { - switch ($tag['type']) { + /** + * Builds a parsed string based on the tag array + * + * The correct html and attribute values are extracted from the private + * _definedTags array. + * + * @return none + * @access private + * @see $_tagArray + * @see $_parsed + * @author Stijn de Reede + */ + public function _buildParsedString() + { + $this->_parsed = ''; + foreach ($this->_tagArray as $tag) { + switch ($tag['type']) { - // just text - case 0: - $this->_parsed .= $tag['text']; - break; + // just text + case 0: + $this->_parsed .= $tag['text']; + break; - // opening tag - case 1: - $this->_parsed .= '<'.$this->_definedTags[$tag['tag']]['htmlopen']; - if ($this->_options['quotestyle'] == 'single') $q = "'"; - if ($this->_options['quotestyle'] == 'double') $q = '"'; - foreach ($tag['attributes'] as $a => $v) { - //prevent XSS attacks. IMHO this is not enough, though... - //@see http://pear.php.net/bugs/bug.php?id=5609 - $v = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1:", $v); - $v = htmlspecialchars($v); - $v = str_replace('&amp;', '&', $v); + // opening tag + case 1: + $this->_parsed .= '<'.$this->_definedTags[$tag['tag']]['htmlopen']; + if ($this->_options['quotestyle'] == 'single') $q = "'"; + if ($this->_options['quotestyle'] == 'double') $q = '"'; + foreach ($tag['attributes'] as $a => $v) { + //prevent XSS attacks. IMHO this is not enough, though... + //@see http://pear.php.net/bugs/bug.php?id=5609 + $v = preg_replace('#(script|about|applet|activex|chrome):#is', "\\1:", $v); + $v = htmlspecialchars($v); + $v = str_replace('&amp;', '&', $v); - if (($this->_options['quotewhat'] == 'nothing') || - (($this->_options['quotewhat'] == 'strings') && is_numeric($v)) - ) { - $this->_parsed .= ' '.sprintf($this->_definedTags[$tag['tag']]['attributes'][$a], $v, ''); - } else { - $this->_parsed .= ' '.sprintf($this->_definedTags[$tag['tag']]['attributes'][$a], $v, $q); - } - } - if ($this->_definedTags[$tag['tag']]['htmlclose'] == '' && $this->_options['xmlclose']) { - $this->_parsed .= ' /'; - } - $this->_parsed .= '>'; - break; + if (($this->_options['quotewhat'] == 'nothing') || + (($this->_options['quotewhat'] == 'strings') && is_numeric($v)) + ) { + $this->_parsed .= ' '.sprintf($this->_definedTags[$tag['tag']]['attributes'][$a], $v, ''); + } else { + $this->_parsed .= ' '.sprintf($this->_definedTags[$tag['tag']]['attributes'][$a], $v, $q); + } + } + if ($this->_definedTags[$tag['tag']]['htmlclose'] == '' && $this->_options['xmlclose']) { + $this->_parsed .= ' /'; + } + $this->_parsed .= '>'; + break; - // closing tag - case 2: - if ($this->_definedTags[$tag['tag']]['htmlclose'] != '') { - $this->_parsed .= '_definedTags[$tag['tag']]['htmlclose'].'>'; - } - break; - } - } - } + // closing tag + case 2: + if ($this->_definedTags[$tag['tag']]['htmlclose'] != '') { + $this->_parsed .= '_definedTags[$tag['tag']]['htmlclose'].'>'; + } + break; + } + } + } - /** - * Sets text in the object to be parsed - * - * @param string the text to set in the object - * @return none - * @access public - * @see getText() - * @see $_text - * @author Stijn de Reede - */ - public function setText($str) - { - $this->_text = $str; - } + /** + * Sets text in the object to be parsed + * + * @param string the text to set in the object + * @return none + * @access public + * @see getText() + * @see $_text + * @author Stijn de Reede + */ + public function setText($str) + { + $this->_text = $str; + } - /** - * Gets the unparsed text from the object - * - * @return string the text set in the object - * @access public - * @see setText() - * @see $_text - * @author Stijn de Reede - */ - public function getText() - { - return $this->_text; - } + /** + * Gets the unparsed text from the object + * + * @return string the text set in the object + * @access public + * @see setText() + * @see $_text + * @author Stijn de Reede + */ + public function getText() + { + return $this->_text; + } - /** - * Gets the preparsed text from the object - * - * @return string the text set in the object - * @access public - * @see _preparse() - * @see $_preparsed - * @author Stijn de Reede - */ - public function getPreparsed() - { - return $this->_preparsed; - } + /** + * Gets the preparsed text from the object + * + * @return string the text set in the object + * @access public + * @see _preparse() + * @see $_preparsed + * @author Stijn de Reede + */ + public function getPreparsed() + { + return $this->_preparsed; + } - /** - * Gets the parsed text from the object - * - * @return string the parsed text set in the object - * @access public - * @see parse() - * @see $_parsed - * @author Stijn de Reede - */ - public function getParsed() - { - return $this->_parsed; - } + /** + * Gets the parsed text from the object + * + * @return string the parsed text set in the object + * @access public + * @see parse() + * @see $_parsed + * @author Stijn de Reede + */ + public function getParsed() + { + return $this->_parsed; + } - /** - * Parses the text set in the object - * - * @return none - * @access public - * @see _preparse() - * @see _buildTagArray() - * @see _validateTagArray() - * @see _buildParsedString() - * @author Stijn de Reede - */ - public function parse() - { - $this->_preparse(); - $this->_buildTagArray(); - $this->_validateTagArray(); - $this->_buildParsedString(); - } + /** + * Parses the text set in the object + * + * @return none + * @access public + * @see _preparse() + * @see _buildTagArray() + * @see _validateTagArray() + * @see _buildParsedString() + * @author Stijn de Reede + */ + public function parse() + { + $this->_preparse(); + $this->_buildTagArray(); + $this->_validateTagArray(); + $this->_buildParsedString(); + } - /** - * Quick method to do setText(), parse() and getParsed at once - * - * @return none - * @access public - * @see parse() - * @see $_text - * @author Stijn de Reede - */ - public function qparse($str) - { - $this->_text = $str; - $this->parse(); - return $this->_parsed; - } + /** + * Quick method to do setText(), parse() and getParsed at once + * + * @return none + * @access public + * @see parse() + * @see $_text + * @author Stijn de Reede + */ + public function qparse($str) + { + $this->_text = $str; + $this->parse(); + return $this->_parsed; + } - /** - * Quick static method to do setText(), parse() and getParsed at once - * - * @return none - * @access public - * @see parse() - * @see $_text - * @author Stijn de Reede - */ - public function staticQparse($str) - { - $p = new SSHTMLBBCodeParser(); - $str = $p->qparse($str); - unset($p); - return $str; - } + /** + * Quick static method to do setText(), parse() and getParsed at once + * + * @return none + * @access public + * @see parse() + * @see $_text + * @author Stijn de Reede + */ + public function staticQparse($str) + { + $p = new SSHTMLBBCodeParser(); + $str = $p->qparse($str); + unset($p); + return $str; + } } diff --git a/search/SearchContext.php b/search/SearchContext.php index 610974f2b..de34b4086 100644 --- a/search/SearchContext.php +++ b/search/SearchContext.php @@ -147,7 +147,7 @@ class SearchContext extends Object { $searchParamArray = $searchParams; } - foreach($searchParamArray as $key => $value) { + foreach($searchParamArray as $key => $value) { $key = str_replace('__', '.', $key); if($filter = $this->getFilter($key)) { $filter->setModel($this->modelClass); @@ -158,9 +158,9 @@ class SearchContext extends Object { } } - if($this->connective != "AND") { - throw new Exception("SearchContext connective '$this->connective' not supported after ORM-rewrite."); - } + if($this->connective != "AND") { + throw new Exception("SearchContext connective '$this->connective' not supported after ORM-rewrite."); + } return $query; } diff --git a/security/Authenticator.php b/security/Authenticator.php index 9d61924a9..75c05ef4d 100644 --- a/security/Authenticator.php +++ b/security/Authenticator.php @@ -11,95 +11,95 @@ */ abstract class Authenticator extends Object { - /** - * This variable holds all authenticators that should be used - * - * @var array - */ - private static $authenticators = array('MemberAuthenticator'); - - /** - * Used to influence the order of authenticators on the login-screen - * (default shows first). - * - * @var string - */ - private static $default_authenticator = 'MemberAuthenticator'; + /** + * This variable holds all authenticators that should be used + * + * @var array + */ + private static $authenticators = array('MemberAuthenticator'); + + /** + * Used to influence the order of authenticators on the login-screen + * (default shows first). + * + * @var string + */ + private static $default_authenticator = 'MemberAuthenticator'; - /** - * Method to authenticate an user - * - * @param array $RAW_data Raw data to authenticate the user - * @param Form $form Optional: If passed, better error messages can be - * produced by using - * {@link Form::sessionMessage()} - * @return bool|Member Returns FALSE if authentication fails, otherwise - * the member object - */ + /** + * Method to authenticate an user + * + * @param array $RAW_data Raw data to authenticate the user + * @param Form $form Optional: If passed, better error messages can be + * produced by using + * {@link Form::sessionMessage()} + * @return bool|Member Returns FALSE if authentication fails, otherwise + * the member object + */ public static function authenticate($RAW_data, Form $form = null) { } - /** - * Method that creates the login form for this authentication method - * - * @param Controller The parent controller, necessary to create the - * appropriate form action tag - * @return Form Returns the login form to use with this authentication - * method - */ + /** + * Method that creates the login form for this authentication method + * + * @param Controller The parent controller, necessary to create the + * appropriate form action tag + * @return Form Returns the login form to use with this authentication + * method + */ public static function get_login_form(Controller $controller) { } - /** - * Get the name of the authentication method - * - * @return string Returns the name of the authentication method. - */ + /** + * Get the name of the authentication method + * + * @return string Returns the name of the authentication method. + */ public static function get_name() { } - public static function register($authenticator) { + public static function register($authenticator) { self::register_authenticator($authenticator); - } + } - /** - * Register a new authenticator - * - * The new authenticator has to exist and to be derived from the - * {@link Authenticator}. - * Every authenticator can be registered only once. - * - * @param string $authenticator Name of the authenticator class to - * register - * @return bool Returns TRUE on success, FALSE otherwise. - */ - public static function register_authenticator($authenticator) { - $authenticator = trim($authenticator); + /** + * Register a new authenticator + * + * The new authenticator has to exist and to be derived from the + * {@link Authenticator}. + * Every authenticator can be registered only once. + * + * @param string $authenticator Name of the authenticator class to + * register + * @return bool Returns TRUE on success, FALSE otherwise. + */ + public static function register_authenticator($authenticator) { + $authenticator = trim($authenticator); - if(class_exists($authenticator) == false) - return false; + if(class_exists($authenticator) == false) + return false; - if(is_subclass_of($authenticator, 'Authenticator') == false) - return false; + if(is_subclass_of($authenticator, 'Authenticator') == false) + return false; - if(in_array($authenticator, self::$authenticators) == false) { - if(call_user_func(array($authenticator, 'on_register')) === true) { - array_push(self::$authenticators, $authenticator); - } else { - return false; - } - } + if(in_array($authenticator, self::$authenticators) == false) { + if(call_user_func(array($authenticator, 'on_register')) === true) { + array_push(self::$authenticators, $authenticator); + } else { + return false; + } + } - return true; - } - - public static function unregister($authenticator) { - self::unregister_authenticator($authenticator); - } - + return true; + } + + public static function unregister($authenticator) { + self::unregister_authenticator($authenticator); + } + /** * Remove a previously registered authenticator * @@ -108,82 +108,82 @@ abstract class Authenticator extends Object { */ public static function unregister_authenticator($authenticator) { if(call_user_func(array($authenticator, 'on_unregister')) === true) { - if(in_array($authenticator, self::$authenticators)) { - unset(self::$authenticators[array_search($authenticator, self::$authenticators)]); - } + if(in_array($authenticator, self::$authenticators)) { + unset(self::$authenticators[array_search($authenticator, self::$authenticators)]); + } }; } - /** - * Check if a given authenticator is registered - * - * @param string $authenticator Name of the authenticator class to check - * @return bool Returns TRUE if the authenticator is registered, FALSE - * otherwise. - */ - public static function is_registered($authenticator) { - return in_array($authenticator, self::$authenticators); - } + /** + * Check if a given authenticator is registered + * + * @param string $authenticator Name of the authenticator class to check + * @return bool Returns TRUE if the authenticator is registered, FALSE + * otherwise. + */ + public static function is_registered($authenticator) { + return in_array($authenticator, self::$authenticators); + } - /** - * Get all registered authenticators - * - * @return array Returns an array with the class names of all registered - * authenticators. - */ - public static function get_authenticators() { - // put default authenticator first (mainly for tab-order on loginform) - if($key = array_search(self::$default_authenticator,self::$authenticators)) { - unset(self::$authenticators[$key]); - array_unshift(self::$authenticators, self::$default_authenticator); - } + /** + * Get all registered authenticators + * + * @return array Returns an array with the class names of all registered + * authenticators. + */ + public static function get_authenticators() { + // put default authenticator first (mainly for tab-order on loginform) + if($key = array_search(self::$default_authenticator,self::$authenticators)) { + unset(self::$authenticators[$key]); + array_unshift(self::$authenticators, self::$default_authenticator); + } - return self::$authenticators; - } - - /** - * Set a default authenticator (shows first in tabs) - * - * @param string - */ - public static function set_default_authenticator($authenticator) { - self::$default_authenticator = $authenticator; - - - } - - /** - * @return string - */ - public static function get_default_authenticator() { - return self::$default_authenticator; - } + return self::$authenticators; + } + + /** + * Set a default authenticator (shows first in tabs) + * + * @param string + */ + public static function set_default_authenticator($authenticator) { + self::$default_authenticator = $authenticator; + + + } + + /** + * @return string + */ + public static function get_default_authenticator() { + return self::$default_authenticator; + } - /** - * Callback function that is called when the authenticator is registered - * - * Use this method for initialization of a newly registered authenticator. - * Just overload this method and it will be called when the authenticator - * is registered. - * If the method returns FALSE, the authenticator won't be - * registered! - * - * @return bool Returns TRUE on success, FALSE otherwise. - */ - protected static function on_register() { - return true; - } - - /** - * Callback function that is called when an authenticator is removed. - * - * @return bool - */ - protected static function on_unregister() { - return true; - } + /** + * Callback function that is called when the authenticator is registered + * + * Use this method for initialization of a newly registered authenticator. + * Just overload this method and it will be called when the authenticator + * is registered. + * If the method returns FALSE, the authenticator won't be + * registered! + * + * @return bool Returns TRUE on success, FALSE otherwise. + */ + protected static function on_register() { + return true; + } + + /** + * Callback function that is called when an authenticator is removed. + * + * @return bool + */ + protected static function on_unregister() { + return true; + } } diff --git a/security/Group.php b/security/Group.php index 518011e6a..be07d5066 100755 --- a/security/Group.php +++ b/security/Group.php @@ -154,7 +154,7 @@ class Group extends DataObject { // but tabstrip.js doesn't display tabs when directly adressed through a URL pragma _t('Group.RolesAddEditLink', 'Manage roles') ) . - "

    " + "

    " ) ); @@ -332,7 +332,7 @@ class Group extends DataObject { } public function getTreeTitle() { - if($this->hasMethod('alternateTreeTitle')) return $this->alternateTreeTitle(); + if($this->hasMethod('alternateTreeTitle')) return $this->alternateTreeTitle(); else return htmlspecialchars($this->Title, ENT_QUOTES); } @@ -384,7 +384,7 @@ class Group extends DataObject { $results = $this->extend('canEdit', $member); if($results && is_array($results)) if(!min($results)) return false; - if( + if( // either we have an ADMIN (bool)Permission::checkMember($member, "ADMIN") || ( diff --git a/security/Member.php b/security/Member.php index 30794ebf5..a28d24ec6 100644 --- a/security/Member.php +++ b/security/Member.php @@ -561,7 +561,7 @@ class Member extends DataObject implements TemplateGlobalProvider { * It should return fields that are editable by the admin and the logged-in user. * * @return FieldList Returns a {@link FieldList} containing the fields for - * the member form. + * the member form. */ public function getMemberFormFields() { $fields = parent::getFrontendFields(); @@ -658,10 +658,10 @@ class Member extends DataObject implements TemplateGlobalProvider { return $word . $number; } else { - $random = rand(); - $string = md5($random); - $output = substr($string, 0, 6); - return $output; + $random = rand(); + $string = md5($random); + $output = substr($string, 0, 6); + return $output; } } @@ -1149,7 +1149,7 @@ class Member extends DataObject implements TemplateGlobalProvider { * * @param array $groupList An array of group code names. * @param array $memberGroups A component set of groups (if set to NULL, - * $this->groups() will be used) + * $this->groups() will be used) * @return array Groups in which the member is NOT in. */ public function memberNotInGroups($groupList, $memberGroups = null){ @@ -1171,7 +1171,7 @@ class Member extends DataObject implements TemplateGlobalProvider { * this member. * * @return FieldList Return a FieldList of fields that would appropriate for - * editing this member. + * editing this member. */ public function getCMSFields() { require_once('Zend/Date.php'); @@ -1542,10 +1542,10 @@ class Member_ProfileForm extends Form { $fields->push(new HiddenField('ID','ID',$member->ID)); $actions = new FieldList( - FormAction::create('dosave',_t('CMSMain.SAVE', 'Save')) - ->addExtraClass('ss-ui-button ss-ui-action-constructive') - ->setAttribute('data-icon', 'accept') - ->setUseButtonTag(true) + FormAction::create('dosave',_t('CMSMain.SAVE', 'Save')) + ->addExtraClass('ss-ui-button ss-ui-action-constructive') + ->setAttribute('data-icon', 'accept') + ->setUseButtonTag(true) ); $validator = new Member_Validator(); @@ -1592,14 +1592,14 @@ class Member_ProfileForm extends Form { * @subpackage security */ class Member_ChangePasswordEmail extends Email { - protected $from = ''; // setting a blank from address uses the site's default administrator email - protected $subject = ''; - protected $ss_template = 'ChangePasswordEmail'; - - public function __construct() { + protected $from = ''; // setting a blank from address uses the site's default administrator email + protected $subject = ''; + protected $ss_template = 'ChangePasswordEmail'; + + public function __construct() { parent::__construct(); - $this->subject = _t('Member.SUBJECTPASSWORDCHANGED', "Your password has been changed", 'Email subject'); - } + $this->subject = _t('Member.SUBJECTPASSWORDCHANGED', "Your password has been changed", 'Email subject'); + } } @@ -1610,14 +1610,14 @@ class Member_ChangePasswordEmail extends Email { * @subpackage security */ class Member_ForgotPasswordEmail extends Email { - protected $from = ''; // setting a blank from address uses the site's default administrator email - protected $subject = ''; - protected $ss_template = 'ForgotPasswordEmail'; - - public function __construct() { + protected $from = ''; // setting a blank from address uses the site's default administrator email + protected $subject = ''; + protected $ss_template = 'ForgotPasswordEmail'; + + public function __construct() { parent::__construct(); - $this->subject = _t('Member.SUBJECTPASSWORDRESET', "Your password reset link", 'Email subject'); - } + $this->subject = _t('Member.SUBJECTPASSWORDRESET', "Your password reset link", 'Email subject'); + } } /** diff --git a/security/MemberAuthenticator.php b/security/MemberAuthenticator.php index 91d7a16fc..7654cca37 100644 --- a/security/MemberAuthenticator.php +++ b/security/MemberAuthenticator.php @@ -18,103 +18,103 @@ class MemberAuthenticator extends Authenticator { 'sha1' => 'sha1_v2.4' ); - /** - * Method to authenticate an user - * - * @param array $RAW_data Raw data to authenticate the user - * @param Form $form Optional: If passed, better error messages can be - * produced by using - * {@link Form::sessionMessage()} - * @return bool|Member Returns FALSE if authentication fails, otherwise - * the member object - * @see Security::setDefaultAdmin() - */ - public static function authenticate($RAW_data, Form $form = null) { - if(array_key_exists('Email', $RAW_data) && $RAW_data['Email']){ - $SQL_user = Convert::raw2sql($RAW_data['Email']); - } else { - return false; - } - - $isLockedOut = false; - $result = null; - - // Default login (see Security::setDefaultAdmin()) - if(Security::check_default_admin($RAW_data['Email'], $RAW_data['Password'])) { - $member = Security::findAnAdministrator(); - } else { - $member = DataObject::get_one( - "Member", - "\"" . Member::get_unique_identifier_field() . "\" = '$SQL_user' AND \"Password\" IS NOT NULL" - ); - - if($member) { - $result = $member->checkPassword($RAW_data['Password']); - } else { - $result = new ValidationResult(false, _t('Member.ERRORWRONGCRED')); - } - - if($member && !$result->valid()) { - $member->registerFailedLogin(); - $member = false; - } - } - - // Optionally record every login attempt as a {@link LoginAttempt} object /** - * TODO We could handle this with an extension + * Method to authenticate an user + * + * @param array $RAW_data Raw data to authenticate the user + * @param Form $form Optional: If passed, better error messages can be + * produced by using + * {@link Form::sessionMessage()} + * @return bool|Member Returns FALSE if authentication fails, otherwise + * the member object + * @see Security::setDefaultAdmin() */ - if(Security::login_recording()) { - $attempt = new LoginAttempt(); - if($member) { - // successful login (member is existing with matching password) - $attempt->MemberID = $member->ID; - $attempt->Status = 'Success'; - - // Audit logging hook - $member->extend('authenticated'); + public static function authenticate($RAW_data, Form $form = null) { + if(array_key_exists('Email', $RAW_data) && $RAW_data['Email']){ + $SQL_user = Convert::raw2sql($RAW_data['Email']); } else { - // failed login - we're trying to see if a user exists with this email (disregarding wrong passwords) - $existingMember = DataObject::get_one( - "Member", - "\"" . Member::get_unique_identifier_field() . "\" = '$SQL_user'" - ); - if($existingMember) { - $attempt->MemberID = $existingMember->ID; - - // Audit logging hook - $existingMember->extend('authenticationFailed'); - } else { - - // Audit logging hook - singleton('Member')->extend('authenticationFailedUnknownUser', $RAW_data); - } - $attempt->Status = 'Failure'; - } - if(is_array($RAW_data['Email'])) { - user_error("Bad email passed to MemberAuthenticator::authenticate(): $RAW_data[Email]", E_USER_WARNING); return false; } + + $isLockedOut = false; + $result = null; + + // Default login (see Security::setDefaultAdmin()) + if(Security::check_default_admin($RAW_data['Email'], $RAW_data['Password'])) { + $member = Security::findAnAdministrator(); + } else { + $member = DataObject::get_one( + "Member", + "\"" . Member::get_unique_identifier_field() . "\" = '$SQL_user' AND \"Password\" IS NOT NULL" + ); + + if($member) { + $result = $member->checkPassword($RAW_data['Password']); + } else { + $result = new ValidationResult(false, _t('Member.ERRORWRONGCRED')); + } + + if($member && !$result->valid()) { + $member->registerFailedLogin(); + $member = false; + } + } - $attempt->Email = $RAW_data['Email']; - $attempt->IP = Controller::curr()->getRequest()->getIP(); - $attempt->write(); - } - - // Legacy migration to precision-safe password hashes. - // A login-event with cleartext passwords is the only time - // when we can rehash passwords to a different hashing algorithm, - // bulk-migration doesn't work due to the nature of hashing. - // See PasswordEncryptor_LegacyPHPHash class. - if( - $member // only migrate after successful login - && self::$migrate_legacy_hashes - && array_key_exists($member->PasswordEncryption, self::$migrate_legacy_hashes) - ) { - $member->Password = $RAW_data['Password']; - $member->PasswordEncryption = self::$migrate_legacy_hashes[$member->PasswordEncryption]; - $member->write(); - } + // Optionally record every login attempt as a {@link LoginAttempt} object + /** + * TODO We could handle this with an extension + */ + if(Security::login_recording()) { + $attempt = new LoginAttempt(); + if($member) { + // successful login (member is existing with matching password) + $attempt->MemberID = $member->ID; + $attempt->Status = 'Success'; + + // Audit logging hook + $member->extend('authenticated'); + } else { + // failed login - we're trying to see if a user exists with this email (disregarding wrong passwords) + $existingMember = DataObject::get_one( + "Member", + "\"" . Member::get_unique_identifier_field() . "\" = '$SQL_user'" + ); + if($existingMember) { + $attempt->MemberID = $existingMember->ID; + + // Audit logging hook + $existingMember->extend('authenticationFailed'); + } else { + + // Audit logging hook + singleton('Member')->extend('authenticationFailedUnknownUser', $RAW_data); + } + $attempt->Status = 'Failure'; + } + if(is_array($RAW_data['Email'])) { + user_error("Bad email passed to MemberAuthenticator::authenticate(): $RAW_data[Email]", E_USER_WARNING); + return false; + } + + $attempt->Email = $RAW_data['Email']; + $attempt->IP = Controller::curr()->getRequest()->getIP(); + $attempt->write(); + } + + // Legacy migration to precision-safe password hashes. + // A login-event with cleartext passwords is the only time + // when we can rehash passwords to a different hashing algorithm, + // bulk-migration doesn't work due to the nature of hashing. + // See PasswordEncryptor_LegacyPHPHash class. + if( + $member // only migrate after successful login + && self::$migrate_legacy_hashes + && array_key_exists($member->PasswordEncryption, self::$migrate_legacy_hashes) + ) { + $member->Password = $RAW_data['Password']; + $member->PasswordEncryption = self::$migrate_legacy_hashes[$member->PasswordEncryption]; + $member->write(); + } if($member) { Session::clear('BackURL'); @@ -126,25 +126,25 @@ class MemberAuthenticator extends Authenticator { } - /** - * Method that creates the login form for this authentication method - * - * @param Controller The parent controller, necessary to create the - * appropriate form action tag - * @return Form Returns the login form to use with this authentication - * method - */ - public static function get_login_form(Controller $controller) { - return Object::create("MemberLoginForm", $controller, "LoginForm"); - } + /** + * Method that creates the login form for this authentication method + * + * @param Controller The parent controller, necessary to create the + * appropriate form action tag + * @return Form Returns the login form to use with this authentication + * method + */ + public static function get_login_form(Controller $controller) { + return Object::create("MemberLoginForm", $controller, "LoginForm"); + } - /** - * Get the name of the authentication method - * - * @return string Returns the name of the authentication method. - */ - public static function get_name() { + /** + * Get the name of the authentication method + * + * @return string Returns the name of the authentication method. + */ + public static function get_name() { return _t('MemberAuthenticator.TITLE', "E-mail & Password"); } } diff --git a/security/MemberLoginForm.php b/security/MemberLoginForm.php index 2e04763f4..5ac7b7d86 100644 --- a/security/MemberLoginForm.php +++ b/security/MemberLoginForm.php @@ -33,7 +33,7 @@ class MemberLoginForm extends LoginForm { * @param string $authenticatorClassName Name of the authenticator class that this form uses. */ public function __construct($controller, $name, $fields = null, $actions = null, - $checkCurrentUser = true) { + $checkCurrentUser = true) { // This is now set on the class directly to make it easier to create subclasses // $this->authenticator_class = $authenticatorClassName; @@ -226,13 +226,13 @@ JS } - /** - * Try to authenticate the user - * - * @param array Submitted data - * @return Member Returns the member object on successful authentication - * or NULL on failure. - */ + /** + * Try to authenticate the user + * + * @param array Submitted data + * @return Member Returns the member object on successful authentication + * or NULL on failure. + */ public function performLogin($data) { $member = call_user_func_array(array($this->authenticator_class, 'authenticate'), array($data, $this)); if($member) { diff --git a/security/Permission.php b/security/Permission.php index a77b8280c..771fef203 100644 --- a/security/Permission.php +++ b/security/Permission.php @@ -6,7 +6,7 @@ */ class Permission extends DataObject implements TemplateGlobalProvider { - // the (1) after Type specifies the DB default value which is needed for + // the (1) after Type specifies the DB default value which is needed for // upgrades from older SilverStripe versions static $db = array( "Code" => "Varchar", @@ -55,7 +55,7 @@ class Permission extends DataObject implements TemplateGlobalProvider { */ static $declared_permissions = null; - /** + /** * Linear list of declared permissions in the system. * * @var array diff --git a/security/PermissionCheckboxSetField.php b/security/PermissionCheckboxSetField.php index c2a98f3b7..059735371 100644 --- a/security/PermissionCheckboxSetField.php +++ b/security/PermissionCheckboxSetField.php @@ -157,7 +157,7 @@ class PermissionCheckboxSetField extends FormField { } } } - + $odd = 0; $options = ''; if($this->source) { @@ -256,7 +256,7 @@ class PermissionCheckboxSetField extends FormField { $idList = array(); if($this->value) foreach($this->value as $id => $bool) { - if($bool) { + if($bool) { $perm = new $managedClass(); $perm->{$this->filterField} = $record->ID; $perm->Code = $id; diff --git a/security/Security.php b/security/Security.php index 908cb13a0..5b3daf07c 100644 --- a/security/Security.php +++ b/security/Security.php @@ -7,18 +7,18 @@ class Security extends Controller { static $allowed_actions = array( - 'index', - 'login', - 'logout', - 'basicauthlogin', - 'lostpassword', - 'passwordsent', - 'changepassword', + 'index', + 'login', + 'logout', + 'basicauthlogin', + 'lostpassword', + 'passwordsent', + 'changepassword', 'ping', 'LoginForm', 'ChangePasswordForm', 'LostPasswordForm', - ); + ); /** * Default user name. Only used in dev-mode by {@link setDefaultAdmin()} @@ -138,22 +138,22 @@ class Security extends Controller { * If you don't provide a messageSet, a default will be used. * * @param Controller $controller The controller that you were on to cause the permission - * failure. + * failure. * @param string|array $messageSet The message to show to the user. This - * can be a string, or a map of different - * messages for different contexts. - * If you pass an array, you can use the - * following keys: - * - default: The default message - * - logInAgain: The message to show - * if the user has just - * logged out and the - * - alreadyLoggedIn: The message to - * show if the user - * is already logged - * in and lacks the - * permission to - * access the item. + * can be a string, or a map of different + * messages for different contexts. + * If you pass an array, you can use the + * following keys: + * - default: The default message + * - logInAgain: The message to show + * if the user has just + * logged out and the + * - alreadyLoggedIn: The message to + * show if the user + * is already logged + * in and lacks the + * permission to + * access the item. * * The alreadyLoggedIn value can contain a '%s' placeholder that will be replaced with a link * to log in. @@ -240,7 +240,7 @@ class Security extends Controller { } - /** + /** * Get the login form to process according to the submitted data */ protected function LoginForm() { @@ -262,7 +262,7 @@ class Security extends Controller { } - /** + /** * Get the login forms for all available authentication methods * * @return array Returns an array of available login forms (array of Form @@ -276,8 +276,8 @@ class Security extends Controller { $authenticators = Authenticator::get_authenticators(); foreach($authenticators as $authenticator) { - array_push($forms, - call_user_func(array($authenticator, 'get_login_form'), + array_push($forms, + call_user_func(array($authenticator, 'get_login_form'), $this)); } @@ -307,9 +307,9 @@ class Security extends Controller { * Log the currently logged in user out * * @param bool $redirect Redirect the user back to where they came. - * - If it's false, the code calling logout() is - * responsible for sending the user where-ever - * they should go. + * - If it's false, the code calling logout() is + * responsible for sending the user where-ever + * they should go. */ public function logout($redirect = true) { $member = Member::currentUser(); @@ -675,7 +675,7 @@ class Security extends Controller { } if ($adminGroup) { - $member = $adminGroup->Members()->First(); + $member = $adminGroup->Members()->First(); } if(!$adminGroup) { diff --git a/tests/api/RestfulServiceTest.php b/tests/api/RestfulServiceTest.php index 9cc817bc5..201ea6f3a 100644 --- a/tests/api/RestfulServiceTest.php +++ b/tests/api/RestfulServiceTest.php @@ -37,7 +37,7 @@ class RestfulServiceTest extends SapphireTest { $service->setQueryString($params); $responseBody = $service->request($url)->getBody(); foreach ($params as $key => $value) { - $this->assertContains("$value", $responseBody); + $this->assertContains("$value", $responseBody); $this->assertContains("$value", $responseBody); } } @@ -52,7 +52,7 @@ class RestfulServiceTest extends SapphireTest { $service->setQueryString($params); $responseBody = $service->request($url)->getBody(); foreach ($params as $key => $value) { - $this->assertContains("$value", $responseBody); + $this->assertContains("$value", $responseBody); $this->assertContains("$value", $responseBody); } } @@ -67,7 +67,7 @@ class RestfulServiceTest extends SapphireTest { $url .= '?' . http_build_query($params); $responseBody = $service->request($url)->getBody(); foreach ($params as $key => $value) { - $this->assertContains("$value", $responseBody); + $this->assertContains("$value", $responseBody); $this->assertContains("$value", $responseBody); } } diff --git a/tests/behat/features/bootstrap/FeatureContext.php b/tests/behat/features/bootstrap/FeatureContext.php index ea6f10054..a522e8a7c 100644 --- a/tests/behat/features/bootstrap/FeatureContext.php +++ b/tests/behat/features/bootstrap/FeatureContext.php @@ -3,10 +3,10 @@ namespace SilverStripe\Framework\Test\Behaviour; use SilverStripe\BehatExtension\Context\SilverStripeContext, - SilverStripe\BehatExtension\Context\BasicContext, - SilverStripe\BehatExtension\Context\LoginContext, - SilverStripe\Framework\Test\Behaviour\CmsFormsContext, - SilverStripe\Framework\Test\Behaviour\CmsUiContext; + SilverStripe\BehatExtension\Context\BasicContext, + SilverStripe\BehatExtension\Context\LoginContext, + SilverStripe\Framework\Test\Behaviour\CmsFormsContext, + SilverStripe\Framework\Test\Behaviour\CmsUiContext; // PHPUnit require_once 'PHPUnit/Autoload.php'; @@ -20,19 +20,19 @@ require_once 'PHPUnit/Framework/Assert/Functions.php'; */ class FeatureContext extends SilverStripeContext { - /** - * Initializes context. - * Every scenario gets it's own context object. - * - * @param array $parameters context parameters (set them up through behat.yml) - */ - public function __construct(array $parameters) - { - $this->useContext('BasicContext', new BasicContext($parameters)); - $this->useContext('LoginContext', new LoginContext($parameters)); - $this->useContext('CmsFormsContext', new CmsFormsContext($parameters)); - $this->useContext('CmsUiContext', new CmsUiContext($parameters)); + /** + * Initializes context. + * Every scenario gets it's own context object. + * + * @param array $parameters context parameters (set them up through behat.yml) + */ + public function __construct(array $parameters) + { + $this->useContext('BasicContext', new BasicContext($parameters)); + $this->useContext('LoginContext', new LoginContext($parameters)); + $this->useContext('CmsFormsContext', new CmsFormsContext($parameters)); + $this->useContext('CmsUiContext', new CmsUiContext($parameters)); - parent::__construct($parameters); - } + parent::__construct($parameters); + } } diff --git a/tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php b/tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php index 7e3591913..ca7b7baf9 100644 --- a/tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php +++ b/tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsFormsContext.php @@ -3,12 +3,12 @@ namespace SilverStripe\Framework\Test\Behaviour; use Behat\Behat\Context\ClosuredContextInterface, - Behat\Behat\Context\TranslatedContextInterface, - Behat\Behat\Context\BehatContext, - Behat\Behat\Context\Step, - Behat\Behat\Exception\PendingException; + Behat\Behat\Context\TranslatedContextInterface, + Behat\Behat\Context\BehatContext, + Behat\Behat\Context\Step, + Behat\Behat\Exception\PendingException; use Behat\Gherkin\Node\PyStringNode, - Behat\Gherkin\Node\TableNode; + Behat\Gherkin\Node\TableNode; // PHPUnit require_once 'PHPUnit/Autoload.php'; @@ -21,81 +21,81 @@ require_once 'PHPUnit/Framework/Assert/Functions.php'; */ class CmsFormsContext extends BehatContext { - protected $context; + protected $context; - /** - * Initializes context. - * Every scenario gets it's own context object. - * - * @param array $parameters context parameters (set them up through behat.yml) - */ - public function __construct(array $parameters) - { - // Initialize your context here - $this->context = $parameters; - } + /** + * Initializes context. + * Every scenario gets it's own context object. + * + * @param array $parameters context parameters (set them up through behat.yml) + */ + public function __construct(array $parameters) + { + // Initialize your context here + $this->context = $parameters; + } - /** - * Get Mink session from MinkContext - */ - public function getSession($name = null) - { - return $this->getMainContext()->getSession($name); - } + /** + * Get Mink session from MinkContext + */ + public function getSession($name = null) + { + return $this->getMainContext()->getSession($name); + } - /** - * @Then /^I should see an edit page form$/ - */ - public function stepIShouldSeeAnEditPageForm() - { - $page = $this->getSession()->getPage(); + /** + * @Then /^I should see an edit page form$/ + */ + public function stepIShouldSeeAnEditPageForm() + { + $page = $this->getSession()->getPage(); - $form = $page->find('css', '#Form_EditForm'); - assertNotNull($form, 'I should see an edit page form'); - } + $form = $page->find('css', '#Form_EditForm'); + assertNotNull($form, 'I should see an edit page form'); + } - /** - * @When /^I fill in the "(?P([^"]*))" HTML field with "(?P([^"]*))"$/ - * @When /^I fill in "(?P([^"]*))" for the "(?P([^"]*))" HTML field$/ - */ - public function stepIFillInTheHtmlFieldWith($field, $value) - { - $page = $this->getSession()->getPage(); - $inputField = $page->findField($field); - assertNotNull($inputField, sprintf('HTML field "%s" not found', $field)); + /** + * @When /^I fill in the "(?P([^"]*))" HTML field with "(?P([^"]*))"$/ + * @When /^I fill in "(?P([^"]*))" for the "(?P([^"]*))" HTML field$/ + */ + public function stepIFillInTheHtmlFieldWith($field, $value) + { + $page = $this->getSession()->getPage(); + $inputField = $page->findField($field); + assertNotNull($inputField, sprintf('HTML field "%s" not found', $field)); - $this->getSession()->evaluateScript(sprintf( - "jQuery('#%s').entwine('ss').getEditor().setContent('%s')", - $inputField->getAttribute('id'), - addcslashes($value, "'") - )); - } + $this->getSession()->evaluateScript(sprintf( + "jQuery('#%s').entwine('ss').getEditor().setContent('%s')", + $inputField->getAttribute('id'), + addcslashes($value, "'") + )); + } - /** - * @When /^I append "(?P([^"]*))" to the "(?P([^"]*))" HTML field$/ - */ - public function stepIAppendTotheHtmlField($field, $value) - { - $page = $this->getSession()->getPage(); - $inputField = $page->findField($field); - assertNotNull($inputField, sprintf('HTML field "%s" not found', $field)); + /** + * @When /^I append "(?P([^"]*))" to the "(?P([^"]*))" HTML field$/ + */ + public function stepIAppendTotheHtmlField($field, $value) + { + $page = $this->getSession()->getPage(); + $inputField = $page->findField($field); + assertNotNull($inputField, sprintf('HTML field "%s" not found', $field)); - $this->getSession()->evaluateScript(sprintf( - "jQuery('#%s').entwine('ss').getEditor().insertContent('%s')", - $inputField->getAttribute('id'), - addcslashes($value, "'") - )); - } + $this->getSession()->evaluateScript(sprintf( + "jQuery('#%s').entwine('ss').getEditor().insertContent('%s')", + $inputField->getAttribute('id'), + addcslashes($value, "'") + )); + } - /** - * @Then /^the "(?P([^"]*))" HTML field should contain "(?P([^"]*))"$/ - */ - public function theHtmlFieldShouldContain($field, $value) - { - $page = $this->getSession()->getPage(); - $inputField = $page->findField($field); - assertNotNull($inputField, sprintf('HTML field "%s" not found', $field)); + /** + * @Then /^the "(?P([^"]*))" HTML field should contain "(?P([^"]*))"$/ + */ + public function theHtmlFieldShouldContain($field, $value) + { + $page = $this->getSession()->getPage(); + $inputField = $page->findField($field); + assertNotNull($inputField, sprintf('HTML field "%s" not found', $field)); - $this->getMainContext()->assertElementContains('#' . $inputField->getAttribute('id'), $value); - } + $this->getMainContext()->assertElementContains('#' . $inputField->getAttribute('id'), $value); + } } diff --git a/tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php b/tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php index 85200c835..1eaba63b4 100644 --- a/tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php +++ b/tests/behat/features/bootstrap/SilverStripe/Framework/Test/Behaviour/CmsUiContext.php @@ -3,12 +3,12 @@ namespace SilverStripe\Framework\Test\Behaviour; use Behat\Behat\Context\ClosuredContextInterface, - Behat\Behat\Context\TranslatedContextInterface, - Behat\Behat\Context\BehatContext, - Behat\Behat\Context\Step, - Behat\Behat\Exception\PendingException; + Behat\Behat\Context\TranslatedContextInterface, + Behat\Behat\Context\BehatContext, + Behat\Behat\Context\Step, + Behat\Behat\Exception\PendingException; use Behat\Gherkin\Node\PyStringNode, - Behat\Gherkin\Node\TableNode; + Behat\Gherkin\Node\TableNode; // PHPUnit @@ -22,293 +22,293 @@ require_once 'PHPUnit/Framework/Assert/Functions.php'; */ class CmsUiContext extends BehatContext { - protected $context; + protected $context; - /** - * Initializes context. - * Every scenario gets it's own context object. - * - * @param array $parameters context parameters (set them up through behat.yml) - */ - public function __construct(array $parameters) - { - // Initialize your context here - $this->context = $parameters; - } + /** + * Initializes context. + * Every scenario gets it's own context object. + * + * @param array $parameters context parameters (set them up through behat.yml) + */ + public function __construct(array $parameters) + { + // Initialize your context here + $this->context = $parameters; + } - /** - * Get Mink session from MinkContext - */ - public function getSession($name = null) - { - return $this->getMainContext()->getSession($name); - } + /** + * Get Mink session from MinkContext + */ + public function getSession($name = null) + { + return $this->getMainContext()->getSession($name); + } - /** - * @Then /^I should see the CMS$/ - */ - public function iShouldSeeTheCms() - { - $page = $this->getSession()->getPage(); - $cms_element = $page->find('css', '.cms'); - assertNotNull($cms_element, 'CMS not found'); - } + /** + * @Then /^I should see the CMS$/ + */ + public function iShouldSeeTheCms() + { + $page = $this->getSession()->getPage(); + $cms_element = $page->find('css', '.cms'); + assertNotNull($cms_element, 'CMS not found'); + } - /** - * @Then /^I should see a "([^"]*)" notice$/ - */ - public function iShouldSeeANotice($notice) - { - $this->getMainContext()->assertElementContains('.notice-wrap', $notice); - } + /** + * @Then /^I should see a "([^"]*)" notice$/ + */ + public function iShouldSeeANotice($notice) + { + $this->getMainContext()->assertElementContains('.notice-wrap', $notice); + } - /** - * @Then /^I should see a "([^"]*)" message$/ - */ - public function iShouldSeeAMessage($message) - { - $this->getMainContext()->assertElementContains('.message', $message); - } + /** + * @Then /^I should see a "([^"]*)" message$/ + */ + public function iShouldSeeAMessage($message) + { + $this->getMainContext()->assertElementContains('.message', $message); + } - protected function getCmsTabsElement() - { - $this->getSession()->wait(5000, "window.jQuery('.cms-content-header-tabs').size() > 0"); + protected function getCmsTabsElement() + { + $this->getSession()->wait(5000, "window.jQuery('.cms-content-header-tabs').size() > 0"); - $page = $this->getSession()->getPage(); - $cms_content_header_tabs = $page->find('css', '.cms-content-header-tabs'); - assertNotNull($cms_content_header_tabs, 'CMS tabs not found'); + $page = $this->getSession()->getPage(); + $cms_content_header_tabs = $page->find('css', '.cms-content-header-tabs'); + assertNotNull($cms_content_header_tabs, 'CMS tabs not found'); - return $cms_content_header_tabs; - } + return $cms_content_header_tabs; + } - protected function getCmsContentToolbarElement() - { - $this->getSession()->wait( - 5000, - "window.jQuery('.cms-content-toolbar').size() > 0 " - . "&& window.jQuery('.cms-content-toolbar').children().size() > 0" - ); + protected function getCmsContentToolbarElement() + { + $this->getSession()->wait( + 5000, + "window.jQuery('.cms-content-toolbar').size() > 0 " + . "&& window.jQuery('.cms-content-toolbar').children().size() > 0" + ); - $page = $this->getSession()->getPage(); - $cms_content_toolbar_element = $page->find('css', '.cms-content-toolbar'); - assertNotNull($cms_content_toolbar_element, 'CMS content toolbar not found'); + $page = $this->getSession()->getPage(); + $cms_content_toolbar_element = $page->find('css', '.cms-content-toolbar'); + assertNotNull($cms_content_toolbar_element, 'CMS content toolbar not found'); - return $cms_content_toolbar_element; - } + return $cms_content_toolbar_element; + } - protected function getCmsTreeElement() - { - $this->getSession()->wait(5000, "window.jQuery('.cms-tree').size() > 0"); + protected function getCmsTreeElement() + { + $this->getSession()->wait(5000, "window.jQuery('.cms-tree').size() > 0"); - $page = $this->getSession()->getPage(); - $cms_tree_element = $page->find('css', '.cms-tree'); - assertNotNull($cms_tree_element, 'CMS tree not found'); + $page = $this->getSession()->getPage(); + $cms_tree_element = $page->find('css', '.cms-tree'); + assertNotNull($cms_tree_element, 'CMS tree not found'); - return $cms_tree_element; - } + return $cms_tree_element; + } - protected function getGridfieldTable($title) - { - $page = $this->getSession()->getPage(); - $table_elements = $page->findAll('css', '.ss-gridfield-table'); - assertNotNull($table_elements, 'Table elements not found'); + protected function getGridfieldTable($title) + { + $page = $this->getSession()->getPage(); + $table_elements = $page->findAll('css', '.ss-gridfield-table'); + assertNotNull($table_elements, 'Table elements not found'); - $table_element = null; - foreach ($table_elements as $table) { - $table_title_element = $table->find('css', '.title'); - if ($table_title_element->getText() === $title) { - $table_element = $table; - break; - } - } - assertNotNull($table_element, sprintf('Table `%s` not found', $title)); + $table_element = null; + foreach ($table_elements as $table) { + $table_title_element = $table->find('css', '.title'); + if ($table_title_element->getText() === $title) { + $table_element = $table; + break; + } + } + assertNotNull($table_element, sprintf('Table `%s` not found', $title)); - return $table_element; - } + return $table_element; + } - /** - * @Given /^I should see a "([^"]*)" button in CMS Content Toolbar$/ - */ - public function iShouldSeeAButtonInCmsContentToolbar($text) - { - $cms_content_toolbar_element = $this->getCmsContentToolbarElement(); + /** + * @Given /^I should see a "([^"]*)" button in CMS Content Toolbar$/ + */ + public function iShouldSeeAButtonInCmsContentToolbar($text) + { + $cms_content_toolbar_element = $this->getCmsContentToolbarElement(); - $element = $cms_content_toolbar_element->find('named', array('link_or_button', "'$text'")); - assertNotNull($element, sprintf('%s button not found', $text)); - } + $element = $cms_content_toolbar_element->find('named', array('link_or_button', "'$text'")); + assertNotNull($element, sprintf('%s button not found', $text)); + } - /** - * @When /^I should see "([^"]*)" in CMS Tree$/ - */ - public function stepIShouldSeeInCmsTree($text) - { - $cms_tree_element = $this->getCmsTreeElement(); + /** + * @When /^I should see "([^"]*)" in CMS Tree$/ + */ + public function stepIShouldSeeInCmsTree($text) + { + $cms_tree_element = $this->getCmsTreeElement(); - $element = $cms_tree_element->find('named', array('content', "'$text'")); - assertNotNull($element, sprintf('%s not found', $text)); - } + $element = $cms_tree_element->find('named', array('content', "'$text'")); + assertNotNull($element, sprintf('%s not found', $text)); + } - /** - * @When /^I should not see "([^"]*)" in CMS Tree$/ - */ - public function stepIShouldNotSeeInCmsTree($text) - { - $cms_tree_element = $this->getCmsTreeElement(); + /** + * @When /^I should not see "([^"]*)" in CMS Tree$/ + */ + public function stepIShouldNotSeeInCmsTree($text) + { + $cms_tree_element = $this->getCmsTreeElement(); - $element = $cms_tree_element->find('named', array('content', "'$text'")); - assertNull($element, sprintf('%s found', $text)); - } + $element = $cms_tree_element->find('named', array('content', "'$text'")); + assertNull($element, sprintf('%s found', $text)); + } - /** - * @When /^I expand the "([^"]*)" CMS Panel$/ - */ - public function iExpandTheCmsPanel() - { - // TODO Make dynamic, currently hardcoded to first panel - $page = $this->getSession()->getPage(); + /** + * @When /^I expand the "([^"]*)" CMS Panel$/ + */ + public function iExpandTheCmsPanel() + { + // TODO Make dynamic, currently hardcoded to first panel + $page = $this->getSession()->getPage(); - $panel_toggle_element = $page->find('css', '.cms-content > .cms-panel > .cms-panel-toggle > .toggle-expand'); - assertNotNull($panel_toggle_element, 'Panel toggle not found'); + $panel_toggle_element = $page->find('css', '.cms-content > .cms-panel > .cms-panel-toggle > .toggle-expand'); + assertNotNull($panel_toggle_element, 'Panel toggle not found'); - if ($panel_toggle_element->isVisible()) { - $panel_toggle_element->click(); - } - } + if ($panel_toggle_element->isVisible()) { + $panel_toggle_element->click(); + } + } - /** - * @When /^I click the "([^"]*)" CMS tab$/ - */ - public function iClickTheCmsTab($tab) - { - $this->getSession()->wait(5000, "window.jQuery('.ui-tabs-nav').size() > 0"); + /** + * @When /^I click the "([^"]*)" CMS tab$/ + */ + public function iClickTheCmsTab($tab) + { + $this->getSession()->wait(5000, "window.jQuery('.ui-tabs-nav').size() > 0"); - $page = $this->getSession()->getPage(); - $tabsets = $page->findAll('css', '.ui-tabs-nav'); - assertNotNull($tabsets, 'CMS tabs not found'); + $page = $this->getSession()->getPage(); + $tabsets = $page->findAll('css', '.ui-tabs-nav'); + assertNotNull($tabsets, 'CMS tabs not found'); - $tab_element = null; - foreach($tabsets as $tabset) { - if($tab_element) continue; - $tab_element = $tabset->find('named', array('link_or_button', "'$tab'")); - } - assertNotNull($tab_element, sprintf('%s tab not found', $tab)); + $tab_element = null; + foreach($tabsets as $tabset) { + if($tab_element) continue; + $tab_element = $tabset->find('named', array('link_or_button', "'$tab'")); + } + assertNotNull($tab_element, sprintf('%s tab not found', $tab)); - $tab_element->click(); - } + $tab_element->click(); + } - /** - * @Then /^the "([^"]*)" table should contain "([^"]*)"$/ - */ - public function theTableShouldContain($table, $text) - { - $table_element = $this->getGridfieldTable($table); + /** + * @Then /^the "([^"]*)" table should contain "([^"]*)"$/ + */ + public function theTableShouldContain($table, $text) + { + $table_element = $this->getGridfieldTable($table); - $element = $table_element->find('named', array('content', "'$text'")); - assertNotNull($element, sprintf('Element containing `%s` not found in `%s` table', $text, $table)); - } + $element = $table_element->find('named', array('content', "'$text'")); + assertNotNull($element, sprintf('Element containing `%s` not found in `%s` table', $text, $table)); + } - /** - * @Then /^the "([^"]*)" table should not contain "([^"]*)"$/ - */ - public function theTableShouldNotContain($table, $text) - { - $table_element = $this->getGridfieldTable($table); + /** + * @Then /^the "([^"]*)" table should not contain "([^"]*)"$/ + */ + public function theTableShouldNotContain($table, $text) + { + $table_element = $this->getGridfieldTable($table); - $element = $table_element->find('named', array('content', "'$text'")); - assertNull($element, sprintf('Element containing `%s` not found in `%s` table', $text, $table)); - } + $element = $table_element->find('named', array('content', "'$text'")); + assertNull($element, sprintf('Element containing `%s` not found in `%s` table', $text, $table)); + } - /** - * @Given /^I click on "([^"]*)" in the "([^"]*)" table$/ - */ - public function iClickOnInTheTable($text, $table) - { - $table_element = $this->getGridfieldTable($table); + /** + * @Given /^I click on "([^"]*)" in the "([^"]*)" table$/ + */ + public function iClickOnInTheTable($text, $table) + { + $table_element = $this->getGridfieldTable($table); - $element = $table_element->find('xpath', sprintf('//*[count(*)=0 and contains(.,"%s")]', $text)); - assertNotNull($element, sprintf('Element containing `%s` not found', $text)); - $element->click(); - } + $element = $table_element->find('xpath', sprintf('//*[count(*)=0 and contains(.,"%s")]', $text)); + assertNotNull($element, sprintf('Element containing `%s` not found', $text)); + $element->click(); + } - /** - * @Then /^I can see the preview panel$/ - */ - public function iCanSeeThePreviewPanel() - { - $this->getMainContext()->assertElementOnPage('.cms-preview'); - } + /** + * @Then /^I can see the preview panel$/ + */ + public function iCanSeeThePreviewPanel() + { + $this->getMainContext()->assertElementOnPage('.cms-preview'); + } - /** - * @Given /^the preview contains "([^"]*)"$/ - */ - public function thePreviewContains($content) - { - $driver = $this->getSession()->getDriver(); - $driver->switchToIFrame('cms-preview-iframe'); + /** + * @Given /^the preview contains "([^"]*)"$/ + */ + public function thePreviewContains($content) + { + $driver = $this->getSession()->getDriver(); + $driver->switchToIFrame('cms-preview-iframe'); - $this->getMainContext()->assertPageContainsText($content); - $driver->switchToWindow(); - } + $this->getMainContext()->assertPageContainsText($content); + $driver->switchToWindow(); + } - /** - * @Given /^the preview does not contain "([^"]*)"$/ - */ - public function thePreviewDoesNotContain($content) - { - $driver = $this->getSession()->getDriver(); - $driver->switchToIFrame('cms-preview-iframe'); + /** + * @Given /^the preview does not contain "([^"]*)"$/ + */ + public function thePreviewDoesNotContain($content) + { + $driver = $this->getSession()->getDriver(); + $driver->switchToIFrame('cms-preview-iframe'); - $this->getMainContext()->assertPageNotContainsText($content); - $driver->switchToWindow(); - } + $this->getMainContext()->assertPageNotContainsText($content); + $driver->switchToWindow(); + } - /** - * Workaround for chosen.js dropdowns which hide the original dropdown field. - * - * @When /^(?:|I )fill in "(?P(?:[^"]|\\")*)" dropdown with "(?P(?:[^"]|\\")*)"$/ - * @When /^(?:|I )fill in "(?P(?:[^"]|\\")*)" for "(?P(?:[^"]|\\")*)" dropdown$/ - */ - public function theIFillInTheDropdownWith($field, $value) - { - $field = $this->fixStepArgument($field); - $value = $this->fixStepArgument($value); + /** + * Workaround for chosen.js dropdowns which hide the original dropdown field. + * + * @When /^(?:|I )fill in "(?P(?:[^"]|\\")*)" dropdown with "(?P(?:[^"]|\\")*)"$/ + * @When /^(?:|I )fill in "(?P(?:[^"]|\\")*)" for "(?P(?:[^"]|\\")*)" dropdown$/ + */ + public function theIFillInTheDropdownWith($field, $value) + { + $field = $this->fixStepArgument($field); + $value = $this->fixStepArgument($value); - $inputField = $this->getSession()->getPage()->findField($field); - if(null === $inputField) { - throw new ElementNotFoundException(sprintf( - 'Chosen.js dropdown named "%s" not found', - $field - )); - } + $inputField = $this->getSession()->getPage()->findField($field); + if(null === $inputField) { + throw new ElementNotFoundException(sprintf( + 'Chosen.js dropdown named "%s" not found', + $field + )); + } - $container = $inputField->getParent()->getParent(); - if(null === $container) throw new ElementNotFoundException('Chosen.js field container not found'); - - $linkEl = $container->find('xpath', './/a'); - if(null === $linkEl) throw new ElementNotFoundException('Chosen.js link element not found'); - $linkEl->click(); - $this->getSession()->wait(100); // wait for dropdown overlay to appear + $container = $inputField->getParent()->getParent(); + if(null === $container) throw new ElementNotFoundException('Chosen.js field container not found'); + + $linkEl = $container->find('xpath', './/a'); + if(null === $linkEl) throw new ElementNotFoundException('Chosen.js link element not found'); + $linkEl->click(); + $this->getSession()->wait(100); // wait for dropdown overlay to appear - $listEl = $container->find('xpath', sprintf('.//li[contains(normalize-space(string(.)), \'%s\')]', $value)); - if(null === $listEl) - { - throw new ElementNotFoundException(sprintf( - 'Chosen.js list element with title "%s" not found', - $value - )); - } - $listEl->click(); - } + $listEl = $container->find('xpath', sprintf('.//li[contains(normalize-space(string(.)), \'%s\')]', $value)); + if(null === $listEl) + { + throw new ElementNotFoundException(sprintf( + 'Chosen.js list element with title "%s" not found', + $value + )); + } + $listEl->click(); + } - /** - * Returns fixed step argument (with \\" replaced back to "). - * - * @param string $argument - * - * @return string - */ - protected function fixStepArgument($argument) - { - return str_replace('\\"', '"', $argument); - } + /** + * Returns fixed step argument (with \\" replaced back to "). + * + * @param string $argument + * + * @return string + */ + protected function fixStepArgument($argument) + { + return str_replace('\\"', '"', $argument); + } } diff --git a/tests/bootstrap.php b/tests/bootstrap.php index 1904a068f..8e4da445d 100644 --- a/tests/bootstrap.php +++ b/tests/bootstrap.php @@ -27,18 +27,18 @@ if(!defined('BASE_PATH')) define('BASE_PATH', dirname($frameworkPath)); // Copied from cli-script.php, to enable same behaviour through phpunit runner. if(isset($_SERVER['argv'][2])) { - $args = array_slice($_SERVER['argv'],2); - if(!isset($_GET)) $_GET = array(); - if(!isset($_REQUEST)) $_REQUEST = array(); - foreach($args as $arg) { - if(strpos($arg,'=') == false) { - $_GET['args'][] = $arg; - } else { - $newItems = array(); - parse_str( (substr($arg,0,2) == '--') ? substr($arg,2) : $arg, $newItems ); - $_GET = array_merge($_GET, $newItems); - } - } + $args = array_slice($_SERVER['argv'],2); + if(!isset($_GET)) $_GET = array(); + if(!isset($_REQUEST)) $_REQUEST = array(); + foreach($args as $arg) { + if(strpos($arg,'=') == false) { + $_GET['args'][] = $arg; + } else { + $newItems = array(); + parse_str( (substr($arg,0,2) == '--') ? substr($arg,2) : $arg, $newItems ); + $_GET = array_merge($_GET, $newItems); + } + } $_REQUEST = array_merge($_REQUEST, $_GET); } @@ -70,4 +70,4 @@ if(!isset($_GET['flush']) || !$_GET['flush']) { "Add flush=1 as an argument to discover new classes or files.\n", false ); -} \ No newline at end of file +} diff --git a/tests/control/HTTPTest.php b/tests/control/HTTPTest.php index 654b824cb..5379c7ae9 100644 --- a/tests/control/HTTPTest.php +++ b/tests/control/HTTPTest.php @@ -10,8 +10,8 @@ class HTTPTest extends SapphireTest { /** * Tests {@link HTTP::getLinksIn()} */ - public function testGetLinksIn() { - $content = ' + public function testGetLinksIn() { + $content = '

    My Cool Site

    @@ -26,13 +26,13 @@ class HTTPTest extends SapphireTest { played a part in his journey. HE ALSO DISCOVERED THE KEY. Later he got his mixed up.

    - '; - + '; + $expected = array ( '/', 'home/', 'mother/', '$Journey', 'space travel', 'unquoted', 'single quote', '/father', 'attributes', 'journey', 'CAPS LOCK', 'quotes \'mixed\' up' ); - + $result = HTTP::getLinksIn($content); // Results don't neccesarily come out in the order they are in the $content param. @@ -41,7 +41,7 @@ class HTTPTest extends SapphireTest { $this->assertTrue(is_array($result)); $this->assertEquals($expected, $result, 'Test that all links within the content are found.'); - } + } /** * Tests {@link HTTP::setGetVar()} diff --git a/tests/core/ArrayDataTest.php b/tests/core/ArrayDataTest.php index 6869246f6..88835b630 100644 --- a/tests/core/ArrayDataTest.php +++ b/tests/core/ArrayDataTest.php @@ -11,7 +11,7 @@ class ArrayDataTest extends SapphireTest { $this->assertEquals("Varchar", get_class($arrayData->A)); $this->assertEquals("ArrayData", get_class($arrayData->B)); } - + public function testWrappingANonEmptyObjectWorks() { $object = new ArrayDataTest_NonEmptyObject(); $this->assertTrue(is_object($object)); diff --git a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassB.php b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassB.php index 1cd5a0dc4..59ea70846 100644 --- a/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassB.php +++ b/tests/core/manifest/fixtures/namespaced_classmanifest/module/classes/ClassB.php @@ -4,5 +4,5 @@ */ namespace silverstripe\test; - + class ClassB extends ClassA { } diff --git a/tests/dev/CsvBulkLoaderTest.php b/tests/dev/CsvBulkLoaderTest.php index 2df55a45c..435972547 100644 --- a/tests/dev/CsvBulkLoaderTest.php +++ b/tests/dev/CsvBulkLoaderTest.php @@ -55,7 +55,7 @@ class CsvBulkLoaderTest extends SapphireTest { $this->assertEquals(4, $resultDataObject->Count(), 'Test if existing data is deleted before new data is added'); - } + } /** * Test import with manual column mapping diff --git a/tests/forms/FileFieldTest.php b/tests/forms/FileFieldTest.php index 83bf22d57..39017d1e1 100644 --- a/tests/forms/FileFieldTest.php +++ b/tests/forms/FileFieldTest.php @@ -18,11 +18,11 @@ class FileFieldTest extends FunctionalTest { new FieldList() ); $fileFieldValue = array( - 'name' => 'aCV.txt', - 'type' => 'application/octet-stream', - 'tmp_name' => '/private/var/tmp/phpzTQbqP', - 'error' => 0, - 'size' => 3471 + 'name' => 'aCV.txt', + 'type' => 'application/octet-stream', + 'tmp_name' => '/private/var/tmp/phpzTQbqP', + 'error' => 0, + 'size' => 3471 ); $fileField->setValue($fileFieldValue); @@ -46,11 +46,11 @@ class FileFieldTest extends FunctionalTest { ); // All fields are filled but for some reason an error occured when uploading the file => fails $fileFieldValue = array( - 'name' => 'aCV.txt', - 'type' => 'application/octet-stream', - 'tmp_name' => '/private/var/tmp/phpzTQbqP', - 'error' => 1, - 'size' => 3471 + 'name' => 'aCV.txt', + 'type' => 'application/octet-stream', + 'tmp_name' => '/private/var/tmp/phpzTQbqP', + 'error' => 1, + 'size' => 3471 ); $fileField->setValue($fileFieldValue); diff --git a/tests/forms/RequirementsTest.php b/tests/forms/RequirementsTest.php index 597bbff23..9c53e0ec9 100644 --- a/tests/forms/RequirementsTest.php +++ b/tests/forms/RequirementsTest.php @@ -368,7 +368,7 @@ class RequirementsTest extends SapphireTest { ); } } - + public function assertFileNotIncluded($backend, $type, $files) { $type = strtolower($type); switch ($type) { @@ -412,4 +412,4 @@ class RequirementsTest extends SapphireTest { ); } } -} \ No newline at end of file +} diff --git a/tests/forms/TableListFieldTest.php b/tests/forms/TableListFieldTest.php index 161d73e99..740cbd9a5 100644 --- a/tests/forms/TableListFieldTest.php +++ b/tests/forms/TableListFieldTest.php @@ -169,11 +169,11 @@ class TableListFieldTest extends SapphireTest { $ajaxResponse = Director::test($table->Link())->getBody(); // Check that the column headings have been rendered - $this->assertRegExp('/]*>.*Col A.*<\/th>/si', $ajaxResponse); - $this->assertRegExp('/]*>.*Col B.*<\/th>/si', $ajaxResponse); - $this->assertRegExp('/]*>.*Col C.*<\/th>/si', $ajaxResponse); - $this->assertRegExp('/]*>.*Col D.*<\/th>/si', $ajaxResponse); - $this->assertRegExp('/]*>.*Col E.*<\/th>/si', $ajaxResponse); + $this->assertRegExp('/]*>.*Col A.*<\/th>/si', $ajaxResponse); + $this->assertRegExp('/]*>.*Col B.*<\/th>/si', $ajaxResponse); + $this->assertRegExp('/]*>.*Col C.*<\/th>/si', $ajaxResponse); + $this->assertRegExp('/]*>.*Col D.*<\/th>/si', $ajaxResponse); + $this->assertRegExp('/]*>.*Col E.*<\/th>/si', $ajaxResponse); } public function testCsvExport() { @@ -294,19 +294,19 @@ class TableListFieldTest extends SapphireTest { unset($_REQUEST['ctf']); } - /** - * Check that a SS_List can be passed to TableListField - */ + /** + * Check that a SS_List can be passed to TableListField + */ public function testDataObjectSet() { - $one = new TableListFieldTest_Obj; - $one->A = "A-one"; - $two = new TableListFieldTest_Obj; - $two->A = "A-two"; - $three = new TableListFieldTest_Obj; - $three->A = "A-three"; - - $list = new ArrayList(array($one, $two, $three)); - + $one = new TableListFieldTest_Obj; + $one->A = "A-one"; + $two = new TableListFieldTest_Obj; + $two->A = "A-two"; + $three = new TableListFieldTest_Obj; + $three->A = "A-three"; + + $list = new ArrayList(array($one, $two, $three)); + // A TableListField must be inside a form for its links to be generated $form = new Form(new TableListFieldTest_TestController(), "TestForm", new FieldList( new TableListField("Tester", $list, array( diff --git a/tests/forms/uploadfield/UploadFieldTest.php b/tests/forms/uploadfield/UploadFieldTest.php index aebb9feb3..2ceb16b17 100644 --- a/tests/forms/uploadfield/UploadFieldTest.php +++ b/tests/forms/uploadfield/UploadFieldTest.php @@ -4,7 +4,7 @@ * @subpackage tests */ - class UploadFieldTest extends FunctionalTest { +class UploadFieldTest extends FunctionalTest { static $fixture_file = 'UploadFieldTest.yml'; diff --git a/tests/injector/testservices/SampleService.php b/tests/injector/testservices/SampleService.php index 738b6afe4..c43ff3110 100644 --- a/tests/injector/testservices/SampleService.php +++ b/tests/injector/testservices/SampleService.php @@ -2,11 +2,11 @@ class SampleService { - public $constructorVarOne; + public $constructorVarOne; public $constructorVarTwo; public function __construct($v1 = null, $v2 = null) { $this->constructorVarOne = $v1; $this->constructorVarTwo = $v2; } -} \ No newline at end of file +} diff --git a/tests/javascript/TreeDropDownField/TreeDropdownField.js b/tests/javascript/TreeDropDownField/TreeDropdownField.js index 05ebd1849..07afd1997 100644 --- a/tests/javascript/TreeDropDownField/TreeDropdownField.js +++ b/tests/javascript/TreeDropDownField/TreeDropdownField.js @@ -49,7 +49,7 @@ '' + '
    • ' ); - }); + }); afterEach(function() { $('#testfield').remove(); @@ -114,7 +114,7 @@ '' + '
    ' ); - }); + }); afterEach(function() { $('#testfield').remove(); @@ -146,7 +146,7 @@ '' + '
    ' ); - }); + }); afterEach(function() { $('#testfield').remove(); @@ -222,7 +222,7 @@ '' + '' ); - }); + }); afterEach(function() { $('#testfield').remove(); @@ -236,4 +236,4 @@ }); }); }); -}(jQuery)); \ No newline at end of file +}(jQuery)); diff --git a/tests/model/ComponentSetTest.php b/tests/model/ComponentSetTest.php index 8a067fec4..074fe2503 100644 --- a/tests/model/ComponentSetTest.php +++ b/tests/model/ComponentSetTest.php @@ -60,7 +60,6 @@ class ComponentSetTest_Player extends Member implements TestOnly { static $belongs_many_many = array( 'Teams' => 'ComponentSetTest_Team' ); - } class ComponentSetTest_Team extends DataObject implements TestOnly { diff --git a/tests/model/DataListTest.php b/tests/model/DataListTest.php index 7f3335f37..f2904be78 100644 --- a/tests/model/DataListTest.php +++ b/tests/model/DataListTest.php @@ -492,7 +492,7 @@ class DataListTest extends SapphireTest { */ public function testExcludeOnFilter() { $list = DataObjectTest_TeamComment::get(); - $list = $list->filter('Comment', 'Phil is a unique guy, and comments on team2'); + $list = $list->filter('Comment', 'Phil is a unique guy, and comments on team2'); $list = $list->exclude('Name', 'Bob'); $this->assertContains( diff --git a/tests/model/DataObjectTest.php b/tests/model/DataObjectTest.php index df4d59e0a..aedfee7e4 100644 --- a/tests/model/DataObjectTest.php +++ b/tests/model/DataObjectTest.php @@ -1143,7 +1143,6 @@ class DataObjectTest_Player extends Member implements TestOnly { static $belongs_many_many = array( 'Teams' => 'DataObjectTest_Team' ); - } class DataObjectTest_Team extends DataObject implements TestOnly { diff --git a/tests/model/MoneyTest.php b/tests/model/MoneyTest.php index 8b479493d..9b8bfc92d 100644 --- a/tests/model/MoneyTest.php +++ b/tests/model/MoneyTest.php @@ -71,12 +71,12 @@ class MoneyTest extends SapphireTest { } /** - * Write a Money object to the database, then re-read it to ensure it - * is re-read properly. - */ - public function testGettingWrittenDataObject() { - $local = i18n::get_locale(); - //make sure that the $ amount is not prefixed by US$, as it would be in non-US locale + * Write a Money object to the database, then re-read it to ensure it + * is re-read properly. + */ + public function testGettingWrittenDataObject() { + $local = i18n::get_locale(); + //make sure that the $ amount is not prefixed by US$, as it would be in non-US locale i18n::set_locale('en_US'); $obj = new MoneyTest_DataObject(); @@ -99,8 +99,8 @@ class MoneyTest extends SapphireTest { "Money field not added to data object properly when read." ); - i18n::set_locale($local); - } + i18n::set_locale($local); + } public function testToCurrency() { $USD = new Money(); diff --git a/tests/model/PaginatedListTest.php b/tests/model/PaginatedListTest.php index d0f7f8540..257212bcb 100644 --- a/tests/model/PaginatedListTest.php +++ b/tests/model/PaginatedListTest.php @@ -43,11 +43,11 @@ class PaginatedListTest extends SapphireTest { public function testSetPaginationFromQuery() { $query = $this->getMock('SQLQuery'); $query->expects($this->once()) - ->method('getLimit') - ->will($this->returnValue(array('limit' => 15, 'start' => 30))); + ->method('getLimit') + ->will($this->returnValue(array('limit' => 15, 'start' => 30))); $query->expects($this->once()) - ->method('unlimitedRowCount') - ->will($this->returnValue(100)); + ->method('unlimitedRowCount') + ->will($this->returnValue(100)); $list = new PaginatedList(new ArrayList()); $list->setPaginationFromQuery($query); diff --git a/tests/model/VersionedTest.php b/tests/model/VersionedTest.php index 34888d53c..6c1aec3b9 100644 --- a/tests/model/VersionedTest.php +++ b/tests/model/VersionedTest.php @@ -254,12 +254,12 @@ class VersionedTest extends SapphireTest { * Test that SQLQuery::queriedTables() applies the version-suffixes properly. */ public function testQueriedTables() { - Versioned::reading_stage('Live'); + Versioned::reading_stage('Live'); - $this->assertEquals(array( - 'VersionedTest_DataObject_Live', - 'VersionedTest_Subclass_Live', - ), DataObject::get('VersionedTest_Subclass')->dataQuery()->query()->queriedTables()); + $this->assertEquals(array( + 'VersionedTest_DataObject_Live', + 'VersionedTest_Subclass_Live', + ), DataObject::get('VersionedTest_Subclass')->dataQuery()->query()->queriedTables()); } public function testGetVersionWhenClassnameChanged() { diff --git a/tests/phpcs/tabs.xml b/tests/phpcs/tabs.xml new file mode 100644 index 000000000..93dc08cb6 --- /dev/null +++ b/tests/phpcs/tabs.xml @@ -0,0 +1,18 @@ + + + CodeSniffer ruleset for SilverStripe indentation conventions. + + + */css/* + css/* + + + thirdparty/* + */jquery-changetracker/* + parsers/HTML/BBCodeParser/* + + + */SSTemplateParser.php$ + + + diff --git a/tests/search/SearchContextTest.php b/tests/search/SearchContextTest.php index f9e9b41e4..f5a9b7ca2 100644 --- a/tests/search/SearchContextTest.php +++ b/tests/search/SearchContextTest.php @@ -41,40 +41,40 @@ class SearchContextTest extends SapphireTest { } public function testPartialMatchUsedByDefaultWhenNotExplicitlySet() { - $person = singleton('SearchContextTest_Person'); - $context = $person->getDefaultSearchContext(); - - $this->assertEquals( - array( - "Name" => new PartialMatchFilter("Name"), - "HairColor" => new PartialMatchFilter("HairColor"), - "EyeColor" => new PartialMatchFilter("EyeColor") - ), - $context->getFilters() - ); + $person = singleton('SearchContextTest_Person'); + $context = $person->getDefaultSearchContext(); + + $this->assertEquals( + array( + "Name" => new PartialMatchFilter("Name"), + "HairColor" => new PartialMatchFilter("HairColor"), + "EyeColor" => new PartialMatchFilter("EyeColor") + ), + $context->getFilters() + ); } public function testDefaultFiltersDefinedWhenNotSetInDataObject() { $book = singleton('SearchContextTest_Book'); $context = $book->getDefaultSearchContext(); - $this->assertEquals( - array( - "Title" => new PartialMatchFilter("Title") - ), - $context->getFilters() - ); + $this->assertEquals( + array( + "Title" => new PartialMatchFilter("Title") + ), + $context->getFilters() + ); } public function testUserDefinedFiltersAppearInSearchContext() { $company = singleton('SearchContextTest_Company'); $context = $company->getDefaultSearchContext(); - + $this->assertEquals( array( "Name" => new PartialMatchFilter("Name"), - "Industry" => new PartialMatchFilter("Industry"), - "AnnualProfit" => new PartialMatchFilter("AnnualProfit") + "Industry" => new PartialMatchFilter("Industry"), + "AnnualProfit" => new PartialMatchFilter("AnnualProfit") ), $context->getFilters() ); @@ -87,8 +87,8 @@ class SearchContextTest extends SapphireTest { $this->assertEquals( new FieldList( new TextField("Name", 'Name'), - new TextareaField("Industry", 'Industry'), - new NumericField("AnnualProfit", 'The Almighty Annual Profit') + new TextareaField("Industry", 'Industry'), + new NumericField("AnnualProfit", 'The Almighty Annual Profit') ), $context->getFields() ); diff --git a/tests/security/GroupTest.php b/tests/security/GroupTest.php index 0299d8d64..e923dad41 100644 --- a/tests/security/GroupTest.php +++ b/tests/security/GroupTest.php @@ -52,47 +52,47 @@ class GroupTest extends FunctionalTest { public function testMemberGroupRelationForm() { Session::set('loggedInAs', $this->idFromFixture('GroupTest_Member', 'admin')); - $adminGroup = $this->objFromFixture('Group', 'admingroup'); - $parentGroup = $this->objFromFixture('Group', 'parentgroup'); - $childGroup = $this->objFromFixture('Group', 'childgroup'); + $adminGroup = $this->objFromFixture('Group', 'admingroup'); + $parentGroup = $this->objFromFixture('Group', 'parentgroup'); + $childGroup = $this->objFromFixture('Group', 'childgroup'); - // Test single group relation through checkboxsetfield - $form = new GroupTest_MemberForm($this, 'Form'); - $member = $this->objFromFixture('GroupTest_Member', 'admin'); - $form->loadDataFrom($member); - $checkboxSetField = $form->Fields()->fieldByName('Groups'); - $checkboxSetField->setValue(array( - $adminGroup->ID => $adminGroup->ID, // keep existing relation - $parentGroup->ID => $parentGroup->ID, // add new relation - )); - $form->saveInto($member); - $updatedGroups = $member->Groups(); + // Test single group relation through checkboxsetfield + $form = new GroupTest_MemberForm($this, 'Form'); + $member = $this->objFromFixture('GroupTest_Member', 'admin'); + $form->loadDataFrom($member); + $checkboxSetField = $form->Fields()->fieldByName('Groups'); + $checkboxSetField->setValue(array( + $adminGroup->ID => $adminGroup->ID, // keep existing relation + $parentGroup->ID => $parentGroup->ID, // add new relation + )); + $form->saveInto($member); + $updatedGroups = $member->Groups(); - $this->assertEquals( + $this->assertEquals( array($adminGroup->ID, $parentGroup->ID), - $updatedGroups->column(), - "Adding a toplevel group works" - ); + $updatedGroups->column(), + "Adding a toplevel group works" + ); - // Test unsetting relationship - $form->loadDataFrom($member); - $checkboxSetField = $form->Fields()->fieldByName('Groups'); - $checkboxSetField->setValue(array( - $adminGroup->ID => $adminGroup->ID, // keep existing relation - //$parentGroup->ID => $parentGroup->ID, // remove previously set relation - )); - $form->saveInto($member); - $member->flushCache(); - $updatedGroups = $member->Groups(); - $this->assertEquals( + // Test unsetting relationship + $form->loadDataFrom($member); + $checkboxSetField = $form->Fields()->fieldByName('Groups'); + $checkboxSetField->setValue(array( + $adminGroup->ID => $adminGroup->ID, // keep existing relation + //$parentGroup->ID => $parentGroup->ID, // remove previously set relation + )); + $form->saveInto($member); + $member->flushCache(); + $updatedGroups = $member->Groups(); + $this->assertEquals( array($adminGroup->ID), - $updatedGroups->column(), - "Removing a previously added toplevel group works" - ); + $updatedGroups->column(), + "Removing a previously added toplevel group works" + ); - // Test adding child group + // Test adding child group - } + } public function testCollateAncestorIDs() { $parentGroup = $this->objFromFixture('Group', 'parentgroup'); @@ -139,37 +139,37 @@ class GroupTest extends FunctionalTest { } class GroupTest_Member extends Member implements TestOnly { - - public function getCMSFields() { - $groups = DataObject::get('Group'); - $groupsMap = ($groups) ? $groups->map() : false; - $fields = new FieldList( - new HiddenField('ID', 'ID'), - new CheckboxSetField( - 'Groups', - 'Groups', - $groupsMap - ) - ); - - return $fields; - } - + + public function getCMSFields() { + $groups = DataObject::get('Group'); + $groupsMap = ($groups) ? $groups->map() : false; + $fields = new FieldList( + new HiddenField('ID', 'ID'), + new CheckboxSetField( + 'Groups', + 'Groups', + $groupsMap + ) + ); + + return $fields; + } + } class GroupTest_MemberForm extends Form { - - public function __construct($controller, $name) { - $fields = singleton('GroupTest_Member')->getCMSFields(); - $actions = new FieldList( - new FormAction('doSave','save') - ); - - parent::__construct($controller, $name, $fields, $actions); - } - - public function doSave($data, $form) { - // done in testing methods - } - + + public function __construct($controller, $name) { + $fields = singleton('GroupTest_Member')->getCMSFields(); + $actions = new FieldList( + new FormAction('doSave','save') + ); + + parent::__construct($controller, $name, $fields, $actions); + } + + public function doSave($data, $form) { + // done in testing methods + } + } diff --git a/tests/security/MemberTest.php b/tests/security/MemberTest.php index 94e94d3bf..4879fa764 100644 --- a/tests/security/MemberTest.php +++ b/tests/security/MemberTest.php @@ -29,8 +29,8 @@ class MemberTest extends FunctionalTest { } public function __destruct() { - i18n::set_default_locale($this->local); - } + i18n::set_default_locale($this->local); + } public function setUp() { parent::setUp(); diff --git a/tests/view/ViewableDataTest.php b/tests/view/ViewableDataTest.php index 93dcf45c0..40d770e02 100644 --- a/tests/view/ViewableDataTest.php +++ b/tests/view/ViewableDataTest.php @@ -155,9 +155,9 @@ class ViewableDataTest_Castable extends ViewableData { return $this->unsafeXML(); } - public function forTemplate() { - return 'castable'; - } + public function forTemplate() { + return 'castable'; + } } class ViewableDataTest_RequiresCasting extends ViewableData { diff --git a/view/ArrayData.php b/view/ArrayData.php index 549a953b5..09b691b02 100644 --- a/view/ArrayData.php +++ b/view/ArrayData.php @@ -65,7 +65,7 @@ class ArrayData extends ViewableData { return new ArrayData($value); } elseif (ArrayLib::is_associative($value)) { return new ArrayData($value); - } else { + } else { return $value; } } diff --git a/view/Requirements.php b/view/Requirements.php index 84cdbfd76..1d10336c9 100644 --- a/view/Requirements.php +++ b/view/Requirements.php @@ -22,7 +22,7 @@ class Requirements { * @return boolean */ public static function get_combined_files_enabled() { - return self::backend()->get_combined_files_enabled(); + return self::backend()->get_combined_files_enabled(); } /** @@ -656,7 +656,7 @@ class Requirements_Backend { $jsRequirements = ''; // Combine files - updates $this->javascript and $this->css - $this->process_combined_files(); + $this->process_combined_files(); foreach(array_diff_key($this->javascript,$this->blocked) as $file => $dummy) { $path = $this->path_for_file($file); @@ -1023,9 +1023,9 @@ class Requirements_Backend { // file exists, check modification date of every contained file $srcLastMod = 0; foreach($fileList as $file) { - if(file_exists($base . $file)) { - $srcLastMod = max(filemtime($base . $file), $srcLastMod); - } + if(file_exists($base . $file)) { + $srcLastMod = max(filemtime($base . $file), $srcLastMod); + } } $refresh = $srcLastMod > filemtime($combinedFilePath); } else { @@ -1071,9 +1071,9 @@ class Requirements_Backend { // method repeatedly - it will behave different on the second call! $this->javascript = $newJSRequirements; $this->css = $newCSSRequirements; - } - - public function get_custom_scripts() { + } + + public function get_custom_scripts() { $requirements = ""; if($this->customScript) { diff --git a/view/SSTemplateParser.php.inc b/view/SSTemplateParser.php.inc index 77635863a..7652ed105 100644 --- a/view/SSTemplateParser.php.inc +++ b/view/SSTemplateParser.php.inc @@ -453,7 +453,7 @@ class SSTemplateParser extends Parser { function Require_Call(&$res, $sub) { $res['php'] = "Requirements::".$sub['Method']['text'].'('.$sub['CallArguments']['php'].');'; } - + /*!* @@ -617,7 +617,7 @@ class SSTemplateParser extends Parser { function OldTTag_OldTPart(&$res, $sub) { $res['php'] = $sub['php']; } - + /*!* # This is the old <% sprintf(_t()) %> tag diff --git a/view/SSViewer.php b/view/SSViewer.php index d50e08947..b3a315122 100644 --- a/view/SSViewer.php +++ b/view/SSViewer.php @@ -664,10 +664,10 @@ class SSViewer { } if(!$this->chosenTemplates) { - $templateList = (is_array($templateList)) ? $templateList : array($templateList); - - user_error("None of these templates can be found in theme '" - . self::current_theme() . "': ". implode(".ss, ", $templateList) . ".ss", E_USER_WARNING); + $templateList = (is_array($templateList)) ? $templateList : array($templateList); + + user_error("None of these templates can be found in theme '" + . self::current_theme() . "': ". implode(".ss, ", $templateList) . ".ss", E_USER_WARNING); } } @@ -717,7 +717,7 @@ class SSViewer { protected static $options = array( 'rewriteHashlinks' => true, ); - + protected static $topLevel = array(); public static function topLevel() { From 4f63f91cc8168affdccfb64051eac6fcd2078a3b Mon Sep 17 00:00:00 2001 From: Marcus Nyeholt Date: Fri, 7 Dec 2012 13:16:33 +1100 Subject: [PATCH 2/2] BUG Fixed issue with convertServiceProperty Fixed issue where convertServiceProperty is called when creating objects with user-supplied constructor arguments, so that it's only called when creating objects using injector configuration. This reduces the overhead of unnecessary calls to convertServiceProperty. Updated test cases to validate behaviour --- control/injector/Injector.php | 35 ++++++++++--- tests/injector/InjectorTest.php | 92 +++++++++++++++++++++++++++------ 2 files changed, 106 insertions(+), 21 deletions(-) diff --git a/control/injector/Injector.php b/control/injector/Injector.php index e5a776fcc..cfe06843e 100644 --- a/control/injector/Injector.php +++ b/control/injector/Injector.php @@ -362,6 +362,7 @@ class Injector { // EXCEPT when there's already an existing instance at this id. // if so, we need to instantiate and replace immediately if (isset($this->serviceCache[$id])) { + $this->updateSpecConstructor($spec); $this->instantiate($spec, $id); } } @@ -403,6 +404,20 @@ class Injector { } } } + + /** + * Update a class specification to convert constructor configuration information if needed + * + * We do this as a separate process to avoid unneeded calls to convertServiceProperty + * + * @param array $spec + * The class specification to update + */ + protected function updateSpecConstructor(&$spec) { + if (isset($spec['constructor'])) { + $spec['constructor'] = $this->convertServiceProperty($spec['constructor']); + } + } /** * Recursively convert a value into its proper representation with service references @@ -468,7 +483,7 @@ class Injector { $constructorParams = $spec['constructor']; } - $object = $this->objectCreator->create($this, $class, $constructorParams); + $object = $this->objectCreator->create($class, $constructorParams); // figure out if we have a specific id set or not. In some cases, we might be instantiating objects // that we don't manage directly; we don't want to store these in the service cache below @@ -730,15 +745,22 @@ class Injector { // we don't want to return the singleton version of it. $spec = $this->specs[$serviceName]; $type = isset($spec['type']) ? $spec['type'] : null; - + // if we're explicitly a prototype OR we're not wanting a singleton if (($type && $type == 'prototype') || !$asSingleton) { if ($spec && $constructorArgs) { $spec['constructor'] = $constructorArgs; + } else { + // convert any _configured_ constructor args. + // we don't call this for get() calls where someone passes in + // constructor args, otherwise we end up calling convertServiceParams + // way too often + $this->updateSpecConstructor($spec); } return $this->instantiate($spec, $serviceName, !$type ? 'prototype' : $type); } else { if (!isset($this->serviceCache[$serviceName])) { + $this->updateSpecConstructor($spec); $this->instantiate($spec, $serviceName); } return $this->serviceCache[$serviceName]; @@ -750,6 +772,7 @@ class Injector { $this->load(array($name => $config)); if (isset($this->specs[$name])) { $spec = $this->specs[$name]; + $this->updateSpecConstructor($spec); return $this->instantiate($spec, $name); } } @@ -816,10 +839,10 @@ class InjectionCreator { * @param array $params * An array of parameters to be passed to the constructor */ - public function create(Injector $injector, $class, $params = array()) { + public function create($class, $params = array()) { $reflector = new ReflectionClass($class); if (count($params)) { - return $reflector->newInstanceArgs($injector->convertServiceProperty($params)); + return $reflector->newInstanceArgs($params); } return $reflector->newInstance(); } @@ -833,10 +856,10 @@ class SilverStripeInjectionCreator { * @param array $params * An array of parameters to be passed to the constructor */ - public function create(Injector $injector, $class, $params = array()) { + public function create($class, $params = array()) { $class = Object::getCustomClass($class); $reflector = new ReflectionClass($class); - return $reflector->newInstanceArgs($injector->convertServiceProperty($params)); + return $reflector->newInstanceArgs($params); } } diff --git a/tests/injector/InjectorTest.php b/tests/injector/InjectorTest.php index d5cd5cfe6..297ba3af2 100644 --- a/tests/injector/InjectorTest.php +++ b/tests/injector/InjectorTest.php @@ -442,7 +442,7 @@ class InjectorTest extends SapphireTest { public function testCustomObjectCreator() { $injector = new Injector(); - $injector->setObjectCreator(new SSObjectCreator()); + $injector->setObjectCreator(new SSObjectCreator($injector)); $config = array( 'OriginalRequirementsBackend', 'DummyRequirements' => array( @@ -485,9 +485,65 @@ class InjectorTest extends SapphireTest { $again = $injector->get('NeedsBothCirculars'); $this->assertEquals($again->var, 'One'); } + + public function testConvertServicePropertyOnCreate() { + // make sure convert service property is not called on direct calls to create, only on configured + // declarations to avoid un-needed function calls + $injector = new Injector(); + $item = $injector->create('ConstructableObject', '%$TestObject'); + $this->assertEquals('%$TestObject', $item->property); + + // do it again but have test object configured as a constructor dependency + $injector = new Injector(); + $config = array( + 'ConstructableObject' => array( + 'constructor' => array( + '%$TestObject' + ) + ) + ); + + $injector->load($config); + $item = $injector->get('ConstructableObject'); + $this->assertTrue($item->property instanceof TestObject); + + // and with a configured object defining TestObject to be something else! + $injector = new Injector(array('locator' => 'InjectorTestConfigLocator')); + $config = array( + 'ConstructableObject' => array( + 'constructor' => array( + '%$TestObject' + ) + ), + ); + + $injector->load($config); + $item = $injector->get('ConstructableObject'); + $this->assertTrue($item->property instanceof ConstructableObject); + + $this->assertInstanceOf('OtherTestObject', $item->property->property); + } } -class TestObject { +class InjectorTestConfigLocator extends SilverStripeServiceConfigurationLocator implements TestOnly { + public function locateConfigFor($name) { + if ($name == 'TestObject') { + return array('class' => 'ConstructableObject', 'constructor' => array('%$OtherTestObject')); + } + + return parent::locateConfigFor($name); + } +} + +class ConstructableObject implements TestOnly { + public $property; + + public function __construct($prop) { + $this->property = $prop; + } +} + +class TestObject implements TestOnly { public $sampleService; @@ -497,7 +553,7 @@ class TestObject { } -class OtherTestObject { +class OtherTestObject implements TestOnly { private $sampleService; @@ -511,13 +567,13 @@ class OtherTestObject { } -class CircularOne { +class CircularOne implements TestOnly { public $circularTwo; } -class CircularTwo { +class CircularTwo implements TestOnly { public $circularOne; @@ -528,7 +584,7 @@ class CircularTwo { } } -class NeedsBothCirculars { +class NeedsBothCirculars implements TestOnly{ public $circularOne; public $circularTwo; @@ -536,15 +592,15 @@ class NeedsBothCirculars { } -class MyParentClass { +class MyParentClass implements TestOnly { public $one; } -class MyChildClass extends MyParentClass { +class MyChildClass extends MyParentClass implements TestOnly { } -class DummyRequirements { +class DummyRequirements implements TestOnly { public $backend; @@ -558,15 +614,15 @@ class DummyRequirements { } -class OriginalRequirementsBackend { +class OriginalRequirementsBackend implements TestOnly { } -class NewRequirementsBackend { +class NewRequirementsBackend implements TestOnly { } -class TestStaticInjections { +class TestStaticInjections implements TestOnly { public $backend; static $dependencies = array( @@ -582,13 +638,19 @@ class TestStaticInjections { * @see https://github.com/silverstripe/sapphire */ class SSObjectCreator extends InjectionCreator { + private $injector; + + public function __construct($injector) { + $this->injector = $injector; + } - public function create(Injector $injector, $class, $params = array()) { + public function create($class, $params = array()) { if (strpos($class, '(') === false) { - return parent::create($injector, $class, $params); + return parent::create($class, $params); } else { list($class, $params) = self::parse_class_spec($class); - return parent::create($injector, $class, $params); + $params = $this->injector->convertServiceProperty($params); + return parent::create($class, $params); } }