Index: trunk/admin/install.php =================================================================== diff -u -N -r32 -r41 --- trunk/admin/install.php (.../install.php) (revision 32) +++ trunk/admin/install.php (.../install.php) (revision 41) @@ -129,6 +129,16 @@ $configs[3] = "in-portal:configure_categories"; $mods[3] = "In-Portal"; + +// simulate rootURL variable: begin + $rootURL = 'http://'.dirname($_SERVER['SERVER_NAME'].$_SERVER['SCRIPT_NAME']); + $tmp = explode('/', $rootURL); + if( $tmp[ count($tmp) - 1 ] == $admin) unset( $tmp[ count($tmp) - 1 ] ); + $rootURL = implode('/', $tmp).'/'; + unset($tmp); + echo "RU: $rootURL
"; +// simulate rootURL variable: end + if(strlen($g_DBType)>0 && strlen($state)>0 && $state !="dbinfo" && $state !="db_config_save") { require_once($pathtoroot."kernel/startup.php"); @@ -159,7 +169,7 @@ } require_once($pathtoroot.$admin."/install/inst_ado.php"); - +$helpURL = $rootURL.$admin.'/help/install_help.php?destform=popup&help_usage=install'; ?> @@ -183,10 +193,34 @@ function Continue() { document.iform1.submit(); } + + function CreatePopup(window_name, url, width, height) + { + // creates a popup window & returns it + if(url == null && typeof(url) == 'undefined' ) url = ''; + if(width == null && typeof(width) == 'undefined' ) width = 750; + if(height == null && typeof(height) == 'undefined' ) height = 400; + + + return window.open(url,window_name,'width='+width+',height='+height+',status=yes,resizable=yes,menubar=no,scrollbars=yes,toolbar=no'); + } + + function ShowHelp(section) + { + var frm = document.getElementById('help_form'); + + frm.section.value = section; + frm.method = 'POST'; + CreatePopup('HelpPopup','/help/blank.html', null, 600); + frm.target = 'HelpPopup'; + frm.submit(); + } + +
"> Index: trunk/kernel/include/usersession.php =================================================================== diff -u -N -r36 -r41 --- trunk/kernel/include/usersession.php (.../usersession.php) (revision 36) +++ trunk/kernel/include/usersession.php (.../usersession.php) (revision 41) @@ -33,12 +33,15 @@ $this->PermCache = array(); $this->PermCacheGroups =""; $this->UseTempKeys = $TempKeys; + + if( GetVar('help_usage') == 'install' ) return; + if(!$this->UseTempKeys || strlen($id)==0) { //echo "with cookies"; if( !isset($_SERVER['HTTP_REFERER']) ) $_SERVER['HTTP_REFERER'] = ''; - if(strlen($id) && (strstr($_SERVER['HTTP_REFERER'], $_SERVER['SERVER_NAME'].$objConfig->Get("Site_Path")) || $_GET['destform'] == 'popup' || $_GET['continue_sess'] == 1)) + if( strlen($id) && (strstr($_SERVER['HTTP_REFERER'], $_SERVER['SERVER_NAME'].$objConfig->Get("Site_Path")) || $_GET['destform'] == 'popup' || $_GET['continue_sess'] == 1)) { $this->Set("SessionKey",$id); return $this->LoadFromDatabase($id); Index: trunk/admin/install/general_error.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/general_error.php (.../general_error.php) (revision 13) +++ trunk/admin/install/general_error.php (.../general_error.php) (revision 41) @@ -1,13 +1,7 @@
 Installation Error

- - - - - - -
 Installation Error
+
Index: trunk/admin/install/postconfig.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/postconfig.php (.../postconfig.php) (revision 13) +++ trunk/admin/install/postconfig.php (.../postconfig.php) (revision 41) @@ -1,13 +1,6 @@ 		 Post-Install Configuration

- - - - - - - -
 Step - Post-Install Configuration
+
Index: trunk/admin/install/settings.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/settings.php (.../settings.php) (revision 13) +++ trunk/admin/install/settings.php (.../settings.php) (revision 41) @@ -1,13 +1,7 @@ 		 Set Root Password

- - - - - - -
 Step - Set Root Password
+
Index: trunk/admin/install/domain.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/domain.php (.../domain.php) (revision 13) +++ trunk/admin/install/domain.php (.../domain.php) (revision 41) @@ -1,13 +1,7 @@ 		 Select Domain

- - - - - - -
 Step - Select Domain
+
Index: trunk/admin/install/db_reconfig.php =================================================================== diff -u -N -r32 -r41 --- trunk/admin/install/db_reconfig.php (.../db_reconfig.php) (revision 32) +++ trunk/admin/install/db_reconfig.php (.../db_reconfig.php) (revision 41) @@ -1,13 +1,7 @@ 		 Database Configuration

- - - - - - -
 Step - Database Configuration
+
Index: trunk/admin/install/get_license.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/get_license.php (.../get_license.php) (revision 13) +++ trunk/admin/install/get_license.php (.../get_license.php) (revision 41) @@ -1,13 +1,6 @@ 		 Select License

- - - - - - - -
 Step 2 - Select License
+
Index: trunk/admin/install/restore_run.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/restore_run.php (.../restore_run.php) (revision 13) +++ trunk/admin/install/restore_run.php (.../restore_run.php) (revision 41) @@ -13,14 +13,7 @@ $o .=' 		 '.$caption.'

- - - - - - - -
 Step 2 - '.$caption."-".$pct.'%
+ '.section_header('Step 2 - '.$caption.' - '.$pct.'%').' Index: trunk/admin/install/warning.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/warning.php (.../warning.php) (revision 13) +++ trunk/admin/install/warning.php (.../warning.php) (revision 41) @@ -1,13 +1,7 @@
Next Category  Approve Restore from Backup

- - - - - - -
 Step - Approve Restore from Backup
+
Index: trunk/admin/install/download_license.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/download_license.php (.../download_license.php) (revision 13) +++ trunk/admin/install/download_license.php (.../download_license.php) (revision 41) @@ -1,13 +1,10 @@ 		 Select License

- - - - - - -
 Step - Select License
+
Index: trunk/admin/install/sel_license.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/sel_license.php (.../sel_license.php) (revision 13) +++ trunk/admin/install/sel_license.php (.../sel_license.php) (revision 41) @@ -1,13 +1,7 @@ 		 Select License

- - - - - - -
 Step - Select License
+
Index: trunk/admin/install/upgrade.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/upgrade.php (.../upgrade.php) (revision 13) +++ trunk/admin/install/upgrade.php (.../upgrade.php) (revision 41) @@ -1,13 +1,7 @@ 		 Select Modules to Upgrade

- - - - - - -
 Step - Select Modules
+
Index: trunk/admin/help/topics/in-portal@install.txt =================================================================== diff -u -N --- trunk/admin/help/topics/in-portal@install.txt (revision 0) +++ trunk/admin/help/topics/in-portal@install.txt (revision 41) @@ -0,0 +1 @@ +

INSTALLATION & GETTING STARTED

\ No newline at end of file Index: trunk/admin/install/modselect.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/modselect.php (.../modselect.php) (revision 13) +++ trunk/admin/install/modselect.php (.../modselect.php) (revision 41) @@ -1,13 +1,7 @@ 		 Select Modules to Install

- - - - - - -
 Step - Select Modules
+
Index: trunk/admin/install/dbinfo.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/dbinfo.php (.../dbinfo.php) (revision 13) +++ trunk/admin/install/dbinfo.php (.../dbinfo.php) (revision 41) @@ -1,13 +1,7 @@ 		 Database Configuration

- - - - - - -
 Step - Database Configuration
+
Index: trunk/admin/install/restore_select.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/restore_select.php (.../restore_select.php) (revision 13) +++ trunk/admin/install/restore_select.php (.../restore_select.php) (revision 41) @@ -72,12 +72,7 @@  Select Backup File

- - - - - -
 Step - Select Backup File
+
Index: trunk/admin/install/install_lib.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/install_lib.php (.../install_lib.php) (revision 13) +++ trunk/admin/install/install_lib.php (.../install_lib.php) (revision 41) @@ -488,4 +488,17 @@ return $packs; } +function section_header($title, $return_result = false) +{ + $ret = ''. + '
 '.$title.''. + ''. + "". + '
'; + if( $return_result ) + return $ret; + else + echo $ret; +} + ?> Index: trunk/admin/install/lang_default.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/lang_default.php (.../lang_default.php) (revision 13) +++ trunk/admin/install/lang_default.php (.../lang_default.php) (revision 41) @@ -1,13 +1,7 @@ 		 Select Default Language

- - - - - - -
 Step - Select Default Language
+
Index: trunk/admin/help/help.php =================================================================== diff -u -N -r36 -r41 --- trunk/admin/help/help.php (.../help.php) (revision 36) +++ trunk/admin/help/help.php (.../help.php) (revision 41) @@ -120,6 +120,9 @@ + + +  Select Default Theme

- - - - - - -
 Step - Select Default Theme
+
Index: trunk/admin/install/rootpass.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/rootpass.php (.../rootpass.php) (revision 13) +++ trunk/admin/install/rootpass.php (.../rootpass.php) (revision 41) @@ -1,13 +1,7 @@ 		 Set Root Password

- - - - - - -
 Step - Set Root Password
+
Index: trunk/kernel/admin/include/navmenu.php =================================================================== diff -u -N -r13 -r41 --- trunk/kernel/admin/include/navmenu.php (.../navmenu.php) (revision 13) +++ trunk/kernel/admin/include/navmenu.php (.../navmenu.php) (revision 41) @@ -14,9 +14,15 @@ ############################################################## +$objSections->AddSection("in-portal:install","la_tab_Install","la_title_Install",$admin."/", "", + $admin."/images/icon_install.gif","", + NULL,"in-portal:site",NULL,null,0,"",1,NULL,NULL,NULL,""); + + /* browse data tree items */ $objSections->AddSection("in-portal:browse","la_tab_Browse","la_title_Browse",$admin."/", "browse.php", - $admin."/icons/icon46_catalog.gif",$admin."/icons/icon24_catalog.gif", NULL,"in-portal:site",NULL,"in-portal:configure_categories",0,"",1,NULL,NULL,NULL,$admin."/icons/icon46_list_catalog.gif"); + $admin."/icons/icon46_catalog.gif",$admin."/icons/icon24_catalog.gif", + NULL,"in-portal:site",NULL,"in-portal:configure_categories",0,"",1,NULL,NULL,NULL,$admin."/icons/icon46_list_catalog.gif"); $objSections->AddSection("in-portal:configure_categories", "la_tab_Settings", "la_tab_Settings", $admin."/config/", "edit_config.php?&module=In-Portal§ion=in-portal:configure_categories", Index: trunk/admin/help/install_help.php =================================================================== diff -u -N --- trunk/admin/help/install_help.php (revision 0) +++ trunk/admin/help/install_help.php (revision 41) @@ -0,0 +1,138 @@ +'.print_r($s, true).''; +} + + +$topic_path = dirname($_SERVER['PATH_TRANSLATED']).'/topics/'.str_replace(':','@',$section).'.txt'; +//echo "TP: $topic_path
"; + +?> + + + In-Portal - Help + + + + + +
+
+ +
+
+
+ + +
+  Installtion Help
+
+
+ + + + + +
+ Install + +
+ + + + + + +
+
+

+ +

+ +
+ + \ No newline at end of file Index: trunk/admin/install/reinstall.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/reinstall.php (.../reinstall.php) (revision 13) +++ trunk/admin/install/reinstall.php (.../reinstall.php) (revision 41) @@ -1,13 +1,8 @@
 Licence Verification

- - - - - - -
 Step 1 - Licence Verification
+ +
Index: trunk/admin/install/install_finish.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/install_finish.php (.../install_finish.php) (revision 13) +++ trunk/admin/install/install_finish.php (.../install_finish.php) (revision 41) @@ -1,13 +1,7 @@ 		 Installation Complete

- - - - - - -
 Installation Complete
+
Index: trunk/admin/install/login.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/login.php (.../login.php) (revision 13) +++ trunk/admin/install/login.php (.../login.php) (revision 41) @@ -1,13 +1,7 @@ 		 Intechnic Account Login

- - - - - - -
 Step - Intechnic Account Login
+
Index: trunk/kernel/startup.php =================================================================== diff -u -N -r34 -r41 --- trunk/kernel/startup.php (.../startup.php) (revision 34) +++ trunk/kernel/startup.php (.../startup.php) (revision 41) @@ -131,7 +131,8 @@ } if (strstr($_SERVER['SCRIPT_FILENAME'], $adminDir) && !GetVar('logout') && !strstr($_SERVER['SCRIPT_FILENAME'], "install") && !strstr($_SERVER['SCRIPT_FILENAME'], "index")) { - //echo "test
"; + //echo "testz [".admin_login()."]
"; + if (!admin_login()) { if(!headers_sent()) Index: trunk/admin/install/lang_run.php =================================================================== diff -u -N -r26 -r41 --- trunk/admin/install/lang_run.php (.../lang_run.php) (revision 26) +++ trunk/admin/install/lang_run.php (.../lang_run.php) (revision 41) @@ -15,13 +15,8 @@ $o .=' 		 '.$caption.'

- - - - - - -
 Step '.$step_num.' - '.$caption."-".$pct.'%
+ '.section_header('Step '.$step_num.' - '.$caption.' - '.$pct.'%',true).' + Index: trunk/kernel/include/modules.php =================================================================== diff -u -N -r36 -r41 --- trunk/kernel/include/modules.php (.../modules.php) (revision 36) +++ trunk/kernel/include/modules.php (.../modules.php) (revision 41) @@ -304,7 +304,9 @@ global $objSession,$login_error, $objConfig,$g_Allow,$g_Deny; //echo "
"; print_r($objSession); echo "
"; - + + if( GetVar('help_usage') == 'install' ) return true; + $env_arr = explode('-', $_GET['env']); $get_session_key = $env_arr[0]; if(!$objSession->ValidSession() || ($objSession->GetSessionKey() != $get_session_key && $_POST['adminlogin'] != 1)) { Index: trunk/admin/install/lang_select.php =================================================================== diff -u -N -r13 -r41 --- trunk/admin/install/lang_select.php (.../lang_select.php) (revision 13) +++ trunk/admin/install/lang_select.php (.../lang_select.php) (revision 41) @@ -1,13 +1,7 @@
Next Category  Select Language Packs to Install

- - - - - - -
 Step - Select Language Packs
+