diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/Anime.php | 2 | ||||
| -rw-r--r-- | models/Kdrama.php | 2 | ||||
| -rw-r--r-- | models/User.php | 8 | ||||
| -rw-r--r-- | models/confirmKey.php | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/models/Anime.php b/models/Anime.php index 2798a43..4543826 100644 --- a/models/Anime.php +++ b/models/Anime.php @@ -3,7 +3,7 @@ namespace app\models; class Anime extends \lithium\data\Model { - protected $_meta = array('key' => '_id', 'source' => 'anime'); + protected $_meta = array('key' => '_id', 'source' => 'anime', 'connection' => 'mongo'); public static function search($query, $page = 1, $by = 'title') { diff --git a/models/Kdrama.php b/models/Kdrama.php index 9d3ddf7..f1eee22 100644 --- a/models/Kdrama.php +++ b/models/Kdrama.php @@ -3,7 +3,7 @@ namespace app\models; class Kdrama extends \lithium\data\Model { - protected $_meta = array('key' => '_id', 'source' => 'kdrama'); + protected $_meta = array('key' => '_id', 'source' => 'kdrama', 'connection' => 'mongo'); public static function search($query, $page = 1, $by = 'title') { diff --git a/models/User.php b/models/User.php index bf9eec2..a1c8f8d 100644 --- a/models/User.php +++ b/models/User.php @@ -10,12 +10,12 @@ use \lithium\security\Password; class User extends \lithium\data\Model { //To bypass mongo bug - protected $_meta = array('key' => '_id'); - protected $_schema = array('_id' => array('type' => 'id'), + //protected $_meta = array('key' => '_id'); + /*protected $_schema = array('_id' => array('type' => 'id'), 'feed' => array('type'=>'string', 'array' => true), 'animelist' => array('type' => 'object', 'array' => true), 'mangalist' => array('type' => 'object', 'array' => true) - ); + );*/ public static function __init() { @@ -338,7 +338,7 @@ class User extends \lithium\data\Model { //Hash their password. $data['password'] = Password::hash($entity->newpass, $salt); - $data['salt'] = $salt; + $data['pepper'] = $salt; unset($entity->newpass); } //If the entity doesn't exist or if the password password has been modified diff --git a/models/confirmKey.php b/models/confirmKey.php index 6a941ad..9348021 100644 --- a/models/confirmKey.php +++ b/models/confirmKey.php @@ -11,7 +11,7 @@ class confirmKey extends \lithium\data\Model { public $secret = "marshmellows"; //I don't know why either? //To bypass mongo bug - protected $_meta = array('key' => '_id'); + //protected $_meta = array('key' => '_id'); //array('isValidKey', 'message' => 'Key does not exist'); public static function __init() |