fix bugs

CHANGELOG.md

@@ -1,5 +1,11 @@
 # DiliCMS更新日志
 
+## 版本号 2.1.3
+
+> 2013年8月15日  更新内容
+
+- 1.增加数据库配置模板文件，解决由于文件污染导致的卡在管理员设置处
+
 ## 版本号 2.1.2
 
 > 2013年8月10日  更新内容

admin/config/database.php

@@ -58,7 +58,7 @@
 $db['default']['password'] = 'root';
 $db['default']['database'] = 'dilicms';
 $db['default']['dbdriver'] = 'mysql';
-$db['default']['dbprefix'] = 'dili_';
+$db['default']['dbprefix'] = 'cd_';
 $db['default']['pconnect'] = FALSE;
 $db['default']['db_debug'] = TRUE;
 $db['default']['cache_on'] = FALSE;

admin/config/database_template.php

@@ -0,0 +1,95 @@
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+/*
+| -------------------------------------------------------------------
+| DATABASE CONNECTIVITY SETTINGS
+| -------------------------------------------------------------------
+| This file will contain the settings needed to access your database.
+|
+| For complete instructions please consult the 'Database Connection'
+| page of the User Guide.
+|
+| -------------------------------------------------------------------
+| EXPLANATION OF VARIABLES
+| -------------------------------------------------------------------
+|
+|	['hostname'] The hostname of your database server.
+|	['username'] The username used to connect to the database
+|	['password'] The password used to connect to the database
+|	['database'] The name of the database you want to connect to
+|	['dbdriver'] The database type. ie: mysql.  Currently supported:
+				 mysql, mysqli, postgre, odbc, mssql, sqlite, oci8
+|	['dbprefix'] You can add an optional prefix, which will be added
+|				 to the table name when using the  Active Record class
+|	['pconnect'] TRUE/FALSE - Whether to use a persistent connection
+|	['db_debug'] TRUE/FALSE - Whether database errors should be displayed.
+|	['cache_on'] TRUE/FALSE - Enables/disables query caching
+|	['cachedir'] The path to the folder where cache files should be stored
+|	['char_set'] The character set used in communicating with the database
+|	['dbcollat'] The character collation used in communicating with the database
+|				 NOTE: For MySQL and MySQLi databases, this setting is only used
+| 				 as a backup if your server is running PHP < 5.2.3 or MySQL < 5.0.7
+|				 (and in table creation queries made with DB Forge).
+| 				 There is an incompatibility in PHP with mysql_real_escape_string() which
+| 				 can make your site vulnerable to SQL injection if you are using a
+| 				 multi-byte character set and are running versions lower than these.
+| 				 Sites using Latin-1 or UTF-8 database character set and collation are unaffected.
+|	['swap_pre'] A default table prefix that should be swapped with the dbprefix
+|	['autoinit'] Whether or not to automatically initialize the database.
+|	['stricton'] TRUE/FALSE - forces 'Strict Mode' connections
+|							- good for ensuring strict SQL while developing
+|
+| The $active_group variable lets you choose which connection group to
+| make active.  By default there is only one group (the 'default' group).
+|
+| The $active_record variables lets you determine whether or not to load
+| the active record class
+*/
+
+if ( ! class_exists('Platform') AND ! function_exists('is_sae'))
+{
+    get_instance()->load->library('platform');
+}
+
+$active_group = get_instance()->platform->get_type();
+$active_record = TRUE;
+
+$db['default']['hostname'] = '{HOSTNAME}';
+$db['default']['username'] = '{USERNAME}';
+$db['default']['password'] = '{PASSWORD}';
+$db['default']['database'] = '{DATABASE}';
+$db['default']['dbdriver'] = 'mysql';
+$db['default']['dbprefix'] = '{PREFIX}';
+$db['default']['pconnect'] = FALSE;
+$db['default']['db_debug'] = TRUE;
+$db['default']['cache_on'] = FALSE;
+$db['default']['cachedir'] = '';
+$db['default']['char_set'] = 'utf8';
+$db['default']['dbcollat'] = 'utf8_general_ci';
+$db['default']['swap_pre'] = '';
+$db['default']['autoinit'] = TRUE;
+$db['default']['stricton'] = FALSE;
+
+if ($active_group == 'sae')
+{
+    //SAE数据库设置
+    $db['sae']['hostname'] = SAE_MYSQL_HOST_M.':'.SAE_MYSQL_PORT;
+    $db['sae']['username'] = SAE_MYSQL_USER;
+    $db['sae']['password'] = SAE_MYSQL_PASS;
+    $db['sae']['database'] = SAE_MYSQL_DB;
+    $db['sae']['dbdriver'] = 'mysql';
+    $db['sae']['dbprefix'] = 'dili_';
+    $db['sae']['pconnect'] = FALSE;
+    $db['sae']['db_debug'] = TRUE;
+    $db['sae']['cache_on'] = FALSE;
+    $db['sae']['cachedir'] = '';
+    $db['sae']['char_set'] = 'utf8';
+    $db['sae']['dbcollat'] = 'utf8_general_ci';
+    $db['sae']['swap_pre'] = '';
+    $db['sae']['autoinit'] = TRUE;
+    $db['sae']['stricton'] = FALSE;
+}
+
+
+
+/* End of file database.php */
+/* Location: ./application/config/database.php */

application/config/database.php

@@ -58,7 +58,7 @@
 $db['default']['password'] = 'root';
 $db['default']['database'] = 'dilicms';
 $db['default']['dbdriver'] = 'mysql';
-$db['default']['dbprefix'] = 'dili_';
+$db['default']['dbprefix'] = 'cd_';
 $db['default']['pconnect'] = FALSE;
 $db['default']['db_debug'] = TRUE;
 $db['default']['cache_on'] = FALSE;

install/config/database.php

@@ -58,7 +58,7 @@
 $db['default']['password'] = 'root';
 $db['default']['database'] = 'dilicms';
 $db['default']['dbdriver'] = 'mysql';
-$db['default']['dbprefix'] = 'dili_';
+$db['default']['dbprefix'] = 'cd_';
 $db['default']['pconnect'] = FALSE;
 $db['default']['db_debug'] = TRUE;
 $db['default']['cache_on'] = FALSE;

install/controllers/install.php

@@ -100,7 +100,7 @@ public function database()
                 {
                     $search_array = array('{HOSTNAME}', '{USERNAME}', '{PASSWORD}', '{DATABASE}', '{PREFIX}');
                     $replace_array = array($config['hostname'], $config['username'], $config['password'], $config['database'], $config['dbprefix']);
-                    $database_config = str_replace($search_array, $replace_array, @file_get_contents(BASEPATH.'../admin/config/database.php'));
+                    $database_config = str_replace($search_array, $replace_array, @file_get_contents(BASEPATH.'../admin/config/database_template.php'));
                     @file_put_contents(BASEPATH.'../admin/config/database.php', $database_config);
                     @file_put_contents(BASEPATH.'../application/config/database.php', $database_config);
                     $database_config = str_replace("get_instance()->platform->get_type()", "PLATFORM", $database_config);

install/public/static/js/templates/complete.html

@@ -31,6 +31,12 @@ <h3>交流经验</h3>
             </p>
           </div>
         </li>
+        <li class="span3">
+          <div class="thumbnail">
+              <h3>使用说明(部分)</h3>
+              <p><a target="_blank" href="http://github.com/DiliCMS/DiliCMS/wiki">点此进入</a></p>
+          </div>
+        </li>
         <li class="span3">
           <div class="thumbnail">
             <h3>管理后台</h3>

shared/config/constant.php

@@ -11,7 +11,7 @@
 
 	define('IN_DILICMS', TRUE);
 
-    define('DILICMS_VERSION', 'V2.1.1');
+    define('DILICMS_VERSION', 'V2.1.3');
 
     define('DILICMS_SHARE_PATH', BASEPATH . '../shared/');