commit c09a9b727ce51a493371b47148ebf53664f17ab4
parent 57efd8f559019b3f2eda53e14d0b5a95e8ec4125
Author: MTRNord <mtrnord1@gmail.com>
Date: Tue, 17 Mar 2015 18:50:47 +0100
some fix
Diffstat:
4 files changed, 4 insertions(+), 167 deletions(-)
diff --git a/core/api/v1/DbHandler.class.php b/core/api/v1/DbHandler.class.php
@@ -122,7 +122,10 @@ class DbHandler {
*/
private function isUserExists($email) {
$stmt = $this->conn->prepare("SELECT id from users WHERE email = ?");
- echo $stmt;
+ var_dump($stmt);
+ if ($stmt === FALSE) {
+ die($this->conn->error);
+ }
$stmt->bind_param("s", $email);
$stmt->execute();
$stmt->store_result();
diff --git a/core/api/v1/old/MyApi.class.php b/core/api/v1/old/MyApi.class.php
@@ -1,38 +0,0 @@
-<?php
-require_once 'api.class.php';
-class MyAPI extends API
-{
- protected $User;
-
- public function __construct($request, $origin) {
- parent::__construct($request);
-
- // Abstracted out for example
- $APIKey = new Models\APIKey();
- $User = new Models\User();
-
- if (!array_key_exists('apiKey', $this->request)) {
- throw new Exception('No API Key provided');
- } else if (!$APIKey->verifyKey($this->request['apiKey'], $origin)) {
- throw new Exception('Invalid API Key');
- } else if (array_key_exists('token', $this->request) &&
- !$User->get('token', $this->request['token'])) {
-
- throw new Exception('Invalid User Token');
- }
-
- $this->User = $User;
- }
-
- /**
- * Example of an Endpoint
- */
- protected function example() {
- if ($this->method == 'GET') {
- return "Your name is " . $this->User->name;
- } else {
- return "Only accepts GET requests";
- }
- }
- }
- ?>
-\ No newline at end of file
diff --git a/core/api/v1/old/api.class.php b/core/api/v1/old/api.class.php
@@ -1,110 +0,0 @@
-<?php
-abstract class API
-{
- /**
- * Property: method
- * The HTTP method this request was made in, either GET, POST, PUT or DELETE
- */
- protected $method = '';
- /**
- * Property: endpoint
- * The Model requested in the URI. eg: /files
- */
- protected $endpoint = '';
- /**
- * Property: verb
- * An optional additional descriptor about the endpoint, used for things that can
- * not be handled by the basic methods. eg: /files/process
- */
- protected $verb = '';
- /**
- * Property: args
- * Any additional URI components after the endpoint and verb have been removed, in our
- * case, an integer ID for the resource. eg: /<endpoint>/<verb>/<arg0>/<arg1>
- * or /<endpoint>/<arg0>
- */
- protected $args = Array();
- /**
- * Property: file
- * Stores the input of the PUT request
- */
- protected $file = Null;
-
- /**
- * Constructor: __construct
- * Allow for CORS, assemble and pre-process the data
- */
- public function __construct($request) {
- header("Access-Control-Allow-Orgin: *");
- header("Access-Control-Allow-Methods: *");
- header("Content-Type: application/json");
-
- $this->args = explode('/', rtrim($request, '/'));
- $this->endpoint = array_shift($this->args);
- if (array_key_exists(0, $this->args) && !is_numeric($this->args[0])) {
- $this->verb = array_shift($this->args);
- }
-
- $this->method = $_SERVER['REQUEST_METHOD'];
- if ($this->method == 'POST' && array_key_exists('HTTP_X_HTTP_METHOD', $_SERVER)) {
- if ($_SERVER['HTTP_X_HTTP_METHOD'] == 'DELETE') {
- $this->method = 'DELETE';
- } else if ($_SERVER['HTTP_X_HTTP_METHOD'] == 'PUT') {
- $this->method = 'PUT';
- } else {
- throw new Exception("Unexpected Header");
- }
- }
-
- switch($this->method) {
- case 'DELETE':
- case 'POST':
- $this->request = $this->_cleanInputs($_POST);
- break;
- case 'GET':
- $this->request = $this->_cleanInputs($_GET);
- break;
- case 'PUT':
- $this->request = $this->_cleanInputs($_GET);
- $this->file = file_get_contents("php://input");
- break;
- default:
- $this->_response('Invalid Method', 405);
- break;
- }
- }
- public function processAPI() {
- if ((int)method_exists($this, $this->endpoint) > 0) {
- return $this->_response($this->{$this->endpoint}($this->args));
- }
- return $this->_response("No Endpoint: $this->endpoint", 404);
- }
-
- private function _response($data, $status = 200) {
- header("HTTP/1.1 " . $status . " " . $this->_requestStatus($status));
- return json_encode($data);
- }
-
- private function _cleanInputs($data) {
- $clean_input = Array();
- if (is_array($data)) {
- foreach ($data as $k => $v) {
- $clean_input[$k] = $this->_cleanInputs($v);
- }
- } else {
- $clean_input = trim(strip_tags($data));
- }
- return $clean_input;
- }
-
- private function _requestStatus($code) {
- $status = array(
- 200 => 'OK',
- 404 => 'Not Found',
- 405 => 'Method Not Allowed',
- 500 => 'Internal Server Error',
- );
- return ($status[$code])?$status[$code]:$status[500];
- }
-}
-?>
-\ No newline at end of file
diff --git a/core/api/v1/old/api.php b/core/api/v1/old/api.php
@@ -1,15 +0,0 @@
-<?php
-require_once 'MyApi.class.php';
-require_once 'api.class.php';
-// Requests from the same server don't have a HTTP_ORIGIN header
-if (!array_key_exists('HTTP_ORIGIN', $_SERVER)) {
- $_SERVER['HTTP_ORIGIN'] = $_SERVER['SERVER_NAME'];
-}
-
-try {
- $API = new MyAPI($_REQUEST['request'], $_SERVER['HTTP_ORIGIN']);
- echo $API->processAPI();
-} catch (Exception $e) {
- echo json_encode(Array('error' => $e->getMessage()));
-}
-?>
-\ No newline at end of file