From 2ed76d5ac89ec7869dcb64c050360fb2f99e9326 Mon Sep 17 00:00:00 2001 From: admin Date: Sat, 2 Sep 2006 17:34:52 +0000 Subject: --- system/application/config/config.php | 2 +- system/drivers/DB_driver.php | 3 ++- system/drivers/DB_postgre.php | 10 +++++++--- system/helpers/file_helper.php | 4 ++-- system/helpers/url_helper.php | 2 +- system/libraries/Output.php | 2 +- user_guide/general/changelog.html | 2 +- user_guide/general/hooks.html | 6 ++++++ user_guide/installation/upgrade_140.html | 15 ++++++++++++++- 9 files changed, 35 insertions(+), 11 deletions(-) diff --git a/system/application/config/config.php b/system/application/config/config.php index c19fabf44..7b19b83b5 100644 --- a/system/application/config/config.php +++ b/system/application/config/config.php @@ -78,7 +78,7 @@ $config['language'] = "english"; | setting this variable to TRUE (boolean). See the user guide for details. | */ -$config['enable_hooks'] = TRUE; +$config['enable_hooks'] = FALSE; /* diff --git a/system/drivers/DB_driver.php b/system/drivers/DB_driver.php index 3a2a5e9bc..0c2084ad8 100644 --- a/system/drivers/DB_driver.php +++ b/system/drivers/DB_driver.php @@ -36,6 +36,7 @@ class CI_DB_driver { var $database; var $dbdriver = 'mysql'; var $dbprefix = ''; + var $port = ''; var $pconnect = FALSE; var $conn_id = FALSE; var $result_id = FALSE; @@ -75,7 +76,7 @@ class CI_DB_driver { { if (is_array($params)) { - foreach (array('hostname' => '', 'username' => '', 'password' => '', 'database' => '', 'dbdriver' => 'mysql', 'dbprefix' => '', 'pconnect' => FALSE, 'db_debug' => FALSE) as $key => $val) + foreach (array('hostname' => '', 'username' => '', 'password' => '', 'database' => '', 'dbdriver' => 'mysql', 'dbprefix' => '', 'port' => '', 'pconnect' => FALSE, 'db_debug' => FALSE) as $key => $val) { $this->$key = ( ! isset($params[$key])) ? $val : $params[$key]; } diff --git a/system/drivers/DB_postgre.php b/system/drivers/DB_postgre.php index fd98ec78b..673dea335 100644 --- a/system/drivers/DB_postgre.php +++ b/system/drivers/DB_postgre.php @@ -38,9 +38,11 @@ class CI_DB_postgre extends CI_DB { */ function db_connect() { - return pg_connect("host=".$this->hostname." dbname=".$this->database." user=".$this->username." password=".$this->password); + $port = ($this->port == '') ? '' : " port=".$this->port; + + return pg_connect("host=".$this->hostname.$port." dbname=".$this->database." user=".$this->username." password=".$this->password); } - + // -------------------------------------------------------------------- /** @@ -51,7 +53,9 @@ class CI_DB_postgre extends CI_DB { */ function db_pconnect() { - return pg_pconnect("host=".$this->hostname." dbname=".$this->database." user=".$this->username." password=".$this->password); + $port = ($this->port == '') ? '' : " port=".$this->port; + + return pg_pconnect("host=".$this->hostname.$port." dbname=".$this->database." user=".$this->username." password=".$this->password); } // -------------------------------------------------------------------- diff --git a/system/helpers/file_helper.php b/system/helpers/file_helper.php index 93bddb029..32c0b2cdc 100644 --- a/system/helpers/file_helper.php +++ b/system/helpers/file_helper.php @@ -75,9 +75,9 @@ function read_file($file) * @param string file data * @return bool */ -function write_file($path, $data) +function write_file($path, $data, $mode = 'wb') { - if ( ! $fp = @fopen($path, 'wb')) + if ( ! $fp = @fopen($path, $mode)) { return FALSE; } diff --git a/system/helpers/url_helper.php b/system/helpers/url_helper.php index 03d6c3b2c..09169e32e 100644 --- a/system/helpers/url_helper.php +++ b/system/helpers/url_helper.php @@ -56,7 +56,7 @@ function site_url($uri = '') function base_url() { $obj =& get_instance(); - return $obj->config->item('base_url', 1); + return $obj->config->slash_item('base_url'); } // ------------------------------------------------------------------------ diff --git a/system/libraries/Output.php b/system/libraries/Output.php index f5db3e0d0..73f03863e 100644 --- a/system/libraries/Output.php +++ b/system/libraries/Output.php @@ -147,7 +147,7 @@ class CI_Output { return; } - $uri = $obj->config->item('base_url', 1). + $uri = $obj->config->slash_item('base_url'). $obj->config->item('index_page'). $obj->uri->uri_string(); diff --git a/user_guide/general/changelog.html b/user_guide/general/changelog.html index 188d8566a..e556684e8 100644 --- a/user_guide/general/changelog.html +++ b/user_guide/general/changelog.html @@ -75,7 +75,7 @@ Change Log
  • Added support for % character in URL.
  • Added the ability to supply full URLs using the anchor() helper function.
  • Added mode parameter to file_write() helper.
    • -
  • Added support for changing the port number in the Postgre driver.
    • +
  • Added support for changing the port number in the Postgre driver.
  • Moved the list of "allowed URI characters" out of the Router class and into the config file.
  • Moved the MIME type array out of the Upload class and into its own file in the applications/config/ folder.
  • Updated the Config Library to be able to load config files silently, and to be able to assign config files to their own index (to avoid collisions if you use multiple config files).
    • diff --git a/user_guide/general/hooks.html b/user_guide/general/hooks.html index 33d343d82..a780a5cdd 100644 --- a/user_guide/general/hooks.html +++ b/user_guide/general/hooks.html @@ -69,6 +69,12 @@ For example, you might want to run a script right before your controllers get lo your own scripts in some other location.

    +

    Enabling Hooks

    + +

    The hooks feature can be globally enabled/disabled by setting the following item in the application/config/config.php file:

    + +$config['enable_hooks'] = TRUE; +

    Defining a Hook

    diff --git a/user_guide/installation/upgrade_140.html b/user_guide/installation/upgrade_140.html index 810d10786..1c72b5d70 100644 --- a/user_guide/installation/upgrade_140.html +++ b/user_guide/installation/upgrade_140.html @@ -89,9 +89,22 @@ have not upgraded to that version please do so first.

    Step 2: Update your config.php file

    -

    Open your application/config/config.php file and add this new item:

    +

    Open your application/config/config.php file and add these new items:

    +
+/*
+|--------------------------------------------------------------------------
+| Enable/Disable System Hooks
+|--------------------------------------------------------------------------
+|
+| If you would like to use the "hooks" feature you must enable it by
+| setting this variable to TRUE (boolean).  See the user guide for details.
+|
+*/
+$config['enable_hooks'] = FALSE;
+
+
 /*
 |--------------------------------------------------------------------------
 | Allowed URL Characters
-- 
cgit v1.2.3-24-g4f1b