diff --git a/www/application/models/Backend_model.php b/www/application/models/Backend_model.php index d1b18c5b..cfc19582 100644 --- a/www/application/models/Backend_model.php +++ b/www/application/models/Backend_model.php @@ -5,6 +5,7 @@ class Backend_model extends CI_Model { var $thisUser = 'oameye'; var $USER = ''; var $wrenchboard; + const DEBUG_API_CALLS = true; function __construct() { @@ -19,7 +20,19 @@ class Backend_model extends CI_Model { public function wrenchboard_api($in, $out = array()) { $this->wrenchboard_load(); - $ret = $this->wrenchboard->wrenchboard_api($in, $out); + if (!is_array($in)) { + $in = array(); + } + if (!is_array($out)) { + $out = array(); + } + if (self::DEBUG_API_CALLS) { + $stack = debug_backtrace(); + $log = json_encode($stack); + error_log($log); + error_log(json_encode($in)); + } + $ret = $this->wrenchboard->wrenchboard_api($in, $out); // var_dump($ret); // echo "-----"; @@ -34,17 +47,60 @@ class Backend_model extends CI_Model { return $ret; } - + public function logMessage($str) { + $this->wrenchboard_load(); + if ($str == NULL || trim($str) == '') { + return NULL; + } + if (self::DEBUG_API_CALLS) { + $stack = debug_backtrace(); + $log = json_encode($stack); + error_log($log); + error_log(json_encode($in)); + } + $ret = $this->wrenchboard->logMessage($str); + return $ret; + } + public function cfgReadChar($str) { $this->wrenchboard_load(); - $ret = $this->wrenchboard->cfgReadChar($str); + if ($str == NULL || trim($str) == '') { + return NULL; + } + if (self::DEBUG_API_CALLS) { + $stack = debug_backtrace(); + $log = json_encode($stack); + error_log($log); + error_log(json_encode($in)); + } + $ret = $this->wrenchboard->cfgReadChar($str); + return $ret; + } + + public function cfgReadLong($str) { + $this->wrenchboard_load(); + if ($str == NULL || trim($str) == '') { + return 0; + } + if (self::DEBUG_API_CALLS) { + $stack = debug_backtrace(); + $log = json_encode($stack); + error_log($log); + error_log(json_encode($in)); + } + $ret = $this->wrenchboard->cfgReadLong($str); return $ret; } private function wrenchboard_load() { + global $wrenchboard; // $this->$USER = $_SERVER['SCRIPT_FILENAME']; - $wrenchboard_class = 'wrenchboard_api_' . $this->USER . '\\WrenchBoard'; - if (!is_object($this->wrenchboard)) { + $wrenchboard_class = 'wrenchboard_api_' . $this->USER . '\\WrenchBoard'; + /* if (is_object($wrenchboard) && is_object($wrenchboard->wrenchboard)) { + $this->wrenchboard = $wrenchboard->wrenchboard; + } else if (is_object($wrenchboard)) { + $this->wrenchboard = $wrenchboard; + } else */ if (!is_object($this->wrenchboard)) { $this->wrenchboard = new $wrenchboard_class(); } } diff --git a/www/backend.php b/www/backend.php index a5bd42aa..d15e8249 100644 --- a/www/backend.php +++ b/www/backend.php @@ -1,12 +1,98 @@ USER = $USER; + } + + public function wrenchboard_api($in, $out = array()) { + if (!is_array($in)) { + $in = array(); + } + if (!is_array($out)) { + $out = array(); + } + if (self::DEBUG_API_CALLS) { + $stack = debug_backtrace(); + $log = json_encode($stack); + error_log($log); + error_log(json_encode($in)); + } + $this->wrenchboard_load(); + return $this->wrenchboard->wrenchboard_api($in, $out); + } + + public function logMessage($in) { + if ($in == null || trim($in) == "") { + return null; + } + if (self::DEBUG_API_CALLS) { + $stack = debug_backtrace(); + $log = json_encode($stack); + error_log($log); + error_log($in); + } + $this->wrenchboard_load(); + return $this->wrenchboard->logMessage($in); + } + + public function cfgReadChar($in) { + if ($in == null || trim($in) == "") { + return null; + } + if (self::DEBUG_API_CALLS) { + $stack = debug_backtrace(); + $log = json_encode($stack); + error_log($log); + error_log($in); + } + $this->wrenchboard_load(); + return $this->wrenchboard->cfgReadChar($in); + } + + public function cfgReadLong($in) { + if ($in == null || trim($in) == "") { + return 0; + } + if (self::DEBUG_API_CALLS) { + $stack = debug_backtrace(); + $log = json_encode($stack); + error_log($log); + error_log($in); + } + $this->wrenchboard_load(); + return $this->wrenchboard->cfgReadLong($in); + } + + private function wrenchboard_load() { +// global $wrenchboard; + // $this->$USER = $_SERVER['SCRIPT_FILENAME']; + $wrenchboard_class = 'wrenchboard_api_' . $this->USER . '\\WrenchBoard'; + if (!is_object($this->wrenchboard)) { + $this->wrenchboard = new $wrenchboard_class(); + } +/* if (is_object($wrenchboard) && is_object($wrenchboard->wrenchboard)) { + $this->wrenchboard = $wrenchboard->wrenchboard; + } else if (is_object($wrenchboard)) { + $this->wrenchboard = $wrenchboard; + } else if (!is_object($this->wrenchboard)) { + $this->wrenchboard = new $wrenchboard_class(); + } +*/ + } + } + global $wrenchboard; + $wrenchboard = new WrenchBoardAPIWrapper(); } ?> diff --git a/www/wr_crons/backend.php b/www/wr_crons/backend.php index 0ff1682f..ad44409a 100644 --- a/www/wr_crons/backend.php +++ b/www/wr_crons/backend.php @@ -22,20 +22,51 @@ class backend { public function wrenchboard_api($in, $out = array()) { $this->wrenchboard_load(); - $ret = $this->wrenchboard->wrenchboard_api($in, $out); + if (!is_array($in)) { + $in = array(); + } + if (!is_array($out)) { + $out = array(); + } + $ret = $this->wrenchboard->wrenchboard_api($in, $out); return $ret; } + public function logMessage($str) { + $this->wrenchboard_load(); + if ($str == NULL || trim($str) == '') { + return NULL; + } + $ret = $this->wrenchboard->logMessage($str); + return $ret; + } + public function cfgReadChar($str) { - $this->wrenchboard_load(); + $this->wrenchboard_load(); + if ($str == NULL || trim($str) == '') { + return NULL; + } $ret = $this->wrenchboard->cfgReadChar($str); return $ret; } + public function cfgReadLong($str) { + $this->wrenchboard_load(); + if ($str == NULL || trim($str) == '') { + return 0; + } + $ret = $this->wrenchboard->cfgReadLong($str); + return $ret; + } + private function wrenchboard_load() { // $this->$USER = $_SERVER['SCRIPT_FILENAME']; $wrenchboard_class = 'wrenchboard_api_' . $this->USER . '\\WrenchBoard'; - if (!is_object($this->wrenchboard)) { + if (is_object($wrenchboard) && is_object($wrenchboard->wrenchboard)) { + $this->wrenchboard = $wrenchboard->wrenchboard; + } else if (is_object($wrenchboard)) { + $this->wrenchboard = $wrenchboard; + } else if (!is_object($this->wrenchboard)) { $this->wrenchboard = new $wrenchboard_class(); } }