adamjakab / SuiteCRM

include/database/MysqlManager.php

Switch Indentation +49 added lines, -49 removed lines

@@ -825,33 +825,33 @@ 
 			$fields = $index['fields'];
 
 		switch ($type) {
-		case 'unique':
-			$columns[] = " UNIQUE $name ($fields)";
-			break;
-		case 'primary':
-			$columns[] = " PRIMARY KEY ($fields)";
-			break;
-		case 'index':
-		case 'foreign':
-		case 'clustered':
-		case 'alternate_key':
-			/**
+		    case 'unique':
+			    $columns[] = " UNIQUE $name ($fields)";
+			    break;
+		    case 'primary':
+			    $columns[] = " PRIMARY KEY ($fields)";
+			    break;
+		    case 'index':
+		    case 'foreign':
+		    case 'clustered':
+		    case 'alternate_key':
+			    /**
 				* @todo here it is assumed that the primary key of the foreign
 				* table will always be named 'id'. It must be noted though
 				* that this can easily be fixed by referring to db dictionary
 				* to find the correct primary field name
 				*/
-			if ( $alter_table )
-				$columns[] = " INDEX $name ($fields)";
-			else
-				$columns[] = " KEY $name ($fields)";
-			break;
-		case 'fulltext':
-			if ($this->full_text_indexing_installed())
-				$columns[] = " FULLTEXT ($fields)";
-			else
-				$GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
-			break;
+			    if ( $alter_table )
+				    $columns[] = " INDEX $name ($fields)";
+			    else
+				    $columns[] = " KEY $name ($fields)";
+			    break;
+		    case 'fulltext':
+			    if ($this->full_text_indexing_installed())
+				    $columns[] = " FULLTEXT ($fields)";
+			    else
+				    $GLOBALS['log']->debug('MYISAM engine is not available/enabled, full-text indexes will be skipped. Skipping:',$name);
+			    break;
 		}
 	}
 	$columns = implode(", $alter_action ", $columns);
@@ -935,33 +935,33 @@ 
 
 		switch ($type){
 		// generic indices
-		case 'index':
-		case 'alternate_key':
-		case 'clustered':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
-			else
-				$sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
-			break;
-		// constraints as indices
-		case 'unique':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP INDEX $name";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
-			break;
-		case 'primary':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
-			break;
-		case 'foreign':
-			if ($drop)
-				$sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
-			else
-				$sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
-			break;
+		    case 'index':
+		    case 'alternate_key':
+		    case 'clustered':
+			    if ($drop)
+				    $sql = "ALTER TABLE {$table} DROP INDEX {$name} ";
+			    else
+				    $sql = "ALTER TABLE {$table} ADD INDEX {$name} ({$fields})";
+			    break;
+		    // constraints as indices
+		    case 'unique':
+			    if ($drop)
+				    $sql = "ALTER TABLE {$table} DROP INDEX $name";
+			    else
+				    $sql = "ALTER TABLE {$table} ADD CONSTRAINT UNIQUE {$name} ({$fields})";
+			    break;
+		    case 'primary':
+			    if ($drop)
+				    $sql = "ALTER TABLE {$table} DROP PRIMARY KEY";
+			    else
+				    $sql = "ALTER TABLE {$table} ADD CONSTRAINT PRIMARY KEY ({$fields})";
+			    break;
+		    case 'foreign':
+			    if ($drop)
+				    $sql = "ALTER TABLE {$table} DROP FOREIGN KEY ({$fields})";
+			    else
+				    $sql = "ALTER TABLE {$table} ADD CONSTRAINT FOREIGN KEY {$name} ({$fields}) REFERENCES {$definition['foreignTable']}({$definition['foreignField']})";
+			    break;
 		}
 		return $sql;
 	}

modules/Import/maps/ImportMapOutlook.php

Switch Indentation +13 added lines, -13 removed lines

@@ -78,19 +78,19 @@
     {
         $return_array = parent::getMapping($module);
         switch ($module) {
-        case 'Contacts':
-        case 'Leads':
-            return $return_array + array(
-                "Job Title"=>"title",
-                "Home Country"=>"alt_address_country",
-                "E-mail 2 Address"=>"email2",
-                );
-            break;
-        case 'Accounts':
-            return $return_array;
-            break;
-        default:
-            return $return_array;
+            case 'Contacts':
+            case 'Leads':
+                return $return_array + array(
+                    "Job Title"=>"title",
+                    "Home Country"=>"alt_address_country",
+                    "E-mail 2 Address"=>"email2",
+                    );
+                break;
+            case 'Accounts':
+                return $return_array;
+                break;
+            default:
+                return $return_array;
         }
     }
 }

modules/Import/maps/ImportMapSalesforce.php

Switch Indentation +70 added lines, -70 removed lines

@@ -78,76 +78,76 @@
     {
         $return_array = parent::getMapping($module);
         switch ($module) {
-        case 'Contacts':
-        case 'Leads':
-            return $return_array + array(
-                "Description"=>"description",
-                "Birthdate"=>"birthdate",
-                "Lead Source"=>"lead_source",
-                "Assistant"=>"assistant",
-                "Asst. Phone"=>"assistant_phone",
-                "Mailing Street"=>"primary_address_street",
-                "Mailing Address Line1"=>"primary_address_street_2",
-                "Mailing Address Line2"=>"primary_address_street_3",
-                "Mailing Address Line3"=>"primary_address_street_4",
-                "Mailing City"=>"primary_address_city",
-                "Mailing State"=>"primary_address_state",
-                "Mailing Zip/Postal Code"=>"primary_address_postalcode",
-                "Mailing Country"=>"primary_address_country",
-                "Other Street"=>"alt_address_street",
-                "Other Address Line 1"=>"alt_address_street_2",
-                "Other Address Line 2"=>"alt_address_street_3",
-                "Other Address Line 3"=>"alt_address_street_4",
-                "Other City"=>"alt_address_city",
-                "Other State"=>"alt_address_state",
-                "Other Zip/Postal Code"=>"alt_address_postalcode",
-                "Other Country"=>"alt_address_country",
-                "Phone"=>"phone_work",
-                "Mobile"=>"phone_mobile",
-                "Home Phone"=>"phone_home",
-                "Other Phone"=>"phone_other",
-                "Fax"=>"phone_fax",
-                "Email"=>"email1",
-                "Email Opt Out"=>"email_opt_out",
-                "Do Not Call"=>"do_not_call",
-                "Account Name"=>"account_name",
-                );
-            break;
-        case 'Accounts':
-            return array(
-                "Account Name"=>"name",
-                "Annual Revenue"=>"annual_revenue",
-                "Type"=>"account_type",
-                "Ticker Symbol"=>"ticker_symbol",
-                "Rating"=>"rating",
-                "Industry"=>"industry",
-                "SIC Code"=>"sic_code",
-                "Ownership"=>"ownership",
-                "Employees"=>"employees",
-                "Description"=>"description",
-                "Billing Street"=>"billing_address_street",
-                "Billing Address Line1"=>"billing_address_street_2",
-                "Billing Address Line2"=>"billing_address_street_3",
-                "Billing City"=>"billing_address_city",
-                "Billing State"=>"billing_address_state",
-                "Billing State/Province"=>"billing_address_state",
-                "Billing Zip/Postal Code"=>"billing_address_postalcode",
-                "Billing Country"=>"billing_address_country",
-                "Shipping Street"=>"shipping_address_street",
-                "Shipping Address Line1"=>"shipping_address_street_2",
-                "Shipping Address Line2"=>"shipping_address_street_3",
-                "Shipping City"=>"shipping_address_city",
-                "Shipping State"=>"shipping_address_state",
-                "Shipping Zip/Postal Code"=>"shipping_address_postalcode",
-                "Shipping Country"=>"shipping_address_country",
-                "Phone"=>"phone_office",
-                "Fax"=>"phone_fax",
-                "Website"=>"website",
-                "Created Date"=>"date_entered",
-                );
-            break;
-        default:
-            return $return_array;
+            case 'Contacts':
+            case 'Leads':
+                return $return_array + array(
+                    "Description"=>"description",
+                    "Birthdate"=>"birthdate",
+                    "Lead Source"=>"lead_source",
+                    "Assistant"=>"assistant",
+                    "Asst. Phone"=>"assistant_phone",
+                    "Mailing Street"=>"primary_address_street",
+                    "Mailing Address Line1"=>"primary_address_street_2",
+                    "Mailing Address Line2"=>"primary_address_street_3",
+                    "Mailing Address Line3"=>"primary_address_street_4",
+                    "Mailing City"=>"primary_address_city",
+                    "Mailing State"=>"primary_address_state",
+                    "Mailing Zip/Postal Code"=>"primary_address_postalcode",
+                    "Mailing Country"=>"primary_address_country",
+                    "Other Street"=>"alt_address_street",
+                    "Other Address Line 1"=>"alt_address_street_2",
+                    "Other Address Line 2"=>"alt_address_street_3",
+                    "Other Address Line 3"=>"alt_address_street_4",
+                    "Other City"=>"alt_address_city",
+                    "Other State"=>"alt_address_state",
+                    "Other Zip/Postal Code"=>"alt_address_postalcode",
+                    "Other Country"=>"alt_address_country",
+                    "Phone"=>"phone_work",
+                    "Mobile"=>"phone_mobile",
+                    "Home Phone"=>"phone_home",
+                    "Other Phone"=>"phone_other",
+                    "Fax"=>"phone_fax",
+                    "Email"=>"email1",
+                    "Email Opt Out"=>"email_opt_out",
+                    "Do Not Call"=>"do_not_call",
+                    "Account Name"=>"account_name",
+                    );
+                break;
+            case 'Accounts':
+                return array(
+                    "Account Name"=>"name",
+                    "Annual Revenue"=>"annual_revenue",
+                    "Type"=>"account_type",
+                    "Ticker Symbol"=>"ticker_symbol",
+                    "Rating"=>"rating",
+                    "Industry"=>"industry",
+                    "SIC Code"=>"sic_code",
+                    "Ownership"=>"ownership",
+                    "Employees"=>"employees",
+                    "Description"=>"description",
+                    "Billing Street"=>"billing_address_street",
+                    "Billing Address Line1"=>"billing_address_street_2",
+                    "Billing Address Line2"=>"billing_address_street_3",
+                    "Billing City"=>"billing_address_city",
+                    "Billing State"=>"billing_address_state",
+                    "Billing State/Province"=>"billing_address_state",
+                    "Billing Zip/Postal Code"=>"billing_address_postalcode",
+                    "Billing Country"=>"billing_address_country",
+                    "Shipping Street"=>"shipping_address_street",
+                    "Shipping Address Line1"=>"shipping_address_street_2",
+                    "Shipping Address Line2"=>"shipping_address_street_3",
+                    "Shipping City"=>"shipping_address_city",
+                    "Shipping State"=>"shipping_address_state",
+                    "Shipping Zip/Postal Code"=>"shipping_address_postalcode",
+                    "Shipping Country"=>"shipping_address_country",
+                    "Phone"=>"phone_office",
+                    "Fax"=>"phone_fax",
+                    "Website"=>"website",
+                    "Created Date"=>"date_entered",
+                    );
+                break;
+            default:
+                return $return_array;
         }
     }
 	

modules/Import/maps/ImportMapOther.php

Switch Indentation +64 added lines, -64 removed lines

@@ -75,70 +75,70 @@
         )
     {
         switch ($module) {
-        case 'Contacts':
-        case 'Leads':
-            return array(
-                "Salutation"=>"salutation",
-                "Full Name"=>"full_name",
-                "Company"=>"company",
-                "First Name"=>"first_name",
-                "Last Name"=>"last_name",
-                "Title"=>"title",
-                "Department"=>"department",
-                "Birthday"=>"birthdate",
-                "Home Phone"=>"phone_home",
-                "Mobile Phone"=>"phone_mobile",
-                "Business Phone"=>"phone_work",
-                "Other Phone"=>"phone_other",
-                "Business Fax"=>"phone_fax",
-                "E-mail Address"=>"email1",
-                "E-mail 2"=>"email2",
-                "Assistant's Name"=>"assistant",
-                "Assistant's Phone"=>"assistant_phone",
-                "Business Street"=>"primary_address_street",
-                "Business Street 2"=>"primary_address_street_2",
-                "Business Street 3"=>"primary_address_street_3",
-                "Business City"=>"primary_address_city",
-                "Business State"=>"primary_address_state",
-                "Business Postal Code"=>"primary_address_postalcode",
-                "Business Country/Region"=>"primary_address_country",
-                "Home Street"=>"alt_address_street",
-                "Home Street 2"=>"alt_address_street_2",
-                "Home Street 3"=>"alt_address_street_3",
-                "Home City"=>"alt_address_city",
-                "Home State"=>"alt_address_state",
-                "Home Postal Code"=>"alt_address_postalcode",
-                "Home Country/Region"=>"alt_address_country",
-                );
-            break;
-        case 'Accounts':
-            return array(
-                "Company"=>"name",
-                "Business Street"=>"billing_address_street",
-                "Business City"=>"billing_address_city",
-                "Business State"=>"billing_address_state",
-                "Business Country"=>"billing_address_country",
-                "Business Postal Code"=>"billing_address_postalcode",
-                "Business Fax"=>"phone_fax",
-                "Company Main Phone"=>"phone_office",
-                "Web Page"=>"website",
-                );
-            break;
-        case 'Opportunities':
-            return array(
-                "Opportunity Name"=>"name" ,
-                "Type"=>"opportunity_type",
-                "Lead Source"=>"lead_source",
-                "Amount"=>"amount",
-                "Created Date"=>"date_entered",
-                "Close Date"=>"date_closed",
-                "Next Step"=>"next_step",
-                "Stage"=>"sales_stage",
-                "Probability (%)"=>"probability",
-                "Account Name"=>"account_name");
-            break;
-        default:
-            return array();
+            case 'Contacts':
+            case 'Leads':
+                return array(
+                    "Salutation"=>"salutation",
+                    "Full Name"=>"full_name",
+                    "Company"=>"company",
+                    "First Name"=>"first_name",
+                    "Last Name"=>"last_name",
+                    "Title"=>"title",
+                    "Department"=>"department",
+                    "Birthday"=>"birthdate",
+                    "Home Phone"=>"phone_home",
+                    "Mobile Phone"=>"phone_mobile",
+                    "Business Phone"=>"phone_work",
+                    "Other Phone"=>"phone_other",
+                    "Business Fax"=>"phone_fax",
+                    "E-mail Address"=>"email1",
+                    "E-mail 2"=>"email2",
+                    "Assistant's Name"=>"assistant",
+                    "Assistant's Phone"=>"assistant_phone",
+                    "Business Street"=>"primary_address_street",
+                    "Business Street 2"=>"primary_address_street_2",
+                    "Business Street 3"=>"primary_address_street_3",
+                    "Business City"=>"primary_address_city",
+                    "Business State"=>"primary_address_state",
+                    "Business Postal Code"=>"primary_address_postalcode",
+                    "Business Country/Region"=>"primary_address_country",
+                    "Home Street"=>"alt_address_street",
+                    "Home Street 2"=>"alt_address_street_2",
+                    "Home Street 3"=>"alt_address_street_3",
+                    "Home City"=>"alt_address_city",
+                    "Home State"=>"alt_address_state",
+                    "Home Postal Code"=>"alt_address_postalcode",
+                    "Home Country/Region"=>"alt_address_country",
+                    );
+                break;
+            case 'Accounts':
+                return array(
+                    "Company"=>"name",
+                    "Business Street"=>"billing_address_street",
+                    "Business City"=>"billing_address_city",
+                    "Business State"=>"billing_address_state",
+                    "Business Country"=>"billing_address_country",
+                    "Business Postal Code"=>"billing_address_postalcode",
+                    "Business Fax"=>"phone_fax",
+                    "Company Main Phone"=>"phone_office",
+                    "Web Page"=>"website",
+                    );
+                break;
+            case 'Opportunities':
+                return array(
+                    "Opportunity Name"=>"name" ,
+                    "Type"=>"opportunity_type",
+                    "Lead Source"=>"lead_source",
+                    "Amount"=>"amount",
+                    "Created Date"=>"date_entered",
+                    "Close Date"=>"date_closed",
+                    "Next Step"=>"next_step",
+                    "Stage"=>"sales_stage",
+                    "Probability (%)"=>"probability",
+                    "Account Name"=>"account_name");
+                break;
+            default:
+                return array();
         }
     }
 	

modules/Administration/UpgradeWizard_commit.php

Switch Indentation +50 added lines, -50 removed lines

@@ -305,50 +305,50 @@ 
 }
 
 switch( $install_type ){
-    case "langpack":
-        if( !isset($_REQUEST['new_lang_name']) || ($_REQUEST['new_lang_name'] == "") ){
-            die($mod_strings['ERR_UW_NO_LANG']);
-        }
-        if( !isset($_REQUEST['new_lang_desc']) || ($_REQUEST['new_lang_desc'] == "") ){
-            die($mod_strings['ERR_UW_NO_LANG_DESC']);
-        }
+        case "langpack":
+            if( !isset($_REQUEST['new_lang_name']) || ($_REQUEST['new_lang_name'] == "") ){
+                die($mod_strings['ERR_UW_NO_LANG']);
+            }
+            if( !isset($_REQUEST['new_lang_desc']) || ($_REQUEST['new_lang_desc'] == "") ){
+                die($mod_strings['ERR_UW_NO_LANG_DESC']);
+            }
 
-        if( $mode == "Install" || $mode=="Enable" ){
-            $sugar_config['languages'] = $sugar_config['languages'] + array( $_REQUEST['new_lang_name'] => $_REQUEST['new_lang_desc'] );
-        }
-        else if( $mode == "Uninstall" || $mode=="Disable" ){
-            $new_langs = array();
-            $old_langs = $sugar_config['languages'];
-            foreach( $old_langs as $key => $value ){
-                if( $key != $_REQUEST['new_lang_name'] ){
-                    $new_langs += array( $key => $value );
+            if( $mode == "Install" || $mode=="Enable" ){
+                $sugar_config['languages'] = $sugar_config['languages'] + array( $_REQUEST['new_lang_name'] => $_REQUEST['new_lang_desc'] );
+            }
+            else if( $mode == "Uninstall" || $mode=="Disable" ){
+                $new_langs = array();
+                $old_langs = $sugar_config['languages'];
+                foreach( $old_langs as $key => $value ){
+                    if( $key != $_REQUEST['new_lang_name'] ){
+                        $new_langs += array( $key => $value );
+                    }
                 }
+			    $sugar_config['languages'] = $new_langs;
+
+	            $default_sugar_instance_lang = 'en_us';
+	            if($current_language == $_REQUEST['new_lang_name']){
+	        	    $_SESSION['authenticated_user_language'] =$default_sugar_instance_lang;
+	        	    $lang_changed_string = $mod_strings['LBL_CURRENT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
+	            }
+
+	            if($sugar_config['default_language'] == $_REQUEST['new_lang_name']){
+	        	    $cfg = new Configurator();
+             	    $cfg->config['languages'] = $new_langs;
+				    $cfg->config['default_language'] = $default_sugar_instance_lang;
+				    $cfg->handleOverride();
+	        	    $lang_changed_string .= $mod_strings['LBL_DEFAULT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
+	            }
             }
-			$sugar_config['languages'] = $new_langs;
-
-	        $default_sugar_instance_lang = 'en_us';
-	        if($current_language == $_REQUEST['new_lang_name']){
-	        	$_SESSION['authenticated_user_language'] =$default_sugar_instance_lang;
-	        	$lang_changed_string = $mod_strings['LBL_CURRENT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
-	        }
-
-	        if($sugar_config['default_language'] == $_REQUEST['new_lang_name']){
-	        	$cfg = new Configurator();
-             	$cfg->config['languages'] = $new_langs;
-				$cfg->config['default_language'] = $default_sugar_instance_lang;
-				$cfg->handleOverride();
-	        	$lang_changed_string .= $mod_strings['LBL_DEFAULT_LANGUAGE_CHANGE'].$sugar_config['languages'][$default_sugar_instance_lang].'<br/>';
-	        }
-        }
-        ksort( $sugar_config );
-        if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
-            die($mod_strings['ERR_UW_CONFIG_FAILED']);
-        }
-        break;
-    case "module":
-        require_once( "ModuleInstall/ModuleInstaller.php" );
-        $mi = new ModuleInstaller();
-        switch( $mode ){
+            ksort( $sugar_config );
+            if( !write_array_to_file( "sugar_config", $sugar_config, "config.php" ) ){
+                die($mod_strings['ERR_UW_CONFIG_FAILED']);
+            }
+            break;
+        case "module":
+            require_once( "ModuleInstall/ModuleInstaller.php" );
+            $mi = new ModuleInstaller();
+            switch( $mode ){
             case "Install":
             //here we can determine if this is an upgrade or a new version
             	if(!empty($previous_version)){
@@ -388,14 +388,14 @@ 
                 break;
             default:
                 break;
-        }
+            }
         $current_user->incrementETag("mainMenuETag");
         break;
-    case "full":
-        // purposely flow into "case: patch"
-    case "patch":
- 		switch($mode)
- 		{
+        case "full":
+            // purposely flow into "case: patch"
+        case "patch":
+ 		    switch($mode)
+ 		    {
  			case 'Install':
  				$file = "$unzip_dir/" . constant('SUGARCRM_POST_INSTALL_FILE');
 				if(is_file($file))
@@ -424,7 +424,7 @@ 
  				break;
  			default:
  				break;
- 		}
+ 		    }
 
 		require( "sugar_version.php" );
 		$sugar_config['sugar_version'] = $sugar_version;
@@ -435,8 +435,8 @@ 
 			die($mod_strings['ERR_UW_UPDATE_CONFIG']);
 		}
         break;
-    default:
-        break;
+        default:
+            break;
 }
 
 switch( $mode ){

modules/Administration/UpgradeWizard_prepare.php

Switch Indentation +79 added lines, -79 removed lines

@@ -164,58 +164,58 @@ 
 	}//fi
 }
 switch( $install_type ){
-	case "full":
-	case "patch":
-		if( !is_writable( "config.php" ) ){
-			die( $mod_strings['ERR_UW_CONFIG'] );
-		}
-		break;
-	case "theme":
-		break;
-	case "langpack":
-		// find name of language pack: find single file in include/language/xx_xx.lang.php
-		$d = dir( "$unzip_dir/$zip_from_dir/include/language" );
-		while( $f = $d->read() ){
-			if( $f == "." || $f == ".." ){
-				continue;
-			}
-			else if( preg_match("/(.*)\.lang\.php\$/", $f, $match) ){
-				$new_lang_name = $match[1];
-			}
-		}
-		if( $new_lang_name == "" ){
-			die( $mod_strings['ERR_UW_NO_LANGPACK'].$install_file );
-		}
-		$hidden_fields .= "<input type=hidden name=\"new_lang_name\" value=\"$new_lang_name\"/>";
-
-		$new_lang_desc = getLanguagePackName( "$unzip_dir/$zip_from_dir/include/language/$new_lang_name.lang.php" );
-		if( $new_lang_desc == "" ){
-			die( $mod_strings['ERR_UW_NO_LANG_DESC_1']."include/language/$new_lang_name.lang.php".$mod_strings['ERR_UW_NO_LANG_DESC_2']."$install_file." );
-		}
-		$hidden_fields .= "<input type=hidden name=\"new_lang_desc\" value=\"$new_lang_desc\"/>";
-
-		if( !is_writable( "config.php" ) ){
-			die( $mod_strings['ERR_UW_CONFIG'] );
-		}
-		break;
-	case "module":
-		$previous_install = array();
-		if(!empty($id_name) & !empty($version))
-		$previous_install = $uh->determineIfUpgrade($id_name, $version);
-		$previous_version = (empty($previous_install['version'])) ? '' : $previous_install['version'];
-		$previous_id = (empty($previous_install['id'])) ? '' : $previous_install['id'];
-		$show_files = false;
-		//rrs pull out unique_key
-		$hidden_fields .= "<input type=hidden name=\"author\" value=\"$author\"/>";
-		$hidden_fields .= "<input type=hidden name=\"name\" value=\"$name\"/>";
-		$hidden_fields .= "<input type=hidden name=\"description\" value=\"$description\"/>";
-		$hidden_fields .= "<input type=hidden name=\"is_uninstallable\" value=\"$is_uninstallable\"/>";
-		$hidden_fields .= "<input type=hidden name=\"id_name\" value=\"$id_name\"/>";
-		$hidden_fields .= "<input type=hidden name=\"previous_version\" value=\"$previous_version\"/>";
-		$hidden_fields .= "<input type=hidden name=\"previous_id\" value=\"$previous_id\"/>";
-		break;
-	default:
-		die( $mod_strings['ERR_UW_WRONG_TYPE'].$install_type );
+	    case "full":
+	    case "patch":
+		    if( !is_writable( "config.php" ) ){
+			    die( $mod_strings['ERR_UW_CONFIG'] );
+		    }
+		    break;
+	    case "theme":
+		    break;
+	    case "langpack":
+		    // find name of language pack: find single file in include/language/xx_xx.lang.php
+		    $d = dir( "$unzip_dir/$zip_from_dir/include/language" );
+		    while( $f = $d->read() ){
+			    if( $f == "." || $f == ".." ){
+				    continue;
+			    }
+			    else if( preg_match("/(.*)\.lang\.php\$/", $f, $match) ){
+				    $new_lang_name = $match[1];
+			    }
+		    }
+		    if( $new_lang_name == "" ){
+			    die( $mod_strings['ERR_UW_NO_LANGPACK'].$install_file );
+		    }
+		    $hidden_fields .= "<input type=hidden name=\"new_lang_name\" value=\"$new_lang_name\"/>";
+
+		    $new_lang_desc = getLanguagePackName( "$unzip_dir/$zip_from_dir/include/language/$new_lang_name.lang.php" );
+		    if( $new_lang_desc == "" ){
+			    die( $mod_strings['ERR_UW_NO_LANG_DESC_1']."include/language/$new_lang_name.lang.php".$mod_strings['ERR_UW_NO_LANG_DESC_2']."$install_file." );
+		    }
+		    $hidden_fields .= "<input type=hidden name=\"new_lang_desc\" value=\"$new_lang_desc\"/>";
+
+		    if( !is_writable( "config.php" ) ){
+			    die( $mod_strings['ERR_UW_CONFIG'] );
+		    }
+		    break;
+	    case "module":
+		    $previous_install = array();
+		    if(!empty($id_name) & !empty($version))
+		    $previous_install = $uh->determineIfUpgrade($id_name, $version);
+		    $previous_version = (empty($previous_install['version'])) ? '' : $previous_install['version'];
+		    $previous_id = (empty($previous_install['id'])) ? '' : $previous_install['id'];
+		    $show_files = false;
+		    //rrs pull out unique_key
+		    $hidden_fields .= "<input type=hidden name=\"author\" value=\"$author\"/>";
+		    $hidden_fields .= "<input type=hidden name=\"name\" value=\"$name\"/>";
+		    $hidden_fields .= "<input type=hidden name=\"description\" value=\"$description\"/>";
+		    $hidden_fields .= "<input type=hidden name=\"is_uninstallable\" value=\"$is_uninstallable\"/>";
+		    $hidden_fields .= "<input type=hidden name=\"id_name\" value=\"$id_name\"/>";
+		    $hidden_fields .= "<input type=hidden name=\"previous_version\" value=\"$previous_version\"/>";
+		    $hidden_fields .= "<input type=hidden name=\"previous_id\" value=\"$previous_id\"/>";
+		    break;
+	    default:
+		    die( $mod_strings['ERR_UW_WRONG_TYPE'].$install_type );
 }
 
 
@@ -317,33 +317,33 @@ 
 }
 
 switch( $mode ){
-	case "Install":
-		if( $install_type == "langpack") {
-			print( $mod_strings['LBL_UW_LANGPACK_READY'] );
-			echo '<br><br>';
-		}
-		break;
-	case "Uninstall":
-		if( $install_type == "langpack" ){
-			print( $mod_strings['LBL_UW_LANGPACK_READY_UNISTALL'] );
-			echo '<br><br>';
-		}
-		else if($install_type != "module"){
-			print( $mod_strings['LBL_UW_FILES_REMOVED'] );
-		}
-		break;
-	case "Disable":
-		if( $install_type == "langpack" ){
-			print( $mod_strings['LBL_UW_LANGPACK_READY_DISABLE'] );
-			echo '<br><br>';
-		}
-		break;
-	case "Enable":
-		if( $install_type == "langpack" ){
-			print( $mod_strings['LBL_UW_LANGPACK_READY_ENABLE'] );
-			echo '<br><br>';
-		}
-		break;
+	    case "Install":
+		    if( $install_type == "langpack") {
+			    print( $mod_strings['LBL_UW_LANGPACK_READY'] );
+			    echo '<br><br>';
+		    }
+		    break;
+	    case "Uninstall":
+		    if( $install_type == "langpack" ){
+			    print( $mod_strings['LBL_UW_LANGPACK_READY_UNISTALL'] );
+			    echo '<br><br>';
+		    }
+		    else if($install_type != "module"){
+			    print( $mod_strings['LBL_UW_FILES_REMOVED'] );
+		    }
+		    break;
+	    case "Disable":
+		    if( $install_type == "langpack" ){
+			    print( $mod_strings['LBL_UW_LANGPACK_READY_DISABLE'] );
+			    echo '<br><br>';
+		    }
+		    break;
+	    case "Enable":
+		    if( $install_type == "langpack" ){
+			    print( $mod_strings['LBL_UW_LANGPACK_READY_ENABLE'] );
+			    echo '<br><br>';
+		    }
+		    break;
 }
 
 

install.php

Switch Indentation +25 added lines, -25 removed lines

@@ -522,34 +522,34 @@
 if($next_clicked) {
 	// store the submitted data because the 'Next' button was clicked
 	switch($workflow[trim($_REQUEST['current_step'])]) {
-	case 'old_php.php':
-		$_SESSION['language'] = $_REQUEST['language'];
-		$_SESSION['setup_old_php'] = get_boolean_from_request('setup_old_php');
-		break;
-
-	case 'welcome.php':
-        	$_SESSION['language'] = $_REQUEST['language'];
-   			$_SESSION['setup_site_admin_user_name'] = 'admin';
-//        break;
-//      case 'license.php':
-                $_SESSION['setup_license_accept']   = get_boolean_from_request('setup_license_accept');
-                $_SESSION['license_submitted']      = true;
-
-
-           // eventually default all vars here, with overrides from config.php
-            if(is_readable('config.php')) {
-            	global $sugar_config;
-                include_once('config.php');
-            }
+	    case 'old_php.php':
+		    $_SESSION['language'] = $_REQUEST['language'];
+		    $_SESSION['setup_old_php'] = get_boolean_from_request('setup_old_php');
+		    break;
+
+	    case 'welcome.php':
+        	    $_SESSION['language'] = $_REQUEST['language'];
+   			    $_SESSION['setup_site_admin_user_name'] = 'admin';
+    //        break;
+    //      case 'license.php':
+                    $_SESSION['setup_license_accept']   = get_boolean_from_request('setup_license_accept');
+                    $_SESSION['license_submitted']      = true;
+
+
+               // eventually default all vars here, with overrides from config.php
+                if(is_readable('config.php')) {
+            	    global $sugar_config;
+                    include_once('config.php');
+                }
 
-            $default_db_type = 'mysql';
+                $default_db_type = 'mysql';
 
-            if(!isset($_SESSION['setup_db_type'])) {
-                $_SESSION['setup_db_type'] = empty($sugar_config['dbconfig']['db_type']) ? $default_db_type : $sugar_config['dbconfig']['db_type'];
-            }
+                if(!isset($_SESSION['setup_db_type'])) {
+                    $_SESSION['setup_db_type'] = empty($sugar_config['dbconfig']['db_type']) ? $default_db_type : $sugar_config['dbconfig']['db_type'];
+                }
 
-            break;
-        //TODO--low: add this functionality to installConfig.php
+                break;
+            //TODO--low: add this functionality to installConfig.php
         case 'installType.php':
             $_SESSION['install_type']   = $_REQUEST['install_type'];
             if(isset($_REQUEST['setup_license_key']) && !empty($_REQUEST['setup_license_key'])){