# HG changeset patch # User Markus Broeker # Date 1455482429 -3600 # Node ID f4fce35327ffb560f5d640099f9c9c1a80961b73 # Parent 011596fe28306bf9d74860a30fc34d6dd0f2d6ab Source Code formatiert diff --git a/classes/bfw/core/Entity.php b/classes/bfw/core/Entity.php --- a/classes/bfw/core/Entity.php +++ b/classes/bfw/core/Entity.php @@ -275,4 +275,5 @@ public function quote($string) { return $this->db->quote($string); } + } diff --git a/classes/bfw/entities/TGroup.php b/classes/bfw/entities/TGroup.php --- a/classes/bfw/entities/TGroup.php +++ b/classes/bfw/entities/TGroup.php @@ -1,26 +1,26 @@ - - * - */ - -namespace bfw\entities; - -/** - * Class TGroup - */ -class TGroup extends \bfw\entities\core\TGroup { - - const SYSTEM = 1; - const ADMIN = 2; - - /** - * @param $name - * @return array|null - */ - public function findByName($name) { - return $this->db->findByField('t_group', 'name', $name); - } - -} + + * + */ + +namespace bfw\entities; + +/** + * Class TGroup + */ +class TGroup extends \bfw\entities\core\TGroup { + + const SYSTEM = 1; + const ADMIN = 2; + + /** + * @param $name + * @return array|null + */ + public function findByName($name) { + return $this->db->findByField('t_group', 'name', $name); + } + +} diff --git a/classes/bfw/entities/TUser.php b/classes/bfw/entities/TUser.php --- a/classes/bfw/entities/TUser.php +++ b/classes/bfw/entities/TUser.php @@ -1,49 +1,49 @@ - - * - */ - -namespace bfw\entities; - -/** - * Class TUser - */ -class TUser extends \bfw\entities\core\TUser { - - const SYSTEM = 1; - - /** - * Liefert eine User-Instanz für den per Parameter übergebenen Nutzernamen. - * - * @param $username - * @return array|null - */ - public function findByUsername($username) { - $this->data = $this->db->findByField($this->table, 'username', $username); - - if ($this->data == null) { - return null; - } - - return $this; - } - - /** - * Liefert den formatierten Nutzernamen zur übergebenen Nutzer-Id - * - * @param $user_id - * @return string - */ - public function getFormattedUsername($user_id) { - $user = $this->find($user_id); - - if (!is_object($user)) { - return null; - } - - return sprintf("%s, %s", $user->getLastname(), $user->getFirstname()); - } - -} + + * + */ + +namespace bfw\entities; + +/** + * Class TUser + */ +class TUser extends \bfw\entities\core\TUser { + + const SYSTEM = 1; + + /** + * Liefert eine User-Instanz für den per Parameter übergebenen Nutzernamen. + * + * @param $username + * @return array|null + */ + public function findByUsername($username) { + $this->data = $this->db->findByField($this->table, 'username', $username); + + if ($this->data == null) { + return null; + } + + return $this; + } + + /** + * Liefert den formatierten Nutzernamen zur übergebenen Nutzer-Id + * + * @param $user_id + * @return string + */ + public function getFormattedUsername($user_id) { + $user = $this->find($user_id); + + if (!is_object($user)) { + return null; + } + + return sprintf("%s, %s", $user->getLastname(), $user->getFirstname()); + } + +} diff --git a/classes/bfw/entities/core/RUserGroup.php b/classes/bfw/entities/core/RUserGroup.php --- a/classes/bfw/entities/core/RUserGroup.php +++ b/classes/bfw/entities/core/RUserGroup.php @@ -16,9 +16,11 @@ * @method setUserId($int) * @method int getGroupId() * @method setGroupId($int) -*/ + */ class RUserGroup extends Entity { + public function __construct() { parent::__construct('r_user_group'); } + } diff --git a/classes/bfw/entities/core/TGroup.php b/classes/bfw/entities/core/TGroup.php --- a/classes/bfw/entities/core/TGroup.php +++ b/classes/bfw/entities/core/TGroup.php @@ -14,9 +14,11 @@ /** * @method string getName() * @method setName($string) -*/ + */ class TGroup extends Entity { + public function __construct() { parent::__construct('t_group'); } + } diff --git a/classes/bfw/entities/core/TUser.php b/classes/bfw/entities/core/TUser.php --- a/classes/bfw/entities/core/TUser.php +++ b/classes/bfw/entities/core/TUser.php @@ -22,9 +22,11 @@ * @method setFirstname($string) * @method string getLastname() * @method setLastname($string) -*/ + */ class TUser extends Entity { + public function __construct() { parent::__construct('t_user'); } + } diff --git a/patches/PersistenceCreator.php b/patches/PersistenceCreator.php --- a/patches/PersistenceCreator.php +++ b/patches/PersistenceCreator.php @@ -66,7 +66,7 @@ case 'char': $type = "string"; break; - default: + default: $type = "string"; }