Merge branch 'master' of ssh://gitlab.chiefsoft.net:10221/WrenchBoard/WrenchBoradWeb

www/.gitignore

@@ -459,6 +459,9 @@ composer.phar
 # You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
 composer.lock
 
+##### CodeIgniter
+/writable/
+
 ##### PHP CodeSniffer
 # gitignore for the PHP Codesniffer framework
 # website: https://github.com/squizlabs/PHP_CodeSniffer

www/application/config/config.php

@@ -247,7 +247,7 @@ $config['log_threshold'] = 0;
 | application/logs/ directory. Use a full server path with trailing slash.
 |
 */
-$config['log_path'] = '';
+$config['log_path'] = APPPATH.'../writable/logs/';
 
 /*
 |--------------------------------------------------------------------------
@@ -306,7 +306,7 @@ $config['error_views_path'] = '';
 | application/cache/ directory.  Use a full server path with trailing slash.
 |
 */
-$config['cache_path'] = '';
+$config['cache_path'] = APPPATH.'../writable/cache/';
 
 /*
 |--------------------------------------------------------------------------
@@ -393,7 +393,7 @@ $config['encryption_key'] = '';
 $config['sess_driver'] = 'files';
 $config['sess_cookie_name'] = 'ci_session';
 $config['sess_expiration'] = 7200;
-$config['sess_save_path'] = NULL;
+$config['sess_save_path'] = APPPATH.'../writable/session';
 $config['sess_match_ip'] = FALSE;
 $config['sess_time_to_update'] = 300;
 $config['sess_regenerate_destroy'] = FALSE;

www/application/models/Backend_model.php

@@ -56,7 +56,7 @@ class Backend_model extends CI_Model {
 	    $stack = debug_backtrace();
             $log = json_encode($stack);
             error_log($log);
-	    error_log(json_encode($in));
+	    error_log($str);
 	}
 	$ret = $this->wrenchboard->logMessage($str);
         return $ret;
@@ -71,7 +71,7 @@ class Backend_model extends CI_Model {
 	    $stack = debug_backtrace();
             $log = json_encode($stack);
             error_log($log);
-	    error_log(json_encode($in));
+	    error_log($str);
 	}
 	$ret = $this->wrenchboard->cfgReadChar($str);
         return $ret;
@@ -86,14 +86,14 @@ class Backend_model extends CI_Model {
 	    $stack = debug_backtrace();
             $log = json_encode($stack);
             error_log($log);
-	    error_log(json_encode($in));
+	    error_log($str);
 	}
 	$ret = $this->wrenchboard->cfgReadLong($str);
         return $ret;
     }
 
     private function wrenchboard_load() {
-        global $wrenchboard;
+        //global $wrenchboard;
         // $this->$USER = $_SERVER['SCRIPT_FILENAME'];
 	$wrenchboard_class = 'wrenchboard_api_' . $this->USER . '\\WrenchBoard';
 	/* if (is_object($wrenchboard) && is_object($wrenchboard->wrenchboard)) {

www/backend.php

@@ -1,5 +1,4 @@
 <?
-var_dump($GLOBALS);
 if (!array_key_exists('wrenchboard', $GLOBALS)) {
     class WrenchBoardAPIWrapper {
         const DEBUG_API_CALLS = true;