adamjakab / SuiteCRM

ModuleInstall/PackageManager/PackageManagerComm.php

Indentation +122 added lines, -122 removed lines

@@ -44,12 +44,12 @@ 
 define("ACTIVE_STATUS", "ACTIVE");
 
 class PackageManagerComm{
-     /**
-      * Initialize the soap client and store in the $GLOBALS object for use
-      *
-      * @param login    designates whether we want to try to login after we initialize or not
-      */
-     function initialize($login = true){
+        /**
+         * Initialize the soap client and store in the $GLOBALS object for use
+         *
+         * @param login    designates whether we want to try to login after we initialize or not
+         */
+        function initialize($login = true){
         if(empty($GLOBALS['SugarDepot'])){
             $GLOBALS['log']->debug('USING HTTPS TO CONNECT TO HEARTBEAT');
             $soap_client = new nusoapclient(HTTPS_URL, false);
@@ -60,91 +60,91 @@ 
         if($login && empty($_SESSION['SugarDepotSessionID'])){
             PackageManagerComm::login();
         }
-     }
+        }
 
-     /**
-      * Check for errors in the response or error_str
-      */
-     function errorCheck(){
-     	if(!empty($GLOBALS['SugarDepot']->error_str)){
-     		$GLOBALS['log']->fatal($GLOBALS['SugarDepot']->error_str);
-     		$GLOBALS['log']->fatal($GLOBALS['SugarDepot']->response);
-     	}
-     }
+        /**
+         * Check for errors in the response or error_str
+         */
+        function errorCheck(){
+            if(!empty($GLOBALS['SugarDepot']->error_str)){
+                $GLOBALS['log']->fatal($GLOBALS['SugarDepot']->error_str);
+                $GLOBALS['log']->fatal($GLOBALS['SugarDepot']->response);
+            }
+        }
 
-     /**
-      * Set the credentials for use during login
-      *
-      * @param username    Mambo username
-      * @param password     Mambo password
-      * @param download_key User's download key
-      */
-     function setCredentials($username, $password, $download_key){
+        /**
+         * Set the credentials for use during login
+         *
+         * @param username    Mambo username
+         * @param password     Mambo password
+         * @param download_key User's download key
+         */
+        function setCredentials($username, $password, $download_key){
         $_SESSION['SugarDepotUsername'] = $username;
         $_SESSION['SugarDepotPassword'] = $password;
         $_SESSION['SugarDepotDownloadKey'] = $download_key;
-     }
+        }
 
-     /**
-      * Clears out the session so we can reauthenticate.
-      */
-     function clearSession(){
-     	$_SESSION['SugarDepotSessionID'] = null;
-     	unset($_SESSION['SugarDepotSessionID']);
-     }
-     /////////////////////////////////////////////////////////
-     ////////// BEGIN: Base Functions for Communicating with the depot
-     /**
-      * Login to the depot
-      *
-      * @return true if successful, false otherwise
-      */
-     function login($terms_checked = true){
-      if(empty($_SESSION['SugarDepotSessionID'])){
-	      global $license;
-	        $GLOBALS['log']->debug("Begin SugarDepot Login");
-	        PackageManagerComm::initialize(false);
-	        require('sugar_version.php');
-	        require('config.php');
-	        $credentials = PackageManager::getCredentials();
-	        if(empty($license))loadLicense();
-	        $info = sugarEncode('2813', serialize(getSystemInfo(true)));
-	        $pm = new PackageManager();
-	        $installed = $pm->buildInstalledReleases();
-	        $installed = base64_encode(serialize($installed));
-	        $params = array('installed_modules' => $installed, 'terms_checked' => $terms_checked, 'system_name' => $credentials['system_name']);
-	        $terms_version = (!empty($_SESSION['SugarDepot_TermsVersion']) ? $_SESSION['SugarDepot_TermsVersion'] : '');
-	        if(!empty($terms_version))
-	        	$params['terms_version'] = $terms_version;
+        /**
+         * Clears out the session so we can reauthenticate.
+         */
+        function clearSession(){
+            $_SESSION['SugarDepotSessionID'] = null;
+            unset($_SESSION['SugarDepotSessionID']);
+        }
+        /////////////////////////////////////////////////////////
+        ////////// BEGIN: Base Functions for Communicating with the depot
+        /**
+         * Login to the depot
+         *
+         * @return true if successful, false otherwise
+         */
+        function login($terms_checked = true){
+        if(empty($_SESSION['SugarDepotSessionID'])){
+            global $license;
+            $GLOBALS['log']->debug("Begin SugarDepot Login");
+            PackageManagerComm::initialize(false);
+            require('sugar_version.php');
+            require('config.php');
+            $credentials = PackageManager::getCredentials();
+            if(empty($license))loadLicense();
+            $info = sugarEncode('2813', serialize(getSystemInfo(true)));
+            $pm = new PackageManager();
+            $installed = $pm->buildInstalledReleases();
+            $installed = base64_encode(serialize($installed));
+            $params = array('installed_modules' => $installed, 'terms_checked' => $terms_checked, 'system_name' => $credentials['system_name']);
+            $terms_version = (!empty($_SESSION['SugarDepot_TermsVersion']) ? $_SESSION['SugarDepot_TermsVersion'] : '');
+            if(!empty($terms_version))
+                $params['terms_version'] = $terms_version;
 
-	        $result = $GLOBALS['SugarDepot']->call('depotLogin', array(array('user_name' => $credentials['username'], 'password' => $credentials['password']),'info'=>$info, 'params' => $params));
-	        PackageManagerComm::errorCheck();
-	        if(!is_array($result))
-	        	$_SESSION['SugarDepotSessionID'] = $result;
-	        $GLOBALS['log']->debug("End SugarDepot Login");
-	        return $result;
-      }
-      else
-      	return $_SESSION['SugarDepotSessionID'];
-     }
+            $result = $GLOBALS['SugarDepot']->call('depotLogin', array(array('user_name' => $credentials['username'], 'password' => $credentials['password']),'info'=>$info, 'params' => $params));
+            PackageManagerComm::errorCheck();
+            if(!is_array($result))
+                $_SESSION['SugarDepotSessionID'] = $result;
+            $GLOBALS['log']->debug("End SugarDepot Login");
+            return $result;
+        }
+        else
+            return $_SESSION['SugarDepotSessionID'];
+        }
 
-     /**
-      * Logout from the depot
-      */
-     function logout(){
+        /**
+         * Logout from the depot
+         */
+        function logout(){
         PackageManagerComm::initialize();
         $result = $GLOBALS['SugarDepot']->call('depotLogout', array('session_id' => $_SESSION['SugarDepotSessionID']));
-     }
+        }
 
-     /**
-      * Get all promotions from the depot
-      */
-     function getPromotion(){
+        /**
+         * Get all promotions from the depot
+         */
+        function getPromotion(){
         PackageManagerComm::initialize();
         //check for fault first and then return
         $name_value_list = $GLOBALS['SugarDepot']->call('depotGetPromotion', array('session_id' => $_SESSION['SugarDepotSessionID']));
         return $name_value_list;
-     }
+        }
 
     /**
      * A generic function which given a category_id some filter will
@@ -154,11 +154,11 @@ 
      * @param filter       a filter which will limit theh number of results returned
      * @return categories_and_packages
      * @see categories_and_packages
-    */
+     */
     function getCategoryPackages($category_id, $filter = array()){
         PackageManagerComm::initialize();
         //check for fault
-         return $GLOBALS['SugarDepot']->call('depotGetCategoriesPackages', array('session_id' => $_SESSION['SugarDepotSessionID'], 'category_id' => $category_id, 'filter' => $filter));
+            return $GLOBALS['SugarDepot']->call('depotGetCategoriesPackages', array('session_id' => $_SESSION['SugarDepotSessionID'], 'category_id' => $category_id, 'filter' => $filter));
     }
 
     /**
@@ -182,11 +182,11 @@ 
      * @param filter       a filter which will limit theh number of results returned
      * @return packages
      * @see packages
-    */
+     */
     function getPackages($category_id, $filter = array()){
         PackageManagerComm::initialize();
         //check for fault
-         return $GLOBALS['SugarDepot']->call('depotGetPackages', array('session_id' => $_SESSION['SugarDepotSessionID'], 'category_id' => $category_id, 'filter' => $filter));
+            return $GLOBALS['SugarDepot']->call('depotGetPackages', array('session_id' => $_SESSION['SugarDepotSessionID'], 'category_id' => $category_id, 'filter' => $filter));
     }
 
     /**
@@ -196,11 +196,11 @@ 
      * @param package_id  the package id which the release belongs to
      * @return packages
      * @see packages
-    */
+     */
     function getReleases($category_id, $package_id, $filter = array()){
         PackageManagerComm::initialize();
-         //check for fault
-         return $GLOBALS['SugarDepot']->call('depotGetReleases', array('session_id' => $_SESSION['SugarDepotSessionID'], 'category_id' => $category_id, 'package_id' => $package_id, 'filter' => $filter));
+            //check for fault
+            return $GLOBALS['SugarDepot']->call('depotGetReleases', array('session_id' => $_SESSION['SugarDepotSessionID'], 'category_id' => $category_id, 'package_id' => $package_id, 'filter' => $filter));
     }
 
     /**
@@ -211,11 +211,11 @@ 
      * @param release_id  the release we want to download
      * @return download
      * @see download
-    */
+     */
     function download($category_id, $package_id, $release_id){
         PackageManagerComm::initialize();
-         //check for fault
-         return $GLOBALS['SugarDepot']->call('depotDownloadRelease', array('session_id' => $_SESSION['SugarDepotSessionID'], 'category_id' => $category_id, 'package_id' => $package_id, 'release_id' => $release_id));
+            //check for fault
+            return $GLOBALS['SugarDepot']->call('depotDownloadRelease', array('session_id' => $_SESSION['SugarDepotSessionID'], 'category_id' => $category_id, 'package_id' => $package_id, 'release_id' => $release_id));
     }
 
     /**
@@ -228,8 +228,8 @@ 
      */
     function addDownload($category_id, $package_id, $release_id){
         PackageManagerComm::initialize();
-         //check for fault
-         return $GLOBALS['SugarDepot']->call('depotAddDownload', array('session_id' => $_SESSION['SugarDepotSessionID'], 'category_id' => $category_id, 'package_id' => $package_id, 'release_id' => $release_id, 'download_key' => '123'));
+            //check for fault
+            return $GLOBALS['SugarDepot']->call('depotAddDownload', array('session_id' => $_SESSION['SugarDepotSessionID'], 'category_id' => $category_id, 'package_id' => $package_id, 'release_id' => $release_id, 'download_key' => '123'));
     }
 
     /**
@@ -240,9 +240,9 @@ 
      */
     static public function performDownload($filename){
         PackageManagerComm::initialize();
-         //check for fault
-         $GLOBALS['log']->debug("Performing download from depot: Session ID: ".$_SESSION['SugarDepotSessionID']." Filename: ".$filename);
-         return PackageManagerDownloader::download($_SESSION['SugarDepotSessionID'], $filename);
+            //check for fault
+            $GLOBALS['log']->debug("Performing download from depot: Session ID: ".$_SESSION['SugarDepotSessionID']." Filename: ".$filename);
+            return PackageManagerDownloader::download($_SESSION['SugarDepotSessionID'], $filename);
     }
 
     /**
@@ -254,14 +254,14 @@ 
      * @return documents
      */
     function getDocumentation($package_id, $release_id){
-    	 PackageManagerComm::initialize();
-         //check for fault
-         return $GLOBALS['SugarDepot']->call('depotGetDocumentation', array('session_id' => $_SESSION['SugarDepotSessionID'], 'package_id' => $package_id, 'release_id' => $release_id));
+            PackageManagerComm::initialize();
+            //check for fault
+            return $GLOBALS['SugarDepot']->call('depotGetDocumentation', array('session_id' => $_SESSION['SugarDepotSessionID'], 'package_id' => $package_id, 'release_id' => $release_id));
     }
 
     function getTermsAndConditions(){
-    	 PackageManagerComm::initialize(false);
-    	  return $GLOBALS['SugarDepot']->call('depotTermsAndConditions',array());
+            PackageManagerComm::initialize(false);
+            return $GLOBALS['SugarDepot']->call('depotTermsAndConditions',array());
     }
 
     /**
@@ -270,32 +270,32 @@ 
      * @param document_id	the document the user has clicked on
      */
     function downloadedDocumentation($document_id){
-    	 PackageManagerComm::initialize();
-         //check for fault
-         $GLOBALS['log']->debug("Logging Document: ".$document_id);
-         $GLOBALS['SugarDepot']->call('depotDownloadedDocumentation', array('session_id' => $_SESSION['SugarDepotSessionID'], 'document_id' => $document_id));
+            PackageManagerComm::initialize();
+            //check for fault
+            $GLOBALS['log']->debug("Logging Document: ".$document_id);
+            $GLOBALS['SugarDepot']->call('depotDownloadedDocumentation', array('session_id' => $_SESSION['SugarDepotSessionID'], 'document_id' => $document_id));
     }
 
-	/**
-	 * Send the list of installed objects, could be patches, or modules, .. to the depot and allow the depot to send back
-	 * a list of corresponding updates
-	 *
-	 * @param objects_to_check	an array of name_value_lists which contain the appropriate values
-	 * 							which will allow the depot to check for updates
-	 *
-	 * @return array of name_value_lists of corresponding updates
-	 */
-	function checkForUpdates($objects_to_check){
-		PackageManagerComm::initialize();
-         //check for fault
-         return $GLOBALS['SugarDepot']->call('depotCheckForUpdates', array('session_id' => $_SESSION['SugarDepotSessionID'], 'objects' => $objects_to_check));
-	}
-     /**
-     * Ping the server to determine if we have established proper communication
+    /**
+     * Send the list of installed objects, could be patches, or modules, .. to the depot and allow the depot to send back
+     * a list of corresponding updates
+     *
+     * @param objects_to_check	an array of name_value_lists which contain the appropriate values
+     * 							which will allow the depot to check for updates
      *
-     * @return true if we can communicate with the server and false otherwise
-    */
-     function isAlive(){
+     * @return array of name_value_lists of corresponding updates
+     */
+    function checkForUpdates($objects_to_check){
+        PackageManagerComm::initialize();
+            //check for fault
+            return $GLOBALS['SugarDepot']->call('depotCheckForUpdates', array('session_id' => $_SESSION['SugarDepotSessionID'], 'objects' => $objects_to_check));
+    }
+        /**
+         * Ping the server to determine if we have established proper communication
+         *
+         * @return true if we can communicate with the server and false otherwise
+         */
+        function isAlive(){
         PackageManagerComm::initialize(false);
 
         $status = $GLOBALS['SugarDepot']->call('sugarPing', array());
@@ -304,9 +304,9 @@ 
         }else{
             return true;
         }
-     }
-     ////////// END: Base Functions for Communicating with the depot
-     ////////////////////////////////////////////////////////
+        }
+        ////////// END: Base Functions for Communicating with the depot
+        ////////////////////////////////////////////////////////
 }
 
 ?>

suitecrm_version.php

Indentation +1 added lines, -1 removed lines

@@ -1,5 +1,5 @@
 <?php
- if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+    if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
 
 $suitecrm_version      = '7.5.1';
 $suitecrm_timestamp    = '2015-01-26 17:00';

install.php

Indentation +78 added lines, -78 removed lines

@@ -1,5 +1,5 @@ 
 <?php
- if(!defined('sugarEntry'))define('sugarEntry', true);
+    if(!defined('sugarEntry'))define('sugarEntry', true);
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,10 +40,10 @@ 
  
 @session_start();
 if(isset($_REQUEST['clear_session']) || !empty($_SESSION['loginAttempts'])) {
-	session_destroy();
-	header('Location: install.php');
-	echo 'session clean, page refresh...';
-	exit;
+    session_destroy();
+    header('Location: install.php');
+    echo 'session clean, page refresh...';
+    exit;
 }
  
 //  recover smtp settings
@@ -53,12 +53,12 @@ 
 
 //session_destroy();
 if (version_compare(phpversion(),'5.2.0') < 0) {
-	$msg = 'Minimum PHP version required is 5.2.0.  You are using PHP version  '. phpversion();
+    $msg = 'Minimum PHP version required is 5.2.0.  You are using PHP version  '. phpversion();
     die($msg);
 }
 $session_id = session_id();
 if(empty($session_id)){
-	@session_start();
+    @session_start();
 }
 $GLOBALS['installing'] = true;
 define('SUGARCRM_IS_INSTALLING', $GLOBALS['installing']);
@@ -88,9 +88,9 @@ 
 $locale = new Localization();
 
 if(get_magic_quotes_gpc() == 1) {
-   $_REQUEST = array_map("stripslashes_checkstrings", $_REQUEST);
-   $_POST = array_map("stripslashes_checkstrings", $_POST);
-   $_GET = array_map("stripslashes_checkstrings", $_GET);
+    $_REQUEST = array_map("stripslashes_checkstrings", $_REQUEST);
+    $_POST = array_map("stripslashes_checkstrings", $_POST);
+    $_GET = array_map("stripslashes_checkstrings", $_GET);
 }
 
 
@@ -109,53 +109,53 @@ 
 ///////////////////////////////////////////////////////////////////////////////
 ////	INSTALLER LANGUAGE
 function getSupportedInstallLanguages(){
-	$supportedLanguages = array(
-	'en_us'	=> 'English (US)',
-	);
-	if(file_exists('install/lang.config.php')){
-		include('install/lang.config.php');
-		if(!empty($config['languages'])){
-
-			foreach($config['languages'] as $k=>$v){
-				if(file_exists('install/language/' . $k . '.lang.php')){
-					$supportedLanguages[$k] = $v;
-				}
-			}
-		}
-	}
-	return $supportedLanguages;
+    $supportedLanguages = array(
+    'en_us'	=> 'English (US)',
+    );
+    if(file_exists('install/lang.config.php')){
+        include('install/lang.config.php');
+        if(!empty($config['languages'])){
+
+            foreach($config['languages'] as $k=>$v){
+                if(file_exists('install/language/' . $k . '.lang.php')){
+                    $supportedLanguages[$k] = $v;
+                }
+            }
+        }
+    }
+    return $supportedLanguages;
 }
 $supportedLanguages = getSupportedInstallLanguages();
 
 // after install language is selected, use that pack
 $default_lang = 'en_us';
 if(!isset($_POST['language']) && (!isset($_SESSION['language']) && empty($_SESSION['language']))) {
-	if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
-		$lang = parseAcceptLanguage();
-		if(isset($supportedLanguages[$lang])) {
-			$_POST['language'] = $lang;
-		} else {
-			$_POST['language'] = $default_lang;
-	    }
-	}
+    if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) && !empty($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+        $lang = parseAcceptLanguage();
+        if(isset($supportedLanguages[$lang])) {
+            $_POST['language'] = $lang;
+        } else {
+            $_POST['language'] = $default_lang;
+        }
+    }
 }
 
 if(isset($_POST['language'])) {
-	$_SESSION['language'] = str_replace('-','_',$_POST['language']);
+    $_SESSION['language'] = str_replace('-','_',$_POST['language']);
 }
 
 $current_language = isset($_SESSION['language']) ? $_SESSION['language'] : $default_lang;
 
 if(file_exists("install/language/{$current_language}.lang.php")) {
-	require_once("install/language/{$current_language}.lang.php");
+    require_once("install/language/{$current_language}.lang.php");
 } else {
-	require_once("install/language/{$default_lang}.lang.php");
+    require_once("install/language/{$default_lang}.lang.php");
 }
 
 if($current_language != 'en_us') {
-	$my_mod_strings = $mod_strings;
-	include('install/language/en_us.lang.php');
-	$mod_strings = sugarLangArrayMerge($mod_strings, $my_mod_strings);
+    $my_mod_strings = $mod_strings;
+    include('install/language/en_us.lang.php');
+    $mod_strings = sugarLangArrayMerge($mod_strings, $my_mod_strings);
 }
 
 $app_list_strings = return_app_list_strings_language($current_language);
@@ -269,7 +269,7 @@ 
         $errors = '';
         if( isset($validation_errors) && is_array($validation_errors)){
             if( count($validation_errors) > 0 ){
-               // $errors  = '<div id="errorMsgs">';
+                // $errors  = '<div id="errorMsgs">';
                 $errors .= '<p>'.$mod_strings['LBL_SITECFG_FIX_ERRORS'].'</p><ul>';
                 foreach( $validation_errors as $error ){
                     $errors .= '<li class="error">' . $error . '</li>';
@@ -298,7 +298,7 @@ 
 
 //maintaining the install_type if earlier set to custom
 if(isset($_REQUEST['install_type']) && $_REQUEST['install_type'] == 'custom'){
-	$_SESSION['install_type'] = $_REQUEST['install_type'];
+    $_SESSION['install_type'] = $_REQUEST['install_type'];
 }
 
 //set the default settings into session
@@ -377,15 +377,15 @@ 
     $_SESSION['cache_dir'] = isset($sugar_config['cache_dir']) ? $sugar_config['cache_dir'] : 'cache/';
 }
 
-  //$workflow[] = 'confirmSettings.php';
+    //$workflow[] = 'confirmSettings.php';
 $workflow[] = 'performSetup.php';
 
-  if(!isset($_SESSION['oc_install']) ||  $_SESSION['oc_install'] == false){
+    if(!isset($_SESSION['oc_install']) ||  $_SESSION['oc_install'] == false){
     if(isset($_SESSION['install_type'])  && !empty($_SESSION['install_type'])  && $_SESSION['install_type']=='custom'){
         //$workflow[] = 'download_patches.php';
         $workflow[] = 'download_modules.php';
     }
-  }
+    }
 
     //$workflow[] = 'register.php';
     $workflow[] = 'complete_install.php';
@@ -409,7 +409,7 @@ 
         case 'SilentInstall':
             $next_step = 9999;
             break;
-		case 'oc_convert':
+        case 'oc_convert':
             $next_step = 9191;
             break;
     }
@@ -464,9 +464,9 @@ 
 
 if(isset($next_step) && isset($workflow[$next_step]) && !in_array($workflow[$next_step],$exclude_files) && isset($sugar_config['installer_locked']) && $sugar_config['installer_locked'] == true) {
     $the_file = 'installDisabled.php';
-	$disabled_title = $mod_strings['LBL_DISABLED_DESCRIPTION'];
-	$disabled_title_2 = $mod_strings['LBL_DISABLED_TITLE_2'];
-	$disabled_text =<<<EOQ
+    $disabled_title = $mod_strings['LBL_DISABLED_DESCRIPTION'];
+    $disabled_title_2 = $mod_strings['LBL_DISABLED_TITLE_2'];
+    $disabled_text =<<<EOQ
 		<p>{$mod_strings['LBL_DISABLED_DESCRIPTION']}</p>
 		<pre>
 			'installer_locked' => false,
@@ -480,20 +480,20 @@ 
 $validation_errors = array();
 // process the data posted
 if($next_clicked) {
-	// store the submitted data because the 'Next' button was clicked
+    // store the submitted data because the 'Next' button was clicked
     switch($workflow[trim($_REQUEST['current_step'])]) {
         case 'welcome.php':
-        	$_SESSION['language'] = $_REQUEST['language'];
-   			$_SESSION['setup_site_admin_user_name'] = 'admin';
+            $_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
+            // eventually default all vars here, with overrides from config.php
             if(is_readable('config.php')) {
-            	global $sugar_config;
+                global $sugar_config;
                 include_once('config.php');
             }
 
@@ -520,7 +520,7 @@ 
 
         //case 'systemOptions.php':
             if(isset($_REQUEST['setup_db_type'])) {
-              $_SESSION['setup_db_type'] = $_REQUEST['setup_db_type'];
+                $_SESSION['setup_db_type'] = $_REQUEST['setup_db_type'];
             }
             $validation_errors = validate_systemOptions();
             if(count($validation_errors) > 0) {
@@ -598,7 +598,7 @@ 
 if($next_step == 9999) {
     $the_file = 'SilentInstall';
 }else if($next_step == 9191) {
-	$_SESSION['oc_server_url']	= $_REQUEST['oc_server_url'];
+    $_SESSION['oc_server_url']	= $_REQUEST['oc_server_url'];
     $_SESSION['oc_username']    = $_REQUEST['oc_username'];
     $_SESSION['oc_password']   	= $_REQUEST['oc_password'];
     $the_file = 'oc_convert.php';
@@ -611,33 +611,33 @@ 
 switch($the_file) {
     case 'welcome.php':
     case 'license.php':
-			//
-			// Check to see if session variables are working properly
-			//
-			$_SESSION['test_session'] = 'sessions are available';
+            //
+            // Check to see if session variables are working properly
+            //
+            $_SESSION['test_session'] = 'sessions are available';
         @session_write_close();
-			unset($_SESSION['test_session']);
+            unset($_SESSION['test_session']);
         @session_start();
 
-			if(!isset($_SESSION['test_session']))
-			{
+            if(!isset($_SESSION['test_session']))
+            {
                 $the_file = 'installDisabled.php';
-				// PHP.ini location -
-				$phpIniLocation = get_cfg_var("cfg_file_path");
-				$disabled_title = $mod_strings['LBL_SESSION_ERR_TITLE'];
-				$disabled_title_2 = $mod_strings['LBL_SESSION_ERR_TITLE'];
-				$disabled_text = $mod_strings['LBL_SESSION_ERR_DESCRIPTION']."<pre>{$phpIniLocation}</pre>";
+                // PHP.ini location -
+                $phpIniLocation = get_cfg_var("cfg_file_path");
+                $disabled_title = $mod_strings['LBL_SESSION_ERR_TITLE'];
+                $disabled_title_2 = $mod_strings['LBL_SESSION_ERR_TITLE'];
+                $disabled_text = $mod_strings['LBL_SESSION_ERR_DESCRIPTION']."<pre>{$phpIniLocation}</pre>";
             break;
-			}
+            }
         // check to see if installer has been disabled
         if(is_readable('config.php') && (filesize('config.php') > 0)) {
             include_once('config.php');
 
             if(!isset($sugar_config['installer_locked']) || $sugar_config['installer_locked'] == true) {
                 $the_file = 'installDisabled.php';
-				$disabled_title = $mod_strings['LBL_DISABLED_DESCRIPTION'];
-				$disabled_title_2 = $mod_strings['LBL_DISABLED_TITLE_2'];
-				$disabled_text =<<<EOQ
+                $disabled_title = $mod_strings['LBL_DISABLED_DESCRIPTION'];
+                $disabled_title_2 = $mod_strings['LBL_DISABLED_TITLE_2'];
+                $disabled_text =<<<EOQ
 					<p>{$mod_strings['LBL_DISABLED_DESCRIPTION']}</p>
 					<pre>
 						'installer_locked' => false,
@@ -646,12 +646,12 @@ 
 
 					<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>
 EOQ;
-		             //if this is an offline client installation but the conversion did not succeed,
-		            //then try to convert again
-					if(isset($sugar_config['disc_client']) && $sugar_config['disc_client'] == true && isset($sugar_config['oc_converted']) && $sugar_config['oc_converted'] == false) {
-			          header('Location: index.php?entryPoint=oc_convert&first_time=true');
-						exit ();
-		            }
+                        //if this is an offline client installation but the conversion did not succeed,
+                    //then try to convert again
+                    if(isset($sugar_config['disc_client']) && $sugar_config['disc_client'] == true && isset($sugar_config['oc_converted']) && $sugar_config['oc_converted'] == false) {
+                        header('Location: index.php?entryPoint=oc_convert&first_time=true');
+                        exit ();
+                    }
             }
         }
         break;
@@ -736,7 +736,7 @@ 
             }
         }
         break;
-	}
+    }
 }
 
 

include/generic/SugarWidgets/SugarWidgetSubPanelDelegatesSelectButton.php

Indentation +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         global $mod_strings;
         
         $button  = "<form id='ManageDelegatesForm' name='ManageDelegatesForm' method='post' action=''>";
-       // $button .= "<input id='custom_hidden_5' type='hidden' name='custom_hidden_5' value=''/>";
+        // $button .= "<input id='custom_hidden_5' type='hidden' name='custom_hidden_5' value=''/>";
         $button .= "<input id='Manage_Delegates' class='button' type='button' name='Manage_Delegates' onclick='manage_delegates()' value='".$mod_strings['LBL_MANAGE_DELEGATES']."'/>\n</form>";
         return $button;
     }

include/generic/SugarWidgets/SugarWidgetSubPanelEditSecurityGroupUserButton.php

Indentation +26 added lines, -26 removed lines

@@ -43,37 +43,37 @@
 
 class SugarWidgetSubPanelEditSecurityGroupUserButton extends SugarWidgetField
 {
-	function displayHeaderCell(&$layout_def)
-	{
-		return ' ';
-	}
+    function displayHeaderCell(&$layout_def)
+    {
+        return ' ';
+    }
 
-	function displayDetail($layout_def) {
+    function displayDetail($layout_def) {
 
-		return displayList($layout_def);
-	}
+        return displayList($layout_def);
+    }
 
-	function displayList(&$layout_def)
-	{
-		global $app_strings;
-		global $image_path;
+    function displayList(&$layout_def)
+    {
+        global $app_strings;
+        global $image_path;
 
-		$href = 'index.php?module=SecurityGroups'
-			. '&action=' . 'SecurityGroupUserRelationshipEdit'
-			. '&record=' . $layout_def['fields']['SECURITYGROUP_NONINHERIT_ID']
-			. '&return_module=' . $_REQUEST['module']
-			. '&return_action=' . 'DetailView'
-			. '&return_id=' . $_REQUEST['record'];
+        $href = 'index.php?module=SecurityGroups'
+            . '&action=' . 'SecurityGroupUserRelationshipEdit'
+            . '&record=' . $layout_def['fields']['SECURITYGROUP_NONINHERIT_ID']
+            . '&return_module=' . $_REQUEST['module']
+            . '&return_action=' . 'DetailView'
+            . '&return_id=' . $_REQUEST['record'];
 
-		$edit_icon_html = SugarThemeRegistry::current()->getImage( 'edit_inline', 'align="absmiddle" border="0"',null,null,'.gif',$app_strings['LNK_EDIT']);
-		//based on listview since that lets you select records
-		if($layout_def['ListView']){
-			return '<a href="' . $href . '"'
-				. 'class="listViewTdToolsS1">' . $edit_icon_html . '&nbsp;' . $app_strings['LNK_EDIT'] .'</a>&nbsp;';
-		}else{
-			return '';
-		}
-	}
+        $edit_icon_html = SugarThemeRegistry::current()->getImage( 'edit_inline', 'align="absmiddle" border="0"',null,null,'.gif',$app_strings['LNK_EDIT']);
+        //based on listview since that lets you select records
+        if($layout_def['ListView']){
+            return '<a href="' . $href . '"'
+                . 'class="listViewTdToolsS1">' . $edit_icon_html . '&nbsp;' . $app_strings['LNK_EDIT'] .'</a>&nbsp;';
+        }else{
+            return '';
+        }
+    }
 
 }
 

include/generic/SugarWidgets/SugarWidgetSubPanelManageAcceptancesButton.php

Indentation +1 added lines, -1 removed lines

@@ -48,7 +48,7 @@
         global $mod_strings;
         
         $button  = "<form id='ManageDelegatesForm' name='ManageDelegatesForm' method='post' action=''>";
-       // $button .= "<input id='custom_hidden_5' type='hidden' name='custom_hidden_5' value=''/>";
+        // $button .= "<input id='custom_hidden_5' type='hidden' name='custom_hidden_5' value=''/>";
         $button .= "<input id='Manage_Delegates' class='button' type='button' name='Manage_Delegates' onclick='manage_delegates()' value='".$mod_strings['LBL_MANAGE_DELEGATES']."'/>\n</form>";
         return $button;
     }

include/Smarty/plugins/function.math.php

Indentation +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
     // match all vars in equation, make sure all are passed
     preg_match_all("!(?:0x[a-fA-F0-9]+)|([a-zA-Z][a-zA-Z0-9_]*)!",$equation, $match);
     $allowed_funcs = array('int','abs','ceil','cos','exp','floor','log','log10',
-                           'max','min','pi','pow','rand','round','sin','sqrt','srand','tan');
+                            'max','min','pi','pow','rand','round','sin','sqrt','srand','tan');
     
     foreach($match[1] as $curr_var) {
         if ($curr_var && !in_array($curr_var, array_keys($params)) && !in_array($curr_var, $allowed_funcs)) {

modules/AOR_Fields/vardefs.php

Indentation +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@ 
  */
 
 $dictionary['AOR_Field'] = array(
-	'table'=>'aor_fields',
-	'audited'=>false,
-	'duplicate_merge'=>true,
-	'fields'=>array (
+    'table'=>'aor_fields',
+    'audited'=>false,
+    'duplicate_merge'=>true,
+    'fields'=>array (
         'aor_report_id' =>
         array (
             'required' => false,
@@ -338,8 +338,8 @@ 
             'fields' => array('aor_report_id'),
         ),
     ),
-	'optimistic_locking'=>true,
-		'unified_search'=>true,
+    'optimistic_locking'=>true,
+        'unified_search'=>true,
 );
 if (!class_exists('VardefManager')){
         require_once('include/SugarObjects/VardefManager.php');

modules/AOR_Reports/metadata/popupdefs.php

Indentation +7 added lines, -7 removed lines

@@ -24,14 +24,14 @@
  */
 
 $popupMeta = array('moduleMain' => 'AOR_Reports',
-						'varName' => 'AOR_Report',
-						'orderBy' => 'aor_reports.name',
-						'whereClauses' => 
-							array('name' => 'aor_reports.name', 
-								),
-						    'searchInputs'=> array('aor_reports_number', 'name', 'priority','status'),
+                        'varName' => 'AOR_Report',
+                        'orderBy' => 'aor_reports.name',
+                        'whereClauses' => 
+                            array('name' => 'aor_reports.name', 
+                                ),
+                            'searchInputs'=> array('aor_reports_number', 'name', 'priority','status'),
 							
-						);
+                        );
 ?>