summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2013-01-09 19:34:01 +0100
committerFlorian Pritz <bluewind@xinu.at>2013-01-09 19:41:45 +0100
commit816fb94c8f5e29d6dd0c7044fa3c59eb3910ed7b (patch)
treee7c050b5357dbca018e48d1b8853cda96c9cdac9
parent600a9ca4720a7a8b9fa875f2726be301d7169e7e (diff)
Fix some indentation issues
Signed-off-by: Florian Pritz <bluewind@xinu.at>
-rw-r--r--application/config/config.php2
-rw-r--r--application/controllers/file.php2
-rw-r--r--application/controllers/user.php10
-rw-r--r--application/models/muser.php2
4 files changed, 8 insertions, 8 deletions
diff --git a/application/config/config.php b/application/config/config.php
index 3ffc367ca..05d391307 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -383,7 +383,7 @@ $config['small_upload_size'] = 1024*10; // 10KB
$config['contact_me_url'] = ''; // ommiting this will remove the "contact me" line.
if (file_exists(FCPATH.'application/config/config-local.php')) {
- include FCPATH.'application/config/config-local.php';
+ include FCPATH.'application/config/config-local.php';
}
/* End of file config.php */
diff --git a/application/controllers/file.php b/application/controllers/file.php
index f9c576536..18e570b20 100644
--- a/application/controllers/file.php
+++ b/application/controllers/file.php
@@ -674,7 +674,7 @@ class File extends CI_Controller {
$dh = opendir($upload_path."/".$dir);
$empty = true;
-
+
while (($file = readdir($dh)) !== false) {
if ($file == ".." || $file == ".") {
continue;
diff --git a/application/controllers/user.php b/application/controllers/user.php
index 7e6b2f27e..0550b0f6a 100644
--- a/application/controllers/user.php
+++ b/application/controllers/user.php
@@ -25,13 +25,13 @@ class User extends CI_Controller {
$this->load->model("muser");
$this->data["title"] = "FileBin";
-
+
$this->load->helper(array('form', 'filebin'));
$this->var->view_dir = "user/";
$this->data['username'] = $this->muser->get_username();
}
-
+
function index()
{
$this->data["username"] = $this->muser->get_username();
@@ -40,7 +40,7 @@ class User extends CI_Controller {
$this->load->view($this->var->view_dir.'index', $this->data);
$this->load->view('footer', $this->data);
}
-
+
function login()
{
$this->muser->require_session();
@@ -197,13 +197,13 @@ class User extends CI_Controller {
$this->load->view($this->var->view_dir.'register', $this->data);
$this->load->view('footer', $this->data);
}
-
+
function logout()
{
$this->muser->logout();
redirect('/');
}
-
+
function hash_password()
{
$process = $this->input->post("process");
diff --git a/application/models/muser.php b/application/models/muser.php
index c614f55c2..657c0bfc9 100644
--- a/application/models/muser.php
+++ b/application/models/muser.php
@@ -53,7 +53,7 @@ class Muser extends CI_Model {
return false;
}
- function login($username, $password)
+ function login($username, $password)
{
$this->require_session();
$query = $this->db->query('