Merge pull request #119 from ravage84/various-improvements

Various improvements

Console/Command/CcShell.php

@@ -13,7 +13,7 @@ if (!defined('LF')) {
  *
  * @version 1.1
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class CcShell extends AppShell {
 

Console/Command/CodeShell.php

@@ -11,7 +11,7 @@ if (!defined('LF')) {
  * - Fix missing App::uses() statements
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class CodeShell extends AppShell {
 

Console/Command/ConvertShell.php

@@ -16,7 +16,7 @@ App::uses('AppShell', 'Console/Command');
  * It is also possible to manually define the binPath (for Windows for example).
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class ConvertShell extends AppShell {
 

Console/Command/CopyShell.php

@@ -34,7 +34,7 @@ if (!defined('WINDOWS')) {
  * - sitecopy [linux] (maybe switch to "rsync" some time...? way more powerful and reliable!)
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class CopyShell extends AppShell {
 

Console/Command/EncodingShell.php

@@ -6,7 +6,7 @@ App::uses('AppShell', 'Console/Command');
  * Detect encoding or find invalid files (starting with BOM)
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class EncodingShell extends AppShell {
 

Console/Command/FolderSyncShell.php

@@ -9,7 +9,7 @@ App::uses('AppShell', 'Console/Command');
  *
  * @version 1.0
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class FolderSyncShell extends AppShell {
 

Console/Command/IndentShell.php

@@ -34,7 +34,7 @@ App::uses('AppShell', 'Console/Command');
  * Oh, and: Use TABS for indentation of code - ALWAYS.
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class IndentShell extends AppShell {
 

Console/Command/IndexShell.php

@@ -18,7 +18,7 @@ App::uses('AppShell', 'Console/Command');
  * - PRIMARY_KEY Indexes for primary keys ("id")
  *
  * @author Mark Scherer
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class IndexShell extends AppShell {
 

Console/Command/PhpTagShell.php

@@ -7,7 +7,7 @@ App::uses('Folder', 'Utility');
  * it also makes sure there is no whitespace at the beginning of the file
  *
  * @author Mark Scherer, Maximilian Ruta
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class PhpTagShell extends AppShell {
 

Console/Command/PwdShell.php

@@ -6,7 +6,7 @@ App::uses('ComponentCollection', 'Controller');
  * Password hashing and output
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class PwdShell extends AppShell {
 

Console/Command/ResetShell.php

@@ -10,7 +10,7 @@ App::uses('AppShell', 'Console/Command');
  * Reset user data
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class ResetShell extends AppShell {
 

Console/Command/UserShell.php

@@ -10,7 +10,7 @@ App::uses('AppShell', 'Console/Command');
  * Create a new user from CLI
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class UserShell extends AppShell {
 

Controller/Component/AjaxComponent.php

@@ -12,7 +12,7 @@ App::uses('Component', 'Controller');
  * of the JSON response object.
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class AjaxComponent extends Component {
 

Controller/Component/Auth/DirectAuthenticate.php

@@ -21,7 +21,7 @@ App::uses('BaseAuthenticate', 'Controller/Component/Auth');
  * Possible configs: see BaseAuthenticate.
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @cakephp 2.x (>= 2.3)
  */
 class DirectAuthenticate extends BaseAuthenticate {

Controller/Component/Auth/ModernPasswordHasher.php

@@ -14,7 +14,7 @@ App::uses('AbstractPasswordHasher', 'Controller/Component/Auth');
  * But the preferred way would be a composer dependency.
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @link http://www.dereuromark.de/2011/08/25/working-with-passwords-in-cakephp/
  */
 class ModernPasswordHasher extends AbstractPasswordHasher {

Controller/Component/Auth/TinyAuthorize.php

@@ -29,7 +29,7 @@ if (!defined('ACL_FILE')) {
  *
  * @version 1.2 - now allows other parent model relations besides Role/role_id
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class TinyAuthorize extends BaseAuthorize {
 

Controller/Component/AuthExtComponent.php

@@ -17,7 +17,7 @@ App::uses('AuthComponent', 'Controller/Component');
  * - dynamic login scope validation
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class AuthExtComponent extends AuthComponent {
 

Controller/Component/AutoLoginComponent.php

@@ -8,7 +8,7 @@ App::uses('Component', 'Controller');
  *
  * @author		Miles Johnson - http://milesj.me
  * @copyright	Copyright 2006-2011, Miles Johnson, Inc.
- * @license		http://opensource.org/licenses/mit-license.php - Licensed under The MIT License
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @link		http://milesj.me/code/cakephp/auto-login
  *
  * @modified Mark Scherer - 2012-01-08 ms

Controller/Component/CalendarComponent.php

@@ -9,7 +9,7 @@ App::uses('Component', 'Controller');
  *
  * @author Mark Scherer
  * @copyright 2012 Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  *
  */
 class CalendarComponent extends Component {

Controller/Component/CommonComponent.php

@@ -12,7 +12,7 @@ App::uses('Utility', 'Tools.Utility');
  *
  * @author Mark Scherer
  * @copyright 2012 Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class CommonComponent extends Component {
 

Controller/Component/FlashComponent.php

@@ -8,7 +8,7 @@ App::uses('Component', 'Controller');
  *
  * @author Mark Scherer
  * @copyright 2012 Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class FlashComponent extends Component {
 

Controller/Component/MobileComponent.php

@@ -23,7 +23,7 @@ App::uses('Router', 'Routing');
  * - Cleanup and tests
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class MobileComponent extends Component {
 

Lib/Auth.php

@@ -32,7 +32,7 @@ App::uses('Hash', 'Utility');
  * Note: This uses AuthComponent internally to work with both stateful and stateless auth.
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @php 5
  */
 class Auth {

Lib/Bootstrap/Password.php

@@ -6,7 +6,7 @@
  *   require CakePlugin::path('Tools') . 'Lib/Bootstrap/Password.php';
  *
  * @author Anthony Ferrara <ircmaxell@php.net>
- * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @license http://opensource.org/licenses/mit-license.html MIT
  * @copyright 2012 The Authors
  */
 

Lib/Cache/Engine/MemcachedEngine.php

@@ -13,7 +13,7 @@
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
  * @since         CakePHP(tm) v 1.2.0.4933
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       http://opensource.org/licenses/mit-license.php MIT
  */
 
 /**

Lib/CurlLib.php

@@ -5,7 +5,7 @@
  * - can switch the UA to test certain browser sensitive features
  * - can simulate/establish tor connection
  *
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class CurlLib {
 

Lib/CurrencyBitcoinLib.php

@@ -5,7 +5,7 @@ App::uses('HttpSocketLib', 'Tools.Lib');
  * Use Webservices to get current rates etc
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class CurrencyBitcoinLib {
 

Lib/CurrencyLib.php

@@ -17,7 +17,7 @@ App::uses('Xml', 'Utility');
  * alternativly: http://www.currencyserver.de/webservice/CurrencyServerWebService.asmx/getXmlStream?provider=AVERAGE
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class CurrencyLib {
 

Lib/DiffLib.php

@@ -13,7 +13,7 @@
  * Currently uses Horde classes, but could also use PEAR or php-diff packages.
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class DiffLib {
 

Lib/EmailLib.php

@@ -35,7 +35,7 @@ if (!Configure::read('Config.adminName')) {
  * For systemEmail() one also needs Configure value Config.systemEmail to be set.
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class EmailLib extends CakeEmail {
 

Lib/ExcelReaderLib.php

@@ -20,7 +20,7 @@ if (!class_exists('SpreadsheetExcelReader')) {
  * See the test cases for details.
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class ExcelReaderLib extends SpreadsheetExcelReader {
-}
+}

Lib/HazardLib.php

@@ -8,7 +8,7 @@ App::uses('Xml', 'Utility');
  * used in configurations controller + debug helper
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class HazardLib {
 

Lib/HttpSocketLib.php

@@ -15,7 +15,7 @@ App::uses('CurlLib', 'Tools.Lib');
  * TODO: throw exceptions instead of error stuff here
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class HttpSocketLib {
 

Lib/IcalLib.php

@@ -12,7 +12,7 @@ App::uses('TimeLib', 'Tools.Utility');
  * @see http://www.dereuromark.de/2011/11/21/serving-views-as-files-in-cake2 for details
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class IcalLib {
 

Lib/InlineCssLib.php

@@ -9,7 +9,7 @@
  *
  * @author Mark Scherer
  * @copyright Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class InlineCssLib {
 

Lib/MimeLib.php

@@ -6,7 +6,7 @@ App::uses('CakeResponse', 'Network');
  * Wrapper to be able to read cake core's mime types as well as fix for missing ones
  *
  * @version 1.0
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @author	Mark Scherer
  */
 class MimeLib extends CakeResponse {

Lib/RandomLib.php

@@ -4,7 +4,7 @@
  * Random Lib
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class RandomLib {
 

Lib/UserAgentLib.php

@@ -8,7 +8,7 @@ App::uses('CakeRequest', 'Network');
  * Last but not least it should be capable of detecting if it is a real user or a bot
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  *
  */
 class UserAgentLib extends CakeRequest {

Lib/Utility/Utility.php

@@ -7,7 +7,7 @@ App::uses('Router', 'Routing');
  * Main class for all app-wide utility methods
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class Utility {
 

Lib/WeatherLib.php

@@ -22,7 +22,7 @@ App::uses('HttpSocket', 'Network/Http');
  * - num_of_days (defaults to 5)
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @see http://developer.worldweatheronline.com/documentation
  */
 class WeatherLib {

Lib/ZipLib.php

@@ -7,7 +7,7 @@
  * @see http://www.php.net/manual/de/class.ziparchive.php
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class ZipLib {
 

Model/Behavior/BitmaskedBehavior.php

@@ -17,7 +17,7 @@ App::uses('ModelBehavior', 'Model');
  * @version 1.1
  * @author Mark Scherer
  * @cake 2.x
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @link http://www.dereuromark.de/2012/02/26/bitmasked-using-bitmasks-in-cakephp/
  */
 class BitmaskedBehavior extends ModelBehavior {

Model/Behavior/ConfirmableBehavior.php

@@ -8,7 +8,7 @@ App::uses('ModelBehavior', 'Model');
  * Copyright 2011, dereuromark (http://www.dereuromark.de)
  *
  * @link http://github.com/dereuromark/
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @link http://www.dereuromark.de/2011/07/05/introducing-two-cakephp-behaviors/
  */
 class ConfirmableBehavior extends ModelBehavior {

Model/Behavior/CustomFindsBehavior.php

@@ -11,7 +11,7 @@ App::uses('ModelBehavior', 'Model');
  * Redistributions of files must retain the above copyright notice.
  *
  * @author Ariel Patschiki, Daniel L. Pakuschewski
- * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @copyright Copyright 2010, MobVox Solu??es Digitais.
  * @version 0.1
  */

Model/Behavior/DecimalInputBehavior.php

@@ -26,7 +26,7 @@ App::uses('ModelBehavior', 'Model');
  * 20.01 => 20,01
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @deprecated Use NumberFormatBehavior instead!
  */
 class DecimalInputBehavior extends ModelBehavior {

Model/Behavior/HazardableBehavior.php

@@ -30,7 +30,7 @@ App::uses('HazardLib', 'Tools.Lib');
  * to the reality as possible.
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class HazardableBehavior extends ModelBehavior {
 

Model/Behavior/JsonableBehavior.php

@@ -6,7 +6,7 @@
  * Redistributions of files must retain the above copyright notice.
  *
  * @version 0.1
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 App::uses('ModelBehavior', 'Model');
 App::uses('Hash', 'Utility');

Model/Behavior/KeyValueBehavior.php

@@ -7,7 +7,7 @@ App::uses('ModelBehavior', 'Model');
  * TODO: long text? separate table or not at all?
  * TODO: caching
  *
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @modified Mark Scherer
  */
 class KeyValueBehavior extends ModelBehavior {

Model/Behavior/MasterPasswordBehavior.php

@@ -26,7 +26,7 @@ App::uses('ModelBehavior', 'Model');
  *
  * @author Mark Scherer
  * @link http://github.com/dereuromark/
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 
 /**

Model/Behavior/MultipleDisplayFieldsBehavior.php

@@ -25,7 +25,7 @@ App::uses('ModelBehavior', 'Model');
  * $Model->Behaviors->load('Tools.MultipleDisplayFields', $config);
  *
  * @see: http://bakery.cakephp.org/articles/view/multiple-display-field-3
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @modified Mark Scherer
  */
 class MultipleDisplayFieldsBehavior extends ModelBehavior {

Model/Behavior/NamedScopeBehavior.php

@@ -32,7 +32,7 @@ App::uses('ModelBehavior', 'Model');
  *
  * See the test cases for more complex examples.
  *
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @author Mark Scherer
  * @link https://github.com/dereuromark/cakephp-tools/wiki/Model-Behavior-NamedScope
  */

Model/Behavior/NumberFormatBehavior.php

@@ -26,7 +26,7 @@ App::uses('ModelBehavior', 'Model');
  * 20.01 => 20,01
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class NumberFormatBehavior extends ModelBehavior {
 

Model/Behavior/PasswordableBehavior.php

@@ -38,7 +38,7 @@ if (!defined('PWD_MAX_LENGTH')) {
  * @version 1.8 (Now supports Tools.Modern PasswordHasher and password_hash() method)
  * @author Mark Scherer
  * @link http://www.dereuromark.de/2011/08/25/working-with-passwords-in-cakephp
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class PasswordableBehavior extends ModelBehavior {
 

Model/Behavior/ResetBehavior.php

@@ -34,7 +34,7 @@ App::uses('ModelBehavior', 'Model');
  * For tables with lots of records you might want to use a shell and the CLI to invoke the reset/update process.
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @version 1.0
  */
 class ResetBehavior extends ModelBehavior {

Model/Behavior/RevisionBehavior.php

@@ -103,7 +103,7 @@ App::uses('Hash', 'Utility');
  *
  * @author Ronny Vindenes
  * @author Alexander 'alkemann' Morland
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @modifed 27. march 2009
  * @version 2.0.6
  * @modified 2012-07-28 Mark Scherer (2.x ready)

Model/Behavior/SluggedBehavior.php

@@ -3,7 +3,7 @@
  * @copyright Copyright (c) 2008, Andy Dawson
  * @author Andy Dawson
  * @author Mark Scherer
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 
 App::uses('ModelBehavior', 'Model');

Model/Behavior/SoftDeleteBehavior.php

@@ -7,7 +7,7 @@
  * Redistributions of files must retain the above copyright notice.
  *
  * @copyright Copyright 2007-2010, Cake Development Corporation (http://cakedc.com)
- * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 App::uses('ModelBehavior', 'Model');
 

Model/Behavior/SortableBehavior.php

@@ -16,7 +16,7 @@ App::uses('ModelBehavior', 'Model');
  * The sort value of a new record will be calculated (currently highest + 1).
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class SortableBehavior extends ModelBehavior {
 

Model/Behavior/TypographicBehavior.php

@@ -3,7 +3,7 @@
  * PHP 5
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 
 App::uses('ModelBehavior', 'Model');

Model/Behavior/WhoDidItBehavior.php

@@ -5,9 +5,9 @@
  * @copyright http://www.4webby.com
  * @author Daniel Vecchiato
  * @author Mark Scherer
- * @author Marc Würth
+ * @author Marc Würth
  * @version 1.3
- * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 
 App::uses('CakeSession', 'Model/Datasource');
@@ -102,8 +102,9 @@ class WhoDidItBehavior extends ModelBehavior {
 	 * ... the modified by field only if it is not in the data array
 	 * or the "force_modified" setting is set to true.
 	 *
-	 * @param Model $Model The model using this behavior.
-	 * @return bool True
+	 * @param Model $Model The Model using this behavior
+	 * @param array $options Options passed from Model::save(), unused.
+	 * @return mixed False if the operation should abort. Any other result will continue.
 	 */
 	public function beforeSave(Model $Model, $options = array()) {
 		$config = $this->settings[$Model->alias];
@@ -112,7 +113,7 @@ class WhoDidItBehavior extends ModelBehavior {
 		}
 
 		$authSession = $config['auth_session'];
-		list($plugin, $userSession) = pluginSplit($config['user_model']);
+		list(, $userSession) = pluginSplit($config['user_model']);
 
 		$userId = CakeSession::read($authSession . '.' . $userSession . '.id');
 

Model/CodeKey.php

@@ -5,7 +5,7 @@ App::uses('Token', 'Tools.Model');
  * @deprecated - use "Token" class
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class CodeKey extends Token {
 

Model/ContactForm.php

@@ -4,7 +4,7 @@ App::uses('ToolsAppModel', 'Tools.Model');
 /**
  * "Fake" model to validate all contact forms
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class ContactForm extends ToolsAppModel {
 

Model/Datasource/ImapSource.php

@@ -11,7 +11,7 @@ App::uses('Set', 'Utility');
  *
  * @copyright Copyright (c) 2010 Carl Sutton ( dogmatic69 )
  * @link http://www.infinitas-cms.org
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @license http://opensource.org/licenses/mit-license.php MIT
  *
  * @author dogmatic69
  * @author kvz

Model/MyModel.php

@@ -7,7 +7,7 @@ App::uses('Hash', 'Utility');
  * Model enhancements for Cake2
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class MyModel extends Model {
 

Model/Qlogin.php

@@ -10,7 +10,7 @@ App::uses('CakeSession', 'Model/Datasource');
  * TODO: Remove CodeKey BC
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class Qlogin extends ToolsAppModel {
 

Model/Qurl.php

@@ -6,7 +6,7 @@ App::uses('Hash', 'Utility');
  * Manage Quick Urls
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class Qurl extends ToolsAppModel {
 

Model/Token.php

@@ -7,7 +7,7 @@ App::uses('Hash', 'Utility');
  * A generic model to hold tokens
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class Token extends ToolsAppModel {
 

Test/Case/Model/Behavior/SluggedBehaviorTest.php

@@ -7,7 +7,7 @@
  *
  * @copyright Copyright (c) 2008, Andy Dawson
  * @link www.ad7six.com
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 App::uses('SluggedBehavior', 'Tools.Model/Behavior');
 App::uses('HttpSocket', 'Network/Http');

Test/Case/Model/Behavior/SoftDeleteBehaviorTest.php

@@ -6,7 +6,7 @@
  * Redistributions of files must retain the above copyright notice.
  *
  * @copyright Copyright 2009-2010, Cake Development Corporation (http://cakedc.com)
- * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 
 App::uses('Model', 'Model');

Test/Case/View/AjaxViewTest.php

@@ -7,7 +7,7 @@
  * Redistributions of files must retain the above copyright notice
  *
  * @author        Mark Scherer
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 
 App::uses('Controller', 'Controller');

Test/Case/View/Helper/IcalHelperTest.php

@@ -11,7 +11,7 @@ App::uses('View', 'View');
  * @see http://www.dereuromark.de/2011/11/21/serving-views-as-files-in-cake2 for details
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class IcalHelperTest extends MyCakeTestCase {
 

Test/Case/View/RssViewTest.php

@@ -7,7 +7,7 @@
  * Redistributions of files must retain the above copyright notice
  *
  * @author        Mark Scherer
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 
 App::uses('Controller', 'Controller');

Test/Fixture/ArrayUserFixture.php

@@ -13,7 +13,7 @@
  * @copyright     Copyright 2005-2010, Cake Software Foundation, Inc. (http://cakefoundation.org)
  * @link          http://cakephp.org CakePHP(tm) Project
  * @since         CakePHP Datasources v 0.3
- * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 
 /**

Test/Fixture/MessageFixture.php

@@ -10,7 +10,7 @@
  * @since v 1.0
  * @modifiedBy $LastChangedBy$
  * @lastModified $Date$
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 
 /**

Test/Fixture/WhoDidItPlayerFixture.php

@@ -4,7 +4,7 @@
  *
  * @author Mark Scherer
  * @author Marc Würth
- * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 
 /**

TestSuite/TestConsoleOutput.php

@@ -9,7 +9,7 @@ App::uses('ConsoleOutput', 'Console');
  *  $stdOut = new TestConsoleOutput();
  *  $this->MyShell = new MyShell($stdOut);
  *
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @author Mark Scherer
  */
 class TestConsoleOutput extends ConsoleOutput {

View/AjaxView.php

@@ -12,7 +12,7 @@ App::uses('View', 'View');
  * You can add more data using _serialize.
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class AjaxView extends View {
 
@@ -113,4 +113,4 @@ class AjaxView extends View {
 		return $response;
 	}
 
-}
+}

View/Helper/BootstrapHelper.php

@@ -11,7 +11,7 @@ App::uses('AppHelper', 'View/Helper');
  * Dependencies:
  * The respective JS plugins for the widgets.
  *
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @author Mark Scherer
  * @php 5
  * @version 1.0

View/Helper/CaptchaHelper.php

@@ -11,7 +11,7 @@ if (!defined('BR')) {
  *
  * @author Mark Scherer
  * @link http://www.dereuromark.de
- * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 
 /**

View/Helper/DiffHelper.php

@@ -13,7 +13,7 @@ App::uses('DiffLib', 'Tools.Lib');
  * Wraps the DiffLib (which does all the heavy lifting) for the view layer.
  *
  * @author Marcin Domanski aka kabturek <blog@kabturek.info>
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @modified Mark Scherer (Make it work with 2.x and clean it up into Lib + Helper)
  */
 class DiffHelper extends AppHelper {

View/Helper/FormatHelper.php

@@ -8,7 +8,7 @@ App::uses('StringTemplate', 'Tools.View');
  * TODO: make snippets more "css and background image" (instead of inline img links)
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class FormatHelper extends TextHelper {
 

View/Helper/GoogleMapV3Helper.php

@@ -16,7 +16,7 @@ App::uses('AppHelper', 'View/Helper');
  * @author Rajib Ahmed
  * @author Mark Scherer
  * @link http://www.dereuromark.de/2010/12/21/googlemapsv3-cakephp-helper/
- * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @version 1.5
  *
  * Changelog:
@@ -27,7 +27,7 @@ App::uses('AppHelper', 'View/Helper');
  *
  * v1.4: Better handling of script output and directions added
  * You can now either keep map() + script(), or you can now write the script to the buffer with
- * map() + finalize(). You can then decide wether the JS should be in the head or the footer of your layout.
+ * map() + finalize(). You can then decide whether the JS should be in the head or the footer of your layout.
  * Don't forget to put `echo $this->Js->writeBuffer(array('inline' => true));` somewhere in your layout then, though.
  * You can now also add directions using addDirections().
  *

View/Helper/GravatarHelper.php

@@ -7,7 +7,7 @@ App::uses('AppHelper', 'View/Helper');
  * A CakePHP View Helper for the display of Gravatar images (http://www.gravatar.com)
  *
  * @copyright Copyright 2009-2010, Graham Weldon (http://grahamweldon.com)
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @license http://opensource.org/licenses/mit-license.php MIT
  *
  * hashtype now always md5
  */

View/Helper/HtmlExtHelper.php

@@ -8,7 +8,7 @@ App::uses('HtmlHelper', 'View/Helper');
  * Use with aliasing to map it back to $this->Html attribute.
  *
  * @author Mark Scherer
- * @license MIT License (http://www.opensource.org/licenses/mit-license.php)
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class HtmlExtHelper extends HtmlHelper {
 

View/Helper/MyHelper.php

@@ -7,7 +7,7 @@ App::uses('UrlCacheManager', 'Tools.Routing');
  * Helper enhancements for CakePHP
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class MyHelper extends Helper {
 

View/Helper/TimelineHelper.php

@@ -12,7 +12,7 @@ App::uses('AppHelper', 'View/Helper');
  *
  * @link http://almende.github.io/chap-links-library/timeline.html
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class TimelineHelper extends AppHelper {
 

View/Helper/TreeHelper.php

@@ -5,7 +5,7 @@
  * Redistributions of files must retain the above copyright notice.
  *
  * @copyright Copyright (c) 2008, Andy Dawson
- * @license http://www.opensource.org/licenses/mit-license.php The MIT License
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 App::uses('AppHelper', 'View/Helper');
 

View/Helper/TypographyHelper.php

@@ -6,7 +6,7 @@
  *
  * @author		ExpressionEngine Dev Team
  * @copyright	Copyright (c) 2008 - 2011, EllisLab, Inc.
- * @license		http://codeigniter.com/user_guide/license.html
+ * @license		http://codeigniter.com/user_guide/license.html CodeIgniter License
  * @link		http://codeigniter.com
  * @since		Version 1.0
  */

View/Helper/WeatherHelper.php

@@ -6,7 +6,7 @@ App::uses('WeatherLib', 'Tools.Lib');
  * Display weather in the view
  *
  * @author Mark Scherer
- * @license MIT
+ * @license http://opensource.org/licenses/mit-license.php MIT
  */
 class WeatherHelper extends AppHelper {
 

View/RssView.php

@@ -5,7 +5,7 @@
  * Redistributions of files must retain the above copyright notice.
  *
  * @author Mark Scherer
- * @license http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license http://opensource.org/licenses/mit-license.php MIT
  * @link http://www.dereuromark.de/2013/10/03/rss-feeds-in-cakephp
  */