diff --git a/backend/lib/Model/EntityDefinition.php b/backend/lib/Model/EntityDefinition.php
index 5901b33..2ffb2d9 100644
--- a/backend/lib/Model/EntityDefinition.php
+++ b/backend/lib/Model/EntityDefinition.php
@@ -21,7 +21,7 @@
* along with volkszaehler.org. If not, see .
*/
-namespace Volkszaehler;
+namespace Volkszaehler\Model;
/**
* @author Steffen Vogel
diff --git a/backend/lib/Model/Property.php b/backend/lib/Model/Property.php
index 1a1fc3d..48461e3 100644
--- a/backend/lib/Model/Property.php
+++ b/backend/lib/Model/Property.php
@@ -110,6 +110,7 @@ class Property {
public function getDefinition() { return PropertyDefinition::get($this->name); }
public function setValue($value) { $this->value = $value; }
+ protected function setName($name) { $this->name = $name; }
}
?>
diff --git a/backend/lib/Router.php b/backend/lib/Router.php
index 8a80c2c..b38624a 100644
--- a/backend/lib/Router.php
+++ b/backend/lib/Router.php
@@ -39,9 +39,10 @@ class Router {
protected static $controllerMapping = array(
'channels' => 'Volkszaehler\Controller\ChannelController',
- 'groups' => 'Volkszaehler\Controller\GroupController',
- 'tokens' => 'Volkszaehler\Controller\TokenController',
- 'capabilities' => 'Volkszaehler\Controller\CapabilitiesController'
+ 'groups' => 'Volkszaehler\Controller\GroupController',
+ 'tokens' => 'Volkszaehler\Controller\TokenController',
+ 'capabilities' => 'Volkszaehler\Controller\CapabilitiesController',
+ 'data' => 'Volkszaehler\Controller\DataController'
);
/**
@@ -61,6 +62,9 @@ class Router {
// PATH_INFO: /channel/550e8400-e29b-11d4-a716-446655440000/edit.json
$pi = $this->getPathInfo();
+ //Util\Debug::log('PATH_INFO', $pi);
+ //Util\Debug::log('_SERVER', $_SERVER);
+
if ($pi) {
$pi = substr($pi, 1);
$pie = explode('/', $pi);
@@ -71,7 +75,7 @@ class Router {
$i++;
}
- if (isset($pie[$i]) && preg_match('/[a-f0-9\-]{3,36}/', $pie[$i])) {
+ if (isset($pie[$i]) && preg_match('/[a-f0-9\-]{5,36}/', $pie[$i])) {
$this->identifier = $pie[$i];
}
$i++;