------------------------------------------------------------
revno: 1071
committer: Roger Martin <[email protected]>
branch nick: aikiframework
timestamp: Sat 2012-02-04 23:50:56 +0100
message:
correction in config lib class
modified:
libs/config.php
--
lp:aikiframework
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk
Your team Aiki Framework Developers is subscribed to branch lp:aikiframework.
To unsubscribe from this branch go to
https://code.launchpad.net/~aikiframework-devel/aikiframework/trunk/+edit-subscription
=== modified file 'libs/config.php'
--- libs/config.php 2012-02-02 21:08:12 +0000
+++ libs/config.php 2012-02-04 22:50:56 +0000
@@ -209,7 +209,7 @@
if (is_array($values)) {
foreach ($values as $value) {
if ($aiki->match_pair($value->config_selector, $site, $view, $language)) {
- if ( preg_match ('/^[asidb]:/', $value->config_value) ) {
+ if ( preg_match ('/^(N;)|([asidbO]:)/', $value->config_value) ) {
$ret= unserialize($value->config_value);
} else {
$ret= $value->config_value;
@@ -286,7 +286,7 @@
}
if ( $givenSelector == "CURRENT" ||
- $givenSelector=="*" ||
+ $givenSelector=="*" || $givenSelector =="*/*/*" ||
$aiki->match_pair($givenSelector, $this->site, $this->view, $this->language) ) {
// value will only store in config, in selector is current, * (all) or match against
// current enviroment.
@@ -296,13 +296,14 @@
$parts = $this->selector($selector);
// Rules: a given site value 100, a view 10, a language only 1, * cero.
- $weight .= ( $parts[0] != "*" && $parts[0] != "" ? 100 : 00 ) +
- ( $parts[1] !="*" && $parts[1] !="" ? 10 : 00 ) +
- ( $parts[2] !="*" && $parts[2] !="" ? 1 : 00 );
+ $weight .=
+ ( $parts[0] != "*" && $parts[0] != "" ? 100 : 00 ) +
+ ( $parts[1] != "*" && $parts[1] != "" ? 10 : 00 ) +
+ ( $parts[2] != "*" && $parts[2] != "" ? 1 : 00 );
- $name = addslashes($setting);
- $selector = addslashes("{$parts[0]}/$parts[1]/$parts[2]");
- $where = " WHERE config_name='$name' AND config_selector='$selector'";
+ $name = addslashes($setting);
+ $selector = addslashes("{$parts[0]}/{$parts[1]}/{$parts[2]}");
+ $where = " WHERE config_name='$name' AND config_selector='$selector'";
if ($db->get_var("SELECT config_id FROM aiki_configs $where")) {
$SQL =
@@ -321,7 +322,7 @@
addslashes(serialize($value)),
$important,
$weight,
- $selector);
+ $selector);
return $db->query($SQL);
}
@@ -367,9 +368,9 @@
* @global $aiki
*/
-function config_set($setting, $dvalue, $selector="*") {
+function config_set($setting, $value, $selector="*") {
global $aiki;
- return $aiki->config->set($setting, $value, $selector="CURRENT");
+ return $aiki->config->set($setting, $value, $selector );
}
_______________________________________________
Mailing list: https://launchpad.net/~aikiframework-devel
Post to : [email protected]
Unsubscribe : https://launchpad.net/~aikiframework-devel
More help : https://help.launchpad.net/ListHelp
