c1ee9aaf by Jonille Arreglo

update

1 parent a29f221c
...@@ -156,6 +156,7 @@ class FlagManager { ...@@ -156,6 +156,7 @@ class FlagManager {
156 if(!$flags) return []; 156 if(!$flags) return [];
157 foreach($flags as $flag){ 157 foreach($flags as $flag){
158 $value = $this->checkFlag($flag, !empty($flag['default']) ? $flag['default'] : null); 158 $value = $this->checkFlag($flag, !empty($flag['default']) ? $flag['default'] : null);
159 setcookie($flag['name'], null, time() + (86400 * 30), "/");
159 setcookie($flag['encrypted_name'], $value['cookie_value'], time() + (86400 * 30), "/"); 160 setcookie($flag['encrypted_name'], $value['cookie_value'], time() + (86400 * 30), "/");
160 } 161 }
161 } 162 }
...@@ -165,22 +166,22 @@ class FlagManager { ...@@ -165,22 +166,22 @@ class FlagManager {
165 if(!$flag['is_filtered']) return array('value' => $needle, 'cookie_value' => $needle ); 166 if(!$flag['is_filtered']) return array('value' => $needle, 'cookie_value' => $needle );
166 167
167 $acceptedValues = $flag['accepted_values']; 168 $acceptedValues = $flag['accepted_values'];
169 $flag_value = '';
170 $default_value = $defaultValue;
168 if(isset($flag['both_usable'])){ 171 if(isset($flag['both_usable'])){
169 if($flag['both_usable']){ 172 if($flag['both_usable']){
170 $flag_value = '';
171 foreach($acceptedValues as $value) { 173 foreach($acceptedValues as $value) {
172 if($value['encrypted_value'] == $needle || $value['value'] == $needle) 174 if($value['encrypted_value'] == $needle || $value['value'] == $needle) $flag_value = $value['value'];
173 $flag_value = $value['value']; 175 if($value['encrypted_value'] == $default_value) $default_value = $value['value'];
174 } 176 }
175 return $flag_value != '' ? array('value' => $flag_value, 'cookie_value' => $needle ) : array('value' => $defaultValue, 'cookie_value' => $defaultValue ); 177 return $flag_value != '' ? array('value' => $flag_value, 'cookie_value' => $needle ) : array('value' => $default_value, 'cookie_value' => $defaultValue );
176 } 178 }
177 } 179 }
178 $flag_value = '';
179 foreach($acceptedValues as $value) { 180 foreach($acceptedValues as $value) {
180 if($value['encrypted_value'] == $needle) 181 if($value['encrypted_value'] == $needle) $flag_value = $value['value'];
181 $flag_value = $value['value']; 182 if($value['encrypted_value'] == $default_value) $default_value = $value['value'];
182 } 183 }
183 return $flag_value != '' ? array('value' => $flag_value, 'cookie_value' => $needle ) : array('value' => $defaultValue, 'cookie_value' => $defaultValue ); 184 return $flag_value != '' ? array('value' => $flag_value, 'cookie_value' => $needle ) : array('value' => $default_value, 'cookie_value' => $defaultValue );
184 } 185 }
185 186
186 public function checkFlag($flag, $defaultValue, $driver = 'cookie'){ 187 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!