Merge pull request #133 from dereuromark/develop

Develop

Author: Mark S.

Controller/Component/Auth/FallbackPasswordHasher.php

@@ -56,13 +56,6 @@ public function startup(Controller $Controller = null) {
 			$this->Controller->request->params['pass'] = $this->trimDeep($this->Controller->request->params['pass']);
 		}
 
-		// Deprecation notices
-		if (Configure::read('App.warnAboutNamedParams')) {
-			if (!empty($Controller->request->params['named']) && ($referer = $Controller->request->referer(true)) && $referer !== '/') {
-				trigger_error('Named params ' . json_encode($Controller->request->params['named']) . ' - from ' . $referer, E_USER_DEPRECATED);
-			}
-		}
-
 		// Information gathering
 		if (!Configure::read('App.disableMobileDetection') && ($mobile = $this->Session->read('Session.mobile')) === null) {
 			App::uses('UserAgentLib', 'Tools.Lib');
@@ -692,26 +685,6 @@ public function ensureControllerConsistency() {
 		}
 	}
 
-	/**
-	 * Main controller function for seo-slugs
-	 * passed titleSlug != current title => redirect to the expected one
-	 *
-	 * @deprecated Will be removed in 1.0
-	 * @return void
-	 */
-	public function ensureConsistency($id, $passedTitleSlug, $currentTitle) {
-		$expectedTitle = slug($currentTitle);
-		if (empty($passedTitleSlug) || $expectedTitle != $passedTitleSlug) { # case sensitive!!!
-			$ref = env('HTTP_REFERER');
-			if (!$this->isForeignReferer($ref)) {
-				$this->Controller->log('Internal ConsistencyProblem at \'' . $ref . '\' - [' . $passedTitleSlug . '] instead of [' . $expectedTitle . ']', 'referer');
-			} else {
-				$this->Controller->log('External ConsistencyProblem at \'' . $ref . '\' - [' . $passedTitleSlug . '] instead of [' . $expectedTitle . ']', 'referer');
-			}
-			$this->Controller->redirect([$id, $expectedTitle], 301);
-		}
-	}
-
 	/**
 	 * Try to detect group for a multidim array for select boxes.
 	 * Extracts the group name of the selected key.
@@ -951,26 +924,6 @@ public function getSearchItem($keyword = null, $searchphrase = null, $options =
 		return [$keyword => $searchphrase];
 	}
 
-	/**
-	 * Returns auto-generated password
-	 *
-	 * @param string $type: user, ...
-	 * @param int $length (if no type is submitted)
-	 * @return pwd on success, empty string otherwise
-	 * @deprecated Will be removed in 1.0. Use RandomLib
-	 */
-	public static function pwd($type = null, $length = null) {
-		trigger_error('deprecated');
-		App::uses('RandomLib', 'Tools.Lib');
-		if (!empty($type) && $type === 'user') {
-			return RandomLib::pronounceablePwd(6);
-		}
-		if (!empty($length)) {
-			return RandomLib::pronounceablePwd($length);
-		}
-		return '';
-	}
-
 	/**
 	 * TODO: move to Lib
 	 * Checks if string contains @ sign

Controller/Component/Auth/ModernPasswordHasher.php

@@ -1,16 +1,10 @@
 <?php
-App::uses('Controller', 'Controller');
+App::uses('ShimController', 'Shim.Controller');
 
 /**
  * DRY Controller stuff
  */
-class MyController extends Controller {
-
-	/**
-	 * @var array
-	 * @link https://github.com/cakephp/cakephp/pull/857
-	 */
-	public $paginate = [];
+class MyController extends ShimController {
 
 	/**
 	 * Fix for asset compress to not run into fatal error loops
@@ -22,52 +16,4 @@ public function __construct($request = null, $response = null) {
 		}
 	}
 
-	/**
-	 * Add headers for IE8 etc to fix caching issues in those stupid browsers
-	 *
-	 * @overwrite to fix IE cacheing issues
-	 * @return void
-	 */
-	public function disableCache() {
-		$this->response->header([
-			'Pragma' => 'no-cache',
-		]);
-		return parent::disableCache();
-	}
-
-	/**
-	 * Handles automatic pagination of model records.
-	 *
-	 * @overwrite to support defaults like limit, querystring settings
-	 * @param Model|string $object Model to paginate (e.g: model instance, or 'Model', or 'Model.InnerModel')
-	 * @param string|array $scope Conditions to use while paginating
-	 * @param array $whitelist List of allowed options for paging
-	 * @return array Model query results
-	 */
-	public function paginate($object = null, $scope = [], $whitelist = []) {
-		if ($defaultSettings = (array)Configure::read('Paginator')) {
-			$this->paginate += $defaultSettings;
-		}
-		return parent::paginate($object, $scope, $whitelist);
-	}
-
-	/**
-	 * Hook to monitor headers being sent.
-	 *
-	 * @return void
-	 */
-	public function afterFilter() {
-		parent::afterFilter();
-
-		if (Configure::read('App.monitorHeaders') && $this->name !== 'CakeError') {
-			if (headers_sent($filename, $linenum)) {
-				$message = sprintf('Headers already sent in %s on line %s', $filename, $linenum);
-				if (Configure::read('debug')) {
-					throw new CakeException($message);
-				}
-				trigger_error($message);
-			}
-		}
-	}
-
 }

Controller/Component/Auth/PasswordHasherFactory.php

@@ -9,7 +9,7 @@ class QloginController extends ToolsAppController {
 
 	public $uses = ['Tools.Qlogin'];
 
-	public $components = ['Tools.Common'];
+	public $components = ['Tools.Flash', 'Tools.Common'];
 
 	public function beforeFilter() {
 		parent::beforeFilter();