From: Conny Sjöblom <redacted>
Date: Mon, 15 Oct 2012 09:23:35 +0000 (+0300)
Subject: Added file for the json class, removed test class
X-Git-Url: https://jfr.im/git/z_archive/KronOS.git/commitdiff_plain/3b8c2cb91c304ed4ff981f7c788b8c85a06bb4ba

Added file for the json class, removed test class
---

diff --git a/README.md b/README.md
index 2dba468..52313a7 100644
--- a/README.md
+++ b/README.md
@@ -11,7 +11,5 @@ Installing
 ----------
 1. Download, unpack, bla.
 1. Import dump.sql into a MySQL db.
-1. Rename config.php.sample -> config.php and edit.
+1. Rename application/config/config.php.example -> config.php and edit.
 1. Insert initial users into the DB.
-   Prepend the PW_SALT (from config.php) to the password, then SHA1.
-1. Set up a webserver for the frontend/ dir
diff --git a/application/controllers/backend.php b/application/controllers/backend.php
index 4e5e0c8..95cf0fa 100755
--- a/application/controllers/backend.php
+++ b/application/controllers/backend.php
@@ -9,7 +9,7 @@ class Backend extends CI_Controller {
 	}
 
 	public function index() {
-		print "";
+		pass;
 	}
 
 	public function logged_in() {
diff --git a/application/controllers/json.php b/application/controllers/json.php
new file mode 100755
index 0000000..6d67642
--- /dev/null
+++ b/application/controllers/json.php
@@ -0,0 +1,13 @@
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+
+class Json extends CI_Controller {
+
+	public function __construct() {
+		# Required
+		parent::__construct();
+	}
+
+	public function index() {
+		echo "";
+	}
+}
diff --git a/application/controllers/test.php b/application/controllers/test.php
deleted file mode 100644
index d9e4ebd..0000000
--- a/application/controllers/test.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-class Test extends CI_Controller {
-
-	function __constuct() {
-		parent::__construct();
-	}
-	function index() {
-		echo "Test";
-	}
-}
-?>