more kernel_config renames

3 files changed, 74 insertions, 5 deletions

diff --git a/convert_r1_to_r2.sh b/convert_r1_to_r2.sh
index 548bdde..b55327a 100644
--- a/convert_r1_to_r2.sh
+++ b/convert_r1_to_r2.sh
@@ -474,6 +474,75 @@ then
 	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bleft_column\b/site_left_column/g' {} \;
 	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bright_column\b/site_right_column/g' {} \;
 
+	echo kernel
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bsession_lifetime\b/site_session_lifetime/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\buse_load_threshold\b/site_use_load_threshold/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bload_threshold\b/site_load_threshold/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\boutput_obzip\b/site_output_obzip/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhelp_popup\b/site_help_popup/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bsession_db\b/site_store_session_db/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\buse_proxy\b/site_use_proxy/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bproxy_host\b/site_proxy_host/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bproxy_port\b/site_proxy_port/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\buser_assigned_modules\b/site_user_assigned_modules/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttp_domain\b/site_http_domain/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttps_domain\b/site_https_domain/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttps_login\b/site_https_login/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttps_login_required\b/site_https_login_required/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bdirect_pagination\b/site_direct_pagination/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bwiki_help\b/site_edit_help/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhelp_notes\b/site_form_help/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\blong_date_format\b/site_long_date_format/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\blong_time_format\b/site_long_time_format/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bshort_date_format\b/site_short_date_format/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bshort_time_format\b/site_short_time_format/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bdisplay_timezone\b/site_display_timezone/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bcentralized_upload_dir\b/site_upload_dir/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\btemp_dir\b/site_temp_dir/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttp_port\b/site_http_port/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttp_prefix\b/site_http_prefix/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttps_port\b/site_https_port/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttps_prefix\b/site_https_prefix/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bsender_email\b/site_sender_email/g' {} \;
+	find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\burl_index\b/site_url_index/g' {} \;
+	#find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhelp\b/site_online_help/g' {} \;
+	#find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bmax_records\b/site_max_records/g' {} \;
+	#find . -name "*.php" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\blanguage\b/site_language/g' {} \;
+
+	echo kernel
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bsession_lifetime\b/site_session_lifetime/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bload_threshold\b/site_load_threshold/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\boutput_obzip\b/site_output_obzip/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhelp_popup\b/site_help_popup/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\buse_load_threshold\b/site_load_threshold/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bsession_db\b/site_store_session_db/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\buse_proxy\b/site_use_proxy/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bproxy_host\b/site_proxy_host/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bproxy_port\b/site_proxy_port/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\buser_assigned_modules\b/site_user_assigned_modules/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttp_domain\b/site_http_domain/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttps_domain\b/site_https_domain/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttps_login\b/site_https_login/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttps_login_required\b/site_https_login_required/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bdirect_pagination\b/site_direct_pagination/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bwiki_help\b/site_edit_help/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhelp_notes\b/site_form_help/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\blong_date_format\b/site_long_date_format/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\blong_time_format\b/site_long_time_format/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bshort_date_format\b/site_short_date_format/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bshort_time_format\b/site_short_time_format/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bdisplay_timezone\b/site_display_timezone/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bcentralized_upload_dir\b/site_upload_dir/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\btemp_dir\b/site_temp_dir/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttp_port\b/site_http_port/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttp_prefix\b/site_http_prefix/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttps_port\b/site_https_port/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhttps_prefix\b/site_https_prefix/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bsender_email\b/site_sender_email/g' {} \;
+	find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\burl_index\b/site_url_index/g' {} \;
+	#find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bhelp\b/site_online_help/g' {} \;
+	#find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\bmax_records\b/site_max_records/g' {} \;
+	#find . -name "*.tpl" -not -name "upgrade_inc.php" -exec perl -i -wpe 's/\blanguage\b/site_language/g' {} \;
 fi
 
 if [ $PERMS ]
diff --git a/install_inc.php b/install_inc.php
index 8465b8c..4f7c775 100644
--- a/install_inc.php
+++ b/install_inc.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @version $Header: /cvsroot/bitweaver/_bit_install/install_inc.php,v 1.11 2006/02/14 04:28:30 seannerd Exp $
+ * @version $Header: /cvsroot/bitweaver/_bit_install/install_inc.php,v 1.12 2006/04/19 13:48:37 squareing Exp $
  * @package install
  * @subpackage functions
  */
@@ -104,9 +104,9 @@ if (isset($_REQUEST['kill'])) {
 }
 
 // set prefs to display help during install
-$gBitSystem->setPreference( 'help', 'y' );
-$gBitSystem->setPreference( 'help_notes', 'y' );
-$gBitSystem->setPreference( 'help_popup', 'n' );
+$gBitSystem->setPreference( 'site_online_help', 'y' );
+$gBitSystem->setPreference( 'site_form_help', 'y' );
+$gBitSystem->setPreference( 'site_help_popup', 'n' );
 
 $commands = array();
 global $failedcommands;
diff --git a/templates/install_bit_settings.tpl b/templates/install_bit_settings.tpl
index 8f6a8f2..f264b84 100644
--- a/templates/install_bit_settings.tpl
+++ b/templates/install_bit_settings.tpl
@@ -50,7 +50,7 @@
 					{/if}
 				{/foreach}
 				{if $gBitSystem->isFeatureActive( 'custom_home' )}
-					<option value="custom_home"{if $bit_index eq $url_index} selected="selected"{/if}>{tr}Custom home{/tr}</option>
+					<option value="custom_home"{if $bit_index eq $site_url_index} selected="selected"{/if}>{tr}Custom home{/tr}</option>
 				{/if}
 			</select>
 			{formhelp note="Pick your site's homepage. This is where they will be redirected, when they access a link to your homepage.