diff --git a/TEST/sample_data.php b/TEST/sample_data.php index 1e1194e..e7f1b77 100644 --- a/TEST/sample_data.php +++ b/TEST/sample_data.php @@ -1,4 +1,4 @@ -load->library(array('session', 'lib_login')); } + + public function index() { $data["login_message"] = ""; $this->load->library('form_validation'); @@ -26,7 +28,8 @@ class Login extends WRB_Controller { $data['action'] = WRENCHBOARD_ACCOUNT_LOGIN; $this->load->model('backend_model'); $out = array(); - $res = $this->backend_model->wrenchboard_api($data, $out); + // $res = $this->backend_model->wrenchboard_api($data, $out); + $res = $this->wrenchboard_api($data, $out); $is_live = $this->backend_model->cfgReadChar("system.live"); // print_r($out); if ($res == PHP_LOGIN_OK) { diff --git a/application/core/WRB_Controller.php b/application/core/WRB_Controller.php index ebc8835..7a0e9d9 100644 --- a/application/core/WRB_Controller.php +++ b/application/core/WRB_Controller.php @@ -50,7 +50,7 @@ class WRB_Controller extends CI_Controller { $this->load->library(array('session', 'lib_login')); } - public function wrenchboard_api($in, $out) { + public function wrenchboard_api($in, &$out) { $this->load->model('backend_model'); // $out = array(); return $this->backend_model->wrenchboard_api($in, $out); diff --git a/application/models/Backend_model.php b/application/models/Backend_model.php index 4b2ce0f..61334ba 100644 --- a/application/models/Backend_model.php +++ b/application/models/Backend_model.php @@ -18,22 +18,62 @@ class Backend_model extends CI_Model { } public function wrenchboard_api($in, $out = array()) { - $this->wrenchboard_load(); - $ret = $this->wrenchboard->wrenchboard_api($in, $out); + $ret = 0; + + $local_url = 'http://fluxtra:fl0xtra!@oameye.works.wrenchboard.com/svs/user'; + + $url = $local_url ."/generics"; + $data = $in; + + $username = "ses66181+1@gmail.com"; + + + + $data = array( + "username" => $username, + "password" => "may12002", + "sessionid" => "DUMMYSESSION" + ); + + $content = json_encode($data); + + $curl = curl_init($url); + curl_setopt($curl, CURLOPT_HEADER, false); + curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, false); + curl_setopt($curl, CURLOPT_RETURNTRANSFER, true); + curl_setopt($curl, CURLOPT_HTTPHEADER, array("Content-type" => "application/json")); + curl_setopt($curl, CURLOPT_POST, true); + curl_setopt($curl, CURLOPT_POSTFIELDS, $content); + + $json_response = curl_exec($curl); + + $status = curl_getinfo($curl, CURLINFO_HTTP_CODE); + + if ($status != 200) { + echo ("Error: call to URL $url failed with status $status, response $json_response, | curl_error " . curl_error($curl) . ", | curl_errno " . curl_errno($curl)); + } + + curl_close($curl); + $response = json_decode($json_response, true); + + + $out = $response; + return $ret; } public function cfgReadChar($str) { - $this->wrenchboard_load(); - $ret = $this->wrenchboard->cfgReadChar($str); - return $ret; + // $this->wrenchboard_load(); + // $ret = $this->wrenchboard->cfgReadChar($str); + // return $ret; + return 0; } private function wrenchboard_load() { // $this->$USER = $_SERVER['SCRIPT_FILENAME']; - $wrenchboard_class = 'wrenchboard_api_' . $this->USER . '\\WrenchBoard'; - if (!is_object($this->wrenchboard)) { - $this->wrenchboard = new $wrenchboard_class(); - } + // $wrenchboard_class = 'wrenchboard_api_' . $this->USER . '\\WrenchBoard'; + // if (!is_object($this->wrenchboard)) { + // $this->wrenchboard = new $wrenchboard_class(); + // } } } diff --git a/docker-compose.yml b/docker-compose.yml index 9f0d81e..335cf6b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -15,5 +15,7 @@ services: - ./apache_log:/var/log/apache2 ports: - 8082:80 + extra_hosts: + - oameye.works.wrenchboard.com:10.20.30.27 volumes: src: \ No newline at end of file