I totally know what I'm doing.

trongate · Jun 15, 2021 · 0551fa0 · 0551fa0
1 parent 78fc72a
commit 0551fa0
Show file tree

Hide file tree

Showing 11 changed files with 3 additions and 457 deletions.
diff --git a/config/config.php b/config/config.php
@@ -15,7 +15,7 @@
 */
 
 //The main config file
-define('BASE_URL', 'http://localhost/trongate-framework/');
+define('BASE_URL', '');
 define('ENV', 'dev');
 define('DEFAULT_MODULE', 'welcome');
 define('DEFAULT_CONTROLLER', 'Welcome');

diff --git a/config/database.php b/config/database.php
@@ -3,5 +3,4 @@
 define('HOST', 'localhost');
 define('USER', 'root');
 define('PASSWORD', '');
-define('DATABASE', 'aaadelete');
-define('DEBUG', false);
+define('DATABASE', '');
diff --git a/engine/Api.php b/engine/Api.php
@@ -491,11 +491,7 @@ function explorer() {
             die();
         }
 
-<<<<<<< HEAD
         $this->module('trongate_security');
-=======
-        $this->module('security');
->>>>>>> 83c72b472e98e44f2274d084f5e5919e6b4656b2
         $target_module = segment(3);
         $this->_make_sure_table_exists($target_module);
         $this->module('trongate_tokens');

diff --git a/engine/tg_helpers/form_helper.php b/engine/tg_helpers/form_helper.php
@@ -223,11 +223,7 @@ function form_file_select($name, $attributes=NULL, $additional_code=NULL) {
     return $html;
 }
 
-<<<<<<< HEAD
 function post($field_name, $clean_up=NULL) {
-=======
-function input($field_name, $clean_up=NULL) {
->>>>>>> 83c72b472e98e44f2274d084f5e5919e6b4656b2
     if (!isset($_POST[$field_name])) {
         $value = '';
     } else {
@@ -240,8 +236,4 @@ function input($field_name, $clean_up=NULL) {
     }
 
     return $value;
-<<<<<<< HEAD
-}
-=======
-}
->>>>>>> 83c72b472e98e44f2274d084f5e5919e6b4656b2
+}
diff --git a/modules/books/api/controllers/Api.php b/modules/books/api/controllers/Api.php
diff --git a/modules/books/assets/api.json b/modules/books/assets/api.json
diff --git a/modules/books/authors/assets/api.json b/modules/books/authors/assets/api.json
diff --git a/modules/books/authors/controllers/Authors.php b/modules/books/authors/controllers/Authors.php
diff --git a/modules/books/controllers/Books.php b/modules/books/controllers/Books.php
diff --git a/modules/books/views/create.php b/modules/books/views/create.php