adamjakab / SuiteCRM

modules/Users/authentication/AuthenticationController.php

Indentation +133 added lines, -133 removed lines

@@ -42,27 +42,27 @@ 
 
 class AuthenticationController
 {
-	public $loggedIn = false; //if a user has attempted to login
-	public $authenticated = false;
-	public $loginSuccess = false;// if a user has successfully logged in
+    public $loggedIn = false; //if a user has attempted to login
+    public $authenticated = false;
+    public $loginSuccess = false;// if a user has successfully logged in
 
-	protected static $authcontrollerinstance = null;
+    protected static $authcontrollerinstance = null;
 
     /**
      * @var SugarAuthenticate
      */
     public $authController;
 
-	/**
-	 * Creates an instance of the authentication controller and loads it
-	 *
-	 * @param STRING $type - the authentication Controller
-	 * @return AuthenticationController -
-	 */
-	public function __construct($type = null)
-	{
+    /**
+     * Creates an instance of the authentication controller and loads it
+     *
+     * @param STRING $type - the authentication Controller
+     * @return AuthenticationController -
+     */
+    public function __construct($type = null)
+    {
         $this->authController = $this->getAuthController($type);
-	}
+    }
 
     /**
      * Get auth controller object
@@ -81,7 +81,7 @@ 
         }
 
         // check in custom dir first, in case someone want's to override an auth controller
-		if (file_exists('custom/modules/Users/authentication/'.$type.'/' . $type . '.php')) {
+        if (file_exists('custom/modules/Users/authentication/'.$type.'/' . $type . '.php')) {
             require_once('custom/modules/Users/authentication/'.$type.'/' . $type . '.php');
         } elseif (file_exists('modules/Users/authentication/'.$type.'/' . $type . '.php')) {
             require_once('modules/Users/authentication/'.$type.'/' . $type . '.php');
@@ -98,123 +98,123 @@ 
         return new $type();
     }
 
-	/**
-	 * Returns an instance of the authentication controller
-	 *
-	 * @param string $type this is the type of authetnication you want to use default is SugarAuthenticate
-	 * @return an instance of the authetnciation controller
-	 */
-	public static function getInstance($type = null)
-	{
-		if (empty(self::$authcontrollerinstance)) {
-			self::$authcontrollerinstance = new AuthenticationController($type);
-		}
-
-		return self::$authcontrollerinstance;
-	}
-
-	/**
-	 * This function is called when a user initially tries to login.
-	 *
-	 * @param string $username
-	 * @param string $password
-	 * @param array $PARAMS
-	 * @return boolean true if the user successfully logs in or false otherwise.
-	 */
-	public function login($username, $password, $PARAMS = array())
-	{
-		//kbrill bug #13225
-		$_SESSION['loginAttempts'] = (isset($_SESSION['loginAttempts']))? $_SESSION['loginAttempts'] + 1: 1;
-		unset($GLOBALS['login_error']);
-
-		if($this->loggedIn)return $this->loginSuccess;
-		LogicHook::initialize()->call_custom_logic('Users', 'before_login');
-
-		$this->loginSuccess = $this->authController->loginAuthenticate($username, $password, false, $PARAMS);
-		$this->loggedIn = true;
-
-		if($this->loginSuccess){
-			//Ensure the user is authorized
-			checkAuthUserStatus();
-
-			//loginLicense();
-			if(!empty($GLOBALS['login_error'])){
-				unset($_SESSION['authenticated_user_id']);
-				$GLOBALS['log']->fatal('FAILED LOGIN: potential hack attempt:'.$GLOBALS['login_error']);
-				$this->loginSuccess = false;
-				return false;
-			}
-
-			//call business logic hook
-			if(isset($GLOBALS['current_user']))
-				$GLOBALS['current_user']->call_custom_logic('after_login');
-
-			// Check for running Admin Wizard
-			$config = new Administration();
-			$config->retrieveSettings();
-		    if ( is_admin($GLOBALS['current_user']) && empty($config->settings['system_adminwizard']) && $_REQUEST['action'] != 'AdminWizard' ) {
-				$GLOBALS['module'] = 'Configurator';
-				$GLOBALS['action'] = 'AdminWizard';
-				ob_clean();
-				header("Location: index.php?module=Configurator&action=AdminWizard");
-				sugar_cleanup(true);
-			}
-
-			$ut = $GLOBALS['current_user']->getPreference('ut');
-			$checkTimeZone = true;
-			if (is_array($PARAMS) && !empty($PARAMS) && isset($PARAMS['passwordEncrypted'])) {
-				$checkTimeZone = false;
-			} // if
-			if(empty($ut) && $checkTimeZone && $_REQUEST['action'] != 'SetTimezone' && $_REQUEST['action'] != 'SaveTimezone' ) {
-				$GLOBALS['module'] = 'Users';
-				$GLOBALS['action'] = 'Wizard';
-				ob_clean();
-				header("Location: index.php?module=Users&action=Wizard");
-				sugar_cleanup(true);
-			}
-		}else{
-			//kbrill bug #13225
-			LogicHook::initialize();
-			$GLOBALS['logic_hook']->call_custom_logic('Users', 'login_failed');
-			$GLOBALS['log']->fatal('FAILED LOGIN:attempts[' .$_SESSION['loginAttempts'] .'] - '. $username);
-		}
-		// if password has expired, set a session variable
-
-		return $this->loginSuccess;
-	}
-
-	/**
-	 * This is called on every page hit.
-	 * It returns true if the current session is authenticated or false otherwise
-	 *
-	 * @return booelan
-	 */
-	public function sessionAuthenticate()
-	{
-		if(!$this->authenticated){
-			$this->authenticated = $this->authController->sessionAuthenticate();
-		}
-		if($this->authenticated){
-			if(!isset($_SESSION['userStats']['pages'])){
-			    $_SESSION['userStats']['loginTime'] = time();
-			    $_SESSION['userStats']['pages'] = 0;
-			}
-			$_SESSION['userStats']['lastTime'] = time();
-			$_SESSION['userStats']['pages']++;
-
-		}
-		return $this->authenticated;
-	}
-
-	/**
-	 * Called when a user requests to logout. Should invalidate the session and redirect
-	 * to the login page.
-	 */
-	public function logout()
-	{
-		$GLOBALS['current_user']->call_custom_logic('before_logout');
-		$this->authController->logout();
-		LogicHook::initialize();
-		$GLOBALS['logic_hook']->call_custom_logic('Users', 'after_logout');
-	}
+    /**
+     * Returns an instance of the authentication controller
+     *
+     * @param string $type this is the type of authetnication you want to use default is SugarAuthenticate
+     * @return an instance of the authetnciation controller
+     */
+    public static function getInstance($type = null)
+    {
+        if (empty(self::$authcontrollerinstance)) {
+            self::$authcontrollerinstance = new AuthenticationController($type);
+        }
+
+        return self::$authcontrollerinstance;
+    }
+
+    /**
+     * This function is called when a user initially tries to login.
+     *
+     * @param string $username
+     * @param string $password
+     * @param array $PARAMS
+     * @return boolean true if the user successfully logs in or false otherwise.
+     */
+    public function login($username, $password, $PARAMS = array())
+    {
+        //kbrill bug #13225
+        $_SESSION['loginAttempts'] = (isset($_SESSION['loginAttempts']))? $_SESSION['loginAttempts'] + 1: 1;
+        unset($GLOBALS['login_error']);
+
+        if($this->loggedIn)return $this->loginSuccess;
+        LogicHook::initialize()->call_custom_logic('Users', 'before_login');
+
+        $this->loginSuccess = $this->authController->loginAuthenticate($username, $password, false, $PARAMS);
+        $this->loggedIn = true;
+
+        if($this->loginSuccess){
+            //Ensure the user is authorized
+            checkAuthUserStatus();
+
+            //loginLicense();
+            if(!empty($GLOBALS['login_error'])){
+                unset($_SESSION['authenticated_user_id']);
+                $GLOBALS['log']->fatal('FAILED LOGIN: potential hack attempt:'.$GLOBALS['login_error']);
+                $this->loginSuccess = false;
+                return false;
+            }
+
+            //call business logic hook
+            if(isset($GLOBALS['current_user']))
+                $GLOBALS['current_user']->call_custom_logic('after_login');
+
+            // Check for running Admin Wizard
+            $config = new Administration();
+            $config->retrieveSettings();
+            if ( is_admin($GLOBALS['current_user']) && empty($config->settings['system_adminwizard']) && $_REQUEST['action'] != 'AdminWizard' ) {
+                $GLOBALS['module'] = 'Configurator';
+                $GLOBALS['action'] = 'AdminWizard';
+                ob_clean();
+                header("Location: index.php?module=Configurator&action=AdminWizard");
+                sugar_cleanup(true);
+            }
+
+            $ut = $GLOBALS['current_user']->getPreference('ut');
+            $checkTimeZone = true;
+            if (is_array($PARAMS) && !empty($PARAMS) && isset($PARAMS['passwordEncrypted'])) {
+                $checkTimeZone = false;
+            } // if
+            if(empty($ut) && $checkTimeZone && $_REQUEST['action'] != 'SetTimezone' && $_REQUEST['action'] != 'SaveTimezone' ) {
+                $GLOBALS['module'] = 'Users';
+                $GLOBALS['action'] = 'Wizard';
+                ob_clean();
+                header("Location: index.php?module=Users&action=Wizard");
+                sugar_cleanup(true);
+            }
+        }else{
+            //kbrill bug #13225
+            LogicHook::initialize();
+            $GLOBALS['logic_hook']->call_custom_logic('Users', 'login_failed');
+            $GLOBALS['log']->fatal('FAILED LOGIN:attempts[' .$_SESSION['loginAttempts'] .'] - '. $username);
+        }
+        // if password has expired, set a session variable
+
+        return $this->loginSuccess;
+    }
+
+    /**
+     * This is called on every page hit.
+     * It returns true if the current session is authenticated or false otherwise
+     *
+     * @return booelan
+     */
+    public function sessionAuthenticate()
+    {
+        if(!$this->authenticated){
+            $this->authenticated = $this->authController->sessionAuthenticate();
+        }
+        if($this->authenticated){
+            if(!isset($_SESSION['userStats']['pages'])){
+                $_SESSION['userStats']['loginTime'] = time();
+                $_SESSION['userStats']['pages'] = 0;
+            }
+            $_SESSION['userStats']['lastTime'] = time();
+            $_SESSION['userStats']['pages']++;
+
+        }
+        return $this->authenticated;
+    }
+
+    /**
+     * Called when a user requests to logout. Should invalidate the session and redirect
+     * to the login page.
+     */
+    public function logout()
+    {
+        $GLOBALS['current_user']->call_custom_logic('before_logout');
+        $this->authController->logout();
+        LogicHook::initialize();
+        $GLOBALS['logic_hook']->call_custom_logic('Users', 'after_logout');
+    }
 }

modules/Users/authentication/SugarAuthenticate/SugarAuthenticateUser.php

Indentation +79 added lines, -79 removed lines

@@ -47,91 +47,91 @@
  */
 class SugarAuthenticateUser{
 
-	/**
-	 * Does the actual authentication of the user and returns an id that will be used
-	 * to load the current user (loadUserOnSession)
-	 *
-	 * @param STRING $name
-	 * @param STRING $password
-	 * @param STRING $fallback - is this authentication a fallback from a failed authentication
-	 * @return STRING id - used for loading the user
-	 */
-	function authenticateUser($name, $password, $fallback=false)
-	{
-	    $row = User::findUserPassword($name, $password, "(portal_only IS NULL OR portal_only !='1') AND (is_group IS NULL OR is_group !='1') AND status !='Inactive'");
+    /**
+     * Does the actual authentication of the user and returns an id that will be used
+     * to load the current user (loadUserOnSession)
+     *
+     * @param STRING $name
+     * @param STRING $password
+     * @param STRING $fallback - is this authentication a fallback from a failed authentication
+     * @return STRING id - used for loading the user
+     */
+    function authenticateUser($name, $password, $fallback=false)
+    {
+        $row = User::findUserPassword($name, $password, "(portal_only IS NULL OR portal_only !='1') AND (is_group IS NULL OR is_group !='1') AND status !='Inactive'");
     
-	    // set the ID in the seed user.  This can be used for retrieving the full user record later
-		//if it's falling back on Sugar Authentication after the login failed on an external authentication return empty if the user has external_auth_disabled for them
-		if (empty ($row) || !empty($row['external_auth_only'])) {
-			return '';
-		} else {
-			return $row['id'];
-		}
-	}
-	/**
-	 * Checks if a user is a sugarLogin user
-	 * which implies they should use the sugar authentication to login
-	 *
-	 * @param STRING $name
-	 * @param STRIUNG $password
-	 * @return boolean
-	 */
-	function isSugarLogin($name, $password)
-	{
-	    $row = User::findUserPassword($name, $password, "(portal_only IS NULL OR portal_only !='1') AND (is_group IS NULL OR is_group !='1') AND status !='Inactive' AND sugar_login=1");
-	    return !empty($row);
-	}
+        // set the ID in the seed user.  This can be used for retrieving the full user record later
+        //if it's falling back on Sugar Authentication after the login failed on an external authentication return empty if the user has external_auth_disabled for them
+        if (empty ($row) || !empty($row['external_auth_only'])) {
+            return '';
+        } else {
+            return $row['id'];
+        }
+    }
+    /**
+     * Checks if a user is a sugarLogin user
+     * which implies they should use the sugar authentication to login
+     *
+     * @param STRING $name
+     * @param STRIUNG $password
+     * @return boolean
+     */
+    function isSugarLogin($name, $password)
+    {
+        $row = User::findUserPassword($name, $password, "(portal_only IS NULL OR portal_only !='1') AND (is_group IS NULL OR is_group !='1') AND status !='Inactive' AND sugar_login=1");
+        return !empty($row);
+    }
 
-	/**
-	 * this is called when a user logs in
-	 *
-	 * @param STRING $name
-	 * @param STRING $password
-	 * @param STRING $fallback - is this authentication a fallback from a failed authentication
-	 * @return boolean
-	 */
-	function loadUserOnLogin($name, $password, $fallback = false, $PARAMS = array()) {
-		global $login_error;
+    /**
+     * this is called when a user logs in
+     *
+     * @param STRING $name
+     * @param STRING $password
+     * @param STRING $fallback - is this authentication a fallback from a failed authentication
+     * @return boolean
+     */
+    function loadUserOnLogin($name, $password, $fallback = false, $PARAMS = array()) {
+        global $login_error;
 
-		$GLOBALS['log']->debug("Starting user load for ". $name);
-		if(empty($name) || empty($password)) return false;
-		$input_hash = $password;
-		$passwordEncrypted = false;
-		if (!empty($PARAMS) && isset($PARAMS['passwordEncrypted']) && $PARAMS['passwordEncrypted']) {
-			$passwordEncrypted = true;
-		}// if
-		if (!$passwordEncrypted) {
-			$input_hash = SugarAuthenticate::encodePassword($password);
-		} // if
-		$user_id = $this->authenticateUser($name, $input_hash, $fallback);
-		if(empty($user_id)) {
-			$GLOBALS['log']->fatal('SECURITY: User authentication for '.$name.' failed');
-			return false;
-		}
-		$this->loadUserOnSession($user_id);
-		return true;
-	}
-	/**
-	 * Loads the current user bassed on the given user_id
-	 *
-	 * @param STRING $user_id
-	 * @return boolean
-	 */
-	function loadUserOnSession($user_id=''){
-		if(!empty($user_id)){
-			$_SESSION['authenticated_user_id'] = $user_id;
-		}
+        $GLOBALS['log']->debug("Starting user load for ". $name);
+        if(empty($name) || empty($password)) return false;
+        $input_hash = $password;
+        $passwordEncrypted = false;
+        if (!empty($PARAMS) && isset($PARAMS['passwordEncrypted']) && $PARAMS['passwordEncrypted']) {
+            $passwordEncrypted = true;
+        }// if
+        if (!$passwordEncrypted) {
+            $input_hash = SugarAuthenticate::encodePassword($password);
+        } // if
+        $user_id = $this->authenticateUser($name, $input_hash, $fallback);
+        if(empty($user_id)) {
+            $GLOBALS['log']->fatal('SECURITY: User authentication for '.$name.' failed');
+            return false;
+        }
+        $this->loadUserOnSession($user_id);
+        return true;
+    }
+    /**
+     * Loads the current user bassed on the given user_id
+     *
+     * @param STRING $user_id
+     * @return boolean
+     */
+    function loadUserOnSession($user_id=''){
+        if(!empty($user_id)){
+            $_SESSION['authenticated_user_id'] = $user_id;
+        }
 
-		if(!empty($_SESSION['authenticated_user_id']) || !empty($user_id)){
-			$GLOBALS['current_user'] = new User();
-			if($GLOBALS['current_user']->retrieve($_SESSION['authenticated_user_id'])){
+        if(!empty($_SESSION['authenticated_user_id']) || !empty($user_id)){
+            $GLOBALS['current_user'] = new User();
+            if($GLOBALS['current_user']->retrieve($_SESSION['authenticated_user_id'])){
 
-				return true;
-			}
-		}
-		return false;
+                return true;
+            }
+        }
+        return false;
 
-	}
+    }
 
 }
 

modules/Users/Save.php

Indentation +254 added lines, -254 removed lines

@@ -57,7 +57,7 @@ 
 
 
 if (isset($_POST['id']))
-	sugar_die("Unauthorized access to administration.");
+    sugar_die("Unauthorized access to administration.");
 if (isset($_POST['record']) && !is_admin($current_user)
      && !$GLOBALS['current_user']->isAdminForModule('Users')
      && $_POST['record'] != $current_user->id)
@@ -115,39 +115,39 @@ 
     }
 
 
-	$portal=array("user_name","last_name","status","portal_only");
-	$group=array("user_name","last_name","status","is_group");
-	if(isset($_POST['portal_only']) && ($_POST['portal_only']=='1' || $focus->portal_only)){
-		foreach($portal as $field){
-			if(isset($_POST[$field]))
-			{
-				$value = $_POST[$field];
-				$focus->$field = $value;
+    $portal=array("user_name","last_name","status","portal_only");
+    $group=array("user_name","last_name","status","is_group");
+    if(isset($_POST['portal_only']) && ($_POST['portal_only']=='1' || $focus->portal_only)){
+        foreach($portal as $field){
+            if(isset($_POST[$field]))
+            {
+                $value = $_POST[$field];
+                $focus->$field = $value;
 
-			}
-		}
-	}
+            }
+        }
+    }
 
-	if(isset($_POST['is_group']) && ($_POST['is_group']=='1' || $focus->is_group)){
-		foreach($group as $field){
-			if(isset($_POST[$field]))
-			{
-				$value = $_POST[$field];
-				$focus->$field = $value;
+    if(isset($_POST['is_group']) && ($_POST['is_group']=='1' || $focus->is_group)){
+        foreach($group as $field){
+            if(isset($_POST[$field]))
+            {
+                $value = $_POST[$field];
+                $focus->$field = $value;
 
-			}
-		}
-	}
+            }
+        }
+    }
 
 
-	// copy the group or portal user name over.  We renamed the field in order to ensure auto-complete would not change the value
-	if(isset($_POST['user_name']))
-	{
-		$focus->user_name = $_POST['user_name'];
-	}
+    // copy the group or portal user name over.  We renamed the field in order to ensure auto-complete would not change the value
+    if(isset($_POST['user_name']))
+    {
+        $focus->user_name = $_POST['user_name'];
+    }
 
-	// if the user saved is a Regular User
-	if(!$focus->is_group && !$focus->portal_only){
+    // if the user saved is a Regular User
+    if(!$focus->is_group && !$focus->portal_only){
 
         foreach ($focus->column_fields as $fieldName)
         {
@@ -178,63 +178,63 @@ 
             }
         }
 
-		$focus->is_group=0;
-		$focus->portal_only=0;
+        $focus->is_group=0;
+        $focus->portal_only=0;
 
-     		if(isset($_POST['status']) && $_POST['status']== "Inactive") $focus->employee_status = "Terminated"; //bug49972
+                if(isset($_POST['status']) && $_POST['status']== "Inactive") $focus->employee_status = "Terminated"; //bug49972
 
-			if(isset($_POST['user_name']))
-		{
-			$focus->user_name = $_POST['user_name'];
-		}
-		if((isset($_POST['is_admin']) && ($_POST['is_admin'] == 'on' || $_POST['is_admin'] == '1')) ||
+            if(isset($_POST['user_name']))
+        {
+            $focus->user_name = $_POST['user_name'];
+        }
+        if((isset($_POST['is_admin']) && ($_POST['is_admin'] == 'on' || $_POST['is_admin'] == '1')) ||
            (isset($_POST['UserType']) && $_POST['UserType'] == "Administrator")) $focus->is_admin = 1;
-		elseif(isset($_POST['is_admin']) && empty($_POST['is_admin'])) $focus->is_admin = 0;
-		//if(empty($_POST['portal_only']) || !empty($_POST['is_admin'])) $focus->portal_only = 0;
-		//if(empty($_POST['is_group'])    || !empty($_POST['is_admin'])) $focus->is_group = 0;
-		if(empty($_POST['receive_notifications'])) $focus->receive_notifications = 0;
-
-		if(isset($_POST['mailmerge_on']) && !empty($_POST['mailmerge_on'])) {
-			$focus->setPreference('mailmerge_on','on', 0, 'global');
-		} else {
-			$focus->setPreference('mailmerge_on','off', 0, 'global');
-		}
-
-	    if(isset($_POST['user_swap_last_viewed']))
-	    {
-	        $focus->setPreference('swap_last_viewed', $_POST['user_swap_last_viewed'], 0, 'global');
-	    }
-	    else
-	    {
-	    	$focus->setPreference('swap_last_viewed', '', 0, 'global');
-	    }
-
-	    if(isset($_POST['user_swap_shortcuts']))
-	    {
-	        $focus->setPreference('swap_shortcuts', $_POST['user_swap_shortcuts'], 0, 'global');
-	    }
-	    else
-	    {
-	        $focus->setPreference('swap_shortcuts', '', 0, 'global');
-	    }
-
-	    if(isset($_POST['use_group_tabs']))
-	    {
-	        $focus->setPreference('navigation_paradigm', $_POST['use_group_tabs'], 0, 'global');
-	    }
-	    else
-	    {
-	        $focus->setPreference('navigation_paradigm', 'gm', 0, 'global');
-	    }
-
-	    if(isset($_POST['user_subpanel_tabs']))
-	    {
-	        $focus->setPreference('subpanel_tabs', $_POST['user_subpanel_tabs'], 0, 'global');
-	    }
-	    else
-	    {
-	        $focus->setPreference('subpanel_tabs', '', 0, 'global');
-	    }
+        elseif(isset($_POST['is_admin']) && empty($_POST['is_admin'])) $focus->is_admin = 0;
+        //if(empty($_POST['portal_only']) || !empty($_POST['is_admin'])) $focus->portal_only = 0;
+        //if(empty($_POST['is_group'])    || !empty($_POST['is_admin'])) $focus->is_group = 0;
+        if(empty($_POST['receive_notifications'])) $focus->receive_notifications = 0;
+
+        if(isset($_POST['mailmerge_on']) && !empty($_POST['mailmerge_on'])) {
+            $focus->setPreference('mailmerge_on','on', 0, 'global');
+        } else {
+            $focus->setPreference('mailmerge_on','off', 0, 'global');
+        }
+
+        if(isset($_POST['user_swap_last_viewed']))
+        {
+            $focus->setPreference('swap_last_viewed', $_POST['user_swap_last_viewed'], 0, 'global');
+        }
+        else
+        {
+            $focus->setPreference('swap_last_viewed', '', 0, 'global');
+        }
+
+        if(isset($_POST['user_swap_shortcuts']))
+        {
+            $focus->setPreference('swap_shortcuts', $_POST['user_swap_shortcuts'], 0, 'global');
+        }
+        else
+        {
+            $focus->setPreference('swap_shortcuts', '', 0, 'global');
+        }
+
+        if(isset($_POST['use_group_tabs']))
+        {
+            $focus->setPreference('navigation_paradigm', $_POST['use_group_tabs'], 0, 'global');
+        }
+        else
+        {
+            $focus->setPreference('navigation_paradigm', 'gm', 0, 'global');
+        }
+
+        if(isset($_POST['user_subpanel_tabs']))
+        {
+            $focus->setPreference('subpanel_tabs', $_POST['user_subpanel_tabs'], 0, 'global');
+        }
+        else
+        {
+            $focus->setPreference('subpanel_tabs', '', 0, 'global');
+        }
 
         if(isset($_POST['user_theme']))
         {
@@ -243,37 +243,37 @@ 
         }
 
         if(isset($_POST['user_module_favicon']))
-	    {
-	        $focus->setPreference('module_favicon', $_POST['user_module_favicon'], 0, 'global');
-	    }
-	    else
-	    {
-	        $focus->setPreference('module_favicon', '', 0, 'global');
-	    }
-
-		$tabs = new TabController();
-		if(isset($_POST['display_tabs']))
-			$tabs->set_user_tabs($DISPLAY_ARR['display_tabs'], $focus, 'display');
-		if(isset($HIDE_ARR['hide_tabs'])){
-			$tabs->set_user_tabs($HIDE_ARR['hide_tabs'], $focus, 'hide');
-
-		}else{
-			$tabs->set_user_tabs(array(), $focus, 'hide');
-		}
-		if(is_admin($current_user)){
-			if(isset($REMOVE_ARR['remove_tabs'])){
-				$tabs->set_user_tabs($REMOVE_ARR['remove_tabs'], $focus, 'remove');
-			}else{
-				$tabs->set_user_tabs(array(), $focus, 'remove');
-			}
-		}
-
-	    if(isset($_POST['no_opps'])) {
-	        $focus->setPreference('no_opps',$_POST['no_opps'], 0, 'global');
-	    }
-	    else {
-	        $focus->setPreference('no_opps','off', 0, 'global');
-	    }
+        {
+            $focus->setPreference('module_favicon', $_POST['user_module_favicon'], 0, 'global');
+        }
+        else
+        {
+            $focus->setPreference('module_favicon', '', 0, 'global');
+        }
+
+        $tabs = new TabController();
+        if(isset($_POST['display_tabs']))
+            $tabs->set_user_tabs($DISPLAY_ARR['display_tabs'], $focus, 'display');
+        if(isset($HIDE_ARR['hide_tabs'])){
+            $tabs->set_user_tabs($HIDE_ARR['hide_tabs'], $focus, 'hide');
+
+        }else{
+            $tabs->set_user_tabs(array(), $focus, 'hide');
+        }
+        if(is_admin($current_user)){
+            if(isset($REMOVE_ARR['remove_tabs'])){
+                $tabs->set_user_tabs($REMOVE_ARR['remove_tabs'], $focus, 'remove');
+            }else{
+                $tabs->set_user_tabs(array(), $focus, 'remove');
+            }
+        }
+
+        if(isset($_POST['no_opps'])) {
+            $focus->setPreference('no_opps',$_POST['no_opps'], 0, 'global');
+        }
+        else {
+            $focus->setPreference('no_opps','off', 0, 'global');
+        }
 
 //		if(isset($_POST['reminder_checked']) && $_POST['reminder_checked'] == '1' && isset($_POST['reminder_checked'])){
 //			$focus->setPreference('reminder_time', $_POST['reminder_time'], 0, 'global');
@@ -289,129 +289,129 @@ 
 //			$focus->setPreference('email_reminder_time', -1, 0, 'global');
 //		}
 		
-		$focus->setPreference('reminder_time', $_POST['reminder_time'], 0, 'global');
-		$focus->setPreference('email_reminder_time', $_POST['email_reminder_time'], 0, 'global');
-		$focus->setPreference('reminder_checked', $_POST['reminder_checked'], 0, 'global');
-		$focus->setPreference('email_reminder_checked', $_POST['email_reminder_checked'], 0, 'global');
+        $focus->setPreference('reminder_time', $_POST['reminder_time'], 0, 'global');
+        $focus->setPreference('email_reminder_time', $_POST['email_reminder_time'], 0, 'global');
+        $focus->setPreference('reminder_checked', $_POST['reminder_checked'], 0, 'global');
+        $focus->setPreference('email_reminder_checked', $_POST['email_reminder_checked'], 0, 'global');
 		
-		if(isset($_POST['timezone'])) $focus->setPreference('timezone',$_POST['timezone'], 0, 'global');
-		if(isset($_POST['ut'])) $focus->setPreference('ut', '0', 0, 'global');
-		else $focus->setPreference('ut', '1', 0, 'global');
-		if(isset($_POST['currency'])) $focus->setPreference('currency',$_POST['currency'], 0, 'global');
-		if(isset($_POST['default_currency_significant_digits'])) $focus->setPreference('default_currency_significant_digits',$_POST['default_currency_significant_digits'], 0, 'global');
-		if(isset($_POST['num_grp_sep'])) $focus->setPreference('num_grp_sep', $_POST['num_grp_sep'], 0, 'global');
-		if(isset($_POST['dec_sep'])) $focus->setPreference('dec_sep', $_POST['dec_sep'], 0, 'global');
+        if(isset($_POST['timezone'])) $focus->setPreference('timezone',$_POST['timezone'], 0, 'global');
+        if(isset($_POST['ut'])) $focus->setPreference('ut', '0', 0, 'global');
+        else $focus->setPreference('ut', '1', 0, 'global');
+        if(isset($_POST['currency'])) $focus->setPreference('currency',$_POST['currency'], 0, 'global');
+        if(isset($_POST['default_currency_significant_digits'])) $focus->setPreference('default_currency_significant_digits',$_POST['default_currency_significant_digits'], 0, 'global');
+        if(isset($_POST['num_grp_sep'])) $focus->setPreference('num_grp_sep', $_POST['num_grp_sep'], 0, 'global');
+        if(isset($_POST['dec_sep'])) $focus->setPreference('dec_sep', $_POST['dec_sep'], 0, 'global');
                 if(isset($_POST['fdow'])) $focus->setPreference('fdow', $_POST['fdow'], 0, 'global');
-		if(isset($_POST['dateformat'])) $focus->setPreference('datef',$_POST['dateformat'], 0, 'global');
-		if(isset($_POST['timeformat'])) $focus->setPreference('timef',$_POST['timeformat'], 0, 'global');
-		if(isset($_POST['timezone'])) $focus->setPreference('timezone',$_POST['timezone'], 0, 'global');
-		if(isset($_POST['mail_fromname'])) $focus->setPreference('mail_fromname',$_POST['mail_fromname'], 0, 'global');
-		if(isset($_POST['mail_fromaddress'])) $focus->setPreference('mail_fromaddress',$_POST['mail_fromaddress'], 0, 'global');
-		if(isset($_POST['mail_sendtype'])) $focus->setPreference('mail_sendtype', $_POST['mail_sendtype'], 0, 'global');
-		if(isset($_POST['mail_smtpserver'])) $focus->setPreference('mail_smtpserver',$_POST['mail_smtpserver'], 0, 'global');
-		if(isset($_POST['mail_smtpport'])) $focus->setPreference('mail_smtpport',$_POST['mail_smtpport'], 0, 'global');
-		if(isset($_POST['mail_smtpuser'])) $focus->setPreference('mail_smtpuser',$_POST['mail_smtpuser'], 0, 'global');
-		if(isset($_POST['mail_smtppass'])) $focus->setPreference('mail_smtppass',$_POST['mail_smtppass'], 0, 'global');
-		if(isset($_POST['default_locale_name_format'])) $focus->setPreference('default_locale_name_format',$_POST['default_locale_name_format'], 0, 'global');
-		if(isset($_POST['export_delimiter'])) $focus->setPreference('export_delimiter', $_POST['export_delimiter'], 0, 'global');
-		if(isset($_POST['default_export_charset'])) $focus->setPreference('default_export_charset', $_POST['default_export_charset'], 0, 'global');
-		if(isset($_POST['use_real_names'])) {
-			$focus->setPreference('use_real_names', 'on', 0, 'global');
-		} elseif(!isset($_POST['use_real_names']) && !isset($_POST['from_dcmenu'])) {
-			// Make sure we're on the full form and not the QuickCreate.
-			$focus->setPreference('use_real_names', 'off', 0, 'global');
-		}
-
-		if(isset($_POST['mail_smtpauth_req'])) {
-			$focus->setPreference('mail_smtpauth_req',$_POST['mail_smtpauth_req'] , 0, 'global');
-		} else {
-			$focus->setPreference('mail_smtpauth_req','', 0, 'global');
-		}
-
-		// SSL-enabled SMTP connection
-		if(isset($_POST['mail_smtpssl'])) {
-			$focus->setPreference('mail_smtpssl', 1, 0, 'global');
-		} else {
-			$focus->setPreference('mail_smtpssl', 0, 0, 'global');
-		}
-	    ///////////////////////////////////////////////////////////////////////////
-	    ////    PDF SETTINGS
-	    foreach($_POST as $k=>$v){
-	        if(strpos($k,"sugarpdf_pdf") !== false){
-	            $focus->setPreference($k, $v, 0, 'global');
-	        }
-	    }
-	    ////    PDF SETTINGS
-		///////////////////////////////////////////////////////////////////////////
-
-		///////////////////////////////////////////////////////////////////////////
-		////	SIGNATURES
-		if(isset($_POST['signature_id']))
-			$focus->setPreference('signature_default', $_POST['signature_id'], 0, 'global');
-
-		if(isset($_POST['signature_prepend'])) $focus->setPreference('signature_prepend',$_POST['signature_prepend'], 0, 'global');
-		////	END SIGNATURES
-		///////////////////////////////////////////////////////////////////////////
-
-
-		 if(isset($_POST['email_link_type'])) $focus->setPreference('email_link_type', $_REQUEST['email_link_type']);
-		if(isset($_REQUEST['email_show_counts'])) {
-			$focus->setPreference('email_show_counts', $_REQUEST['email_show_counts'], 0, 'global');
-		} else {
-			$focus->setPreference('email_show_counts', 0, 0, 'global');
-		}
-		if(isset($_REQUEST['email_editor_option']))
-			$focus->setPreference('email_editor_option', $_REQUEST['email_editor_option'], 0, 'global');
-		if(isset($_REQUEST['default_email_charset']))
-			$focus->setPreference('default_email_charset', $_REQUEST['default_email_charset'], 0, 'global');
-
-		if(isset($_POST['calendar_publish_key'])) $focus->setPreference('calendar_publish_key',$_POST['calendar_publish_key'], 0, 'global');
-	}
-
-	if (!$focus->verify_data())
-	{
-		header("Location: index.php?action=Error&module=Users&error_string=".urlencode($focus->error_string));
-		exit;
-	}
-	else
-	{	$GLOBALS['sugar_config']['disable_team_access_check'] = true;
-		$focus->save();
-		$GLOBALS['sugar_config']['disable_team_access_check'] = false;
-		$return_id = $focus->id;
-		$ieVerified = true;
-
-		global $new_pwd;
-		$new_pwd='';
-		if((isset($_POST['old_password']) || $focus->portal_only) &&
-			(isset($_POST['new_password']) && !empty($_POST['new_password'])) &&
-			(isset($_POST['password_change']) && $_POST['password_change'] == 'true') ) {
-			if (!$focus->change_password($_POST['old_password'], $_POST['new_password'])) {
-			   if((isset($_POST['page']) && $_POST['page'] == 'EditView')){
-			       header("Location: index.php?action=EditView&module=Users&record=".$_POST['record']."&error_password=".urlencode($focus->error_string));
-			       exit;
-			   }
-			   if((isset($_POST['page']) && $_POST['page'] == 'Change')){
-			       header("Location: index.php?action=ChangePassword&module=Users&record=".$_POST['record']."&error_password=".urlencode($focus->error_string));
-			       exit;
-			   }
-		   }
-		   else{
-		   		if ($newUser)
-		   			$new_pwd='3';
-		   		else
-		   			$new_pwd='1';
-		   }
-		}
-
-		///////////////////////////////////////////////////////////////////////////
-		////	OUTBOUND EMAIL SAVES
-		///////////////////////////////////////////////////////////////////////////
-
-		$sysOutboundAccunt = new OutboundEmail();
-
-		//If a user is not alloweed to use the default system outbound account then they will be
-		//saving their own username/password for the system account
-		if( ! $sysOutboundAccunt->isAllowUserAccessToSystemDefaultOutbound() )
+        if(isset($_POST['dateformat'])) $focus->setPreference('datef',$_POST['dateformat'], 0, 'global');
+        if(isset($_POST['timeformat'])) $focus->setPreference('timef',$_POST['timeformat'], 0, 'global');
+        if(isset($_POST['timezone'])) $focus->setPreference('timezone',$_POST['timezone'], 0, 'global');
+        if(isset($_POST['mail_fromname'])) $focus->setPreference('mail_fromname',$_POST['mail_fromname'], 0, 'global');
+        if(isset($_POST['mail_fromaddress'])) $focus->setPreference('mail_fromaddress',$_POST['mail_fromaddress'], 0, 'global');
+        if(isset($_POST['mail_sendtype'])) $focus->setPreference('mail_sendtype', $_POST['mail_sendtype'], 0, 'global');
+        if(isset($_POST['mail_smtpserver'])) $focus->setPreference('mail_smtpserver',$_POST['mail_smtpserver'], 0, 'global');
+        if(isset($_POST['mail_smtpport'])) $focus->setPreference('mail_smtpport',$_POST['mail_smtpport'], 0, 'global');
+        if(isset($_POST['mail_smtpuser'])) $focus->setPreference('mail_smtpuser',$_POST['mail_smtpuser'], 0, 'global');
+        if(isset($_POST['mail_smtppass'])) $focus->setPreference('mail_smtppass',$_POST['mail_smtppass'], 0, 'global');
+        if(isset($_POST['default_locale_name_format'])) $focus->setPreference('default_locale_name_format',$_POST['default_locale_name_format'], 0, 'global');
+        if(isset($_POST['export_delimiter'])) $focus->setPreference('export_delimiter', $_POST['export_delimiter'], 0, 'global');
+        if(isset($_POST['default_export_charset'])) $focus->setPreference('default_export_charset', $_POST['default_export_charset'], 0, 'global');
+        if(isset($_POST['use_real_names'])) {
+            $focus->setPreference('use_real_names', 'on', 0, 'global');
+        } elseif(!isset($_POST['use_real_names']) && !isset($_POST['from_dcmenu'])) {
+            // Make sure we're on the full form and not the QuickCreate.
+            $focus->setPreference('use_real_names', 'off', 0, 'global');
+        }
+
+        if(isset($_POST['mail_smtpauth_req'])) {
+            $focus->setPreference('mail_smtpauth_req',$_POST['mail_smtpauth_req'] , 0, 'global');
+        } else {
+            $focus->setPreference('mail_smtpauth_req','', 0, 'global');
+        }
+
+        // SSL-enabled SMTP connection
+        if(isset($_POST['mail_smtpssl'])) {
+            $focus->setPreference('mail_smtpssl', 1, 0, 'global');
+        } else {
+            $focus->setPreference('mail_smtpssl', 0, 0, 'global');
+        }
+        ///////////////////////////////////////////////////////////////////////////
+        ////    PDF SETTINGS
+        foreach($_POST as $k=>$v){
+            if(strpos($k,"sugarpdf_pdf") !== false){
+                $focus->setPreference($k, $v, 0, 'global');
+            }
+        }
+        ////    PDF SETTINGS
+        ///////////////////////////////////////////////////////////////////////////
+
+        ///////////////////////////////////////////////////////////////////////////
+        ////	SIGNATURES
+        if(isset($_POST['signature_id']))
+            $focus->setPreference('signature_default', $_POST['signature_id'], 0, 'global');
+
+        if(isset($_POST['signature_prepend'])) $focus->setPreference('signature_prepend',$_POST['signature_prepend'], 0, 'global');
+        ////	END SIGNATURES
+        ///////////////////////////////////////////////////////////////////////////
+
+
+            if(isset($_POST['email_link_type'])) $focus->setPreference('email_link_type', $_REQUEST['email_link_type']);
+        if(isset($_REQUEST['email_show_counts'])) {
+            $focus->setPreference('email_show_counts', $_REQUEST['email_show_counts'], 0, 'global');
+        } else {
+            $focus->setPreference('email_show_counts', 0, 0, 'global');
+        }
+        if(isset($_REQUEST['email_editor_option']))
+            $focus->setPreference('email_editor_option', $_REQUEST['email_editor_option'], 0, 'global');
+        if(isset($_REQUEST['default_email_charset']))
+            $focus->setPreference('default_email_charset', $_REQUEST['default_email_charset'], 0, 'global');
+
+        if(isset($_POST['calendar_publish_key'])) $focus->setPreference('calendar_publish_key',$_POST['calendar_publish_key'], 0, 'global');
+    }
+
+    if (!$focus->verify_data())
+    {
+        header("Location: index.php?action=Error&module=Users&error_string=".urlencode($focus->error_string));
+        exit;
+    }
+    else
+    {	$GLOBALS['sugar_config']['disable_team_access_check'] = true;
+        $focus->save();
+        $GLOBALS['sugar_config']['disable_team_access_check'] = false;
+        $return_id = $focus->id;
+        $ieVerified = true;
+
+        global $new_pwd;
+        $new_pwd='';
+        if((isset($_POST['old_password']) || $focus->portal_only) &&
+            (isset($_POST['new_password']) && !empty($_POST['new_password'])) &&
+            (isset($_POST['password_change']) && $_POST['password_change'] == 'true') ) {
+            if (!$focus->change_password($_POST['old_password'], $_POST['new_password'])) {
+                if((isset($_POST['page']) && $_POST['page'] == 'EditView')){
+                    header("Location: index.php?action=EditView&module=Users&record=".$_POST['record']."&error_password=".urlencode($focus->error_string));
+                    exit;
+                }
+                if((isset($_POST['page']) && $_POST['page'] == 'Change')){
+                    header("Location: index.php?action=ChangePassword&module=Users&record=".$_POST['record']."&error_password=".urlencode($focus->error_string));
+                    exit;
+                }
+            }
+            else{
+                    if ($newUser)
+                        $new_pwd='3';
+                    else
+                        $new_pwd='1';
+            }
+        }
+
+        ///////////////////////////////////////////////////////////////////////////
+        ////	OUTBOUND EMAIL SAVES
+        ///////////////////////////////////////////////////////////////////////////
+
+        $sysOutboundAccunt = new OutboundEmail();
+
+        //If a user is not alloweed to use the default system outbound account then they will be
+        //saving their own username/password for the system account
+        if( ! $sysOutboundAccunt->isAllowUserAccessToSystemDefaultOutbound() )
         {
             $userOverrideOE = $sysOutboundAccunt->getUsersMailerForSystemOverride($focus->id);
             if($userOverrideOE != null)
@@ -430,29 +430,29 @@ 
         }
 
 
-		///////////////////////////////////////////////////////////////////////////
-		////	INBOUND EMAIL SAVES
-		if(isset($_REQUEST['server_url']) && !empty($_REQUEST['server_url'])) {
+        ///////////////////////////////////////////////////////////////////////////
+        ////	INBOUND EMAIL SAVES
+        if(isset($_REQUEST['server_url']) && !empty($_REQUEST['server_url'])) {
 
-			$ie = new InboundEmail();
-			if(false === $ie->savePersonalEmailAccount($return_id, $focus->user_name)) {
-				header("Location: index.php?action=Error&module=Users&error_string=&ie_error=true&id=".$return_id);
-				die(); // die here, else the header redirect below takes over.
-			}
-		} elseif(isset($_REQUEST['ie_id']) && !empty($_REQUEST['ie_id']) && empty($_REQUEST['server_url'])) {
-			// user is deleting their I-E
+            $ie = new InboundEmail();
+            if(false === $ie->savePersonalEmailAccount($return_id, $focus->user_name)) {
+                header("Location: index.php?action=Error&module=Users&error_string=&ie_error=true&id=".$return_id);
+                die(); // die here, else the header redirect below takes over.
+            }
+        } elseif(isset($_REQUEST['ie_id']) && !empty($_REQUEST['ie_id']) && empty($_REQUEST['server_url'])) {
+            // user is deleting their I-E
 
-			$ie = new InboundEmail();
-			$ie->deletePersonalEmailAccount($_REQUEST['ie_id'], $focus->user_name);
-		}
-		////	END INBOUND EMAIL SAVES
-		///////////////////////////////////////////////////////////////////////////
-		if(($newUser) && !($focus->is_group) && !($focus->portal_only) && isset($sugar_config['passwordsetting']['SystemGeneratedPasswordON']) && $sugar_config['passwordsetting']['SystemGeneratedPasswordON']){
-			$new_pwd='2';
-			require_once('modules/Users/GeneratePassword.php');
-		}
+            $ie = new InboundEmail();
+            $ie->deletePersonalEmailAccount($_REQUEST['ie_id'], $focus->user_name);
+        }
+        ////	END INBOUND EMAIL SAVES
+        ///////////////////////////////////////////////////////////////////////////
+        if(($newUser) && !($focus->is_group) && !($focus->portal_only) && isset($sugar_config['passwordsetting']['SystemGeneratedPasswordON']) && $sugar_config['passwordsetting']['SystemGeneratedPasswordON']){
+            $new_pwd='2';
+            require_once('modules/Users/GeneratePassword.php');
+        }
 
-	}
+    }
 
 
     //handle navigation from user wizard

modules/Users/UserViewHelper.php

Indentation +15 added lines, -15 removed lines

@@ -218,7 +218,7 @@ 
 
         //if this is an existing bean and the type is empty, then populate user type
         if(!empty($this->bean->id) && empty($this->bean->user_type))
-	    {
+        {
             $this->setUserType($this->bean);
             $userType = $this->bean->user_type;
         } else {
@@ -414,26 +414,26 @@ 
             $this->ss->assign('NO_OPPS', 'CHECKED');
         }
 
-	    $reminder_time = $this->bean->getPreference('reminder_time');
-	    if(empty($reminder_time)){
-		    $reminder_time = -1;
-	    }
-	    $email_reminder_time = $this->bean->getPreference('email_reminder_time');
-	    if(empty($email_reminder_time)){
-		    $email_reminder_time = -1;
-	    }
+        $reminder_time = $this->bean->getPreference('reminder_time');
+        if(empty($reminder_time)){
+            $reminder_time = -1;
+        }
+        $email_reminder_time = $this->bean->getPreference('email_reminder_time');
+        if(empty($email_reminder_time)){
+            $email_reminder_time = -1;
+        }
 		
         $this->ss->assign("REMINDER_TIME_OPTIONS", $app_list_strings['reminder_time_options']);
         $this->ss->assign("EMAIL_REMINDER_TIME_OPTIONS", $app_list_strings['reminder_time_options']);
-	    $this->ss->assign("REMINDER_TIME", $reminder_time);
-	    $this->ss->assign("EMAIL_REMINDER_TIME", $email_reminder_time);
+        $this->ss->assign("REMINDER_TIME", $reminder_time);
+        $this->ss->assign("EMAIL_REMINDER_TIME", $email_reminder_time);
 
         $remindersDefaultPreferences = Reminder::loadRemindersDefaultValuesData();
-		$this->ss->assign("REMINDER_CHECKED", $remindersDefaultPreferences['popup']);
-	    $this->ss->assign("EMAIL_REMINDER_CHECKED", $remindersDefaultPreferences['email']);
+        $this->ss->assign("REMINDER_CHECKED", $remindersDefaultPreferences['popup']);
+        $this->ss->assign("EMAIL_REMINDER_CHECKED", $remindersDefaultPreferences['email']);
 		
-	    $this->ss->assign("REMINDER_TABINDEX", "12");
-	    $publish_key = $this->bean->getPreference('calendar_publish_key' );
+        $this->ss->assign("REMINDER_TABINDEX", "12");
+        $publish_key = $this->bean->getPreference('calendar_publish_key' );
         $this->ss->assign('CALENDAR_PUBLISH_KEY', $publish_key);
 
         $publish_url = $sugar_config['site_url'].'/vcal_server.php';

install/performSetup.php

Indentation +18 added lines, -18 removed lines

@@ -156,9 +156,9 @@ 
 if(strpos($server_software,'Microsoft-IIS') !== false)
 {
     installLog("calling handleWebConfig()");
-	handleWebConfig();
+    handleWebConfig();
 } else {
-	installLog("calling handleHtaccess()");
+    installLog("calling handleHtaccess()");
     handleHtaccess();
 }
 
@@ -228,27 +228,27 @@ 
  * loop through all the Beans and create their tables
  */
 installStatus($mod_strings['STAT_CREATE_DB']);
- installLog("looping through all the Beans and create their tables");
- //start by clearing out the vardefs
- VardefManager::clearVardef();
+    installLog("looping through all the Beans and create their tables");
+    //start by clearing out the vardefs
+    VardefManager::clearVardef();
 installerHook('pre_createAllModuleTables');
 
 
 foreach( $beanFiles as $bean => $file ) {
-	$doNotInit = array('Scheduler', 'SchedulersJob', 'ProjectTask','jjwg_Maps','jjwg_Address_Cache','jjwg_Areas','jjwg_Markers');
+    $doNotInit = array('Scheduler', 'SchedulersJob', 'ProjectTask','jjwg_Maps','jjwg_Address_Cache','jjwg_Areas','jjwg_Markers');
 
-	if(in_array($bean, $doNotInit)) {
-		$focus = new $bean(false);
-	} else {
-	    $focus = new $bean();
-	}
+    if(in_array($bean, $doNotInit)) {
+        $focus = new $bean(false);
+    } else {
+        $focus = new $bean();
+    }
 
-	if ( $bean == 'Configurator' )
-	    continue;
+    if ( $bean == 'Configurator' )
+        continue;
 
     $table_name = $focus->table_name;
     //installStatus(sprintf($mod_strings['STAT_CREATE_DB_TABLE'], $focus->table_name ));
-     installLog("processing table ".$focus->table_name);
+        installLog("processing table ".$focus->table_name);
     // check to see if we have already setup this table
     if(!in_array($table_name, $processed_tables)) {
         if(!file_exists("modules/".$focus->module_dir."/vardefs.php")){
@@ -260,7 +260,7 @@ 
                 continue; // support new vardef definitions
             }
         } else {
-        	continue; //no further processing needed for ignored beans.
+            continue; //no further processing needed for ignored beans.
         }
 
         // table has not been setup...we will do it now and remember that
@@ -288,7 +288,7 @@ 
         installerHook('pre_createModuleTable', array('module' => $focus->getObjectName()));
         SugarBean::createRelationshipMeta($focus->getObjectName(), $db, $table_name, $empty, $focus->module_dir);
         installerHook('post_createModuleTable', array('module' => $focus->getObjectName()));
-		echo ".";
+        echo ".";
 
     } // end if()
 }
@@ -420,8 +420,8 @@ 
 
     //require_once('modules/Connectors/InstallDefaultConnectors.php');
 
-	///////////////////////////////////////////////////////////////////////////////
-	////    INSTALL PASSWORD TEMPLATES
+    ///////////////////////////////////////////////////////////////////////////////
+    ////    INSTALL PASSWORD TEMPLATES
     include('install/seed_data/Advanced_Password_SeedData.php');
 
 ///////////////////////////////////////////////////////////////////////////////

install/installConfig.php

Indentation +4 added lines, -4 removed lines

@@ -221,7 +221,7 @@ 
     }
 
     private function getFormItems($mod_strings, $app_list_strings, $sugarConfigDefaults, $drivers, $checked, $db, $errors, $supportedLanguages,
-                                  $current_language, $customSession, $customLog, $customId, $customSessionHidden, $customLogHidden, $customIdHidden) {
+                                    $current_language, $customSession, $customLog, $customId, $customSessionHidden, $customLogHidden, $customIdHidden) {
 
 
 
@@ -445,9 +445,9 @@ 
             $_SESSION['email1'] = null;
         }
 
-		if(!isset($_SESSION['setup_site_admin_user_name'])) {
-			$_SESSION['setup_site_admin_user_name'] = null;
-		}
+        if(!isset($_SESSION['setup_site_admin_user_name'])) {
+            $_SESSION['setup_site_admin_user_name'] = null;
+        }
 		
         $out .=<<<EOQ
 <div class='install_block'>

ModuleInstall/PackageManager/PackageManagerDownloader.php

Indentation +29 added lines, -29 removed lines

@@ -41,34 +41,34 @@
 define('PACKAGE_MANAGER_DOWNLOAD_PAGE', 'download.php');
 class PackageManagerDownloader{
 
-	/**
-	 * Using curl we will download the file from the depot server
-	 *
-	 * @param session_id		the session_id this file is queued for
-	 * @param file_name			the file_name to download
-	 * @param save_dir			(optional) if specified it will direct where to save the file once downloaded
-	 * @param download_sever	(optional) if specified it will direct the url for the download
-	 *
-	 * @return the full path of the saved file
-	 */
-	function download($session_id, $file_name, $save_dir = '', $download_server = ''){
-		if(empty($save_dir)){
-			$save_dir = "upload://";
-		}
-		if(empty($download_server)){
-			$download_server = PACKAGE_MANAGER_DOWNLOAD_SERVER;
-		}
-		$download_server .= PACKAGE_MANAGER_DOWNLOAD_PAGE;
-		$ch = curl_init($download_server . '?filename='. $file_name);
-		$fp = sugar_fopen($save_dir . $file_name, 'w');
-		curl_setopt($ch, CURLOPT_COOKIE, 'PHPSESSID='.$session_id. ';');
-		curl_setopt($ch, CURLOPT_FILE, $fp);
-		curl_setopt($ch, CURLOPT_HEADER, 0);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
-		curl_exec($ch);
-		curl_close($ch);
-		fclose($fp);
-		return $save_dir . $file_name;
-	}
+    /**
+     * Using curl we will download the file from the depot server
+     *
+     * @param session_id		the session_id this file is queued for
+     * @param file_name			the file_name to download
+     * @param save_dir			(optional) if specified it will direct where to save the file once downloaded
+     * @param download_sever	(optional) if specified it will direct the url for the download
+     *
+     * @return the full path of the saved file
+     */
+    function download($session_id, $file_name, $save_dir = '', $download_server = ''){
+        if(empty($save_dir)){
+            $save_dir = "upload://";
+        }
+        if(empty($download_server)){
+            $download_server = PACKAGE_MANAGER_DOWNLOAD_SERVER;
+        }
+        $download_server .= PACKAGE_MANAGER_DOWNLOAD_PAGE;
+        $ch = curl_init($download_server . '?filename='. $file_name);
+        $fp = sugar_fopen($save_dir . $file_name, 'w');
+        curl_setopt($ch, CURLOPT_COOKIE, 'PHPSESSID='.$session_id. ';');
+        curl_setopt($ch, CURLOPT_FILE, $fp);
+        curl_setopt($ch, CURLOPT_HEADER, 0);
+        curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, 0);
+        curl_exec($ch);
+        curl_close($ch);
+        fclose($fp);
+        return $save_dir . $file_name;
+    }
 }
 ?>
\ No newline at end of file

ModuleInstall/PackageManager/PackageManagerDisplay.php

Indentation +247 added lines, -247 removed lines

@@ -47,7 +47,7 @@ 
 
 class PackageManagerDisplay{
 
-   /**
+    /**
      * A Static method to Build the display for the package manager
      *
      * @param String form1 - the form to display for manual downloading
@@ -58,7 +58,7 @@ 
      * @return String - a string of html which will be used to display the forms
      */
     static function buildPackageDisplay($form1, $hidden_fields, $form_action, $types = array('module'), $active_form = 'form1', $install = false){
-		global $current_language;
+        global $current_language;
 
         $mod_strings = return_module_language($current_language, "Administration");
         global $app_strings;
@@ -76,18 +76,18 @@ 
         $show_login = $result['show_login'];
         $mi_errors = ModuleInstaller::getErrors();
         $error_html = "";
-		if(!empty($mi_errors)){
-			$error_html = "<tr><td><span>";
-			foreach($mi_errors as $error){
-				$error_html .= "<font color='red'>".$error."</font><br>";
-			}
-			$error_html .= "</span></td></tr>";
-		}
+        if(!empty($mi_errors)){
+            $error_html = "<tr><td><span>";
+            foreach($mi_errors as $error){
+                $error_html .= "<font color='red'>".$error."</font><br>";
+            }
+            $error_html .= "</span></td></tr>";
+        }
 
         $form2 = "<table  class='tabForm' width='100%'  cellpadding='0' cellspacing='0' width='100%' border='0'>";
         $form2 .= $error_html;
         if(!$isAlive)
-        	$form2 .= "<tr><td><span id='span_display_html'>".$header_text."</span></td></tr>";
+            $form2 .= "<tr><td><span id='span_display_html'>".$header_text."</span></td></tr>";
         $form2 .= "</table>";
 
         $tree = null;
@@ -100,7 +100,7 @@ 
         $form2 .= "<table  class='tabForm' cellpadding='0' cellspacing='0' width='100%' border='0'>";
         $form2 .= "<tr><td></td><td align='left'>";
         if($isAlive){
-        	$form2 .= "<input type='button' id='modifCredentialsBtn' class='button' onClick='PackageManager.showLoginDialog(true);' value='".$mod_strings['LBL_MODIFY_CREDENTIALS']."'>";
+            $form2 .= "<input type='button' id='modifCredentialsBtn' class='button' onClick='PackageManager.showLoginDialog(true);' value='".$mod_strings['LBL_MODIFY_CREDENTIALS']."'>";
         }else{
             $form2 .= "<input type='button' id='modifCredentialsBtn' class='button' onClick='PackageManager.showLoginDialog(true);' value='".$mod_strings['LBL_MODIFY_CREDENTIALS']."'style='display:none;'>";
         }
@@ -112,14 +112,14 @@ 
             $form2 .= "<slot><a class=\"listViewTdToolsS1\" id='href_animate' onClick=\"PackageManager.toggleDiv('span_animate_server_div', 'catview');\"><span id='span_animate_server_div' style='display:none;'><img src='".SugarThemeRegistry::current()->getImageURL('basic_search.gif')."' width='8' height='8' border='0'>&nbsp;Collapse</span></a></slot>";
         }
         $form2 .= "</td></tr></table>";
-		$form2 = '';   //Commenting out the form as part of sugar depot hiding.
+        $form2 = '';   //Commenting out the form as part of sugar depot hiding.
         $ss->assign('installation', ($install ? 'true' : 'false'));
 
 
-       $mod_strings = return_module_language($current_language, "Administration");
+        $mod_strings = return_module_language($current_language, "Administration");
 
         $ss->assign('MOD', $mod_strings);
-		$ss->assign('module_load', 'true');
+        $ss->assign('module_load', 'true');
         if (UploadStream::getSuhosinStatus() == false)
         {
             $ss->assign('ERR_SUHOSIN', true);
@@ -129,14 +129,14 @@ 
             $ss->assign('scripts', PackageManagerDisplay::getDisplayScript($install));
         }
         $show_login = false; //hiding install from sugar
-		$ss->assign('MODULE_SELECTOR', PackageManagerDisplay::buildGridOutput($tree, $mod_strings, $isAlive, $show_login));
-       $ss->assign('FORM_2_PLACE_HOLDER', $form2);
+        $ss->assign('MODULE_SELECTOR', PackageManagerDisplay::buildGridOutput($tree, $mod_strings, $isAlive, $show_login));
+        $ss->assign('FORM_2_PLACE_HOLDER', $form2);
         $ss->assign('MOD', $mod_strings);
         $descItemsInstalled = $mod_strings['LBL_UW_DESC_MODULES_INSTALLED'];
         $ss->assign('INSTALLED_PACKAGES_HOLDER', PackageManagerDisplay::buildInstalledGrid($mod_strings, $types));
 
-   $str = $ss->fetch('ModuleInstall/PackageManager/tpls/PackageForm.tpl');
-      return $str;
+    $str = $ss->fetch('ModuleInstall/PackageManager/tpls/PackageForm.tpl');
+        return $str;
     }
 
     /**
@@ -150,7 +150,7 @@ 
      * @return String - a string of html which will be used to display the forms
      */
     function buildPatchDisplay($form1, $hidden_fields, $form_action, $types = array('module'), $active_form = 'form1'){
-    	global $current_language;
+        global $current_language;
         $mod_strings = return_module_language($current_language, "Administration");
         $ss = new Sugar_Smarty();
         $ss->assign('FORM_1_PLACE_HOLDER', $form1);
@@ -169,43 +169,43 @@ 
         //}
         $form2 = "<table  class='tabForm' width='100%'  cellpadding='0' cellspacing='0' width='100%' border='0'>";
         if(!$isAlive)
-        	$form2 .= "<tr><td><span id='span_display_html'>".$header_text."</span></td></tr>";
+            $form2 .= "<tr><td><span id='span_display_html'>".$header_text."</span></td></tr>";
         $form2 .= "</table>";
         $form2 .= "<table width='100%'><tr><td align='left'>";
         if($show_login){
-        	$form2 .= "<input type='button' class='button' onClick='PackageManager.showLoginDialog(true);' value='".$mod_strings['LBL_MODIFY_CREDENTIALS']."'>";
+            $form2 .= "<input type='button' class='button' onClick='PackageManager.showLoginDialog(true);' value='".$mod_strings['LBL_MODIFY_CREDENTIALS']."'>";
         }
         $form2 .= "</td><td align='right'><div id='workingStatusDiv' style='display:none;'>".SugarThemeRegistry::current()->getImage("sqsWait","border='0' align='bottom'",null,null,'.gif',"Loading")."</div></td></tr><tr><td colspan='2'>";
 
         $loginViewStyle = ($isAlive ? 'none' : 'block');
-		$selectViewStyle = ($isAlive ? 'block' : 'none');
-		$form2 .= "<div id='selectView' style='display:".$selectViewStyle."'>";
-		$form2 .= "  <div id='patch_downloads' class='ygrid-mso' style='height:205px; display: ".$display.";'></div>";
-		 $form2 .= "</div>";
-		 if(!$show_login)
-         	$loginViewStyle = 'none';
-         //$form2 .= "<div id='loginView' style='display:".$loginViewStyle."'>";
-    	 //$form2 .= PackageManagerDisplay::buildLoginPanel($mod_strings, $isAlive);
-    	 //$form2 .= "</div>";
+        $selectViewStyle = ($isAlive ? 'block' : 'none');
+        $form2 .= "<div id='selectView' style='display:".$selectViewStyle."'>";
+        $form2 .= "  <div id='patch_downloads' class='ygrid-mso' style='height:205px; display: ".$display.";'></div>";
+            $form2 .= "</div>";
+            if(!$show_login)
+                $loginViewStyle = 'none';
+            //$form2 .= "<div id='loginView' style='display:".$loginViewStyle."'>";
+            //$form2 .= PackageManagerDisplay::buildLoginPanel($mod_strings, $isAlive);
+            //$form2 .= "</div>";
 
         $form2 .= "</td></tr></table>";
         $form2 = '';
         $packages = array();
         $releases = array();
         if($isAlive){
-          	$filter = array();
-          	$count = count($types);
-          	$index = 1;
-          	$type_str = '"';
-          	foreach($types as $type){
-          		$type_str .= "'".$type."'";
-          		if($index < $count)
-          			$type_str .= ",";
-          		$index++;
-          	}
-          	$type_str .= '"';
-          	$filter = array('type' => $type_str);
-          	$filter = PackageManager::toNameValueList($filter);
+                $filter = array();
+                $count = count($types);
+                $index = 1;
+                $type_str = '"';
+                foreach($types as $type){
+                    $type_str .= "'".$type."'";
+                    if($index < $count)
+                        $type_str .= ",";
+                    $index++;
+                }
+                $type_str .= '"';
+                $filter = array('type' => $type_str);
+                $filter = PackageManager::toNameValueList($filter);
             $pm = new PackageManager();
             /*if(in_array('patch', $types)){
             	$releases = $pm->getReleases('3', '3', $filter);
@@ -214,13 +214,13 @@ 
             }*/
         }
         if($form_action == 'install.php' && (empty($releases) || count($releases['packages']) == 0)){
-        	//return false;
+            //return false;
         }
         $tree = PackageManagerDisplay::buildTreeView('treeview', $isAlive);
         $tree->tree_style= 'include/ytree/TreeView/css/check/tree.css';
         $ss->assign('TREEHEADER',$tree->generate_header());
-		$ss->assign('module_load', 'false');
-		$ss->assign('MODULE_SELECTOR', PackageManagerDisplay::buildGridOutput($tree, $mod_strings, $isAlive, $show_login));
+        $ss->assign('module_load', 'false');
+        $ss->assign('MODULE_SELECTOR', PackageManagerDisplay::buildGridOutput($tree, $mod_strings, $isAlive, $show_login));
         $ss->assign('FORM_2_PLACE_HOLDER', $form2);
         $ss->assign('scripts', PackageManagerDisplay::getDisplayScript(false, 'patch', $releases, $types, $isAlive));
         $str = $ss->fetch('ModuleInstall/PackageManager/tpls/PackageForm.tpl');
@@ -228,34 +228,34 @@ 
     }
 
     static function buildInstalledGrid($mod_strings, $types = array('modules')){
-    	  $descItemsInstalled = $mod_strings['LBL_UW_DESC_MODULES_INSTALLED'];
-    	  $output = '<table width="100%" border="0" cellspacing="0" cellpadding="0" ><tr><td align="left">'.$descItemsInstalled.'</td>';
-          $output .= '</td></tr></table>';
-          $output .= "<table width='100%'><tr><td ><div id='installed_grid' class='ygrid-mso' style='height:205px;'></div></td></tr></table>";
-          return $output;
+            $descItemsInstalled = $mod_strings['LBL_UW_DESC_MODULES_INSTALLED'];
+            $output = '<table width="100%" border="0" cellspacing="0" cellpadding="0" ><tr><td align="left">'.$descItemsInstalled.'</td>';
+            $output .= '</td></tr></table>';
+            $output .= "<table width='100%'><tr><td ><div id='installed_grid' class='ygrid-mso' style='height:205px;'></div></td></tr></table>";
+            return $output;
     }
 
     function buildLoginPanel($mod_strings, $display_cancel){
         $credentials = PackageManager::getCredentials();
-    	$output = "<div id='login_panel'><div class='hd'><b>".$mod_strings['HDR_LOGIN_PANEL']."</b></div>";
+        $output = "<div id='login_panel'><div class='hd'><b>".$mod_strings['HDR_LOGIN_PANEL']."</b></div>";
         $output .= "<div class='bd'><form><table><tr><td>".$mod_strings['LBL_USERNAME']."</td><td><input type='text' name='login_panel_username' id='login_panel_username' value='".$credentials['username']."'></td><td><a href='http://www.sugarcrm.com/crm/index.php?option=com_registration&task=register' target='blank'>".$mod_strings['LNK_NEW_ACCOUNT']."</a></td>";
 
         $output .= "</tr><tr><td>".$mod_strings['LBL_PASSWORD']."</td><td><input type='password' name='login_panel_password' id='login_panel_password'></td><td><a href='http://www.sugarcrm.com/crm/component/option,com_registration/Itemid,0/task,lostPassword/' target='blank'>".$mod_strings['LNK_FORGOT_PASS']."</a></td>";
 
-		$terms = PackageManager::getTermsAndConditions();
-		$output .= "</tr><tr><td colspan='6' valign='top'><b>".$mod_strings['LBL_TERMS_AND_CONDITIONS']."</b><br><textarea readonly cols=80 rows=8>" . $terms['terms'] . '</textarea></td>';
-       	$_SESSION['SugarDepot_TermsVersion'] = (!empty($terms['version']) ? $terms['version'] : '');
+        $terms = PackageManager::getTermsAndConditions();
+        $output .= "</tr><tr><td colspan='6' valign='top'><b>".$mod_strings['LBL_TERMS_AND_CONDITIONS']."</b><br><textarea readonly cols=80 rows=8>" . $terms['terms'] . '</textarea></td>';
+            $_SESSION['SugarDepot_TermsVersion'] = (!empty($terms['version']) ? $terms['version'] : '');
 
-		$output .= "</td></tr><tr><td colspan='6'><input class='checkbox' type='checkbox' name='cb_terms' id='cb_terms' onclick='if(this.checked){this.form.panel_login_button.disabled=false;}else{this.form.panel_login_button.disabled=true;}'>".$mod_strings['LBL_ACCEPT_TERMS']."</td></tr><tr>";
+        $output .= "</td></tr><tr><td colspan='6'><input class='checkbox' type='checkbox' name='cb_terms' id='cb_terms' onclick='if(this.checked){this.form.panel_login_button.disabled=false;}else{this.form.panel_login_button.disabled=true;}'>".$mod_strings['LBL_ACCEPT_TERMS']."</td></tr><tr>";
         $output .= "<td align='left'>";
         $output .= "<input type='button' id='panel_login_button' name='panel_login_button' value='Login' class='button' onClick='PackageManager.authenticate(this.form.login_panel_username.value, this.form.login_panel_password.value, \"\",\"" . $terms['version'] . "\");' disabled>";
 
         if($display_cancel){
-        	$output .= "&nbsp;<input type='button' id='panel_cancel_button' value='Cancel' class='button' onClick='PackageManager.showLoginDialog(false);'>";
+            $output .= "&nbsp;<input type='button' id='panel_cancel_button' value='Cancel' class='button' onClick='PackageManager.showLoginDialog(false);'>";
         }
         $output .= "</td><td></td></tr>";
-		$output .= "<tr></td><td></td></tr>";
-		$output .= "</table></div>";
+        $output .= "<tr></td><td></td></tr>";
+        $output .= "</table></div>";
         $output .= "<div class='ft'></div></form></div>";
         return $output;
     }
@@ -267,48 +267,48 @@ 
      *  @param Array mod_strings - the local mod strings to display
      *  @return String - a string of html
      */
-	static function buildGridOutput($tree, $mod_strings, $display = true, $show_login = true){
-		 $output = "<div id='catview'>";
-		$loginViewStyle = ($display ? 'none' : 'block');
-		$selectViewStyle = ($display ? 'block' : 'none');
-		$output .= "<div id='selectView' style='display:".$selectViewStyle."'>";
-         //if($display){
-    		$output .= "<table border=0 width='100%' class='moduleTitle'><tr><td width='100%' valign='top'>";
-    		$output .= "<div id='treeview'>";
-    		$output .= $tree->generate_nodes_array();
-    		$output .= "</div>";
-    		$output .= "</td></tr>";
+    static function buildGridOutput($tree, $mod_strings, $display = true, $show_login = true){
+            $output = "<div id='catview'>";
+        $loginViewStyle = ($display ? 'none' : 'block');
+        $selectViewStyle = ($display ? 'block' : 'none');
+        $output .= "<div id='selectView' style='display:".$selectViewStyle."'>";
+            //if($display){
+            $output .= "<table border=0 width='100%' class='moduleTitle'><tr><td width='100%' valign='top'>";
+            $output .= "<div id='treeview'>";
+            $output .= $tree->generate_nodes_array();
+            $output .= "</div>";
+            $output .= "</td></tr>";
             $output .= "<tr><td width='100%'>";
-			$output .= "<div id='tabs1'></div>";
+            $output .= "<div id='tabs1'></div>";
             $output .= "</td></tr>";
             $output .= "<tr><td width='100%' align='left'>";
             $output .= "<input type='button' class='button' value='Download Selected' onClick='PackageManager.download();'>";
             $output .= "</td></tr></table>";
         // }
-         $output .= "</div>";
-         if(!$show_login)
-         	$loginViewStyle = 'none';
+            $output .= "</div>";
+            if(!$show_login)
+                $loginViewStyle = 'none';
         // $output .= "<div id='loginView' style='display:".$loginViewStyle."'>";
-         // jchi ,#24296 :commented code because we are currently not using depot, in the future this may change so you can put this code back in.
-    	 //$output .= PackageManagerDisplay::buildLoginPanel($mod_strings, $display);
-    	 //$output .= "</div>";
-    	 //$output .= "<table width='100%' class='moduleTitle' border=1><tr><td><div id='patch_downloads' class='ygrid-mso' style='height:205px;'></div></td></tr></table>";
-		$output .= "</div>";
+            // jchi ,#24296 :commented code because we are currently not using depot, in the future this may change so you can put this code back in.
+            //$output .= PackageManagerDisplay::buildLoginPanel($mod_strings, $display);
+            //$output .= "</div>";
+            //$output .= "<table width='100%' class='moduleTitle' border=1><tr><td><div id='patch_downloads' class='ygrid-mso' style='height:205px;'></div></td></tr></table>";
+        $output .= "</div>";
 
-		return $output;
-	}
+        return $output;
+    }
 
-     /**
-     * A Static method used to build the initial treeview when the page is first displayed
-     *
-     * @param String div_id - this div in which to display the tree
-     * @return Tree - the tree that is built
-     */
+        /**
+         * A Static method used to build the initial treeview when the page is first displayed
+         *
+         * @param String div_id - this div in which to display the tree
+         * @return Tree - the tree that is built
+         */
     static function buildTreeView($div_id, $isAlive = true){
         $tree = new Tree($div_id);
         $nodes = array();
         if($isAlive)
-        	$nodes = PackageManager::getCategories('');
+            $nodes = PackageManager::getCategories('');
 
         foreach($nodes as $arr_node){
             $node = new Node($arr_node['id'], $arr_node['label']);
@@ -335,7 +335,7 @@ 
      * @return String - a form used to display the license
      */
     function getLicenseDisplay($license_file, $form_action, $next_step, $zipFile, $type, $manifest, $modify_field){
-    	global $current_language;
+        global $current_language;
         $mod_strings = return_module_language($current_language, "Administration");
         $contents = sugar_file_get_contents($license_file);
         $div_id = urlencode($zipFile);
@@ -372,11 +372,11 @@ 
         return $display;
     }
 
-     /**
-     * A Static method used to generate the javascript for the page
-     *
-     * @return String - the javascript required for the page
-     */
+        /**
+         * A Static method used to generate the javascript for the page
+         *
+         * @return String - the javascript required for the page
+         */
     static function getDisplayScript($install = false, $type = 'module', $releases = null, $types = array(), $isAlive = true){
         global $sugar_version, $sugar_config;
         global $current_language;
@@ -387,72 +387,72 @@ 
         if(!$install){
             $install = 0;
         }
-		$ss->assign('INSTALLATION', $install);
+        $ss->assign('INSTALLATION', $install);
         $ss->assign('WAIT_IMAGE', SugarThemeRegistry::current()->getImage("loading","border='0' align='bottom'",null,null,'.gif',"Loading"));
 
         $ss->assign('sugar_version', $sugar_version);
         $ss->assign('js_custom_version', $sugar_config['js_custom_version']);
-         $ss->assign('IS_ALIVE', $isAlive);
+            $ss->assign('IS_ALIVE', $isAlive);
         //if($type == 'patch' && $releases != null){
         if($type == 'patch'){
             $ss->assign('module_load', 'false');
             $patches = PackageManagerDisplay::createJavascriptPackageArray($releases);
             $ss->assign('PATCHES', $patches);
-             $ss->assign('GRID_TYPE', implode(',', $types));
+                $ss->assign('GRID_TYPE', implode(',', $types));
         }else{
-           	$pm = new PackageManager();
-           	$releases = $pm->getPackagesInStaging();
-           	$patches = PackageManagerDisplay::createJavascriptModuleArray($releases);
+                $pm = new PackageManager();
+                $releases = $pm->getPackagesInStaging();
+                $patches = PackageManagerDisplay::createJavascriptModuleArray($releases);
             $ss->assign('PATCHES', $patches);
             $installeds = $pm->getinstalledPackages();
-           	$patches = PackageManagerDisplay::createJavascriptModuleArray($installeds, 'mti_installed_data');
+                $patches = PackageManagerDisplay::createJavascriptModuleArray($installeds, 'mti_installed_data');
             $ss->assign('INSTALLED_MODULES', $patches);
-			 $ss->assign('UPGARDE_WIZARD_URL', 'index.php?module=UpgradeWizard&action=index');
+                $ss->assign('UPGARDE_WIZARD_URL', 'index.php?module=UpgradeWizard&action=index');
             $ss->assign('module_load', 'true');
         }
         if(!empty($GLOBALS['ML_STATUS_MESSAGE']))
-        	$ss->assign('ML_STATUS_MESSAGE',$GLOBALS['ML_STATUS_MESSAGE']);
+            $ss->assign('ML_STATUS_MESSAGE',$GLOBALS['ML_STATUS_MESSAGE']);
 
         //Bug 24064. Checking and Defining labels since these might not be cached during Upgrade
         if(!isset($mod_strings['LBL_ML_INSTALL']) || empty($mod_strings['LBL_ML_INSTALL'])){
-			$mod_strings['LBL_ML_INSTALL'] = 'Install';
-    	}
-		if(!isset($mod_strings['LBL_ML_ENABLE_OR_DISABLE']) || empty($mod_strings['LBL_ML_ENABLE_OR_DISABLE'])) {
-			$mod_strings['LBL_ML_ENABLE_OR_DISABLE'] = 'Enable/Disable';
-		}
-		if(!isset($mod_strings['LBL_ML_DELETE'])|| empty($mod_strings['LBL_ML_DELETE'])){
-			$mod_strings['LBL_ML_DELETE'] = 'Delete';
-		}
+            $mod_strings['LBL_ML_INSTALL'] = 'Install';
+        }
+        if(!isset($mod_strings['LBL_ML_ENABLE_OR_DISABLE']) || empty($mod_strings['LBL_ML_ENABLE_OR_DISABLE'])) {
+            $mod_strings['LBL_ML_ENABLE_OR_DISABLE'] = 'Enable/Disable';
+        }
+        if(!isset($mod_strings['LBL_ML_DELETE'])|| empty($mod_strings['LBL_ML_DELETE'])){
+            $mod_strings['LBL_ML_DELETE'] = 'Delete';
+        }
         //Add by jchi 6/23/2008 to fix the bug 21667
-		$filegrid_column_ary = array(
-			'Name' => $mod_strings['LBL_ML_NAME'],
-			'Install' => $mod_strings['LBL_ML_INSTALL'],
-			'Delete' => $mod_strings['LBL_ML_DELETE'],
-			'Type' => $mod_strings['LBL_ML_TYPE'],
-			'Version' => $mod_strings['LBL_ML_VERSION'],
-			'Published' => $mod_strings['LBL_ML_PUBLISHED'],
-			'Uninstallable' => $mod_strings['LBL_ML_UNINSTALLABLE'],
-			'Description' => $mod_strings['LBL_ML_DESCRIPTION']
-		);
-
-		$filegridinstalled_column_ary = array(
-			'Name' => $mod_strings['LBL_ML_NAME'],
-			'Install' => $mod_strings['LBL_ML_INSTALL'],
-			'Action' => $mod_strings['LBL_ML_ACTION'],
-			'Enable_Or_Disable' => $mod_strings['LBL_ML_ENABLE_OR_DISABLE'],
-			'Type' => $mod_strings['LBL_ML_TYPE'],
-			'Version' => $mod_strings['LBL_ML_VERSION'],
-			'Date_Installed' => $mod_strings['LBL_ML_INSTALLED'],
-			'Uninstallable' => $mod_strings['LBL_ML_UNINSTALLABLE'],
-			'Description' => $mod_strings['LBL_ML_DESCRIPTION']
-		);
-
-		$ss->assign('ML_FILEGRID_COLUMN',$filegrid_column_ary);
-		$ss->assign('ML_FILEGRIDINSTALLED_COLUMN',$filegridinstalled_column_ary);
-		//end
-
-		$ss->assign('SHOW_IMG', SugarThemeRegistry::current()->getImage('advanced_search', 'border="0"', 8, 8, '.gif', 'Show'));
-		$ss->assign('HIDE_IMG', SugarThemeRegistry::current()->getImage('basic_search', 'border="0"', 8, 8, '.gif', 'Hide'));
+        $filegrid_column_ary = array(
+            'Name' => $mod_strings['LBL_ML_NAME'],
+            'Install' => $mod_strings['LBL_ML_INSTALL'],
+            'Delete' => $mod_strings['LBL_ML_DELETE'],
+            'Type' => $mod_strings['LBL_ML_TYPE'],
+            'Version' => $mod_strings['LBL_ML_VERSION'],
+            'Published' => $mod_strings['LBL_ML_PUBLISHED'],
+            'Uninstallable' => $mod_strings['LBL_ML_UNINSTALLABLE'],
+            'Description' => $mod_strings['LBL_ML_DESCRIPTION']
+        );
+
+        $filegridinstalled_column_ary = array(
+            'Name' => $mod_strings['LBL_ML_NAME'],
+            'Install' => $mod_strings['LBL_ML_INSTALL'],
+            'Action' => $mod_strings['LBL_ML_ACTION'],
+            'Enable_Or_Disable' => $mod_strings['LBL_ML_ENABLE_OR_DISABLE'],
+            'Type' => $mod_strings['LBL_ML_TYPE'],
+            'Version' => $mod_strings['LBL_ML_VERSION'],
+            'Date_Installed' => $mod_strings['LBL_ML_INSTALLED'],
+            'Uninstallable' => $mod_strings['LBL_ML_UNINSTALLABLE'],
+            'Description' => $mod_strings['LBL_ML_DESCRIPTION']
+        );
+
+        $ss->assign('ML_FILEGRID_COLUMN',$filegrid_column_ary);
+        $ss->assign('ML_FILEGRIDINSTALLED_COLUMN',$filegridinstalled_column_ary);
+        //end
+
+        $ss->assign('SHOW_IMG', SugarThemeRegistry::current()->getImage('advanced_search', 'border="0"', 8, 8, '.gif', 'Show'));
+        $ss->assign('HIDE_IMG', SugarThemeRegistry::current()->getImage('basic_search', 'border="0"', 8, 8, '.gif', 'Hide'));
         $str = $ss->fetch('ModuleInstall/PackageManager/tpls/PackageManagerScripts.tpl');
         return $str;
     }
@@ -462,15 +462,15 @@ 
         $count = count($releases);
         $index = 1;
         if(!empty($releases['packages'])){
-	        foreach($releases['packages'] as $release){
-	            $release = PackageManager::fromNameValueList($release);
-	            $output .= "[";
-	            $output .= "'".$release['description']."', '".$release['version']."', '".$release['build_number']."', '".$release['id']."'";
-	            $output .= "]";
-	            if($index < $count)
-	                $output .= ",";
-	            $index++;
-	        }
+            foreach($releases['packages'] as $release){
+                $release = PackageManager::fromNameValueList($release);
+                $output .= "[";
+                $output .= "'".$release['description']."', '".$release['version']."', '".$release['build_number']."', '".$release['id']."'";
+                $output .= "]";
+                if($index < $count)
+                    $output .= ",";
+                $index++;
+            }
         }
         $output .= "]\n;";
         return $output;
@@ -481,30 +481,30 @@ 
         $count = count($modules);
         $index = 1;
         if(!empty($modules)){
-	        foreach($modules as $module){
-	            $output .= "[";
-	            $output .= "'".$module['name']."', '".$module['file_install']."', '".$module['file']."', '";
-	            if(!empty($module['enabled']))
-	            	$output .= $module['enabled'].'_'.$module['file']."', '";
-
- 				$description = js_escape($module['description']);
-	            $output .= $module['type']."', '".$module['version']."', '".$module['published_date']."', '".$module['uninstallable']."', '".$description."'".(isset($module['upload_file'])?" , '".$module['upload_file']."']":"]");
-	            if($index < $count)
-	                $output .= ",";
-	            $index++;
-	        }
+            foreach($modules as $module){
+                $output .= "[";
+                $output .= "'".$module['name']."', '".$module['file_install']."', '".$module['file']."', '";
+                if(!empty($module['enabled']))
+                    $output .= $module['enabled'].'_'.$module['file']."', '";
+
+                    $description = js_escape($module['description']);
+                $output .= $module['type']."', '".$module['version']."', '".$module['published_date']."', '".$module['uninstallable']."', '".$description."'".(isset($module['upload_file'])?" , '".$module['upload_file']."']":"]");
+                if($index < $count)
+                    $output .= ",";
+                $index++;
+            }
 
         }
         $output .= "]\n;";
         return $output;
     }
 
-   /**
-    *  This method is meant to be used to display the license agreement inline on the page
-    *  if the system would like to perform the installation on the same page via an Ajax call
-    */
+    /**
+     *  This method is meant to be used to display the license agreement inline on the page
+     *  if the system would like to perform the installation on the same page via an Ajax call
+     */
     function buildLicenseOutput($file){
-    	global $current_language;
+        global $current_language;
 
         $mod_strings = return_module_language($current_language, "Administration");
         $contents = '';
@@ -520,102 +520,102 @@ 
     }
 
     static function getHeader(){
-    	global $current_language;
+        global $current_language;
 
         $mod_strings = return_module_language($current_language, "Administration");
         $header_text = '';
         $isAlive = false;
         $show_login = false;
         if(!function_exists('curl_init') && $show_login){
-        	$header_text = "<font color='red'><b>".$mod_strings['ERR_ENABLE_CURL']."</b></font>";
-        	$show_login = false;
+            $header_text = "<font color='red'><b>".$mod_strings['ERR_ENABLE_CURL']."</b></font>";
+            $show_login = false;
         }else{
             $credentials = PackageManager::getCredentials();
             if(empty($credentials['username']) || empty($credentials['password'])){
-            	//$header_text = "<font color='red'><b>".$mod_strings['ERR_CREDENTIALS_MISSING']."</b></font>";
+                //$header_text = "<font color='red'><b>".$mod_strings['ERR_CREDENTIALS_MISSING']."</b></font>";
             }
             else{
-            	$result = PackageManagerComm::login();
-            	if((is_array($result) && !empty($result['faultcode'])) || $result == false){
-            		$header_text = "<font color='red'><b>".$result['faultstring']."</b></font>";
-            	}else{
-            		$header_text = PackageManager::getPromotion();
-            		$isAlive = true;
-            	}
+                $result = PackageManagerComm::login();
+                if((is_array($result) && !empty($result['faultcode'])) || $result == false){
+                    $header_text = "<font color='red'><b>".$result['faultstring']."</b></font>";
+                }else{
+                    $header_text = PackageManager::getPromotion();
+                    $isAlive = true;
+                }
             }
         }
         return array('text' => $header_text, 'isAlive' => $isAlive, 'show_login' => $show_login);
     }
 
     function buildInstallGrid($view){
-    	$uh = new UpgradeHistory();
-    	$installeds = $uh->getAll();
-		$upgrades_installed = 0;
-		$installed_objects = array();
-		foreach($installeds as $installed)
-		{
-			$filename = from_html($installed->filename);
-			$date_entered = $installed->date_entered;
-			$type = $installed->type;
-			$version = $installed->version;
-			$upgrades_installed++;
-			$link = "";
-
-			switch($type)
-			{
-				case "theme":
-				case "langpack":
-				case "module":
-				case "patch":
-				$manifest_file = extractManifest($filename);
-				require_once($manifest_file);
-
-				$name = empty($manifest['name']) ? $filename : $manifest['name'];
-				$description = empty($manifest['description']) ? $mod_strings['LBL_UW_NONE'] : $manifest['description'];
-				if(($upgrades_installed==0 || $uh->UninstallAvailable($installeds, $installed))
-					&& is_file($filename) && !empty($manifest['is_uninstallable']))
-				{
-					$link = urlencode( $filename );
-				}
-				else
-				{
-					$link = 'false';
-				}
-
-				break;
-				default:
-					break;
-			}
-
-			if($view == 'default' && $type != 'patch')
-			{
-				continue;
-			}
-
-			if($view == 'module'
-				&& $type != 'module' && $type != 'theme' && $type != 'langpack')
-			{
-				continue;
-			}
-
-			$target_manifest = remove_file_extension( $filename ) . "-manifest.php";
-			require_once( "$target_manifest" );
-
-			if(isset($manifest['icon']) && $manifest['icon'] != "")
-			{
-				$manifest_copy_files_to_dir = isset($manifest['copy_files']['to_dir']) ? clean_path($manifest['copy_files']['to_dir']) : "";
-				$manifest_copy_files_from_dir = isset($manifest['copy_files']['from_dir']) ? clean_path($manifest['copy_files']['from_dir']) : "";
-				$manifest_icon = clean_path($manifest['icon']);
-				$icon = "<img src=\"" . $manifest_copy_files_to_dir . ($manifest_copy_files_from_dir != "" ? substr($manifest_icon, strlen($manifest_copy_files_from_dir)+1) : $manifest_icon ) . "\">";
-			}
-			else
-			{
-				$icon = getImageForType( $manifest['type'] );
-			}
-			$installed_objects[] = array('icon' => $icon, 'name' => $name, 'type' => $type, 'version' => $version, 'date_entered' => $date_entered, 'description' => $description, 'file' => $link);
-			//print( "<form action=\"" . $form_action . "_prepare\" method=\"post\">\n" );
-			//print( "<tr><td>$icon</td><td>$name</td><td>$type</td><td>$version</td><td>$date_entered</td><td>$description</td><td>$link</td></tr>\n" );
-			//print( "</form>\n" );
-		}
+        $uh = new UpgradeHistory();
+        $installeds = $uh->getAll();
+        $upgrades_installed = 0;
+        $installed_objects = array();
+        foreach($installeds as $installed)
+        {
+            $filename = from_html($installed->filename);
+            $date_entered = $installed->date_entered;
+            $type = $installed->type;
+            $version = $installed->version;
+            $upgrades_installed++;
+            $link = "";
+
+            switch($type)
+            {
+                case "theme":
+                case "langpack":
+                case "module":
+                case "patch":
+                $manifest_file = extractManifest($filename);
+                require_once($manifest_file);
+
+                $name = empty($manifest['name']) ? $filename : $manifest['name'];
+                $description = empty($manifest['description']) ? $mod_strings['LBL_UW_NONE'] : $manifest['description'];
+                if(($upgrades_installed==0 || $uh->UninstallAvailable($installeds, $installed))
+                    && is_file($filename) && !empty($manifest['is_uninstallable']))
+                {
+                    $link = urlencode( $filename );
+                }
+                else
+                {
+                    $link = 'false';
+                }
+
+                break;
+                default:
+                    break;
+            }
+
+            if($view == 'default' && $type != 'patch')
+            {
+                continue;
+            }
+
+            if($view == 'module'
+                && $type != 'module' && $type != 'theme' && $type != 'langpack')
+            {
+                continue;
+            }
+
+            $target_manifest = remove_file_extension( $filename ) . "-manifest.php";
+            require_once( "$target_manifest" );
+
+            if(isset($manifest['icon']) && $manifest['icon'] != "")
+            {
+                $manifest_copy_files_to_dir = isset($manifest['copy_files']['to_dir']) ? clean_path($manifest['copy_files']['to_dir']) : "";
+                $manifest_copy_files_from_dir = isset($manifest['copy_files']['from_dir']) ? clean_path($manifest['copy_files']['from_dir']) : "";
+                $manifest_icon = clean_path($manifest['icon']);
+                $icon = "<img src=\"" . $manifest_copy_files_to_dir . ($manifest_copy_files_from_dir != "" ? substr($manifest_icon, strlen($manifest_copy_files_from_dir)+1) : $manifest_icon ) . "\">";
+            }
+            else
+            {
+                $icon = getImageForType( $manifest['type'] );
+            }
+            $installed_objects[] = array('icon' => $icon, 'name' => $name, 'type' => $type, 'version' => $version, 'date_entered' => $date_entered, 'description' => $description, 'file' => $link);
+            //print( "<form action=\"" . $form_action . "_prepare\" method=\"post\">\n" );
+            //print( "<tr><td>$icon</td><td>$name</td><td>$type</td><td>$version</td><td>$date_entered</td><td>$description</td><td>$link</td></tr>\n" );
+            //print( "</form>\n" );
+        }
+    }
     }
- }

ModuleInstall/PackageManager/ListViewPackages.php

Indentation +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
  * display the words  "Powered by SugarCRM" and "Supercharged by SuiteCRM".
  ********************************************************************************/
 
- require_once('include/ListView/ListViewSmarty.php');
+    require_once('include/ListView/ListViewSmarty.php');
  
 class ListViewPackages extends ListViewSmarty{
     var $secondaryDisplayColumns;