diff --git a/application/datastorage/Users.php b/application/datastorage/Users.php index 6f9e4b9..dc72568 100644 --- a/application/datastorage/Users.php +++ b/application/datastorage/Users.php @@ -35,7 +35,7 @@ class Users extends Zend_Db_Table_Abstract implements Fiktiv_Data_Storage // Keep all but password and salt in session. $storage = $auth->getStorage(); $storage->write($authAdapter->getResultRowObject(null, array('password', 'salt'))); - + return true; } diff --git a/application/languages/en.ini b/application/languages/en.ini index b959a5a..cb442b7 100644 --- a/application/languages/en.ini +++ b/application/languages/en.ini @@ -6,7 +6,7 @@ example = "This is an example of %s and %s" email = email password = password login = login -LOGIN_TXT = "Fill out your information below to login.

There is no sign up at this time.

" +LOGIN_TXT = "Fill out your information below to login.

There is no sign up at this time.

" START_TXT = "Welcome to fiktivkod.org. ...." ABOUT_TXT = "Fiktiv (fiktivkod.org) is ... that started ..." diff --git a/application/languages/se.ini b/application/languages/se.ini index 5ef003f..2f17cb4 100644 --- a/application/languages/se.ini +++ b/application/languages/se.ini @@ -6,7 +6,7 @@ example = "Det här är ett exempel på %s och %s" email = e-post password = lösenord login = logga in -LOGIN_TXT = "Ange dina uppgifter nedan för att logga in.

Det går inte att registrera sig just nu.

" +LOGIN_TXT = "Ange dina uppgifter nedan för att logga in.

Det går inte att registrera sig just nu.

" START_TXT = "Välkommen till fiktivkod.org. ...." ABOUT_TXT = "Fiktiv (fiktivkod.org) är ... som startade ..." diff --git a/application/models/User.php b/application/models/User.php index b2841be..709b495 100644 --- a/application/models/User.php +++ b/application/models/User.php @@ -7,16 +7,12 @@ class User { protected $_email; - protected $_firstName; - protected $_lastName; - protected $_regDate; - protected $_isDeleted = false; - + public function __construct(array $data = array()) { @@ -86,6 +82,10 @@ class User return false; } + /** + * String representation of the object + * @return string + */ public function __toString() { return '{' . $this->_firstName . ' ' . $this->_lastName . '}'; diff --git a/library/Fiktiv/Data/Interface/Read.php b/library/Fiktiv/Data/Interface/Read.php new file mode 100644 index 0000000..f822a70 --- /dev/null +++ b/library/Fiktiv/Data/Interface/Read.php @@ -0,0 +1,6 @@ +