Added file for the json class, removed test class

diff --git a/README.md b/README.md
index 2dba468cb4717d64807924cc9b39449463e56c0a..52313a7ab395bdd4912200414256eceb76fa36bd 100644 (file)
--- 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 4e5e0c8ecff09737c9145f91fcbec4938ea869bd..95cf0fab8d2c50f5a3159e3428e73f1013c714da 100755 (executable)
--- 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 (executable)
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 (file)
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";
-       }
-}
-?>