removed user entity which is obsolet by group entity
This commit is contained in:
parent
4a5f8476eb
commit
81ad0c2459
3 changed files with 0 additions and 166 deletions
|
@ -1,59 +0,0 @@
|
|||
<?php
|
||||
/*
|
||||
* Copyright (c) 2010 by Justin Otherguy <justin@justinotherguy.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License (either version 2 or
|
||||
* version 3) as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* For more information on the GPL, please go to:
|
||||
* http://www.gnu.org/copyleft/gpl.html
|
||||
*/
|
||||
|
||||
namespace Volkszaehler\Controller;
|
||||
|
||||
class User extends Controller {
|
||||
// TODO do we need this?
|
||||
public function get() {
|
||||
|
||||
}
|
||||
|
||||
public function add() {
|
||||
$user = new User();
|
||||
$user->setPassword($this->view->request->getParameter('password'));
|
||||
|
||||
$this->em->persist($user);
|
||||
$this->em->flush();
|
||||
|
||||
$this->view->add($user);
|
||||
}
|
||||
|
||||
// TODO check for valid user identity
|
||||
public function delete() {
|
||||
$user = User::getByUuid($this->view->request->getParameter('uuid'));
|
||||
|
||||
$this->em->remove($user);
|
||||
$this->em->flush();
|
||||
}
|
||||
|
||||
public function edit() {
|
||||
// TODO implement UserController::edit();
|
||||
}
|
||||
|
||||
public function subscribe() {
|
||||
// TODO implement UserController::subscribe();
|
||||
}
|
||||
|
||||
public function unsubscribe() {
|
||||
// TODO implement UserController::unsubscribe();
|
||||
}
|
||||
}
|
|
@ -1,72 +0,0 @@
|
|||
<?php
|
||||
/*
|
||||
* Copyright (c) 2010 by Justin Otherguy <justin@justinotherguy.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License (either version 2 or
|
||||
* version 3) as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* For more information on the GPL, please go to:
|
||||
* http://www.gnu.org/copyleft/gpl.html
|
||||
*/
|
||||
|
||||
namespace Volkszaehler\Model;
|
||||
|
||||
use Doctrine\Common\Collections\ArrayCollection;
|
||||
|
||||
/**
|
||||
* User class
|
||||
*
|
||||
* @Entity
|
||||
* @Table(name="users")
|
||||
*/
|
||||
class User extends Entity {
|
||||
/** @Column(type="string") */
|
||||
private $email;
|
||||
|
||||
/** @Column(type="string") */
|
||||
private $password;
|
||||
|
||||
/**
|
||||
* @ManyToMany(targetEntity="Group")
|
||||
* @JoinTable(name="groups_users",
|
||||
* joinColumns={@JoinColumn(name="user_id", referencedColumnName="id")},
|
||||
* inverseJoinColumns={@JoinColumn(name="group_id", referencedColumnName="id")}
|
||||
* )
|
||||
*/
|
||||
private $groups = NULL;
|
||||
|
||||
/*
|
||||
* constructor
|
||||
*/
|
||||
public function __construct() {
|
||||
parent::__construct();
|
||||
|
||||
$this->groups = new ArrayCollection();
|
||||
}
|
||||
|
||||
/*
|
||||
* getter & setter
|
||||
*/
|
||||
public function getEmail() { return $this->email; }
|
||||
public function setEmail($email) { $this->email = $email; }
|
||||
public function setPassword($password) { $this->password = sha1($password); }
|
||||
|
||||
/*
|
||||
* check hashed password against cleartext
|
||||
*/
|
||||
public function checkPassword($password) {
|
||||
return (sha1($password) === $this->password);
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
|
@ -1,35 +0,0 @@
|
|||
<?php
|
||||
/*
|
||||
* Copyright (c) 2010 by Justin Otherguy <justin@justinotherguy.org>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License (either version 2 or
|
||||
* version 3) as published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*
|
||||
* For more information on the GPL, please go to:
|
||||
* http://www.gnu.org/copyleft/gpl.html
|
||||
*/
|
||||
|
||||
namespace Volkszaehler\View\Json;
|
||||
|
||||
class User extends \Volkszaehler\View\Json {
|
||||
|
||||
public function add(\Volkszaehler\Model\User $obj) {
|
||||
$user['id'] = (int) $obj->getId();
|
||||
$user['uuid'] = (string) $obj->addUuid();
|
||||
$user['email'] = $obj->getEmail();
|
||||
|
||||
$this->json['users'][] = $user;
|
||||
}
|
||||
}
|
||||
|
||||
?>
|
Loading…
Add table
Reference in a new issue