cacert/cacert-testmgr
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Doh, apparently the convention has changed nowadays models are placed in the Application_ namespace but we still use Default_

Browse source 
Signed-off-by: Michael Tänzer <neo@nhng.de>
This commit is contained in:
Michael Tänzer 2011-06-20 23:08:08 +02:00
parent f4d471baac
commit bf1495e18b
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manager/application/controllers/ManageAccountController.php
View file

@ -57,7 +57,7 @@ class ManageAccountController extends Zend_Controller_Action
$values = $form->getValues(); $values = $form->getValues();
// Get the current user // Get the current user
$user = Application_Model_User::findCurrentUser(); $user = Default_Model_User::findCurrentUser();
$this->view->assurancesDone = array(); $this->view->assurancesDone = array();
$quantity = $values['quantity']; $quantity = $values['quantity'];

16
manager/application/models/User.php
View file

@ -3,7 +3,7 @@
* @author Michael Tänzer * @author Michael Tänzer
*/ */
class Application_Model_User { class Default_Model_User {
protected $db; protected $db;
protected $id; protected $id;
@ -20,7 +20,7 @@ class Application_Model_User {
* Get an user object for the given ID * Get an user object for the given ID
* *
* @param $id int * @param $id int
* @return Application_Model_User * @return Default_Model_User
*/ */
public static function findById($id) { public static function findById($id) {
// Get database connection // Get database connection
@ -40,13 +40,13 @@ class Application_Model_User {
} }
$row = $result->fetch(); $row = $result->fetch();
return new Application_Model_User($db, $row['id']); return new Default_Model_User($db, $row['id']);
} }
/** /**
* Get an user object for the currently logged in user * Get an user object for the currently logged in user
* *
* @return Application_Model_User * @return Default_Model_User
*/ */
public static function findCurrentUser() { public static function findCurrentUser() {
$session = Zend_Registry::get('session'); $session = Zend_Registry::get('session');
@ -61,7 +61,7 @@ class Application_Model_User {
/** /**
* Get the first assurer who didn't already assure the user * Get the first assurer who didn't already assure the user
* *
* @return Application_Model_User * @return Default_Model_User
*/ */
public function findNewAssurer() public function findNewAssurer()
{ {
@ -77,7 +77,7 @@ class Application_Model_User {
'assured this account'); 'assured this account');
} }
return new Application_Model_User($this->db, $row['assurer']); return new Default_Model_User($this->db, $row['assurer']);
} }
/** /**
@ -174,7 +174,7 @@ class Application_Model_User {
/** /**
* Assure another user. Usual restrictions apply * Assure another user. Usual restrictions apply
* *
* @param $assuree Application_Model_User * @param $assuree Default_Model_User
* @param $points int * @param $points int
* @param $location string * @param $location string
* @param $date string * @param $date string
@ -184,7 +184,7 @@ class Application_Model_User {
* The amount of points that have been issued (might be less than * The amount of points that have been issued (might be less than
* $points) * $points)
*/ */
public function assure(Application_Model_User $assuree, $points, $location, public function assure(Default_Model_User $assuree, $points, $location,
$date) { $date) {
// Sanitize inputs // Sanitize inputs
$points = intval($points); $points = intval($points);