stv0g/vzlogger
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

several fixes

Browse source 
typos corrected
This commit is contained in:
Steffen Vogel 2010-09-06 08:26:39 +02:00
parent 8c091ed52f
commit 5932772d0a
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
backend/lib/Model/EntityDefinition.php
View file

@ -21,7 +21,7 @@
* along with volkszaehler.org. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Volkszaehler;
namespace Volkszaehler\Model;
/**
* @author Steffen Vogel <info@steffenvogel.de>

1
backend/lib/Model/Property.php
View file

@ -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; }
}
?>

12
backend/lib/Router.php
View file

@ -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++;