adamjakab / SuiteCRM

modules/ACLRoles/metadata/subpanels/default.php

Indentation +15 added lines, -15 removed lines

@@ -41,24 +41,24 @@ 
 
 
 $subpanel_layout = array(
-	'top_buttons' => array(
-			array('widget_class' => 'SubPanelTopCreateButton'),
-			array('widget_class' => 'SubPanelTopSelectButton'),
-	),
+    'top_buttons' => array(
+            array('widget_class' => 'SubPanelTopCreateButton'),
+            array('widget_class' => 'SubPanelTopSelectButton'),
+    ),
 
-	'where' => '',
+    'where' => '',
 
 
-	'list_fields' => array(
+    'list_fields' => array(
         'name'=>array(
-		 	'vname' => 'LBL_NAME',
-			'width' => '25%',
-		),
-		'description'=>array(
-		 	'vname' => 'LBL_DESCRIPTION',
-			'width' => '70%',
-			'sortable'=>false,
-		),
+                'vname' => 'LBL_NAME',
+            'width' => '25%',
+        ),
+        'description'=>array(
+                'vname' => 'LBL_DESCRIPTION',
+            'width' => '70%',
+            'sortable'=>false,
+        ),
 /*		
 		'edit_button'=>array(
 			'vname' => 'LBL_EDIT_BUTTON',
@@ -75,6 +75,6 @@ 
 		),
 */		
 		
-	),
+    ),
 );
 ?>
\ No newline at end of file

Spacing +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');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/ACLRoles/views/view.list.php

Braces +3 added lines, -2 removed lines

@@ -45,8 +45,9 @@
     public function preDisplay()
     {
         //bug #46690: Developer Access to Users/Teams/Roles
-        if (!$GLOBALS['current_user']->isAdminForModule('Users') && !$GLOBALS['current_user']->isDeveloperForModule('Users'))
-            sugar_die('No Access');
+        if (!$GLOBALS['current_user']->isAdminForModule('Users') && !$GLOBALS['current_user']->isDeveloperForModule('Users')) {
+                    sugar_die('No Access');
+        }
 
         $this->lv = new ListViewSmarty();
         $this->lv->export = false;

modules/ACLRoles/Save.php

Indentation +19 added lines, -19 removed lines

@@ -44,30 +44,30 @@
 $role = new ACLRole();
 if(isset($_REQUEST['record']))$role->id = $_POST['record'];
 if(!empty($_REQUEST['name'])){
-	$role->name = $_POST['name'];
-	$role->description = $_POST['description'];
-	$role->save();
-	//if duplicate
-	if(isset($_REQUEST['isduplicate']) && !empty($_REQUEST['isduplicate'])){
-	    //duplicate actions
-	    $role_actions=$role->getRoleActions($_REQUEST['isduplicate']);
-	    foreach($role_actions as $module){
-	        foreach($module as $type){
-	            foreach($type as $act){
-	                $role->setAction($role->id, $act['id'], $act['aclaccess']);
-	            }
-	        }
-	    }
-	}
+    $role->name = $_POST['name'];
+    $role->description = $_POST['description'];
+    $role->save();
+    //if duplicate
+    if(isset($_REQUEST['isduplicate']) && !empty($_REQUEST['isduplicate'])){
+        //duplicate actions
+        $role_actions=$role->getRoleActions($_REQUEST['isduplicate']);
+        foreach($role_actions as $module){
+            foreach($module as $type){
+                foreach($type as $act){
+                    $role->setAction($role->id, $act['id'], $act['aclaccess']);
+                }
+            }
+        }
+    }
 }else{
     ob_clean();	
     $flc_module = 'All';
     foreach($_POST as $name=>$value){
-    	if(substr_count($name, 'act_guid') > 0){
-    		$name = str_replace('act_guid', '', $name);
+        if(substr_count($name, 'act_guid') > 0){
+            $name = str_replace('act_guid', '', $name);
     
-    		$role->setAction($role->id,$name, $value);
-    	}
+            $role->setAction($role->id,$name, $value);
+        }
     	
     }
     echo "result = {role_id:'$role->id', module:'$flc_module'}";

Spacing +13 added lines, -13 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');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -42,31 +42,31 @@ 
 
 
 $role = new ACLRole();
-if(isset($_REQUEST['record']))$role->id = $_POST['record'];
-if(!empty($_REQUEST['name'])){
+if (isset($_REQUEST['record']))$role->id = $_POST['record'];
+if (!empty($_REQUEST['name'])) {
 	$role->name = $_POST['name'];
 	$role->description = $_POST['description'];
 	$role->save();
 	//if duplicate
-	if(isset($_REQUEST['isduplicate']) && !empty($_REQUEST['isduplicate'])){
+	if (isset($_REQUEST['isduplicate']) && !empty($_REQUEST['isduplicate'])) {
 	    //duplicate actions
-	    $role_actions=$role->getRoleActions($_REQUEST['isduplicate']);
-	    foreach($role_actions as $module){
-	        foreach($module as $type){
-	            foreach($type as $act){
+	    $role_actions = $role->getRoleActions($_REQUEST['isduplicate']);
+	    foreach ($role_actions as $module) {
+	        foreach ($module as $type) {
+	            foreach ($type as $act) {
 	                $role->setAction($role->id, $act['id'], $act['aclaccess']);
 	            }
 	        }
 	    }
 	}
-}else{
+} else {
     ob_clean();	
     $flc_module = 'All';
-    foreach($_POST as $name=>$value){
-    	if(substr_count($name, 'act_guid') > 0){
+    foreach ($_POST as $name=>$value) {
+    	if (substr_count($name, 'act_guid') > 0) {
     		$name = str_replace('act_guid', '', $name);
     
-    		$role->setAction($role->id,$name, $value);
+    		$role->setAction($role->id, $name, $value);
     	}
     	
     }
@@ -74,5 +74,5 @@ 
     sugar_cleanup(true);
 }
 
-header("Location: index.php?module=ACLRoles&action=DetailView&record=". $role->id);
+header("Location: index.php?module=ACLRoles&action=DetailView&record=".$role->id);
 ?>
\ No newline at end of file

Braces +7 added lines, -3 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -42,7 +44,9 @@ 
 
 
 $role = new ACLRole();
-if(isset($_REQUEST['record']))$role->id = $_POST['record'];
+if(isset($_REQUEST['record'])) {
+    $role->id = $_POST['record'];
+}
 if(!empty($_REQUEST['name'])){
 	$role->name = $_POST['name'];
 	$role->description = $_POST['description'];
@@ -59,7 +63,7 @@ 
 	        }
 	    }
 	}
-}else{
+} else{
     ob_clean();	
     $flc_module = 'All';
     foreach($_POST as $name=>$value){

modules/ACLRoles/Delete.php

Indentation +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
 $role = new ACLRole();
 if(isset($_REQUEST['record'])){
-	$role->mark_deleted($_REQUEST['record']);
+    $role->mark_deleted($_REQUEST['record']);
 }
 require_once('include/formbase.php');
 handleRedirect();

Spacing +2 added lines, -2 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');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -40,7 +40,7 @@ 
 
 
 $role = new ACLRole();
-if(isset($_REQUEST['record'])){
+if (isset($_REQUEST['record'])) {
 	$role->mark_deleted($_REQUEST['record']);
 }
 require_once('include/formbase.php');

Braces +3 added lines, -1 removed lines

@@ -1,5 +1,7 @@
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.

modules/Users/authentication/AuthenticationController.php

Braces +10 added lines, -5 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -127,7 +129,9 @@ 
 		$_SESSION['loginAttempts'] = (isset($_SESSION['loginAttempts']))? $_SESSION['loginAttempts'] + 1: 1;
 		unset($GLOBALS['login_error']);
 
-		if($this->loggedIn)return $this->loginSuccess;
+		if($this->loggedIn) {
+		    return $this->loginSuccess;
+		}
 		LogicHook::initialize()->call_custom_logic('Users', 'before_login');
 
 		$this->loginSuccess = $this->authController->loginAuthenticate($username, $password, false, $PARAMS);
@@ -146,8 +150,9 @@ 
 			}
 
 			//call business logic hook
-			if(isset($GLOBALS['current_user']))
-				$GLOBALS['current_user']->call_custom_logic('after_login');
+			if(isset($GLOBALS['current_user'])) {
+							$GLOBALS['current_user']->call_custom_logic('after_login');
+			}
 
 			// Check for running Admin Wizard
 			$config = new Administration();
@@ -172,7 +177,7 @@ 
 				header("Location: index.php?module=Users&action=Wizard");
 				sugar_cleanup(true);
 			}
-		}else{
+		} else{
 			//kbrill bug #13225
 			LogicHook::initialize();
 			$GLOBALS['logic_hook']->call_custom_logic('Users', 'login_failed');

Spacing +18 added lines, -18 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');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -44,7 +44,7 @@ 
 {
 	public $loggedIn = false; //if a user has attempted to login
 	public $authenticated = false;
-	public $loginSuccess = false;// if a user has successfully logged in
+	public $loginSuccess = false; // if a user has successfully logged in
 
 	protected static $authcontrollerinstance = null;
 
@@ -81,10 +81,10 @@ 
         }
 
         // 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')) {
-            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');
+		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');
         } else {
             require_once('modules/Users/authentication/SugarAuthenticate/SugarAuthenticate.php');
             $type = 'SugarAuthenticate';
@@ -124,21 +124,21 @@ 
 	public function login($username, $password, $PARAMS = array())
 	{
 		//kbrill bug #13225
-		$_SESSION['loginAttempts'] = (isset($_SESSION['loginAttempts']))? $_SESSION['loginAttempts'] + 1: 1;
+		$_SESSION['loginAttempts'] = (isset($_SESSION['loginAttempts'])) ? $_SESSION['loginAttempts'] + 1 : 1;
 		unset($GLOBALS['login_error']);
 
-		if($this->loggedIn)return $this->loginSuccess;
+		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){
+		if ($this->loginSuccess) {
 			//Ensure the user is authorized
 			checkAuthUserStatus();
 
 			//loginLicense();
-			if(!empty($GLOBALS['login_error'])){
+			if (!empty($GLOBALS['login_error'])) {
 				unset($_SESSION['authenticated_user_id']);
 				$GLOBALS['log']->fatal('FAILED LOGIN: potential hack attempt:'.$GLOBALS['login_error']);
 				$this->loginSuccess = false;
@@ -146,14 +146,14 @@ 
 			}
 
 			//call business logic hook
-			if(isset($GLOBALS['current_user']))
+			if (isset($GLOBALS['current_user']))
 				$GLOBALS['current_user']->call_custom_logic('after_login');
 
 			// Check for running Admin Wizard
 			$config = new Administration();
 			$config->retrieveSettings();
 			$postSilentInstallAdminWizardCompleted = $GLOBALS['current_user']->getPreference('postSilentInstallAdminWizardCompleted');
-		    if ( (is_admin($GLOBALS['current_user']) && empty($config->settings['system_adminwizard']) && $_REQUEST['action'] != 'AdminWizard') ||($postSilentInstallAdminWizardCompleted !== NULL && !$postSilentInstallAdminWizardCompleted) ) {
+		    if ((is_admin($GLOBALS['current_user']) && empty($config->settings['system_adminwizard']) && $_REQUEST['action'] != 'AdminWizard') || ($postSilentInstallAdminWizardCompleted !== NULL && !$postSilentInstallAdminWizardCompleted)) {
 				$GLOBALS['module'] = 'Configurator';
 				$GLOBALS['action'] = 'AdminWizard';
 				ob_clean();
@@ -166,18 +166,18 @@ 
 			if (is_array($PARAMS) && !empty($PARAMS) && isset($PARAMS['passwordEncrypted'])) {
 				$checkTimeZone = false;
 			} // if
-			if(empty($ut) && $checkTimeZone && $_REQUEST['action'] != 'SetTimezone' && $_REQUEST['action'] != 'SaveTimezone' ) {
+			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{
+		} else {
 			//kbrill bug #13225
 			LogicHook::initialize();
 			$GLOBALS['logic_hook']->call_custom_logic('Users', 'login_failed');
-			$GLOBALS['log']->fatal('FAILED LOGIN:attempts[' .$_SESSION['loginAttempts'] .'] - '. $username);
+			$GLOBALS['log']->fatal('FAILED LOGIN:attempts['.$_SESSION['loginAttempts'].'] - '.$username);
 		}
 		// if password has expired, set a session variable
 
@@ -192,11 +192,11 @@ 
 	 */
 	public function sessionAuthenticate()
 	{
-		if(!$this->authenticated){
+		if (!$this->authenticated) {
 			$this->authenticated = $this->authController->sessionAuthenticate();
 		}
-		if($this->authenticated){
-			if(!isset($_SESSION['userStats']['pages'])){
+		if ($this->authenticated) {
+			if (!isset($_SESSION['userStats']['pages'])) {
 			    $_SESSION['userStats']['loginTime'] = time();
 			    $_SESSION['userStats']['pages'] = 0;
 			}

Indentation +137 added lines, -137 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');
@@ -92,133 +92,133 @@ 
 
         if (!empty($_REQUEST['no_saml']) 
             && (
-				(is_subclass_of($type, 'SAMLAuthenticate') || 'SAMLAuthenticate' == $type) ||
-				(is_subclass_of($type, 'SAML2Authenticate') || 'SAML2Authenticate' == $type)
-			)) {
+                (is_subclass_of($type, 'SAMLAuthenticate') || 'SAMLAuthenticate' == $type) ||
+                (is_subclass_of($type, 'SAML2Authenticate') || 'SAML2Authenticate' == $type)
+            )) {
             $type = 'SugarAuthenticate';
         }
 
         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();
-			$postSilentInstallAdminWizardCompleted = $GLOBALS['current_user']->getPreference('postSilentInstallAdminWizardCompleted');
-		    if ( (is_admin($GLOBALS['current_user']) && empty($config->settings['system_adminwizard']) && $_REQUEST['action'] != 'AdminWizard') ||($postSilentInstallAdminWizardCompleted !== NULL && !$postSilentInstallAdminWizardCompleted) ) {
-				$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();
+            $postSilentInstallAdminWizardCompleted = $GLOBALS['current_user']->getPreference('postSilentInstallAdminWizardCompleted');
+            if ( (is_admin($GLOBALS['current_user']) && empty($config->settings['system_adminwizard']) && $_REQUEST['action'] != 'AdminWizard') ||($postSilentInstallAdminWizardCompleted !== NULL && !$postSilentInstallAdminWizardCompleted) ) {
+                $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;
 
-	}
+    }
 
 }
 

Spacing +10 added lines, -10 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');
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -45,7 +45,7 @@ 
  * This file is where the user authentication occurs. No redirection should happen in this file.
  *
  */
-class SugarAuthenticateUser{
+class SugarAuthenticateUser {
 
 	/**
 	 * Does the actual authentication of the user and returns an id that will be used
@@ -56,7 +56,7 @@ 
 	 * @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)
+	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'");
     
@@ -93,8 +93,8 @@ 
 	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;
+		$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']) {
@@ -104,7 +104,7 @@ 
 			$input_hash = SugarAuthenticate::encodePassword($password);
 		} // if
 		$user_id = $this->authenticateUser($name, $input_hash, $fallback);
-		if(empty($user_id)) {
+		if (empty($user_id)) {
 			$GLOBALS['log']->fatal('SECURITY: User authentication for '.$name.' failed');
 			return false;
 		}
@@ -117,14 +117,14 @@ 
 	 * @param STRING $user_id
 	 * @return boolean
 	 */
-	function loadUserOnSession($user_id=''){
-		if(!empty($user_id)){
+	function loadUserOnSession($user_id = '') {
+		if (!empty($user_id)) {
 			$_SESSION['authenticated_user_id'] = $user_id;
 		}
 
-		if(!empty($_SESSION['authenticated_user_id']) || !empty($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 ($GLOBALS['current_user']->retrieve($_SESSION['authenticated_user_id'])) {
 
 				return true;
 			}

Braces +6 added lines, -2 removed lines

@@ -1,5 +1,7 @@ 
 <?php
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
+if(!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
 /*********************************************************************************
  * SugarCRM Community Edition is a customer relationship management program developed by
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -94,7 +96,9 @@ 
 		global $login_error;
 
 		$GLOBALS['log']->debug("Starting user load for ". $name);
-		if(empty($name) || empty($password)) return false;
+		if(empty($name) || empty($password)) {
+		    return false;
+		}
 		$input_hash = $password;
 		$passwordEncrypted = false;
 		if (!empty($PARAMS) && isset($PARAMS['passwordEncrypted']) && $PARAMS['passwordEncrypted']) {

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';

Braces +14 added lines, -11 removed lines

@@ -158,7 +158,7 @@ 
 
         if (isset($GLOBALS['sugar_config']['show_download_tab'])) {
             $enable_download_tab = $GLOBALS['sugar_config']['show_download_tab'];
-        }else{
+        } else{
             $enable_download_tab = true;
         }
 
@@ -175,8 +175,7 @@ 
             if ($this->bean->id == $current_user->id) {
                 $reset_pref_warning = translate('LBL_RESET_PREFERENCES_WARNING','Users');
                 $reset_home_warning = translate('LBL_RESET_HOMEPAGE_WARNING','Users');
-            }
-            else {
+            } else {
                 $reset_pref_warning = translate('LBL_RESET_PREFERENCES_WARNING_USER','Users');
                 $reset_home_warning = translate('LBL_RESET_HOMEPAGE_WARNING_USER','Users');
             }
@@ -193,8 +192,12 @@ 
             $buttons_footer[]="<input type='button' class='button' id='reset_homepage_footer' onclick='if(confirm(\"{$reset_home_warning}\"))window.location=\"".$_SERVER['PHP_SELF'] .'?'.$the_query_string."&reset_homepage=true\";' value='".translate('LBL_RESET_HOMEPAGE','Users')."' />";
 
         }
-        if (isset($buttons_header)) $this->ss->assign("BUTTONS_HEADER", $buttons_header);
-        if (isset($buttons_footer)) $this->ss->assign("BUTTONS_FOOTER", $buttons_footer);
+        if (isset($buttons_header)) {
+            $this->ss->assign("BUTTONS_HEADER", $buttons_header);
+        }
+        if (isset($buttons_footer)) {
+            $this->ss->assign("BUTTONS_FOOTER", $buttons_footer);
+        }
 
 
 
@@ -388,7 +391,9 @@ 
 
         $this->ss->assign('EXPORT_DELIMITER', $this->bean->getPreference('export_delimiter'));
 
-        if($this->bean->receive_notifications ||(!isset($this->bean->id) && $admin->settings['notify_send_by_default'])) $this->ss->assign("RECEIVE_NOTIFICATIONS", "checked");
+        if($this->bean->receive_notifications ||(!isset($this->bean->id) && $admin->settings['notify_send_by_default'])) {
+            $this->ss->assign("RECEIVE_NOTIFICATIONS", "checked");
+        }
 
         //jc:12293 - modifying to use the accessor method which will translate the
         //available character sets using the translation files
@@ -479,7 +484,7 @@ 
             $this->ss->assign('EXTERNAL_AUTH_CLASS_1', $sugar_config['authenticationClass']);
             $this->ss->assign('EXTERNAL_AUTH_CLASS', $sugar_config['authenticationClass']);
             $authclass = $sugar_config['authenticationClass'];
-        }else{
+        } else{
             if(!empty($GLOBALS['system_config']->settings['system_ldap_enabled'])){
                 $this->ss->assign('EXTERNAL_AUTH_CLASS_1', translate('LBL_LDAP','Users'));
                 $this->ss
@@ -772,12 +777,10 @@ 
         if ($user->is_admin)
         {
             $user->user_type = 'Administrator';
-        }
-        else if ($user->is_group)
+        } else if ($user->is_group)
         {
             $user->user_type = 'GROUP';
-        }
-        else
+        } else
         {
             $user->user_type = 'RegularUser';
         }

Spacing +133 added lines, -133 removed lines

@@ -79,7 +79,7 @@ 
     /**
      * Constructor, pass in the smarty template, the bean and the viewtype
      */
-    public function __construct(Sugar_Smarty &$smarty, SugarBean &$bean, $viewType = 'EditView' ) {
+    public function __construct(Sugar_Smarty & $smarty, SugarBean & $bean, $viewType = 'EditView') {
         $this->ss = $smarty;
         $this->bean = $bean;
         $this->viewType = $viewType;
@@ -103,37 +103,37 @@ 
         global $current_user, $app_list_strings;
 
         // There is a lot of extra stuff that needs to go in here to properly render
-        $this->is_current_admin=is_admin($current_user)
+        $this->is_current_admin = is_admin($current_user)
             ||$current_user->isAdminForModule('Users');
         $this->is_super_admin = is_admin($current_user);
 
-        $this->usertype='REGULAR';
-        if($this->is_super_admin){
-            $this->usertype='Administrator';
+        $this->usertype = 'REGULAR';
+        if ($this->is_super_admin) {
+            $this->usertype = 'Administrator';
         }
 
 
         // check if the user has access to the User Management
-        $this->ss->assign('USER_ADMIN',$current_user->isAdminForModule('Users')&& !is_admin($current_user));
+        $this->ss->assign('USER_ADMIN', $current_user->isAdminForModule('Users') && !is_admin($current_user));
 
 
         if ($this->is_current_admin) {
-            $this->ss->assign('IS_ADMIN','1');
+            $this->ss->assign('IS_ADMIN', '1');
         } else {
             $this->ss->assign('IS_ADMIN', '0');
         }
 
         if ($this->is_super_admin) {
-            $this->ss->assign('IS_SUPER_ADMIN','1');
+            $this->ss->assign('IS_SUPER_ADMIN', '1');
         } else {
             $this->ss->assign('IS_SUPER_ADMIN', '0');
         }
 
         $this->ss->assign('IS_PORTALONLY', '0');
         $this->ss->assign('IS_GROUP', '0');
-        if((!empty($this->bean->is_group) && $this->bean->is_group)  || (isset($_REQUEST['usertype']) && $_REQUEST['usertype']=='group')){
+        if ((!empty($this->bean->is_group) && $this->bean->is_group) || (isset($_REQUEST['usertype']) && $_REQUEST['usertype'] == 'group')) {
             $this->ss->assign('IS_GROUP', '1');
-            $this->usertype='GROUP';
+            $this->usertype = 'GROUP';
         }
 
 
@@ -144,11 +144,11 @@ 
 
         $this->ss->assign('IS_FOCUS_ADMIN', is_admin($this->bean));
 
-        if($edit_self) {
-            $this->ss->assign('EDIT_SELF','1');
+        if ($edit_self) {
+            $this->ss->assign('EDIT_SELF', '1');
         }
-        if($admin_edit_self) {
-            $this->ss->assign('ADMIN_EDIT_SELF','1');
+        if ($admin_edit_self) {
+            $this->ss->assign('ADMIN_EDIT_SELF', '1');
         }
 
     }
@@ -158,7 +158,7 @@ 
 
         if (isset($GLOBALS['sugar_config']['show_download_tab'])) {
             $enable_download_tab = $GLOBALS['sugar_config']['show_download_tab'];
-        }else{
+        } else {
             $enable_download_tab = true;
         }
 
@@ -166,31 +166,31 @@ 
 
 
         $the_query_string = 'module=Users&action=DetailView';
-        if(isset($_REQUEST['record'])) {
+        if (isset($_REQUEST['record'])) {
             $the_query_string .= '&record='.$_REQUEST['record'];
         }
         $buttons_header = array();
         $buttons_footer = array();
-        if (!$this->bean->is_group){
+        if (!$this->bean->is_group) {
             if ($this->bean->id == $current_user->id) {
-                $reset_pref_warning = translate('LBL_RESET_PREFERENCES_WARNING','Users');
-                $reset_home_warning = translate('LBL_RESET_HOMEPAGE_WARNING','Users');
+                $reset_pref_warning = translate('LBL_RESET_PREFERENCES_WARNING', 'Users');
+                $reset_home_warning = translate('LBL_RESET_HOMEPAGE_WARNING', 'Users');
             }
             else {
-                $reset_pref_warning = translate('LBL_RESET_PREFERENCES_WARNING_USER','Users');
-                $reset_home_warning = translate('LBL_RESET_HOMEPAGE_WARNING_USER','Users');
+                $reset_pref_warning = translate('LBL_RESET_PREFERENCES_WARNING_USER', 'Users');
+                $reset_home_warning = translate('LBL_RESET_HOMEPAGE_WARNING_USER', 'Users');
             }
 
             //bug 48170
             $user_preference_url = "module=Users&action=resetPreferences";
-            if(isset($_REQUEST['record'])){
+            if (isset($_REQUEST['record'])) {
                 $user_preference_url .= "&record=".$_REQUEST['record'];
             }
-            $buttons_header[]="<input type='button' class='button' id='reset_user_preferences_header' onclick='if(confirm(\"{$reset_pref_warning}\"))window.location=\"".$_SERVER['PHP_SELF'] .'?'.$user_preference_url."&reset_preferences=true\";' value='".translate('LBL_RESET_PREFERENCES','Users')."' />";
-            $buttons_header[]="<input type='button' class='button' id='reset_homepage_header' onclick='if(confirm(\"{$reset_home_warning}\"))window.location=\"".$_SERVER['PHP_SELF'] .'?'.$the_query_string."&reset_homepage=true\";' value='".translate('LBL_RESET_HOMEPAGE','Users')."' />";
+            $buttons_header[] = "<input type='button' class='button' id='reset_user_preferences_header' onclick='if(confirm(\"{$reset_pref_warning}\"))window.location=\"".$_SERVER['PHP_SELF'].'?'.$user_preference_url."&reset_preferences=true\";' value='".translate('LBL_RESET_PREFERENCES', 'Users')."' />";
+            $buttons_header[] = "<input type='button' class='button' id='reset_homepage_header' onclick='if(confirm(\"{$reset_home_warning}\"))window.location=\"".$_SERVER['PHP_SELF'].'?'.$the_query_string."&reset_homepage=true\";' value='".translate('LBL_RESET_HOMEPAGE', 'Users')."' />";
 
-            $buttons_footer[]="<input type='button' class='button' id='reset_user_preferences_footer' onclick='if(confirm(\"{$reset_pref_warning}\"))window.location=\"".$_SERVER['PHP_SELF'] .'?'.$user_preference_url."&reset_preferences=true\";' value='".translate('LBL_RESET_PREFERENCES','Users')."' />";
-            $buttons_footer[]="<input type='button' class='button' id='reset_homepage_footer' onclick='if(confirm(\"{$reset_home_warning}\"))window.location=\"".$_SERVER['PHP_SELF'] .'?'.$the_query_string."&reset_homepage=true\";' value='".translate('LBL_RESET_HOMEPAGE','Users')."' />";
+            $buttons_footer[] = "<input type='button' class='button' id='reset_user_preferences_footer' onclick='if(confirm(\"{$reset_pref_warning}\"))window.location=\"".$_SERVER['PHP_SELF'].'?'.$user_preference_url."&reset_preferences=true\";' value='".translate('LBL_RESET_PREFERENCES', 'Users')."' />";
+            $buttons_footer[] = "<input type='button' class='button' id='reset_homepage_footer' onclick='if(confirm(\"{$reset_home_warning}\"))window.location=\"".$_SERVER['PHP_SELF'].'?'.$the_query_string."&reset_homepage=true\";' value='".translate('LBL_RESET_HOMEPAGE', 'Users')."' />";
 
         }
         if (isset($buttons_header)) $this->ss->assign("BUTTONS_HEADER", $buttons_header);
@@ -199,7 +199,7 @@ 
 
 
         if (isset($this->bean->id)) {
-            $this->ss->assign('ID',$this->bean->id);
+            $this->ss->assign('ID', $this->bean->id);
         }
 
     }
@@ -217,7 +217,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))
+        if (!empty($this->bean->id) && empty($this->bean->user_type))
 	    {
             $this->setUserType($this->bean);
             $userType = $this->bean->user_type;
@@ -228,27 +228,27 @@ 
         $availableUserTypes = array();
         $userTypes = array(
             'RegularUser' => array(
-                'label' => translate('LBL_REGULAR_USER','Users'),
-                'description' => translate('LBL_REGULAR_DESC','Users'),
+                'label' => translate('LBL_REGULAR_USER', 'Users'),
+                'description' => translate('LBL_REGULAR_DESC', 'Users'),
             ),
             'GROUP' => array(
-                'label' => translate('LBL_GROUP_USER','Users'),
-                'description' => translate('LBL_GROUP_DESC','Users'),
+                'label' => translate('LBL_GROUP_USER', 'Users'),
+                'description' => translate('LBL_GROUP_DESC', 'Users'),
             ),
             'Administrator' => array(
-                'label' => translate('LBL_ADMIN_USER','Users'),
-                'description' => translate('LBL_ADMIN_DESC','Users'),
+                'label' => translate('LBL_ADMIN_USER', 'Users'),
+                'description' => translate('LBL_ADMIN_DESC', 'Users'),
             ),
         );
 
-        if ( $userType == 'GROUP' || $userType == 'PORTAL_ONLY' ) {
+        if ($userType == 'GROUP' || $userType == 'PORTAL_ONLY') {
             $availableUserTypes = array($this->usertype);
         } else {
-            if ( $this->ss->get_template_vars('USER_ADMIN') ) {
+            if ($this->ss->get_template_vars('USER_ADMIN')) {
                 $availableUserTypes = array('RegularUser');
-            } elseif($this->ss->get_template_vars('ADMIN_EDIT_SELF')) {
+            } elseif ($this->ss->get_template_vars('ADMIN_EDIT_SELF')) {
                 $availableUserTypes = array('Administrator');
-            } elseif($this->ss->get_template_vars('IS_SUPER_ADMIN')) {
+            } elseif ($this->ss->get_template_vars('IS_SUPER_ADMIN')) {
                 $availableUserTypes = array(
                     'RegularUser',
                     'Administrator',
@@ -259,7 +259,7 @@ 
         }
 
         $userTypeDropdown = '<select id="UserType" name="UserType" onchange="user_status_display(this);" ';
-        if ( count($availableUserTypes) == 1 ) {
+        if (count($availableUserTypes) == 1) {
             $userTypeDropdown .= ' disabled ';
         }
         $userTypeDropdown .= '>';
@@ -268,8 +268,8 @@ 
 
         $setSelected = !empty($this->bean->id);
 
-        foreach ( $availableUserTypes as $currType ) {
-            if ($setSelected && $currType == $userType ) {
+        foreach ($availableUserTypes as $currType) {
+            if ($setSelected && $currType == $userType) {
                 $userTypeDropdown .= '<option value="'.$currType.'" SELECTED>'.$userTypes[$currType]['label'].'</option>';
             } else {
                 $userTypeDropdown .= '<option value="'.$currType.'">'.$userTypes[$currType]['label'].'</option>';
@@ -277,8 +277,8 @@ 
         }
         $userTypeDropdown .= '</select><div id="UserTypeDesc">&nbsp;</div>';
 
-        $this->ss->assign('USER_TYPE_DROPDOWN',$userTypeDropdown);
-        $this->ss->assign('USER_TYPE_READONLY',$userTypes[$userType]['label'] . "<input type='hidden' id='UserType' value='{$userType}'><div id='UserTypeDesc'>&nbsp;</div>");
+        $this->ss->assign('USER_TYPE_DROPDOWN', $userTypeDropdown);
+        $this->ss->assign('USER_TYPE_READONLY', $userTypes[$userType]['label']."<input type='hidden' id='UserType' value='{$userType}'><div id='UserTypeDesc'>&nbsp;</div>");
 
     }
 
@@ -288,48 +288,48 @@ 
         $this->ss->assign('PWDSETTINGS', isset($GLOBALS['sugar_config']['passwordsetting']) ? $GLOBALS['sugar_config']['passwordsetting'] : array());
 
 
-        $enable_syst_generate_pwd=false;
-        if(isset($GLOBALS['sugar_config']['passwordsetting']) && isset($GLOBALS['sugar_config']['passwordsetting']['SystemGeneratedPasswordON'])){
-            $enable_syst_generate_pwd=$GLOBALS['sugar_config']['passwordsetting']['SystemGeneratedPasswordON'];
+        $enable_syst_generate_pwd = false;
+        if (isset($GLOBALS['sugar_config']['passwordsetting']) && isset($GLOBALS['sugar_config']['passwordsetting']['SystemGeneratedPasswordON'])) {
+            $enable_syst_generate_pwd = $GLOBALS['sugar_config']['passwordsetting']['SystemGeneratedPasswordON'];
         }
 
         // If new regular user without system generated password or new portal user
-        if(((isset($enable_syst_generate_pwd) && !$enable_syst_generate_pwd && $this->usertype!='GROUP') || $this->usertype =='PORTAL_ONLY') && empty($this->bean->id)) {
-            $this->ss->assign('REQUIRED_PASSWORD','1');
+        if (((isset($enable_syst_generate_pwd) && !$enable_syst_generate_pwd && $this->usertype != 'GROUP') || $this->usertype == 'PORTAL_ONLY') && empty($this->bean->id)) {
+            $this->ss->assign('REQUIRED_PASSWORD', '1');
         } else {
-            $this->ss->assign('REQUIRED_PASSWORD','0');
+            $this->ss->assign('REQUIRED_PASSWORD', '0');
         }
 
         // If my account page or portal only user or regular user without system generated password or a duplicate user
-        if((($current_user->id == $this->bean->id) || $this->usertype=='PORTAL_ONLY' || (($this->usertype=='REGULAR' || $this->usertype == 'Administrator' || (isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true' && $this->usertype!='GROUP')) && !$enable_syst_generate_pwd)) && !$this->bean->external_auth_only ) {
+        if ((($current_user->id == $this->bean->id) || $this->usertype == 'PORTAL_ONLY' || (($this->usertype == 'REGULAR' || $this->usertype == 'Administrator' || (isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true' && $this->usertype != 'GROUP')) && !$enable_syst_generate_pwd)) && !$this->bean->external_auth_only) {
             $this->ss->assign('CHANGE_PWD', '1');
         } else {
             $this->ss->assign('CHANGE_PWD', '0');
         }
 
         // Make sure group users don't get a password change prompt
-        if ( $this->usertype == 'GROUP' ) {
+        if ($this->usertype == 'GROUP') {
             $this->ss->assign('CHANGE_PWD', '0');
         }
 
         $configurator = new Configurator();
-        if ( isset($configurator->config['passwordsetting'])
+        if (isset($configurator->config['passwordsetting'])
              && ($configurator->config['passwordsetting']['SystemGeneratedPasswordON']
                  || $configurator->config['passwordsetting']['forgotpasswordON'])
-             && $this->usertype != 'GROUP' && $this->usertype != 'PORTAL_ONLY' ) {
-            $this->ss->assign('REQUIRED_EMAIL_ADDRESS','1');
+             && $this->usertype != 'GROUP' && $this->usertype != 'PORTAL_ONLY') {
+            $this->ss->assign('REQUIRED_EMAIL_ADDRESS', '1');
         } else {
-            $this->ss->assign('REQUIRED_EMAIL_ADDRESS','0');
+            $this->ss->assign('REQUIRED_EMAIL_ADDRESS', '0');
         }
-        if($this->usertype=='GROUP' || $this->usertype=='PORTAL_ONLY') {
+        if ($this->usertype == 'GROUP' || $this->usertype == 'PORTAL_ONLY') {
             $this->ss->assign('HIDE_FOR_GROUP_AND_PORTAL', 'none');
-            $this->ss->assign('HIDE_CHANGE_USERTYPE','none');
+            $this->ss->assign('HIDE_CHANGE_USERTYPE', 'none');
         } else {
-            $this->ss->assign('HIDE_FOR_NORMAL_AND_ADMIN','none');
+            $this->ss->assign('HIDE_FOR_NORMAL_AND_ADMIN', 'none');
             if (!$this->is_current_admin) {
-                $this->ss->assign('HIDE_CHANGE_USERTYPE','none');
+                $this->ss->assign('HIDE_CHANGE_USERTYPE', 'none');
             } else {
-                $this->ss->assign('HIDE_STATIC_USERTYPE','none');
+                $this->ss->assign('HIDE_STATIC_USERTYPE', 'none');
             }
         }
 
@@ -337,12 +337,12 @@ 
 
     protected function setupThemeTab() {
         $user_theme = $this->bean->getPreference('user_theme');
-        if(isset($user_theme)) {
+        if (isset($user_theme)) {
             $this->ss->assign("THEMES", get_select_options_with_id(SugarThemeRegistry::availableThemes(), $user_theme));
         } else {
             $this->ss->assign("THEMES", get_select_options_with_id(SugarThemeRegistry::availableThemes(), $GLOBALS['sugar_config']['default_theme']));
         }
-        $this->ss->assign("SHOW_THEMES",count(SugarThemeRegistry::availableThemes()) > 1);
+        $this->ss->assign("SHOW_THEMES", count(SugarThemeRegistry::availableThemes()) > 1);
         $this->ss->assign("USER_THEME_COLOR", $this->bean->getPreference('user_theme_color'));
         $this->ss->assign("USER_THEME_FONT", $this->bean->getPreference('user_theme_font'));
         $this->ss->assign("USER_THEME", $user_theme);
@@ -351,25 +351,25 @@ 
         $this->ss->assign("DISPLAY_GROUP_TAB", 'none');
 
         $selectedTheme = $user_theme;
-        if(!isset($user_theme)) {
+        if (!isset($user_theme)) {
             $selectedTheme = $GLOBALS['sugar_config']['default_theme'];
         }
 
         $themeList = SugarThemeRegistry::availableThemes();
         $themeGroupList = array();
 
-        foreach ( $themeList as $themeId => $themeName ) {
+        foreach ($themeList as $themeId => $themeName) {
             $currThemeObj = SugarThemeRegistry::get($themeId);
-            if ( isset($currThemeObj->group_tabs) && $currThemeObj->group_tabs == 1 ) {
+            if (isset($currThemeObj->group_tabs) && $currThemeObj->group_tabs == 1) {
                 $themeGroupList[$themeId] = true;
-                if ( $themeId == $selectedTheme ) {
+                if ($themeId == $selectedTheme) {
                     $this->ss->assign("DISPLAY_GROUP_TAB", '');
                 }
             } else {
                 $themeGroupList[$themeId] = false;
             }
         }
-        $this->ss->assign("themeGroupListJSON",json_encode($themeGroupList));
+        $this->ss->assign("themeGroupListJSON", json_encode($themeGroupList));
 
     }
 
@@ -388,7 +388,7 @@ 
 
         $this->ss->assign('EXPORT_DELIMITER', $this->bean->getPreference('export_delimiter'));
 
-        if($this->bean->receive_notifications ||(!isset($this->bean->id) && $admin->settings['notify_send_by_default'])) $this->ss->assign("RECEIVE_NOTIFICATIONS", "checked");
+        if ($this->bean->receive_notifications || (!isset($this->bean->id) && $admin->settings['notify_send_by_default'])) $this->ss->assign("RECEIVE_NOTIFICATIONS", "checked");
 
         //jc:12293 - modifying to use the accessor method which will translate the
         //available character sets using the translation files
@@ -398,28 +398,28 @@ 
         $this->ss->assign('EXPORT_CHARSET_DISPLAY', $export_charset);
         //end:12293
 
-        if( $this->bean->getPreference('use_real_names') == 'on'
-            || ( empty($this->bean->id)
+        if ($this->bean->getPreference('use_real_names') == 'on'
+            || (empty($this->bean->id)
                  && isset($GLOBALS['sugar_config']['use_real_names'])
                  && $GLOBALS['sugar_config']['use_real_names']
-                 && $this->bean->getPreference('use_real_names') != 'off') ) {
+                 && $this->bean->getPreference('use_real_names') != 'off')) {
             $this->ss->assign('USE_REAL_NAMES', 'CHECKED');
         }
 
-        if($this->bean->getPreference('mailmerge_on') == 'on') {
+        if ($this->bean->getPreference('mailmerge_on') == 'on') {
             $this->ss->assign('MAILMERGE_ON', 'checked');
         }
 
-        if($this->bean->getPreference('no_opps') == 'on') {
+        if ($this->bean->getPreference('no_opps') == 'on') {
             $this->ss->assign('NO_OPPS', 'CHECKED');
         }
 
 	    $reminder_time = $this->bean->getPreference('reminder_time');
-	    if(empty($reminder_time)){
+	    if (empty($reminder_time)) {
 		    $reminder_time = -1;
 	    }
 	    $email_reminder_time = $this->bean->getPreference('email_reminder_time');
-	    if(empty($email_reminder_time)){
+	    if (empty($email_reminder_time)) {
 		    $email_reminder_time = -1;
 	    }
 		
@@ -433,29 +433,29 @@ 
 	    $this->ss->assign("EMAIL_REMINDER_CHECKED", $remindersDefaultPreferences['email']);
 		
 	    $this->ss->assign("REMINDER_TABINDEX", "12");
-	    $publish_key = $this->bean->getPreference('calendar_publish_key' );
+	    $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';
         $token = "/";
         //determine if the web server is running IIS
         //if so then change the publish url
-        if(isset($_SERVER) && !empty($_SERVER['SERVER_SOFTWARE'])){
+        if (isset($_SERVER) && !empty($_SERVER['SERVER_SOFTWARE'])) {
             $position = strpos(strtolower($_SERVER['SERVER_SOFTWARE']), 'iis');
-            if($position !== false){
+            if ($position !== false) {
                 $token = '?parms=';
             }
         }
 
         $publish_url .= $token."type=vfb&source=outlook&key=<span id=\"cal_pub_key_span\">$publish_key</span>";
-        if (! empty($this->bean->email1)) {
+        if (!empty($this->bean->email1)) {
             $publish_url .= '&email='.$this->bean->email1;
         } else {
             $publish_url .= '&user_name='.$this->bean->user_name;
         }
 
         $ical_url = $sugar_config['site_url']."/ical_server.php?type=ics&key=<span id=\"ical_pub_key_span\">$publish_key</span>";
-        if (! empty($this->bean->email1))
+        if (!empty($this->bean->email1))
         {
             $ical_url .= '&email='.$this->bean->email1;
         } else
@@ -475,24 +475,24 @@ 
         global $sugar_config;
 
         $authclass = '';
-        if(!empty($sugar_config['authenticationClass'])){
+        if (!empty($sugar_config['authenticationClass'])) {
             $this->ss->assign('EXTERNAL_AUTH_CLASS_1', $sugar_config['authenticationClass']);
             $this->ss->assign('EXTERNAL_AUTH_CLASS', $sugar_config['authenticationClass']);
             $authclass = $sugar_config['authenticationClass'];
-        }else{
-            if(!empty($GLOBALS['system_config']->settings['system_ldap_enabled'])){
-                $this->ss->assign('EXTERNAL_AUTH_CLASS_1', translate('LBL_LDAP','Users'));
+        } else {
+            if (!empty($GLOBALS['system_config']->settings['system_ldap_enabled'])) {
+                $this->ss->assign('EXTERNAL_AUTH_CLASS_1', translate('LBL_LDAP', 'Users'));
                 $this->ss
-                        ->assign('EXTERNAL_AUTH_CLASS', translate('LBL_LDAP_AUTHENTICATION','Users'));
+                        ->assign('EXTERNAL_AUTH_CLASS', translate('LBL_LDAP_AUTHENTICATION', 'Users'));
                 $authclass = 'LDAPAuthenticate';
             }
         }
-        if(!empty($this->bean->external_auth_only)) {
+        if (!empty($this->bean->external_auth_only)) {
             $this->ss->assign('EXTERNAL_AUTH_ONLY_CHECKED', 'CHECKED');
         }
 
-        if($this->is_super_admin && !empty($authclass)) {
-            $this->ss->assign('DISPLAY_EXTERNAL_AUTH',true);
+        if ($this->is_super_admin && !empty($authclass)) {
+            $this->ss->assign('DISPLAY_EXTERNAL_AUTH', true);
         }
 
     }
@@ -502,19 +502,19 @@ 
 
         // Grouped tabs?
         $useGroupTabs = $this->bean->getPreference('navigation_paradigm');
-        if ( ! isset($useGroupTabs) ) {
-            if ( ! isset($GLOBALS['sugar_config']['default_navigation_paradigm']) ) {
+        if (!isset($useGroupTabs)) {
+            if (!isset($GLOBALS['sugar_config']['default_navigation_paradigm'])) {
                 $GLOBALS['sugar_config']['default_navigation_paradigm'] = 'gm';
             }
             $useGroupTabs = $GLOBALS['sugar_config']['default_navigation_paradigm'];
         }
-        $this->ss->assign("USE_GROUP_TABS",($useGroupTabs=='gm')?'checked':'');
+        $this->ss->assign("USE_GROUP_TABS", ($useGroupTabs == 'gm') ? 'checked' : '');
 
         $user_subpanel_tabs = $this->bean->getPreference('subpanel_tabs');
-        if(isset($user_subpanel_tabs)) {
-            $this->ss->assign("SUBPANEL_TABS", $user_subpanel_tabs?'checked':'');
+        if (isset($user_subpanel_tabs)) {
+            $this->ss->assign("SUBPANEL_TABS", $user_subpanel_tabs ? 'checked' : '');
         } else {
-            $this->ss->assign("SUBPANEL_TABS", $GLOBALS['sugar_config']['default_subpanel_tabs']?'checked':'');
+            $this->ss->assign("SUBPANEL_TABS", $GLOBALS['sugar_config']['default_subpanel_tabs'] ? 'checked' : '');
         }
 
         /* Module Tab Chooser */
@@ -524,7 +524,7 @@ 
         $controller = new TabController();
 
 
-        if($this->is_current_admin || $controller->get_users_can_edit()) {
+        if ($this->is_current_admin || $controller->get_users_can_edit()) {
             $chooser->display_hide_tabs = true;
         } else {
             $chooser->display_hide_tabs = false;
@@ -532,29 +532,29 @@ 
 
         $chooser->args['id'] = 'edit_tabs';
         $chooser->args['values_array'] = $controller->get_tabs($this->bean);
-        foreach($chooser->args['values_array'][0] as $key=>$value) {
+        foreach ($chooser->args['values_array'][0] as $key=>$value) {
             $chooser->args['values_array'][0][$key] = $app_list_strings['moduleList'][$key];
         }
 
-        foreach($chooser->args['values_array'][1] as $key=>$value) {
+        foreach ($chooser->args['values_array'][1] as $key=>$value) {
             $chooser->args['values_array'][1][$key] = $app_list_strings['moduleList'][$key];
         }
 
-        foreach($chooser->args['values_array'][2] as $key=>$value) {
+        foreach ($chooser->args['values_array'][2] as $key=>$value) {
             $chooser->args['values_array'][2][$key] = $app_list_strings['moduleList'][$key];
         }
 
         $chooser->args['left_name'] = 'display_tabs';
         $chooser->args['right_name'] = 'hide_tabs';
 
-        $chooser->args['left_label'] =  translate('LBL_DISPLAY_TABS','Users');
-        $chooser->args['right_label'] =  translate('LBL_HIDE_TABS','Users');
+        $chooser->args['left_label'] = translate('LBL_DISPLAY_TABS', 'Users');
+        $chooser->args['right_label'] = translate('LBL_HIDE_TABS', 'Users');
         require_once('include/Smarty/plugins/function.sugar_help.php');
-        $chooser->args['title'] =  translate('LBL_EDIT_TABS','Users').smarty_function_sugar_help(array("text"=>translate('LBL_CHOOSE_WHICH','Users')),$ss);
+        $chooser->args['title'] = translate('LBL_EDIT_TABS', 'Users').smarty_function_sugar_help(array("text"=>translate('LBL_CHOOSE_WHICH', 'Users')), $ss);
 
         $this->ss->assign('TAB_CHOOSER', $chooser->display());
-        $this->ss->assign('CHOOSER_SCRIPT','set_chooser();');
-        $this->ss->assign('CHOOSE_WHICH', translate('LBL_CHOOSE_WHICH','Users'));
+        $this->ss->assign('CHOOSER_SCRIPT', 'set_chooser();');
+        $this->ss->assign('CHOOSE_WHICH', translate('LBL_CHOOSE_WHICH', 'Users'));
 
     }
 
@@ -564,8 +564,8 @@ 
         ///////////////////////////////////////////////////////////////////////////////
         ////	LOCALE SETTINGS
         ////	Date/time format
-        $dformat = $locale->getPrecedentPreference($this->bean->id?'datef':'default_date_format', $this->bean);
-        $tformat = $locale->getPrecedentPreference($this->bean->id?'timef':'default_time_format', $this->bean);
+        $dformat = $locale->getPrecedentPreference($this->bean->id ? 'datef' : 'default_date_format', $this->bean);
+        $tformat = $locale->getPrecedentPreference($this->bean->id ? 'timef' : 'default_time_format', $this->bean);
         $nformat = $locale->getPrecedentPreference('default_locale_name_format', $this->bean);
         if (!array_key_exists($nformat, $sugar_config['name_formats'])) {
             $nformat = $sugar_config['default_locale_name_format'];
@@ -581,18 +581,18 @@ 
         $this->ss->assign('NAMEFORMAT', $sugar_config['name_formats'][$nformat]);
 
         //// Timezone
-        if(empty($this->bean->id)) { // remove default timezone for new users(set later)
+        if (empty($this->bean->id)) { // remove default timezone for new users(set later)
             $this->bean->user_preferences['timezone'] = '';
         }
 
         $userTZ = $this->bean->getPreference('timezone');
 
-        if(empty($userTZ) && !$this->bean->is_group && !$this->bean->portal_only) {
+        if (empty($userTZ) && !$this->bean->is_group && !$this->bean->portal_only) {
             $userTZ = TimeDate::guessTimezone();
             $this->bean->setPreference('timezone', $userTZ);
         }
 
-        if(!$this->bean->getPreference('ut')) {
+        if (!$this->bean->getPreference('ut')) {
             $this->ss->assign('PROMPTTZ', ' checked');
         }
         $this->ss->assign('TIMEZONE_CURRENT', $userTZ);
@@ -610,7 +610,7 @@ 
         $this->ss->assign("FDOWOPTIONS", $fdowDays);
         $currentFDOW = $this->bean->get_first_day_of_week();
 
-        if (!isset($currentFDOW)) {$currentFDOW = 0;}
+        if (!isset($currentFDOW)) {$currentFDOW = 0; }
         $this->ss->assign("FDOWCURRENT", $currentFDOW);
         $this->ss->assign("FDOWDISPLAY", $fdowDays[$currentFDOW]);
 
@@ -624,7 +624,7 @@ 
         // Euro or other type of currency then this setting would not apply as the
         // default because it was being overridden by US Dollars.
         $cur_id = $locale->getPrecedentPreference('currency', $this->bean);
-        if($cur_id) {
+        if ($cur_id) {
             $selectCurrency = $currency->getSelectOptions($cur_id);
             $this->ss->assign("CURRENCY", $selectCurrency);
         } else {
@@ -633,25 +633,25 @@ 
         }
 
         $currencyList = array();
-        foreach($locale->currencies as $id => $val ) {
+        foreach ($locale->currencies as $id => $val) {
             $currencyList[$id] = $val['symbol'];
         }
         $currencySymbolJSON = json_encode($currencyList);
         $this->ss->assign('currencySymbolJSON', $currencySymbolJSON);
 
         $currencyDisplay = new Currency();
-        if(isset($cur_id) ) {
+        if (isset($cur_id)) {
             $currencyDisplay->retrieve($cur_id);
-            $this->ss->assign('CURRENCY_DISPLAY', $currencyDisplay->iso4217 .' '.$currencyDisplay->symbol );
+            $this->ss->assign('CURRENCY_DISPLAY', $currencyDisplay->iso4217.' '.$currencyDisplay->symbol);
         } else {
-            $this->ss->assign("CURRENCY_DISPLAY", $currencyDisplay->getDefaultISO4217() .' '.$currencyDisplay->getDefaultCurrencySymbol() );
+            $this->ss->assign("CURRENCY_DISPLAY", $currencyDisplay->getDefaultISO4217().' '.$currencyDisplay->getDefaultCurrencySymbol());
         }
 
         // fill significant digits dropdown
         $significantDigits = $locale->getPrecedentPreference('default_currency_significant_digits', $this->bean);
         $sigDigits = '';
-        for($i=0; $i<=6; $i++) {
-            if($significantDigits == $i) {
+        for ($i = 0; $i <= 6; $i++) {
+            if ($significantDigits == $i) {
                 $sigDigits .= "<option value=\"$i\" selected=\"true\">$i</option>";
             } else {
                 $sigDigits .= "<option value=\"$i\">{$i}</option>";
@@ -663,8 +663,8 @@ 
 
         $num_grp_sep = $this->bean->getPreference('num_grp_sep');
         $dec_sep = $this->bean->getPreference('dec_sep');
-        $this->ss->assign("NUM_GRP_SEP",(empty($num_grp_sep) ? $GLOBALS['sugar_config']['default_number_grouping_seperator'] : $num_grp_sep));
-        $this->ss->assign("DEC_SEP",(empty($dec_sep) ? $GLOBALS['sugar_config']['default_decimal_seperator'] : $dec_sep));
+        $this->ss->assign("NUM_GRP_SEP", (empty($num_grp_sep) ? $GLOBALS['sugar_config']['default_number_grouping_seperator'] : $num_grp_sep));
+        $this->ss->assign("DEC_SEP", (empty($dec_sep) ? $GLOBALS['sugar_config']['default_decimal_seperator'] : $dec_sep));
         $this->ss->assign('getNumberJs', $locale->getNumberJs());
 
         //// Name display format
@@ -685,28 +685,28 @@ 
         ///////////////////////////////////////////////////////////////////////////////
         ////	EMAIL OPTIONS
         // We need to turn off the requiredness of emails if it is a group or portal user
-        if ($this->usertype == 'GROUP' || $this->usertype == 'PORTAL_ONLY' ) {
+        if ($this->usertype == 'GROUP' || $this->usertype == 'PORTAL_ONLY') {
             global $dictionary;
             $dictionary['User']['fields']['email1']['required'] = false;
         }
         // hack to disable email field being required if it shouldn't be required
-        if ( $this->ss->get_template_vars("REQUIRED_EMAIL_ADDRESS") == '0' ) {
+        if ($this->ss->get_template_vars("REQUIRED_EMAIL_ADDRESS") == '0') {
             $GLOBALS['dictionary']['User']['fields']['email1']['required'] = false;
         }
-        $this->ss->assign("NEW_EMAIL",  '<span id="email_span">' . getEmailAddressWidget($this->bean, "email1", $this->bean->email1, $this->viewType) . '</span>');
+        $this->ss->assign("NEW_EMAIL", '<span id="email_span">'.getEmailAddressWidget($this->bean, "email1", $this->bean->email1, $this->viewType).'</span>');
         // hack to undo that previous hack
-        if ( $this->ss->get_template_vars("REQUIRED_EMAIL_ADDRESS") == '0' ) {
+        if ($this->ss->get_template_vars("REQUIRED_EMAIL_ADDRESS") == '0') {
             $GLOBALS['dictionary']['User']['fields']['email1']['required'] = true;
         }
         $raw_email_link_type = $this->bean->getPreference('email_link_type');
-        if ( $this->viewType == 'EditView' ) {
+        if ($this->viewType == 'EditView') {
             $this->ss->assign('EMAIL_LINK_TYPE', get_select_options_with_id($app_list_strings['dom_email_link_type'], $raw_email_link_type));
         } else {
             $this->ss->assign('EMAIL_LINK_TYPE', $app_list_strings['dom_email_link_type'][$raw_email_link_type]);
         }
 
         $rawEditorType = $this->bean->getEditorType();
-        if ( $this->viewType == 'EditView' ) {
+        if ($this->viewType == 'EditView') {
             $this->ss->assign('EDITOR_TYPE', get_select_options_with_id($app_list_strings['dom_editor_type'], $rawEditorType));
         } else {
             $this->ss->assign('EDITOR_TYPE', $app_list_strings['dom_editor_type'][$rawEditorType]);
@@ -718,7 +718,7 @@ 
         /////////////////////////////////////////////
         /// Handle email account selections for users
         /////////////////////////////////////////////
-        if( !($this->usertype=='GROUP' || $this->usertype=='PORTAL_ONLY') ) {
+        if (!($this->usertype == 'GROUP' || $this->usertype == 'PORTAL_ONLY')) {
             // email smtp
             $systemOutboundEmail = new OutboundEmail();
             $systemOutboundEmail = $systemOutboundEmail->getSystemMailerSettings();
@@ -729,20 +729,20 @@ 
             $mail_smtpuser = "";
             $mail_smtppass = "";
             $mail_smtpdisplay = $systemOutboundEmail->mail_smtpdisplay;
-            $mail_smtpauth_req=true;
+            $mail_smtpauth_req = true;
 
-            if( !$systemOutboundEmail->isAllowUserAccessToSystemDefaultOutbound() ) {
+            if (!$systemOutboundEmail->isAllowUserAccessToSystemDefaultOutbound()) {
                 $mail_smtpauth_req = $systemOutboundEmail->mail_smtpauth_req;
                 $userOverrideOE = $systemOutboundEmail->getUsersMailerForSystemOverride($this->bean->id);
-                if($userOverrideOE != null) {
+                if ($userOverrideOE != null) {
                     $mail_smtpuser = $userOverrideOE->mail_smtpuser;
                     $mail_smtppass = $userOverrideOE->mail_smtppass;
                 }
 
 
-                if(!$mail_smtpauth_req && (empty($systemOutboundEmail->mail_smtpserver) || empty($systemOutboundEmail->mail_smtpuser) || empty($systemOutboundEmail->mail_smtppass))) {
+                if (!$mail_smtpauth_req && (empty($systemOutboundEmail->mail_smtpserver) || empty($systemOutboundEmail->mail_smtpuser) || empty($systemOutboundEmail->mail_smtppass))) {
                     $hide_if_can_use_default = true;
-                } else{
+                } else {
                     $hide_if_can_use_default = false;
                 }
             }
@@ -751,10 +751,10 @@ 
             $this->ss->assign("mail_smtpserver", $mail_smtpserver);
             $this->ss->assign("mail_smtpuser", $mail_smtpuser);
             $this->ss->assign("mail_smtppass", "");
-            $this->ss->assign("mail_haspass", empty($systemOutboundEmail->mail_smtppass)?0:1);
+            $this->ss->assign("mail_haspass", empty($systemOutboundEmail->mail_smtppass) ? 0 : 1);
             $this->ss->assign("mail_smtpauth_req", $mail_smtpauth_req);
-            $this->ss->assign('MAIL_SMTPPORT',$mail_smtpport);
-            $this->ss->assign('MAIL_SMTPSSL',$mail_smtpssl);
+            $this->ss->assign('MAIL_SMTPPORT', $mail_smtpport);
+            $this->ss->assign('MAIL_SMTPSSL', $mail_smtpssl);
         }
     }
 

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

Spacing +8 added lines, -8 removed lines

@@ -39,7 +39,7 @@ 
 
 define('PACKAGE_MANAGER_DOWNLOAD_SERVER', 'https://depot.sugarcrm.com/depot/');
 define('PACKAGE_MANAGER_DOWNLOAD_PAGE', 'download.php');
-class PackageManagerDownloader{
+class PackageManagerDownloader {
 
 	/**
 	 * Using curl we will download the file from the depot server
@@ -51,24 +51,24 @@ 
 	 *
 	 * @return the full path of the saved file
 	 */
-	function download($session_id, $file_name, $save_dir = '', $download_server = ''){
-		if(empty($save_dir)){
+	function download($session_id, $file_name, $save_dir = '', $download_server = '') {
+		if (empty($save_dir)) {
 			$save_dir = "upload://";
 		}
-		if(empty($download_server)){
+		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. ';');
+		$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;
+		return $save_dir.$file_name;
 	}
 }
 ?>
\ No newline at end of file

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;

Spacing +6 added lines, -6 removed lines

@@ -39,21 +39,21 @@ 
 
  require_once('include/ListView/ListViewSmarty.php');
 
-class ListViewPackages extends ListViewSmarty{
+class ListViewPackages extends ListViewSmarty {
     var $secondaryDisplayColumns;
     /**
      * Constructor  Call ListViewSmarty
      */
-    function __construct(){
+    function __construct() {
         parent::__construct();
     }
 
     /**
      * @deprecated deprecated since version 7.6, PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code, use __construct instead
      */
-    function ListViewPackages(){
+    function ListViewPackages() {
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
-        if(isset($GLOBALS['log'])) {
+        if (isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
         }
         else {
@@ -69,7 +69,7 @@ 
      * @param data  the data to display on the page
      * @param file  the template file to parse
      */
-    function setup($data, $file, $where, $params = Array(), $offset = 0, $limit = -1, $filter_fields = Array(), $id_field = 'id'){
+    function setup($data, $file, $where, $params = Array(), $offset = 0, $limit = -1, $filter_fields = Array(), $id_field = 'id') {
         $this->data = $data;
         $this->tpl = $file;
     }
@@ -77,7 +77,7 @@ 
     /**
      * Override the display method
      */
-    function display($end = true){
+    function display($end = true) {
         global $odd_bg, $even_bg, $app_strings;
         $this->ss->assign('rowColor', array('oddListRow', 'evenListRow'));
         $this->ss->assign('bgColor', array($odd_bg, $even_bg));

Braces +1 added lines, -2 removed lines

@@ -347,8 +347,7 @@
         $deprecatedMessage = 'PHP4 Style Constructors are deprecated and will be remove in 7.8, please update your code';
         if(isset($GLOBALS['log'])) {
             $GLOBALS['log']->deprecated($deprecatedMessage);
-        }
-        else {
+        } else {
             trigger_error($deprecatedMessage, E_USER_DEPRECATED);
         }
         self::__construct();