Skip to content

Commit

Permalink
Merge branch '1.3' into 1.3-misc
Browse files Browse the repository at this point in the history
  • Loading branch information
@markstory
markstory committed Oct 31, 2009
2 parents 5f1e6ba + bc26a6a commit ad8cba4
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 78 deletions.
7 changes: 4 additions & 3 deletions cake/console/libs/tasks/fixture.php
View file
Expand Up @@ -73,9 +73,6 @@ class FixtureTask extends Shell {
function __construct(&$dispatch) {
parent::__construct($dispatch);
$this->path = $this->params['working'] . DS . 'tests' . DS . 'fixtures' . DS;
if (!class_exists('CakeSchema')) {
App::import('Model', 'CakeSchema', false);
}
}

/**
Expand All @@ -85,6 +82,10 @@ function __construct(&$dispatch) {
* @access public
*/
function execute() {
if (!class_exists('CakeSchema')) {
App::import('Model', 'CakeSchema', false);
}

if (empty($this->args)) {
$this->__interactive();
}
Expand Down
112 changes: 37 additions & 75 deletions cake/libs/controller/components/cookie.php
View file
Expand Up @@ -205,31 +205,25 @@ function write($key, $value = null, $encrypt = true, $expires = null) {
if (is_null($encrypt)) {
$encrypt = true;
}

$this->__encrypted = $encrypt;
$this->__expire($expires);

if (!is_array($key)) {
$key = array($key => $value);
}

if (!is_array($key) && $value !== null) {
$name = $this->__cookieVarNames($key);

if (count($name) > 1) {
$this->__values[$name[0]][$name[1]] = $value;
$this->__write("[" . $name[0] . "][" . $name[1] . "]", $value);
foreach ($key as $name => $value) {
if (strpos($name, '.') === false) {
$this->__values[$name] = $value;
$this->__write(".$name", $value);

} else {
$this->__values[$name[0]] = $value;
$this->__write("[" . $name[0] . "]", $value);
}
} else {
foreach ($key as $names => $value) {
$name = $this->__cookieVarNames($names);

if (count($name) > 1) {
$this->__values[$name[0]][$name[1]] = $value;
$this->__write("[" . $name[0] . "][" . $name[1] . "]", $value);
} else {
$this->__values[$name[0]] = $value;
$this->__write("[" . $name[0] . "]", $value);
$names = explode('.', $name, 2);
if (!isset($this->__values[$names[0]])) {
$this->__values[$names[0]] = array();
}
$this->__values[$names[0]] = Set::insert($this->__values[$names[0]], $names[1], $value);
$this->__write("." . implode('.', $names), $value);
}
}
$this->__encrypted = true;
Expand All @@ -253,22 +247,19 @@ function read($key = null) {
if (is_null($key)) {
return $this->__values;
}
$name = $this->__cookieVarNames($key);

if (count($name) > 1) {
if (isset($this->__values[$name[0]])) {
if (isset($this->__values[$name[0]][$name[1]])) {
return $this->__values[$name[0]][$name[1]];
}
}
return null;
} else {
if (isset($this->__values[$name[0]])) {
$value = $this->__values[$name[0]];
return $value;
}

if (strpos($key, '.') !== false) {
$names = explode('.', $key, 2);
$key = $names[0];
}
if (!isset($this->__values[$key])) {
return null;
}

if (!empty($names[1])) {
return Set::extract($this->__values[$key], $names[1]);
}
return $this->__values[$key];
}

/**
Expand Down Expand Up @@ -296,23 +287,14 @@ function delete($key) {
if (empty($this->__values)) {
$this->read();
}
$name = $this->__cookieVarNames($key);
if (count($name) > 1) {
if (isset($this->__values[$name[0]])) {
$this->__delete("[" . $name[0] . "][" . $name[1] . "]");
unset($this->__values[$name[0]][$name[1]]);
}
} else {
if (isset($this->__values[$name[0]])) {
if (is_array($this->__values[$name[0]])) {
foreach ($this->__values[$name[0]] as $key => $value) {
$this->__delete("[" . $name[0] . "][" . $key . "]");
}
}
$this->__delete("[" . $name[0] . "]");
unset($this->__values[$name[0]]);
}
if (strpos($key, '.') === false) {
unset($this->__values[$key]);
$this->__delete(".$key");
return;
}
$names = explode('.', $key, 2);
$this->__values[$names[0]] = Set::remove($this->__values[$names[0]], $names[1]);
$this->__delete("." . implode('.', $names));
}

/**
Expand All @@ -333,11 +315,11 @@ function destroy() {
if (is_array($value)) {
foreach ($value as $key => $val) {
unset($this->__values[$name][$key]);
$this->__delete("[$name][$key]");
$this->__delete(".$name.$key");
}
}
unset($this->__values[$name]);
$this->__delete("[$name]");
$this->__delete(".$name");
}
}

Expand Down Expand Up @@ -386,7 +368,7 @@ function __expire($expires = null) {
* @access private
*/
function __write($name, $value) {
setcookie($this->name . "$name", $this->__encrypt($value), $this->__expires, $this->path, $this->domain, $this->secure);
setcookie($this->name . $name, $this->__encrypt($value), $this->__expires, $this->path, $this->domain, $this->secure);

if (!is_null($this->__reset)) {
$this->__expires = $this->__reset;
Expand Down Expand Up @@ -420,7 +402,7 @@ function __encrypt($value) {
$type = $this->__type;
$value = "Q2FrZQ==." .base64_encode(Security::$type($value, $this->key));
}
return($value);
return $value;
}

/**
Expand Down Expand Up @@ -455,27 +437,7 @@ function __decrypt($values) {
}
}
}

return($decrypted);
}

/**
* Creates an array from the $name parameter which allows the dot notation
* similar to one used by Session and Configure classes
*
* @param string $name Name with or without dot notation
* @return array Extracted names
* @access private
*/
function __cookieVarNames($name) {
if (is_string($name)) {
if (strpos($name, ".")) {
$name = explode(".", $name);
} else {
$name = array($name);
}
}
return $name;
return $decrypted;
}

/**
Expand Down
2 changes: 2 additions & 0 deletions cake/libs/l10n.php
View file
Expand Up @@ -474,6 +474,8 @@ function catalog($language = null) {
} else if (is_string($language)) {
if (isset($this->__l10nCatalog[$language])) {
return $this->__l10nCatalog[$language];
} else if (isset($this->__l10nMap[$language]) && isset($this->__l10nCatalog[$this->__l10nMap[$language]])) {
return $this->__l10nCatalog[$this->__l10nMap[$language]];
}
return false;
}
Expand Down
11 changes: 11 additions & 0 deletions cake/tests/cases/libs/l10n.test.php
View file
Expand Up @@ -981,6 +981,17 @@ function testCatalog() {
'pt-br' => array('language' => 'Portuguese (Brazil)', 'locale' => 'pt_br', 'localeFallback' => 'por', 'charset' => 'utf-8')
);
$this->assertEqual($result, $expected);

$result = $l10n->catalog(array('eng', 'deu', 'zho', 'rum', 'zul', 'yid'));
$expected = array(
'eng' => array('language' => 'English', 'locale' => 'eng', 'localeFallback' => 'eng', 'charset' => 'utf-8'),
'deu' => array('language' => 'German (Standard)', 'locale' => 'deu', 'localeFallback' => 'deu', 'charset' => 'utf-8'),
'zho' => array('language' => 'Chinese', 'locale' => 'chi', 'localeFallback' => 'chi', 'charset' => 'utf-8'),
'rum' => array('language' => 'Romanian', 'locale' => 'rum', 'localeFallback' => 'rum', 'charset' => 'utf-8'),
'zul' => array('language' => 'Zulu', 'locale' => 'zul', 'localeFallback' => 'zul', 'charset' => 'utf-8'),
'yid' => array('language' => 'Yiddish', 'locale' => 'yid', 'localeFallback' => 'yid', 'charset' => 'utf-8')
);
$this->assertEqual($result, $expected);
}
}
?>

0 comments on commit ad8cba4

Please sign in to comment.