From 36fd8a4585e8ab65e68cb8b7d8a2977ce3016473 Mon Sep 17 00:00:00 2001 From: Ivan Diaz Date: Sun, 1 Nov 2015 18:46:13 -0300 Subject: [PATCH] [Ivan Diaz] - Add server changes --- server/controllers/user.php | 1 - server/index.php | 4 ---- server/models/DataStore.php | 10 ++++++++++ server/models/Log.php | 17 +++++++++++++++++ server/models/User.php | 1 - 5 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 server/models/DataStore.php create mode 100644 server/models/Log.php diff --git a/server/controllers/user.php b/server/controllers/user.php index acfd05e6..84cc8fce 100644 --- a/server/controllers/user.php +++ b/server/controllers/user.php @@ -6,7 +6,6 @@ $app->group('/user', function () use ($app) { }); $app->get('/add/:user/:pass', function ($user, $pass) use ($app) { - // $app->response()->setStatus(400); $userInstance = new User(); $userInstance->setProperties(array( 'user' => $user, diff --git a/server/index.php b/server/index.php index 1df003aa..4cfd9ec4 100644 --- a/server/index.php +++ b/server/index.php @@ -9,10 +9,6 @@ RedBean::setup('mysql:host='. $mysql_host .';dbname=' . $mysql_database, $mysql_ // SLIM FRAMEWORK \Slim\Slim::registerAutoLoader(); $app = new \Slim\Slim(); -$app->config('debug', true); -$app->error(function (\Exception $e) use ($app) { - echo "error"; -}); // LOAD MODELS spl_autoload_register(function ($class) { diff --git a/server/models/DataStore.php b/server/models/DataStore.php new file mode 100644 index 00000000..7160faac --- /dev/null +++ b/server/models/DataStore.php @@ -0,0 +1,10 @@ +log = RedBean::dispense('LOGS'); + $log->date = RedBean::isoDateTime(); + $log->type = $properties['type']; + $log->content = $properties['content']; + } + + public function showUserDetails() { + return $this->_user; + } +} diff --git a/server/models/User.php b/server/models/User.php index 031dd513..cca359c1 100644 --- a/server/models/User.php +++ b/server/models/User.php @@ -44,7 +44,6 @@ class User { $this->_user = $user; } else { - //echo RedBean; $this->_user = RedBean::dispense('users'); $this->setDefaultProperties(); }