Completed
Push — master ( 24ce66...da2f36 )
by Adam
25:35
created
install.php 1 patch
Switch Indentation   +38 added lines, -38 removed lines patch added patch discarded remove patch
@@ -652,53 +652,53 @@
 block discarded – undo
652 652
     }
653 653
 
654 654
 switch($the_file) {
655
-    case 'old_php.php':
656
-    case 'welcome.php':
657
-    case 'license.php':
658
-			//
659
-			// Check to see if session variables are working properly
660
-			//
661
-			$_SESSION['test_session'] = 'sessions are available';
662
-        @session_write_close();
663
-			unset($_SESSION['test_session']);
664
-        @session_start();
665
-
666
-            if(!isset($_SESSION['test_session']))
667
-            {
668
-                $the_file = 'installDisabled.php';
669
-                // PHP.ini location -
670
-                $phpIniLocation = get_cfg_var("cfg_file_path");
671
-                $disabled_title = $mod_strings['LBL_SESSION_ERR_TITLE'];
672
-                $disabled_title_2 = $mod_strings['LBL_SESSION_ERR_TITLE'];
673
-                $disabled_text = $mod_strings['LBL_SESSION_ERR_DESCRIPTION']."<pre>{$phpIniLocation}</pre>";
674
-                break;
675
-            }
676
-            // check to see if installer has been disabled
677
-            if(is_readable('config.php') && (filesize('config.php') > 0)) {
678
-                include_once('config.php');
679
-
680
-                if(!isset($sugar_config['installer_locked']) || $sugar_config['installer_locked'] == true) {
655
+        case 'old_php.php':
656
+        case 'welcome.php':
657
+        case 'license.php':
658
+			    //
659
+			    // Check to see if session variables are working properly
660
+			    //
661
+			    $_SESSION['test_session'] = 'sessions are available';
662
+            @session_write_close();
663
+			    unset($_SESSION['test_session']);
664
+            @session_start();
665
+
666
+                if(!isset($_SESSION['test_session']))
667
+                {
681 668
                     $the_file = 'installDisabled.php';
682
-                    $disabled_title = $mod_strings['LBL_DISABLED_DESCRIPTION'];
683
-                    $disabled_title_2 = $mod_strings['LBL_DISABLED_TITLE_2'];
684
-                    $disabled_text =<<<EOQ
685
-					<p>{$mod_strings['LBL_DISABLED_DESCRIPTION']}</p>
669
+                    // PHP.ini location -
670
+                    $phpIniLocation = get_cfg_var("cfg_file_path");
671
+                    $disabled_title = $mod_strings['LBL_SESSION_ERR_TITLE'];
672
+                    $disabled_title_2 = $mod_strings['LBL_SESSION_ERR_TITLE'];
673
+                    $disabled_text = $mod_strings['LBL_SESSION_ERR_DESCRIPTION']."<pre>{$phpIniLocation}</pre>";
674
+                    break;
675
+                }
676
+                // check to see if installer has been disabled
677
+                if(is_readable('config.php') && (filesize('config.php') > 0)) {
678
+                    include_once('config.php');
679
+
680
+                    if(!isset($sugar_config['installer_locked']) || $sugar_config['installer_locked'] == true) {
681
+                        $the_file = 'installDisabled.php';
682
+                        $disabled_title = $mod_strings['LBL_DISABLED_DESCRIPTION'];
683
+                        $disabled_title_2 = $mod_strings['LBL_DISABLED_TITLE_2'];
684
+                        $disabled_text =<<<EOQ
685
+    					<p>{$mod_strings['LBL_DISABLED_DESCRIPTION']}</p>
686 686
 					<pre>
687 687
 						'installer_locked' => false,
688 688
 					</pre>
689 689
 					<p>{$mod_strings['LBL_DISABLED_DESCRIPTION_2']}</p>
690 690
 
691 691
 					<p>{$mod_strings['LBL_DISABLED_HELP_1']} <a href="{$mod_strings['LBL_DISABLED_HELP_LNK']}" target="_blank">{$mod_strings['LBL_DISABLED_HELP_2']}</a>.</p>
692
-EOQ;
693
-                    //if this is an offline client installation but the conversion did not succeed,
694
-                    //then try to convert again
695
-                    if(isset($sugar_config['disc_client']) && $sugar_config['disc_client'] == true && isset($sugar_config['oc_converted']) && $sugar_config['oc_converted'] == false) {
696
-                        header('Location: index.php?entryPoint=oc_convert&first_time=true');
697
-                        exit ();
692
+    EOQ;
693
+                        //if this is an offline client installation but the conversion did not succeed,
694
+                        //then try to convert again
695
+                        if(isset($sugar_config['disc_client']) && $sugar_config['disc_client'] == true && isset($sugar_config['oc_converted']) && $sugar_config['oc_converted'] == false) {
696
+                            header('Location: index.php?entryPoint=oc_convert&first_time=true');
697
+                            exit ();
698
+                        }
698 699
                     }
699 700
                 }
700
-            }
701
-            break;
701
+                break;
702 702
         case 'register.php':
703 703
         case 'complete_install.php':
704 704
             session_unset();
Please login to merge, or discard this patch.