adamjakab / SuiteCRM

modules/ACLRoles/metadata/popupdefs.php

Indentation +6 added lines, -6 removed lines

@@ -41,12 +41,12 @@
 
 global $mod_strings;
 $popupMeta = array('moduleMain' => 'ACLRole',
-	'varName' => 'ROLE',
-	'listTitle' => $mod_strings['LBL_ROLE'],
-	'orderBy' => 'name',
-	'whereClauses' => array('name' => 'acl_roles.name'),
-	'searchInputs' => array('name'),
-	'searchdefs'   => array('name' => array('name' => 'name', 'label' => 'LBL_NAME',),)		
+    'varName' => 'ROLE',
+    'listTitle' => $mod_strings['LBL_ROLE'],
+    'orderBy' => 'name',
+    'whereClauses' => array('name' => 'acl_roles.name'),
+    'searchInputs' => array('name'),
+    'searchdefs'   => array('name' => array('name' => 'name', 'label' => 'LBL_NAME',),)		
 );
 ?>
  

modules/ACLRoles/metadata/searchdefs.php

Indentation +11 added lines, -11 removed lines

@@ -43,17 +43,17 @@
  * To change the template for this generated file go to
  * Window - Preferences - PHPeclipse - PHP - Code Templates
  */
-  $searchdefs['ACLRoles'] = array(
-					'templateMeta' => array(
-							'maxColumns' => '3', 
-  							'maxColumnsBasic' => '4', 
+    $searchdefs['ACLRoles'] = array(
+                    'templateMeta' => array(
+                            'maxColumns' => '3', 
+                                'maxColumnsBasic' => '4', 
                             'widths' => array('label' => '10', 'field' => '30'),                 
-                           ),
+                            ),
                     'layout' => array(  					
-						'basic_search' => array(
-						    'name' => array('name' => 'name', 'label' => 'LBL_NAME',),
-						 	),
-						'advanced_search' => array(),
-					),
- 			   );
+                        'basic_search' => array(
+                            'name' => array('name' => 'name', 'label' => 'LBL_NAME',),
+                                ),
+                        'advanced_search' => array(),
+                    ),
+                );
 ?>

modules/ACLRoles/metadata/SearchFields.php

Indentation +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@
  ********************************************************************************/
 
 $searchFields['ACLRoles'] = 
-	array (
-		'name' => array( 'query_type'=>'default'),
-		);
+    array (
+        'name' => array( 'query_type'=>'default'),
+        );
 ?>

modules/ACLRoles/metadata/detailviewdefs.php

Indentation +3 added lines, -3 removed lines

@@ -5,11 +5,11 @@
                             'widths' => array(
                                             ),
                             'includes'=> array(
-                                         ),                                            
-                           ),
+                                            ),                                            
+                            ),
     'panels' => array(
 	      
-     ),
+        ),
     
     
 );

modules/ACLRoles/metadata/subpanels/admin.php

Indentation +30 added lines, -30 removed lines

@@ -41,38 +41,38 @@
 
 
 $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' => '',
-	'default_order_by' => '',
+    'where' => '',
+    'default_order_by' => '',
 
-	'list_fields' => array(
+    'list_fields' => array(
         'name'=>array(
-		 	'vname' => 'LBL_NAME',
-			'widget_class' => 'SubPanelDetailViewLink',
-			'width' => '25%',
-		),
-		'description'=>array(
-		 	'vname' => 'LBL_DESCRIPTION',
-			'width' => '60%',
-			'sortable'=>false,
-		),
-		'edit_button'=>array(
-			'vname' => 'LBL_EDIT_BUTTON',
-			'widget_class' => 'SubPanelEditButton',
-		 	'module' => 'Contacts',
-			'width' => '5%',
-		),
-		'remove_button'=>array(
-			'vname' => 'LBL_REMOVE',
-			'widget_class' => 'SubPanelRemoveButton',
-		 	'module' => 'Contacts',
-			'width' => '5%',
-			'refresh_page'=>true,
-		),
-	),
+                'vname' => 'LBL_NAME',
+            'widget_class' => 'SubPanelDetailViewLink',
+            'width' => '25%',
+        ),
+        'description'=>array(
+                'vname' => 'LBL_DESCRIPTION',
+            'width' => '60%',
+            'sortable'=>false,
+        ),
+        'edit_button'=>array(
+            'vname' => 'LBL_EDIT_BUTTON',
+            'widget_class' => 'SubPanelEditButton',
+                'module' => 'Contacts',
+            'width' => '5%',
+        ),
+        'remove_button'=>array(
+            'vname' => 'LBL_REMOVE',
+            'widget_class' => 'SubPanelRemoveButton',
+                'module' => 'Contacts',
+            'width' => '5%',
+            'refresh_page'=>true,
+        ),
+    ),
 );
 ?>
\ No newline at end of file

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

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

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();

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');
+    }
 }