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

Admin users page. some fix to template processor.

Browse Source
This commit is contained in:
Fabio Comuni
2011-06-16 14:56:43 +02:00
parent c94b809634
commit ede011cc32
5 changed files with 211 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/main.js
View File

@@ -307,3 +307,15 @@
});
}
/**
* sprintf in javascript
* "{0} and {1}".format('zero','uno');
**/
String.prototype.format = function() {
var formatted = this;
for (var i = 0; i < arguments.length; i++) {
var regexp = new RegExp('\\{'+i+'\\}', 'gi');
formatted = formatted.replace(regexp, arguments[i]);
}
return formatted;
};

9
include/template_processor.php
View File

@@ -71,11 +71,7 @@
} else {
$val = $this->_get_var($args[2]);
}
if (isset($args[4])) {
list($strue, $sfalse)= explode($args[4], $args[3]);
} else {
$strue = $args[3]; $sfalse = "";
}
list($strue, $sfalse)= preg_split("|{{ *else *}}|", $args[3]);
return ($val?$strue:$sfalse);
}
@@ -135,7 +131,6 @@
$s = "";
}
$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
if ($s==Null) $this->_preg_error()
return $s;
}
@@ -168,7 +163,7 @@
#$s = str_replace(array("\n","\r"),array("§n§","§r§"),$s);
$s = $this->_build_nodes($s);
$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
if ($s==Null) $this->_preg_error()
if ($s==Null) $this->_preg_error();
$s = str_replace($this->search,$this->replace, $s);
return $s;