summaryrefslogtreecommitdiffstats
path: root/system/application
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-05-13 06:22:33 +0200
committerDerek Jones <derek.jones@ellislab.com>2008-05-13 06:22:33 +0200
commit0b59f270a432f8c7b6128981f0a39b4a2e2fbd34 (patch)
tree1e7655eabd76bb981692f5d4f21cb1fc7be3e9cd /system/application
parent5cf664748ee295867f593d7eb7991bd35fe8eca6 (diff)
Some sweeping syntax changes for consistency:
(! foo) changed to ( ! foo) || changed to OR changed newline standardization code in various places from preg_replace to str_replace
Diffstat (limited to 'system/application')
-rw-r--r--system/application/config/autoload.php6
-rw-r--r--system/application/config/config.php6
-rw-r--r--system/application/config/constants.php6
-rw-r--r--system/application/config/database.php6
-rw-r--r--system/application/config/hooks.php2
-rw-r--r--system/application/config/mimes.php6
-rw-r--r--system/application/config/routes.php6
-rw-r--r--system/application/config/smileys.php2
-rw-r--r--system/application/config/user_agents.php6
-rw-r--r--system/application/controllers/welcome.php2
-rw-r--r--system/application/views/welcome_message.php6
11 files changed, 30 insertions, 24 deletions
diff --git a/system/application/config/autoload.php b/system/application/config/autoload.php
index e3e76d560..b99ffe484 100644
--- a/system/application/config/autoload.php
+++ b/system/application/config/autoload.php
@@ -1,4 +1,4 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| AUTO-LOADER
@@ -122,6 +122,6 @@ $autoload['model'] = array();
// $autoload['core'] = array();
-
-/* End of file autoload.php */
+
+/* End of file autoload.php */
/* Location: ./system/application/config/autoload.php */ \ No newline at end of file
diff --git a/system/application/config/config.php b/system/application/config/config.php
index c93127366..814362326 100644
--- a/system/application/config/config.php
+++ b/system/application/config/config.php
@@ -1,4 +1,4 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
|--------------------------------------------------------------------------
@@ -311,6 +311,6 @@ $config['time_reference'] = 'local';
$config['rewrite_short_tags'] = FALSE;
-
-/* End of file config.php */
+
+/* End of file config.php */
/* Location: ./system/application/config/config.php */ \ No newline at end of file
diff --git a/system/application/config/constants.php b/system/application/config/constants.php
index 020baa2d1..55dc6b777 100644
--- a/system/application/config/constants.php
+++ b/system/application/config/constants.php
@@ -1,4 +1,4 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
|--------------------------------------------------------------------------
@@ -36,6 +36,6 @@ define('FOPEN_READ_WRITE_CREATE', 'a+b');
define('FOPEN_WRITE_CREATE_STRICT', 'xb');
define('FOPEN_READ_WRITE_CREATE_STRICT', 'x+b');
-
-/* End of file constants.php */
+
+/* End of file constants.php */
/* Location: ./system/application/config/constants.php */ \ No newline at end of file
diff --git a/system/application/config/database.php b/system/application/config/database.php
index e8eebef97..24789f4b7 100644
--- a/system/application/config/database.php
+++ b/system/application/config/database.php
@@ -1,4 +1,4 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| DATABASE CONNECTIVITY SETTINGS
@@ -50,6 +50,6 @@ $db['default']['cachedir'] = "";
$db['default']['char_set'] = "utf8";
$db['default']['dbcollat'] = "utf8_general_ci";
-
-/* End of file database.php */
+
+/* End of file database.php */
/* Location: ./system/application/config/database.php */ \ No newline at end of file
diff --git a/system/application/config/hooks.php b/system/application/config/hooks.php
index b13ce6cbd..5e98a9b46 100644
--- a/system/application/config/hooks.php
+++ b/system/application/config/hooks.php
@@ -1,4 +1,4 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------------
| Hooks
diff --git a/system/application/config/mimes.php b/system/application/config/mimes.php
index f3bfe8713..f73858acc 100644
--- a/system/application/config/mimes.php
+++ b/system/application/config/mimes.php
@@ -1,4 +1,4 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| MIME TYPES
@@ -99,6 +99,6 @@ $mimes = array( 'hqx' => 'application/mac-binhex40',
);
-
-/* End of file mimes.php */
+
+/* End of file mimes.php */
/* Location: ./system/application/config/mimes.php */ \ No newline at end of file
diff --git a/system/application/config/routes.php b/system/application/config/routes.php
index 5cd3cca70..a05361e28 100644
--- a/system/application/config/routes.php
+++ b/system/application/config/routes.php
@@ -1,4 +1,4 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------------
| URI ROUTING
@@ -43,6 +43,6 @@
$route['default_controller'] = "welcome";
$route['scaffolding_trigger'] = "";
-
-/* End of file routes.php */
+
+/* End of file routes.php */
/* Location: ./system/application/config/routes.php */ \ No newline at end of file
diff --git a/system/application/config/smileys.php b/system/application/config/smileys.php
index 5968f3733..9f38d2ca6 100644
--- a/system/application/config/smileys.php
+++ b/system/application/config/smileys.php
@@ -1,4 +1,4 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| SMILEYS
diff --git a/system/application/config/user_agents.php b/system/application/config/user_agents.php
index 4a59ab6bc..27a9d0c76 100644
--- a/system/application/config/user_agents.php
+++ b/system/application/config/user_agents.php
@@ -1,4 +1,4 @@
-<?php if (!defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/*
| -------------------------------------------------------------------
| USER AGENT TYPES
@@ -100,6 +100,6 @@ $robots = array(
);
-
-/* End of file user_agents.php */
+
+/* End of file user_agents.php */
/* Location: ./system/application/config/user_agents.php */ \ No newline at end of file
diff --git a/system/application/controllers/welcome.php b/system/application/controllers/welcome.php
index 20d48855e..9ab91d039 100644
--- a/system/application/controllers/welcome.php
+++ b/system/application/controllers/welcome.php
@@ -10,6 +10,8 @@ class Welcome extends Controller {
function index()
{
$this->load->view('welcome_message');
+ $this->load->view('fake');
+
}
}
diff --git a/system/application/views/welcome_message.php b/system/application/views/welcome_message.php
index 8313059e4..40997b6b2 100644
--- a/system/application/views/welcome_message.php
+++ b/system/application/views/welcome_message.php
@@ -59,4 +59,8 @@ code {
<p><br />Page rendered in {elapsed_time} seconds</p>
</body>
-</html> \ No newline at end of file
+</html>
+<?php
+
+echo 'grandma';
+
generated by cgit v1.2.3-24-g4f1b (git 2.32.0) at 2024-11-10 21:02:23 +0100