5ceda9b9 by Joshua Tundag

Merge branch '11515_encrypted_flag' into 'master'

update FlagManager

See merge request !4
2 parents fb425b13 c1ee9aaf
......@@ -156,6 +156,7 @@ class FlagManager {
if(!$flags) return [];
foreach($flags as $flag){
$value = $this->checkFlag($flag, !empty($flag['default']) ? $flag['default'] : null);
setcookie($flag['name'], null, time() + (86400 * 30), "/");
setcookie($flag['encrypted_name'], $value['cookie_value'], time() + (86400 * 30), "/");
}
}
......@@ -165,22 +166,22 @@ class FlagManager {
if(!$flag['is_filtered']) return array('value' => $needle, 'cookie_value' => $needle );
$acceptedValues = $flag['accepted_values'];
$flag_value = '';
$default_value = $defaultValue;
if(isset($flag['both_usable'])){
if($flag['both_usable']){
$flag_value = '';
foreach($acceptedValues as $value) {
if($value['encrypted_value'] == $needle || $value['value'] == $needle)
$flag_value = $value['value'];
if($value['encrypted_value'] == $needle || $value['value'] == $needle) $flag_value = $value['value'];
if($value['encrypted_value'] == $default_value) $default_value = $value['value'];
}
return $flag_value != '' ? array('value' => $flag_value, 'cookie_value' => $needle ) : array('value' => $defaultValue, 'cookie_value' => $defaultValue );
return $flag_value != '' ? array('value' => $flag_value, 'cookie_value' => $needle ) : array('value' => $default_value, 'cookie_value' => $defaultValue );
}
}
$flag_value = '';
foreach($acceptedValues as $value) {
if($value['encrypted_value'] == $needle)
$flag_value = $value['value'];
if($value['encrypted_value'] == $needle) $flag_value = $value['value'];
if($value['encrypted_value'] == $default_value) $default_value = $value['value'];
}
return $flag_value != '' ? array('value' => $flag_value, 'cookie_value' => $needle ) : array('value' => $defaultValue, 'cookie_value' => $defaultValue );
return $flag_value != '' ? array('value' => $flag_value, 'cookie_value' => $needle ) : array('value' => $default_value, 'cookie_value' => $defaultValue );
}
public function checkFlag($flag, $defaultValue, $driver = 'cookie'){
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!