diff options
| -rw-r--r-- | index.php | 16 | ||||
| -rw-r--r-- | system/codeigniter/CodeIgniter.php | 4 | ||||
| -rw-r--r-- | system/libraries/Controller.php | 4 | ||||
| -rw-r--r-- | user_guide/changelog.html | 8 | ||||
| -rw-r--r-- | user_guide/general/alternative_php.html | 10 | ||||
| -rw-r--r-- | user_guide/general/caching.html | 2 | ||||
| -rw-r--r-- | user_guide/general/changelog.html | 2 | ||||
| -rw-r--r-- | user_guide/general/managing_apps.html | 139 | ||||
| -rw-r--r-- | user_guide/general/profiling.html | 2 | ||||
| -rw-r--r-- | user_guide/installation/upgrade_150.html | 8 | ||||
| -rw-r--r-- | user_guide/nav/nav.js | 2 | ||||
| -rw-r--r-- | user_guide/toc.html | 2 |
12 files changed, 41 insertions, 158 deletions
@@ -32,7 +32,11 @@ error_reporting(E_ALL); |--------------------------------------------------------------- | | If you want this front controller to use a different "application" -| folder then the default one you can set its name here. +| folder then the default one you can set its name here. +| The folder can also be relocated anywhere on your server. For +| more info please see the user guide: +| http://www.codeigniter.com/user_guide/general/managing_apps.html +| | | NO TRAILING SLASH! | @@ -77,7 +81,15 @@ define('EXT', '.'.pathinfo(__FILE__, PATHINFO_EXTENSION)); define('FCPATH', __FILE__); define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME)); define('BASEPATH', $system_folder.'/'); -define('APPPATH', BASEPATH.$application_folder.'/'); + +if ( ! is_dir($application_folder)) +{ + define($application_folder.'/'); +} +else +{ + define('APPPATH', BASEPATH.$application_folder.'/'); +} // Load the front controller and away we go!.... require_once BASEPATH.'codeigniter/CodeIgniter'.EXT; diff --git a/system/codeigniter/CodeIgniter.php b/system/codeigniter/CodeIgniter.php index fb27191ce..5b3f54ae3 100644 --- a/system/codeigniter/CodeIgniter.php +++ b/system/codeigniter/CodeIgniter.php @@ -115,11 +115,9 @@ $LANG =& load_class('Language'); * Note: The Loader class needs to be included first * */ - -load_class('Loader', FALSE); - if (floor(phpversion()) < 5) { + load_class('Loader', FALSE); require(BASEPATH.'codeigniter/Base4'.EXT); } else diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php index 922382ab7..c8fa646c7 100644 --- a/system/libraries/Controller.php +++ b/system/libraries/Controller.php @@ -74,11 +74,11 @@ class Controller extends CI_Base { $this->$var =& load_class($class); } - // In PHP 5 the Controller class is run as a discreet + // In PHP 5 the Loader class is run as a discreet // class. In PHP 4 it extends the Controller if (floor(phpversion()) >= 5) { - $this->load = new CI_Loader(); + $this->load =& load_class('Loader'); $this->load->_ci_autoloader(); } else diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 1d48e1258..099614d6d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -86,6 +86,8 @@ Change Log <li>Added new <a href="./helpers/file_helper.html">File Helper</a>: get_filenames()</li>
<li>Added new helper: <a href="./helpers/smiley_helper.html">Smiley Helper</a></li>
<li>Added support for <ul> and <ol> lists in the <a href="./helpers/html_helper.html">HTML Helper</a></li>
+<li>Added the ability to rewrite <a href="./general/alternative_php.html">short tags</a> on-the-fly, converting them to standard PHP statements, for those servers that do not support short tags. This allows the cleaner syntax to be used regardless of whether it's supported by the server.</li>
+<li>Added the ability to <a href="./general/managing_apps.html">rename or relocate the "application" folder</a>.</dfn>
<li>Added more thorough initialization in the upload class so that all class variables are reset.</li>
<li>Added "is_numeric" to validation, which uses the native PHP is_numeric function.</li>
<li>Improved the URI handler to make it more reliable when the $config['uri_protocol'] item is set to AUTO.</li>
@@ -94,12 +96,12 @@ Change Log <li>Updated the <dfn>input->cookie()</dfn> and <dfn>input->post()</dfn> functions in <a href="./libraries/input.html">Input Class</a> to permit arrays contained cookies that are arrays to be run through the XSS filter.</li>
<li>Documented three functions from the <a href="./libraries/validation.html">Validation class</a> that were missing from the user guide: set_select(), set_radio(), and set_checkbox().</li>
<li>Fixed a bug in the Email class related to SMTP Helo data.</li>
-<li>Fixed a bugin the word wrapping heper and function in the email class.</li>
+<li>Fixed a bug in the word wrapping helper and function in the email class.</li>
<li>Fixed a bug in the validation class.</li>
<li>Fixed a bug in the typography helper that was incorrectly wrapping block level elements in paragraph tags.</li>
<li>Fixed a problem in the form_prep() function that was double encoding entities.</li>
<li>Fixed a bug that affects some versions of PHP when output buffering is nested.</li>
-<li>Fixed a bug that caused CI to stop working when the PHP magic __get() function was used within models or controllers.</li>
+<li>Fixed a bug that caused CI to stop working when the PHP magic __get() or __set() functions were used within models or controllers.</li>
<li><strong>Deprecated "init" folder</strong>. Initialization happens automatically now. <a href="creating_libraries.html">Please see documentation</a>.</li>
<li><strong>Deprecated</strong> $this->db->field_names() USE $this->db->list_fields()</li>
<li><strong>Deprecated</strong> the <dfn>$config['log_errors']</dfn> item from the config.php file. Instead, <dfn>$config['log_threshold']</dfn> can be set to "0" to turn it off.</li>
@@ -315,7 +317,7 @@ all controller methods are prefixed with <dfn>_ci</dfn> to avoid controller coll <ul>
<li>Added a <a href="./libraries/calendar.html">Calendaring class</a>.</li>
-<li>Added support for running <a href="multiple_apps.html">multiple applications</a> that share a common Code Igniter backend.</li>
+<li>Added support for running <a href="managing_apps.html">multiple applications</a> that share a common Code Igniter backend.</li>
<li>Moved the "uri protocol" variable from the index.php file into the config.php file</li>
<li>Fixed a problem that was preventing certain function calls from working within constructors.</li>
<li>Fixed a problem that was preventing the $this->load->library function from working in constructors.</li>
diff --git a/user_guide/general/alternative_php.html b/user_guide/general/alternative_php.html index 7e8de7c0b..564dc3238 100644 --- a/user_guide/general/alternative_php.html +++ b/user_guide/general/alternative_php.html @@ -67,6 +67,12 @@ in your View files. To minimize the PHP code in these files, and to make it eas syntax for control structures and echo statements. If you are not familiar with this syntax, it allows you to eliminate the braces from your code,
and eliminate "echo" statements.</p>
+<p class="important"><strong>Note:</strong> If you find that the syntax described in this page does not work on your server it might
+be that "short tags" are disabled in your PHP ini file. Code Igniter will optionally rewrite short tags on-the-fly,
+allowing you to use that syntax even if your server doesn't support it. This feature can be enabled in your
+<dfn>config/config.php</dfn> file.</p>
+
+
<h2>Alternative Echos</h2>
<p>Normally to echo, or print out a variable you would do this:</p>
@@ -77,8 +83,6 @@ and eliminate "echo" statements.</p> <code><?=$variable?></code>
-<p class="important"><strong>Note:</strong> If you find that the syntax described in this page does not work on your server it might
-be that "short tags" are disabled in your PHP ini file.</p>
<h2>Alternative Control Structures</h2>
@@ -129,7 +133,7 @@ important!</p> <div id="footer">
<p>
-Previous Topic: <a href="multiple_apps.html">Running Multiple Applications</a>
+Previous Topic: <a href="managing_apps.html">Managing Applications</a>
·
<a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
diff --git a/user_guide/general/caching.html b/user_guide/general/caching.html index 9a8afd590..88f6c8c00 100644 --- a/user_guide/general/caching.html +++ b/user_guide/general/caching.html @@ -110,7 +110,7 @@ Previous Topic: <a href="errors.html">Error Handling</a> ·
<a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
-Next Topic: <a href="multiple_apps.html">Running Multiple Applications</a>
+Next Topic: <a href="managing_apps.html">Managing Applications</a>
<p>
<p><a href="http://www.codeigniter.com">Code Igniter</a> · Copyright © 2006 · <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
</div>
diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html index 81235cae0..9058f03b8 100644 --- a/user_guide/general/changelog.html +++ b/user_guide/general/changelog.html @@ -304,7 +304,7 @@ all controller methods are prefixed with <dfn>_ci</dfn> to avoid controller coll <ul>
<li>Added a <a href="../libraries/calendar.html">Calendaring class</a>.</li>
-<li>Added support for running <a href="multiple_apps.html">multiple applications</a> that share a common Code Igniter backend.</li>
+<li>Added support for running <a href="managing_apps.html">multiple applications</a> that share a common Code Igniter backend.</li>
<li>Moved the "uri protocol" variable from the index.php file into the config.php file</li>
<li>Fixed a problem that was preventing certain function calls from working within constructors.</li>
<li>Fixed a problem that was preventing the $this->load->library function from working in constructors.</li>
diff --git a/user_guide/general/managing_apps.html b/user_guide/general/managing_apps.html deleted file mode 100644 index 9b5c68d71..000000000 --- a/user_guide/general/managing_apps.html +++ /dev/null @@ -1,139 +0,0 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-
-<title>Code Igniter User Guide</title>
-
-<style type='text/css' media='all'>@import url('../userguide.css');</style>
-<link rel='stylesheet' type='text/css' media='all' href='../userguide.css' />
-
-<script type="text/javascript" src="../nav/nav.js"></script>
-<script type="text/javascript" src="../nav/prototype.lite.js"></script>
-<script type="text/javascript" src="../nav/moo.fx.js"></script>
-<script type="text/javascript">
-window.onload = function() {
- myHeight = new fx.Height('nav', {duration: 400});
- myHeight.hide();
-}
-</script>
-
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta http-equiv='expires' content='-1' />
-<meta http-equiv= 'pragma' content='no-cache' />
-<meta name='robots' content='all' />
-<meta name='author' content='Rick Ellis' />
-<meta name='description' content='Code Igniter User Guide' />
-
-</head>
-<body>
-
-<!-- START NAVIGATION -->
-<div id="nav"><div id="nav_inner"><script type="text/javascript">create_menu('../');</script></div></div>
-<div id="nav2"><a name="top"></a><a href="javascript:void(0);" onclick="myHeight.toggle();"><img src="../images/nav_toggle.jpg" width="153" height="44" border="0" title="Toggle Table of Contents" alt="Toggle Table of Contents" /></a></div>
-<div id="masthead">
-<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
-<tr>
-<td><h1>Code Igniter User Guide Version 1.5.0</h1></td>
-<td id="breadcrumb_right"><a href="../toc.html">Linear Table of Contents</a></td>
-</tr>
-</table>
-</div>
-<!-- END NAVIGATION -->
-
-
-<!-- START BREADCRUMB -->
-<table cellpadding="0" cellspacing="0" border="0" style="width:100%">
-<tr>
-<td id="breadcrumb">
-<a href="http://www.codeigniter.com/">Code Igniter Home</a> ›
-<a href="../index.html">User Guide Home</a> ›
-Managing your Applications
-</td>
-<td id="searchbox"><form method="get" action="http://www.google.com/search"><input type="hidden" name="as_sitesearch" id="as_sitesearch" value="www.codeigniter.com/user_guide/" />Search User Guide <input type="text" class="input" style="width:200px;" name="q" id="q" size="31" maxlength="255" value="" /> <input type="submit" class="submit" name="sa" value="Go" /></form></td>
-</tr>
-</table>
-<!-- END BREADCRUMB -->
-
-<br clear="all" />
-
-
-<!-- START CONTENT -->
-<div id="content">
-
-<h1>Managing your Applications</h1>
-
-<p>By default it is assumed that you only intend to use Code Igniter to manage one application, which you will build in your
-<dfn>system/application/</dfn> directory. It is possible, however, to have multiple sets of applications that share a single
-Code Igniter installation, or even to rename or relocate your <dfn>application</dfn> folder.</p>
-
-<h2>Renaming the Application Folder</h2>
-
-<p>If you would like to rename your <dfn>applicaiton</dfn> folder you may do so as long as you open your main <kbd>index.php</kbd>
-file and set its name using the <samp>$application_folder</samp> variable:</p>
-
-<code>$application_folder = "application";</code>
-
-<h2>Relocating your Application Folder</h2>
-
-<p>It is possible to move your <dfn>application</dfn> folder to a different location on your server than your <kbd>system</kbd> folder.
-To do so open your main <kbd>index.php</kbd> and set a <em>full server path</em> in the <samp>$application_folder</samp> variable.</p>
-
-
-<code>$application_folder = "/Path/to/your/application";</code>
-
-
-<h2>Running Multiple Applications with one Code Igniter Installation</h2>
-
-<p>If you would like to share a common Code Igniter installation to manage several different applications simply
-put all of the directories located inside your <kbd>application</kbd> folder into their
-own sub-folder.</p>
-
-<p>For example, let's say you want to create two applications, "foo" and "bar". You will structure your
-application folder like this:
-
-<code>system/application/<var>foo</var>/<br />
-system/application/<var>foo</var>/config/<br />
-system/application/<var>foo</var>/controllers/<br />
-system/application/<var>foo</var>/errors/<br />
-system/application/<var>foo</var>/libraries/<br />
-system/application/<var>foo</var>/models/<br />
-system/application/<var>foo</var>/views/<br />
-system/application/<samp>bar</samp>/<br />
-system/application/<samp>bar</samp>/config/<br />
-system/application/<samp>bar</samp>/controllers/<br />
-system/application/<samp>bar</samp>/errors/<br />
-system/application/<samp>bar</samp>/libraries/<br />
-system/application/<samp>bar</samp>/models/<br />
-system/application/<samp>bar</samp>/views/</code>
-
-
-<p>To select a particular application for use requires that you open your main <kbd>index.php</kbd> file and set the <dfn>$application_folder</dfn>
-variable. For example, to select the "foo" application for use you would do this:</p>
-
-<code>$application_folder = "application/foo";</code>
-
-<p class="important"><strong>Note:</strong> Each of your applications will need its own <dfn>index.php</dfn> file which
-calls the desired application. The index.php file can be named anything you want.</p>
-
-
-
-
-
-</div>
-<!-- END CONTENT -->
-
-
-<div id="footer">
-<p>
-Previous Topic: <a href="caching.html">Web Page Caching</a>
- ·
-<a href="#top">Top of Page</a> ·
-<a href="../index.html">User Guide Home</a> ·
-Next Topic: <a href="alternative_php.html">Alternative PHP Syntax</a>
-<p>
-
-<p><a href="http://www.codeigniter.com">Code Igniter</a> · Copyright © 2006 · <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
-</div>
-
-</body>
-</html>
\ No newline at end of file diff --git a/user_guide/general/profiling.html b/user_guide/general/profiling.html index 029dbf02f..0f74f1e2e 100644 --- a/user_guide/general/profiling.html +++ b/user_guide/general/profiling.html @@ -110,7 +110,7 @@ Previous Topic: <a href="caching.html">Caching</a> ·
<a href="#top">Top of Page</a> ·
<a href="../index.html">User Guide Home</a> ·
-Next Topic: <a href="multiple_apps.html">Running Multiple Applications</a>
+Next Topic: <a href="managing_apps.html">Managing Applications</a>
<p>
<p><a href="http://www.codeigniter.com">Code Igniter</a> · Copyright © 2006 · <a href="http://www.pmachine.com">pMachine, Inc.</a></p>
</div>
diff --git a/user_guide/installation/upgrade_150.html b/user_guide/installation/upgrade_150.html index 06d0c7027..79632ece1 100644 --- a/user_guide/installation/upgrade_150.html +++ b/user_guide/installation/upgrade_150.html @@ -155,7 +155,13 @@ $config['log_errors'] = FALSE; <h2>Step 4: Update your main index.php file</h2>
<p>If you are running a stock <dfn>index.php</dfn> file simply replace your version with the new one. If you are running one with
-internal modifications, open it and add this line of code near the bottom:</p>
+internal modifications, open it and make these two changes:</p>
+
+<p>Find the $application_folder variable and make sure it contains the name of your "application" directory:</p>
+
+<code>$application_folder = "application";</code>
+
+<p>Next, at add this line of code near the bottom of the page:</p>
<code>define('FCPATH', __FILE__);</code>
diff --git a/user_guide/nav/nav.js b/user_guide/nav/nav.js index dafe22e8a..253700e60 100644 --- a/user_guide/nav/nav.js +++ b/user_guide/nav/nav.js @@ -54,7 +54,7 @@ function create_menu(basepath) '<li><a href="'+base+'general/errors.html">Error Handling</a></li>' + '<li><a href="'+base+'general/caching.html">Caching</a></li>' + '<li><a href="'+base+'general/profiling.html">Profiling Your Application</a></li>' + - '<li><a href="'+base+'general/multiple_apps.html">Running Multiple Applications</a></li>' + + '<li><a href="'+base+'general/managing_apps.html">Managing Applications</a></li>' + '<li><a href="'+base+'general/alternative_php.html">Alternative PHP Syntax</a></li>' + '<li><a href="'+base+'general/security.html">Security</a></li>' + '</ul>' + diff --git a/user_guide/toc.html b/user_guide/toc.html index 7d6178de2..95ea19bda 100644 --- a/user_guide/toc.html +++ b/user_guide/toc.html @@ -109,7 +109,7 @@ Table of Contents <li><a href="./general/errors.html">Error Handling</a></li>
<li><a href="./general/caching.html">Caching</a></li>
<li><a href="./general/profiling.html">Profiling Your Application</a></li>
- <li><a href="./general/multiple_apps.html">Running Multiple Applications</a></li>
+ <li><a href="./general/managing_apps.html">Managing Applications</a></li>
<li><a href="./general/alternative_php.html">Alternative PHP Syntax</a></li>
<li><a href="./general/security.html">Security</a></li>
</ul>
|