Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

Class if macro improvement

givanz708c06cc5196
diff --git a/system/vtpl/macros.php b/system/vtpl/macros.php
index 4ad73ce..48fff16 100755
--- a/system/vtpl/macros.php
+++ b/system/vtpl/macros.php
@@ -68,7 +68,7 @@ function vtplKeyValue($vtpl, $node, $selector, $keyAttribute, $valueAttribute) {
variable = variable ex product.price = price this will result in $product['price'] == $price
variable = 'string' ex this.stock = 'available' this will result in $this->price == $price
*/
-function vtplIfCondition($vtpl, $node, $string = false) {
+function ifCondition($string = '') {
$logic = ['&&', '\|\|', 'AND', 'OR'];
$regex = '/\s+(' . implode(')\s+|\s+(', $logic) . ')\s+/i';
$conditions = preg_split($regex, $string, 0, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
@@ -125,6 +125,10 @@ function vtplIfCondition($vtpl, $node, $string = false) {
return $return;
}
+function vtplIfCondition($vtpl, $node, $string = '') {
+ return ifCondition($string);
+}
+
/*
Remove class from node, used by data-v-class-if
*/
@@ -138,3 +142,48 @@ function vtplRemoveClass($vtpl, $node, $className = '') {
$node->setAttribute('class', str_replace($className, '', $value));
}
}
+
+function vtplIfClass($vtpl, $node) {
+ $if = [];
+ $ifnot = [];
+ $length = $node->attributes->length;
+
+ for ($i = 0; $i < $length; ++$i) {
+ if ($item = $node->attributes->item($i)) {
+ $name = $item->name;
+
+ if (strpos($name, 'data-v-class-if-not-') !== false) {
+ $name = str_replace('data-v-class-if-not-', '', $name);
+ $ifnot[$name] = $item->value;
+ } else {
+ if (strpos($name, 'data-v-class-if-') !== false) {
+ $name = str_replace('data-v-class-if-', '', $name);
+ $if[$name] = $item->value;
+ }
+ }
+ }
+ }
+
+ $return = '';
+ $value = $node->getAttribute('class');
+
+ foreach ($ifnot as $class => $cond) {
+ $value = str_replace($class, '',$value);
+ //$node->removeAttribute("data-v-class-if-not-$class");
+ $condition = ifCondition($cond);
+ $return .= "if (!($condition)) {echo ' $class';}";
+ }
+
+ foreach ($if as $class => $cond) {
+ $value = str_replace($class, '',$value);
+ //$node->removeAttribute("data-v-class-if-$class");
+ $condition = ifCondition($cond);
+ $return .= "if ($condition) {echo ' $class';}";
+ }
+
+ $value = preg_replace('/\s+/', ' ', $value);
+
+ $node->setAttribute('class', $value);
+
+ return $return;
+}
diff --git a/system/vtpl/vtpl.php b/system/vtpl/vtpl.php
index 574321f..3c9ef79 100755
--- a/system/vtpl/vtpl.php
+++ b/system/vtpl/vtpl.php
@@ -974,7 +974,7 @@ class Vtpl {
$value = preg_replace_callback('/@@__innerText__@@/',
function ($matches) use ($node) {
- $value = $this->innerHtml([$node]);
+ $value = $this->innerText([$node]);
if (isset($value[0]) && $value[0] == '{') {
$value = json_decode($value, 1);
@@ -1004,7 +1004,6 @@ class Vtpl {
$value = preg_replace_callback('/@@__([\.a-zA-Z*_-]+)__@@/',
function ($matches) use ($node) {
$attributeName = $matches[1];
- $value = '';
if (strpos($attributeName, '*') !== false) {
//wildcard attribute
@@ -1702,7 +1701,7 @@ class Vtpl {
$this->debug->log('SELECTOR_FROM', $filename);
if (! ($html = @file_get_contents($filename))) {
- Vvveb\log_error("can't load html $filename");
+ Vvveb\logError("can't load html $filename");
$this->debug->log('LOAD', '<b>EXTERNAL ERROR</b> ' . $filename . ' ' . $selector);
return false;
@@ -1741,7 +1740,7 @@ class Vtpl {
}
if (! ($html = @file_get_contents($filename))) {
- Vvveb\log_error("can't load template $filename");
+ Vvveb\logError("can't load template $filename");
$this->debug->log('LOAD', '<b>ERROR</b> ' . $filename);
return false;
@@ -1782,9 +1781,9 @@ class Vtpl {
}
if ($this->isHTML) {
- @$this->document->loadHTML($html);
+ @$this->document->loadHTML($html, LIBXML_NOERROR);
} else {
- @$this->document->loadXML($html);
+ @$this->document->loadXML($html, LIBXML_NOERROR);
}
$errors = libxml_get_errors();
@@ -1831,6 +1830,7 @@ class Vtpl {
if ($head->length > 0) {
$base = $this->document->createElement('base');
+ $base->setAttribute('href','');
$head->item(0)->insertBefore($base, $head->item(0)->firstChild);
}
}
@@ -1892,8 +1892,12 @@ class Vtpl {
}
}
+ $tagName = isset($node->parentNode->tagName) ? strtolower($node->parentNode->tagName) : false;
+
if ($node && $node->nodeType == XML_TEXT_NODE &&
- (! isset($node->parentNode->tagName) || $node->parentNode->tagName != '_script')) {
+ (! $tagName || ($tagName != 'textarea' && $tagName != '_script'
+ && $tagName != 'code' && $tagName != 'iframe'
+ && $tagName != 'noscript'))) {
if (isset($node->wholeText)) {
$text = $node->wholeText;
} else {
@@ -1911,13 +1915,16 @@ class Vtpl {
if ($trimmed != '') {
$trimmed = addcslashes($trimmed, "'");
- $php = '<_script language="php"><![CDATA[ echo ' . $this->translationFunction . '(\'' . $trimmed . '\');]]></_script>';
- //keep space around text for html spacing
- $php = str_replace($trimmed, $php, $text);
- $f = $this->document->createDocumentFragment();
- $f->appendXML($php);
- $node = $node->parentNode->replaceChild($f, $node);
- //$node->parentNode->replaceChild($f, $node);
+
+ if (strlen($trimmed) < 1024) {
+ $php = '<_script language="php"><![CDATA[ echo ' . $this->translationFunction . '(\'' . $trimmed . '\');]]></_script>';
+ //keep space around text for html spacing
+ $php = str_replace($trimmed, $php, $text);
+ $f = $this->document->createDocumentFragment();
+ $f->appendXML($php);
+ $node = $node->parentNode->replaceChild($f, $node);
+ }
+ //$node->parentNode->replaceChild($f, $node);
} else {
if ($this->removeWhitespace) {
//remove empty space
@@ -2102,7 +2109,7 @@ class Vtpl {
}
if (empty($html)) {
- Vvveb\log_error("compiled template is empty for $compiledFile");
+ Vvveb\logError("compiled template is empty for $compiledFile");
return false;
}