euromark 12 years ago
parent
commit
2469d50c4c

+ 6 - 6
Model/Behavior/BitmaskedBehavior.php

@@ -170,9 +170,9 @@ class BitmaskedBehavior extends ModelBehavior {
 				}
 				continue;
 			} elseif ($key === $Model->alias . '.' . $mappedField) {
-				$conditions[$Model->alias . '.' .$field] = $this->encodeBitmask($Model, $val);
+				$conditions[$Model->alias . '.' . $field] = $this->encodeBitmask($Model, $val);
 				if ($field !== $mappedField) {
-					unset($conditions[$Model->alias . '.' .$mappedField]);
+					unset($conditions[$Model->alias . '.' . $mappedField]);
 				}
 				continue;
 			}
@@ -218,7 +218,7 @@ class BitmaskedBehavior extends ModelBehavior {
 		$bitmask = $this->encodeBitmask($Model, $bits);
 
 		$field = $this->settings[$Model->alias]['field'];
-		return array($Model->alias.'.'.$field => $bitmask);
+		return array($Model->alias . '.'. $field => $bitmask);
 	}
 
 	/**
@@ -230,7 +230,7 @@ class BitmaskedBehavior extends ModelBehavior {
 		$bitmask = $this->encodeBitmask($Model, $bits);
 
 		$field = $this->settings[$Model->alias]['field'];
-		return array('NOT' => array($Model->alias.'.'.$field => $bitmask));
+		return array('NOT' => array($Model->alias . '.' . $field => $bitmask));
 	}
 
 	/**
@@ -242,7 +242,7 @@ class BitmaskedBehavior extends ModelBehavior {
 		$bitmask = $this->encodeBitmask($Model, $bits);
 
 		$field = $this->settings[$Model->alias]['field'];
-		return array('('.$Model->alias.'.'.$field.' & ? = ?)' => array($bitmask, $bitmask));
+		return array('(' . $Model->alias . '.' . $field . ' & ? = ?)' => array($bitmask, $bitmask));
 	}
 
 	/**
@@ -254,7 +254,7 @@ class BitmaskedBehavior extends ModelBehavior {
 		$bitmask = $this->encodeBitmask($Model, $bits);
 
 		$field = $this->settings[$Model->alias]['field'];
-		return array('('.$Model->alias.'.'.$field.' & ? != ?)' => array($bitmask, $bitmask));
+		return array('(' . $Model->alias . '.' . $field . ' & ? != ?)' => array($bitmask, $bitmask));
 	}
 
 }

+ 3 - 3
Model/Behavior/CaptchaBehavior.php

@@ -220,12 +220,12 @@ class CaptchaBehavior extends ModelBehavior {
 		if (!$this->settings[$this->Model->alias]['log']) {
 			return null;
 		}
-		$msg = 'IP \''.Utility::getClientIp().'\', Agent \''.env('HTTP_USER_AGENT').'\', Referer \''.env('HTTP_REFERER').'\', Host-Referer \''.Utility::getReferer().'\'';
+		$msg = 'IP \'' . Utility::getClientIp() . '\', Agent \''.env('HTTP_USER_AGENT').'\', Referer \''.env('HTTP_REFERER').'\', Host-Referer \''.Utility::getReferer().'\'';
 		if (!empty($this->error)) {
-			$msg .= ', '.$this->error;
+			$msg .= ', ' . $this->error;
 		}
 		if (!empty($this->internalError)) {
-			$msg .= ' ('.$this->internalError.')';
+			$msg .= ' (' . $this->internalError . ')';
 		}
 		$this->log($msg, 'captcha');
 		return true;

+ 1 - 1
Model/Behavior/JsonableBehavior.php

@@ -199,7 +199,7 @@ class JsonableBehavior extends ModelBehavior {
 	public function _toParam(Model $Model, $val) {
 		$res = array();
 		foreach ($val as $key => $v) {
-			$res[] = $key.$this->settings[$Model->alias]['keyValueSeparator'].$v;
+			$res[] = $key . $this->settings[$Model->alias]['keyValueSeparator'] . $v;
 		}
 		return implode($this->settings[$Model->alias]['separator'], $res);
 	}

+ 9 - 4
Model/MyModel.php

@@ -238,7 +238,7 @@ class MyModel extends Model {
 					$this->$model->virtualFields[$field] = $sql;
 				}
 			}
-			$res[] = $sql.' AS '.$model.'__'.$field;
+			$res[] = $sql . ' AS ' . $model . '__' . $field;
 		}
 		return $res;
 	}
@@ -987,7 +987,7 @@ class MyModel extends Model {
 
 				} elseif (!empty($id)) {
 					# manual query! (only possible on edit)
-					$res = $this->find('first', array('fields' => array($this->alias.'.'.$dependingField), 'conditions' => array($this->alias.'.id' => $id)));
+					$res = $this->find('first', array('fields' => array($this->alias . '.' . $dependingField), 'conditions' => array($this->alias . '.id' => $id)));
 					if (!empty($res)) {
 						$conditions[$this->alias . '.' . $dependingField] = $res[$this->alias][$dependingField];
 					}
@@ -1133,10 +1133,15 @@ class MyModel extends Model {
 		}
 		$headers = implode("\n", $headers);
 		$protocol = mb_strpos($url, 'https://') === 0 ? 'HTTP' : 'HTTP';
-		return ((bool)preg_match('#^'.$protocol.'/.*\s+[(200|301|302)]+\s#i', $headers) && !(bool)preg_match('#^'.$protocol.'/.*\s+[(404|999)]+\s#i', $headers));
+		if (!(bool)preg_match('#^' . $protocol . '/.*\s+[(200|301|302)]+\s#i', $headers)) {
+			return false;
+		}
+		if ((bool)preg_match('#^' . $protocol . '/.*\s+[(404|999)]+\s#i', $headers)) {
+			return false;
+		}
+		return true;
 	}
 
-
 	/**
 	 * Validation of DateTime Fields (both Date and Time together)
 	 *

+ 3 - 0
README.md

@@ -81,6 +81,9 @@ Please provide PRs mainly against master branch then.
 
 For details on how to contribute please read the [CONTRIBUTING page](CONTRIBUTING.md).
 
+### License
+Licensed under [The MIT License](http://www.opensource.org/licenses/mit-license.php)
+
 ### Recent changes (possibly BC breaking)
 
 * 2013-02 Removed PasswordChangeBehavior in favor of its new name Passwordable.