gettin rid of one nonaesthetic warning message & making possible to use base36 templa...

diff --git a/wwwroot/nodes.php b/wwwroot/nodes.php
index cffb9d09e9e9bafceaeb3387729a9d0b349f8bc3..0c3802391a7203cac09aa775a22646d43a61c2c6 100644 (file)
--- a/wwwroot/nodes.php
+++ b/wwwroot/nodes.php
@@ -42,13 +42,13 @@ $db = new CLASS_DATABASE();
 if (preg_match('/id\/([0-9]+)(?:\/([0-9]+)\/?)?/',$_SERVER['PATH_INFO'],$match)) {
 //     print_r($match);
        $_GET['node_id']=$match[1];
-       if ($match[2]) {
+       if (!empty($match[2])) {
                $_GET['template_id']=$match[2];
        }
-} elseif (preg_match('/k\/([a-z0-9]+)(?:\/([0-9]+))?/',$_SERVER['PATH_INFO'],$match)) {
+} elseif (preg_match('/k\/([a-z0-9]{1,7})(?:\/([a-z0-9]{1,7}))?/',$_SERVER['PATH_INFO'],$match)) {
        $_GET['node_id']=base_convert($match[1], 36, 10);
-       if ($match[2]) {
-               $_GET['template_id']=$match[2]; 
+       if (!empty($match[2])) {
+               $_GET['template_id']=base_convert($match[2],36,10);     
        }
 } elseif (preg_match('/name\/(.*?)\/?$/',$_SERVER['PATH_INFO'],$match)) {
        $_GET['node_id']  = nodes::getNodeIdByName($match[1]);