X-Git-Url: https://git.mxchange.org/?p=shipsimu.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Ffilter%2Fchange%2Fclass_PasswordChangeFilter.php;h=e7b8b50556ee3899294a85808ca6c37839c48ae1;hp=eab6ace0253411a8ae74607dfd5430f971665f0d;hb=df33e264f3246f80756d7e2da55d7f7c40f9088c;hpb=d527a312ec4b2983fc0ecda2179ce335c1a5a1f9

diff --git a/inc/classes/main/filter/change/class_PasswordChangeFilter.php b/inc/classes/main/filter/change/class_PasswordChangeFilter.php
index eab6ace..e7b8b50 100644
--- a/inc/classes/main/filter/change/class_PasswordChangeFilter.php
+++ b/inc/classes/main/filter/change/class_PasswordChangeFilter.php
@@ -21,7 +21,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class PasswordChangeFilter extends BaseFrameworkSystem implements Filterable {
+class PasswordChangeFilter extends BaseFilter implements Filterable {
 	/**
 	 * Protected constructor
 	 *
@@ -30,27 +30,21 @@ class PasswordChangeFilter extends BaseFrameworkSystem implements Filterable {
 	protected function __construct () {
 		// Call parent constructor
 		parent::__construct(__CLASS__);
-
-		// Set part description
-		$this->setObjectDescription("A filter for password change");
-
-		// Create unique ID number
-		$this->generateUniqueId();
-
-		// Clean up a little
-		$this->removeNumberFormaters();
-		$this->removeSystemArray();
 	}
 
 	/**
 	 * Creates an instance of this filter class
 	 *
-	 * @return	$filterInstance		An instance of this filter class
+	 * @param	$controllerInstance		An instance of a controller class
+	 * @return	$filterInstance			An instance of this filter class
 	 */
-	public final static function createPasswordChangeFilter () {
+	public final static function createPasswordChangeFilter (Controller $controllerInstance) {
 		// Get a new instance
 		$filterInstance = new PasswordChangeFilter();
 
+		// Set the controller
+		$filterInstance->setControllerInstance($controllerInstance);
+
 		// Return the instance
 		return $filterInstance;
 	}
@@ -92,6 +86,12 @@ class PasswordChangeFilter extends BaseFrameworkSystem implements Filterable {
 			return false;
 		} // END - if
 
+		// Are password and confirmation empty?
+		if ((empty($pass1)) && (empty($pass2))) {
+			// Don't change password here
+			return true;
+		} // END - if
+
 		// Do both match?
 		if ($pass1 != $pass2) {
 			// Request is invalid!