harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Comanche conditionals - provide a conditional "~=" form for testing 'contains' (case independent substring match). Also add $request the request uri) to the supported variables.

Browse Source
This commit is contained in:
zotlabs
2017-01-07 15:58:01 -08:00
parent b2a4075e12
commit dd97d84c19
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Zotlabs/Render/Comanche.php
View File

@@ -104,6 +104,8 @@ class Comanche {
$x = explode('.',$v); $x = explode('.',$v);
if($x[0] == 'config') if($x[0] == 'config')
return get_config($x[1],$x[2]); return get_config($x[1],$x[2]);
elseif($x[0] === 'request')
return $_SERVER['REQUEST_URI'];
elseif($x[0] === 'observer') { elseif($x[0] === 'observer') {
if(count($x) > 1) { if(count($x) > 1) {
$y = \App::get_observer(); $y = \App::get_observer();
@@ -125,6 +127,8 @@ class Comanche {
function test_condition($s) { function test_condition($s) {
// This is extensible. The first version of variable testing supports tests of the forms: // This is extensible. The first version of variable testing supports tests of the forms:
// [if $config.system.foo ~= baz] which will check if get_config('system','foo') contains the string 'baz';
// [if $config.system.foo == baz] which will check if get_config('system','foo') is the string 'baz'; // [if $config.system.foo == baz] which will check if get_config('system','foo') is the string 'baz';
// [if $config.system.foo != baz] which will check if get_config('system','foo') is not the string 'baz'; // [if $config.system.foo != baz] which will check if get_config('system','foo') is not the string 'baz';
// You may check numeric entries, but these checks are evaluated as strings. // You may check numeric entries, but these checks are evaluated as strings.
@@ -133,12 +137,20 @@ class Comanche {
// [if $config.system.foo] which will check for a return of a true condition for get_config('system','foo'); // [if $config.system.foo] which will check for a return of a true condition for get_config('system','foo');
// The values 0, '', an empty array, and an unset value will all evaluate to false. // The values 0, '', an empty array, and an unset value will all evaluate to false.
if(preg_match('/[\$](.*?)\s\~\=\s(.*?)$/',$s,$matches)) {
$x = $this->get_condition_var($matches[1]);
if(stripos($x,trim($matches[2])) !== false)
return true;
return false;
}
if(preg_match('/[\$](.*?)\s\=\=\s(.*?)$/',$s,$matches)) { if(preg_match('/[\$](.*?)\s\=\=\s(.*?)$/',$s,$matches)) {
$x = $this->get_condition_var($matches[1]); $x = $this->get_condition_var($matches[1]);
if($x == trim($matches[2])) if($x == trim($matches[2]))
return true; return true;
return false; return false;
} }
if(preg_match('/[\$](.*?)\s\!\=\s(.*?)$/',$s,$matches)) { if(preg_match('/[\$](.*?)\s\!\=\s(.*?)$/',$s,$matches)) {
$x = $this->get_condition_var($matches[1]); $x = $this->get_condition_var($matches[1]);
if($x != trim($matches[2])) if($x != trim($matches[2]))