adamjakab / SuiteCRM

modules/Contacts/metadata/listviewdefs.php

Indentation +46 added lines, -46 removed lines

@@ -42,61 +42,61 @@ 
 
 
 $listViewDefs['Contacts'] = array(
-	'NAME' => array(
-		'width' => '20%', 		
-		'label' => 'LBL_LIST_NAME', 
-		'link' => true,
+    'NAME' => array(
+        'width' => '20%', 		
+        'label' => 'LBL_LIST_NAME', 
+        'link' => true,
         'contextMenu' => array('objectType' => 'sugarPerson', 
-                               'metaData' => array('contact_id' => '{$ID}', 
-                                                   'module' => 'Contacts',
-                                                   'return_action' => 'ListView', 
-                                                   'contact_name' => '{$FULL_NAME}', 
-                                                   'parent_id' => '{$ACCOUNT_ID}',
-                                                   'parent_name' => '{$ACCOUNT_NAME}',
-                                                   'return_module' => 'Contacts', 
-                                                   'return_action' => 'ListView', 
-                                                   'parent_type' => 'Account', 
-                                                   'notes_parent_type' => 'Account')
-                              ),
-		'orderBy' => 'name',
+                                'metaData' => array('contact_id' => '{$ID}', 
+                                                    'module' => 'Contacts',
+                                                    'return_action' => 'ListView', 
+                                                    'contact_name' => '{$FULL_NAME}', 
+                                                    'parent_id' => '{$ACCOUNT_ID}',
+                                                    'parent_name' => '{$ACCOUNT_NAME}',
+                                                    'return_module' => 'Contacts', 
+                                                    'return_action' => 'ListView', 
+                                                    'parent_type' => 'Account', 
+                                                    'notes_parent_type' => 'Account')
+                                ),
+        'orderBy' => 'name',
         'default' => true,
         'related_fields' => array('first_name', 'last_name', 'salutation', 'account_name', 'account_id'),
-		), 
-	'TITLE' => array(
-		'width' => '15%', 
-		'label' => 'LBL_LIST_TITLE',
+        ), 
+    'TITLE' => array(
+        'width' => '15%', 
+        'label' => 'LBL_LIST_TITLE',
         'default' => true), 
-	'ACCOUNT_NAME' => array(
-		'width' => '34%', 
-		'label' => 'LBL_LIST_ACCOUNT_NAME', 
-		'module' => 'Accounts',
-		'id' => 'ACCOUNT_ID',
-		'link' => true,
+    'ACCOUNT_NAME' => array(
+        'width' => '34%', 
+        'label' => 'LBL_LIST_ACCOUNT_NAME', 
+        'module' => 'Accounts',
+        'id' => 'ACCOUNT_ID',
+        'link' => true,
         'contextMenu' => array('objectType' => 'sugarAccount', 
-                               'metaData' => array('return_module' => 'Contacts', 
-                                                   'return_action' => 'ListView', 
-                                                   'module' => 'Accounts',
-                                                   'return_action' => 'ListView', 
-                                                   'parent_id' => '{$ACCOUNT_ID}', 
-                                                   'parent_name' => '{$ACCOUNT_NAME}', 
-                                                   'account_id' => '{$ACCOUNT_ID}', 
-                                                   'account_name' => '{$ACCOUNT_NAME}'),
-                              ),
+                                'metaData' => array('return_module' => 'Contacts', 
+                                                    'return_action' => 'ListView', 
+                                                    'module' => 'Accounts',
+                                                    'return_action' => 'ListView', 
+                                                    'parent_id' => '{$ACCOUNT_ID}', 
+                                                    'parent_name' => '{$ACCOUNT_NAME}', 
+                                                    'account_id' => '{$ACCOUNT_ID}', 
+                                                    'account_name' => '{$ACCOUNT_NAME}'),
+                                ),
         'default' => true,
         'sortable'=> true,
         'ACLTag' => 'ACCOUNT',
         'related_fields' => array('account_id')),
-	'EMAIL1' => array(
-		'width' => '15%', 
-		'label' => 'LBL_LIST_EMAIL_ADDRESS',
-		'sortable' => false,
-		'link' => true,
-		'customCode' => '{$EMAIL1_LINK}{$EMAIL1}</a>',
+    'EMAIL1' => array(
+        'width' => '15%', 
+        'label' => 'LBL_LIST_EMAIL_ADDRESS',
+        'sortable' => false,
+        'link' => true,
+        'customCode' => '{$EMAIL1_LINK}{$EMAIL1}</a>',
         'default' => true
-		),  
-	'PHONE_WORK' => array(
-		'width' => '15%', 
-		'label' => 'LBL_OFFICE_PHONE',
+        ),  
+    'PHONE_WORK' => array(
+        'width' => '15%', 
+        'label' => 'LBL_OFFICE_PHONE',
         'default' => true),
     'DEPARTMENT' => array(
         'width' => '10', 
@@ -177,6 +177,6 @@ 
     'DATE_ENTERED' => array(
         'width' => '10', 
         'label' => 'LBL_DATE_ENTERED',
-		'default' => true)       
+        'default' => true)       
 );
 ?>

modules/Contacts/views/view.detail.php

Indentation +19 added lines, -19 removed lines

@@ -44,27 +44,27 @@
 
 class ContactsViewDetail extends ViewDetail
 {
- 	/**
- 	 * @see SugarView::display()
-	 *
- 	 * We are overridding the display method to manipulate the portal information.
- 	 * If portal is not enabled then don't show the portal fields.
- 	 */
-	public function display(){
-		global $sugar_config;
+        /**
+         * @see SugarView::display()
+         *
+         * We are overridding the display method to manipulate the portal information.
+         * If portal is not enabled then don't show the portal fields.
+         */
+    public function display(){
+        global $sugar_config;
 
-		$aop_portal_enabled = !empty($sugar_config['aop']['enable_portal']) && !empty($sugar_config['aop']['enable_aop']);
+        $aop_portal_enabled = !empty($sugar_config['aop']['enable_portal']) && !empty($sugar_config['aop']['enable_aop']);
 
-		$this->ss->assign("AOP_PORTAL_ENABLED", $aop_portal_enabled);
+        $this->ss->assign("AOP_PORTAL_ENABLED", $aop_portal_enabled);
 
-		require_once('modules/AOS_PDF_Templates/formLetter.php');
-		formLetter::DVPopupHtml('Contacts');
+        require_once('modules/AOS_PDF_Templates/formLetter.php');
+        formLetter::DVPopupHtml('Contacts');
 
-		$admin = new Administration();
-		$admin->retrieveSettings();
-		if(isset($admin->settings['portal_on']) && $admin->settings['portal_on']) {
-			$this->ss->assign("PORTAL_ENABLED", true);
-		}
-		parent::display();
-	}
+        $admin = new Administration();
+        $admin->retrieveSettings();
+        if(isset($admin->settings['portal_on']) && $admin->settings['portal_on']) {
+            $this->ss->assign("PORTAL_ENABLED", true);
+        }
+        parent::display();
+    }
 }

modules/Contacts/views/view.quickcreate.php

Indentation +12 added lines, -12 removed lines

@@ -46,17 +46,17 @@
 {
     public function preDisplay() 
     {
-    	parent::preDisplay();
-    	if($this->_isDCForm) {
-    		//XXX TODO 20110329 Frank Steegmans: Hack to make quick create fields populate when used through the DC menu
-    		//          NOTE HOWEVER that sqs_objects form fields are not properly populated because of some other hacks
-    		//          resulting in none of the fields properly populating when selecting an account
-    		if(!empty($this->bean->phone_office))$_REQUEST['phone_work'] = $this->bean->phone_office;
-    		if(!empty($this->bean->billing_address_street))$_REQUEST['primary_address_street'] = $this->bean->billing_address_street;
-    		if(!empty($this->bean->billing_address_city))$_REQUEST['primary_address_city'] = $this->bean->billing_address_city;
-    		if(!empty($this->bean->billing_address_state))$_REQUEST['primary_address_state'] = $this->bean->billing_address_state;
-    		if(!empty($this->bean->billing_address_country))$_REQUEST['primary_address_country'] = $this->bean->billing_address_country;
-    		if(!empty($this->bean->billing_address_postalcode))$_REQUEST['primary_address_postalcode'] = $this->bean->billing_address_postalcode;
-	   	}
+        parent::preDisplay();
+        if($this->_isDCForm) {
+            //XXX TODO 20110329 Frank Steegmans: Hack to make quick create fields populate when used through the DC menu
+            //          NOTE HOWEVER that sqs_objects form fields are not properly populated because of some other hacks
+            //          resulting in none of the fields properly populating when selecting an account
+            if(!empty($this->bean->phone_office))$_REQUEST['phone_work'] = $this->bean->phone_office;
+            if(!empty($this->bean->billing_address_street))$_REQUEST['primary_address_street'] = $this->bean->billing_address_street;
+            if(!empty($this->bean->billing_address_city))$_REQUEST['primary_address_city'] = $this->bean->billing_address_city;
+            if(!empty($this->bean->billing_address_state))$_REQUEST['primary_address_state'] = $this->bean->billing_address_state;
+            if(!empty($this->bean->billing_address_country))$_REQUEST['primary_address_country'] = $this->bean->billing_address_country;
+            if(!empty($this->bean->billing_address_postalcode))$_REQUEST['primary_address_postalcode'] = $this->bean->billing_address_postalcode;
+            }
     }    
 }
\ No newline at end of file

modules/Contacts/views/view.validportalusername.php

Indentation +11 added lines, -11 removed lines

@@ -54,17 +54,17 @@ 
 
 class ContactsViewValidPortalUsername extends SugarView 
 {
- 	/**
-     * @see SugarView::process()
-     */
+        /**
+         * @see SugarView::process()
+         */
     public function process() 
- 	{
-		$this->display();
- 	}
+        {
+        $this->display();
+        }
 
- 	/**
-     * @see SugarView::display()
-     */
+        /**
+         * @see SugarView::display()
+         */
     public function display()
     {
         if (!empty($_REQUEST['portal_name'])) {
@@ -76,6 +76,6 @@ 
             echo $total;
         }
         else
-           echo '0';
- 	}	
+            echo '0';
+        }	
 }
\ No newline at end of file

modules/Contacts/ContactOpportunityRelationshipEdit.php

Indentation +1 added lines, -1 removed lines

@@ -62,7 +62,7 @@
 }
 
 if(isset($_REQUEST['isDuplicate']) && $_REQUEST['isDuplicate'] == 'true') {
-	$focus->id = "";
+    $focus->id = "";
 }
 
 // Prepopulate either side of the relationship if passed in.

modules/AOS_PDF_Templates/formLetterPdf.php

Indentation +87 added lines, -87 removed lines

@@ -26,17 +26,17 @@ 
 
 //ini_set('display_errors', '1');
 
-	require_once('modules/AOS_PDF_Templates/PDF_Lib/mpdf.php');
-	require_once('modules/AOS_PDF_Templates/templateParser.php');
-	require_once('modules/AOS_PDF_Templates/AOS_PDF_Templates.php');
+    require_once('modules/AOS_PDF_Templates/PDF_Lib/mpdf.php');
+    require_once('modules/AOS_PDF_Templates/templateParser.php');
+    require_once('modules/AOS_PDF_Templates/AOS_PDF_Templates.php');
 	
-	global $sugar_config;
+    global $sugar_config;
 
     $module_type = $_REQUEST['module'];
-	$module_type_create = rtrim($module_type,'s');
-	$module_type_low = strtolower($module_type);
+    $module_type_create = rtrim($module_type,'s');
+    $module_type_low = strtolower($module_type);
 	
-	$module = new $module_type_create();
+    $module = new $module_type_create();
 
     $recordIds = array();
 
@@ -59,101 +59,101 @@ 
     }
 
 	
-	$template = new AOS_PDF_Templates();
-	$template->retrieve($_REQUEST['templateID']);
+    $template = new AOS_PDF_Templates();
+    $template->retrieve($_REQUEST['templateID']);
 	
-	$pdf=new mPDF('en','A4','','DejaVuSansCondensed',$template->margin_left,$template->margin_right,$template->margin_top,$template->margin_bottom,$template->margin_header,$template->margin_footer);
+    $pdf=new mPDF('en','A4','','DejaVuSansCondensed',$template->margin_left,$template->margin_right,$template->margin_top,$template->margin_bottom,$template->margin_header,$template->margin_footer);
 	
-	foreach ($recordIds as $recordId) {
-		$module->retrieve($recordId);
-		$pdf_history=new mPDF('en','A4','','DejaVuSansCondensed',$template->margin_left,$template->margin_right,$template->margin_top,$template->margin_bottom,$template->margin_header,$template->margin_footer);
+    foreach ($recordIds as $recordId) {
+        $module->retrieve($recordId);
+        $pdf_history=new mPDF('en','A4','','DejaVuSansCondensed',$template->margin_left,$template->margin_right,$template->margin_top,$template->margin_bottom,$template->margin_header,$template->margin_footer);
 
-		$object_arr = array();
-		$object_arr[$module_type] = $module->id;
+        $object_arr = array();
+        $object_arr[$module_type] = $module->id;
 	
-		if($module_type === 'Contacts')
-		{
-			$object_arr['Accounts'] = $module->account_id;
-		}
+        if($module_type === 'Contacts')
+        {
+            $object_arr['Accounts'] = $module->account_id;
+        }
 	
-		$search = array ('@<script[^>]*?>.*?</script>@si', 		// Strip out javascript
-						'@<[\/\!]*?[^<>]*?>@si',		// Strip out HTML tags
-						'@([\r\n])[\s]+@',			// Strip out white space
-						'@&(quot|#34);@i',			// Replace HTML entities
-						'@&(amp|#38);@i',
-						'@&(lt|#60);@i',
-						'@&(gt|#62);@i',
-						'@&(nbsp|#160);@i',
-						'@&(iexcl|#161);@i',
-						'@<address[^>]*?>@si'
-		);
+        $search = array ('@<script[^>]*?>.*?</script>@si', 		// Strip out javascript
+                        '@<[\/\!]*?[^<>]*?>@si',		// Strip out HTML tags
+                        '@([\r\n])[\s]+@',			// Strip out white space
+                        '@&(quot|#34);@i',			// Replace HTML entities
+                        '@&(amp|#38);@i',
+                        '@&(lt|#60);@i',
+                        '@&(gt|#62);@i',
+                        '@&(nbsp|#160);@i',
+                        '@&(iexcl|#161);@i',
+                        '@<address[^>]*?>@si'
+        );
 
-		$replace = array ('',
-						 '',
-						 '\1',
-						 '"',
-						 '&',
-						 '<',
-						 '>',
-						 ' ',
-						 chr(161),
-						 '<br>'
-			);
+        $replace = array ('',
+                            '',
+                            '\1',
+                            '"',
+                            '&',
+                            '<',
+                            '>',
+                            ' ',
+                            chr(161),
+                            '<br>'
+            );
 	
-		$text = preg_replace($search, $replace, $template->description);
-		$text = preg_replace_callback('/\{DATE\s+(.*?)\}/', 
-			function ($matches) { return date($matches[1]); },
-			$text );
-		$header = preg_replace($search, $replace, $template->pdfheader);
-		$footer = preg_replace($search, $replace, $template->pdffooter);
+        $text = preg_replace($search, $replace, $template->description);
+        $text = preg_replace_callback('/\{DATE\s+(.*?)\}/', 
+            function ($matches) { return date($matches[1]); },
+            $text );
+        $header = preg_replace($search, $replace, $template->pdfheader);
+        $footer = preg_replace($search, $replace, $template->pdffooter);
 	
-		$converted = templateParser::parse_template($text, $object_arr);
-		$header = templateParser::parse_template($header, $object_arr);
-		$footer = templateParser::parse_template($footer, $object_arr);
+        $converted = templateParser::parse_template($text, $object_arr);
+        $header = templateParser::parse_template($header, $object_arr);
+        $footer = templateParser::parse_template($footer, $object_arr);
 	
-		$printable = str_replace("\n","<br />",$converted);
+        $printable = str_replace("\n","<br />",$converted);
 
-		$file_name = str_replace(" ","_",$template->name).".pdf";
+        $file_name = str_replace(" ","_",$template->name).".pdf";
 	
-		ob_clean();
-		try{
-			$note = new Note();
-			$note->modified_user_id = $current_user->id;
-			$note->created_by = $current_user->id;
-			$note->name = $file_name;
-			$note->parent_type = $module_type;
-			$note->parent_id = $module->id;
-			$note->file_mime_type = 'application/pdf';
-			$note->filename = $file_name;
-			if($module_type == 'Contacts')
-			{
-				$note->contact_id = $module->id;
-				$note->parent_type = 'Accounts';
-				$note->parent_id = $module->account_id;
-			}
-			$note->save();
+        ob_clean();
+        try{
+            $note = new Note();
+            $note->modified_user_id = $current_user->id;
+            $note->created_by = $current_user->id;
+            $note->name = $file_name;
+            $note->parent_type = $module_type;
+            $note->parent_id = $module->id;
+            $note->file_mime_type = 'application/pdf';
+            $note->filename = $file_name;
+            if($module_type == 'Contacts')
+            {
+                $note->contact_id = $module->id;
+                $note->parent_type = 'Accounts';
+                $note->parent_id = $module->account_id;
+            }
+            $note->save();
 		
-			$fp = fopen($sugar_config['upload_dir'].'nfile.pdf','wb');
-			fclose($fp);
+            $fp = fopen($sugar_config['upload_dir'].'nfile.pdf','wb');
+            fclose($fp);
 		
-			$pdf_history->setAutoFont();
-			$pdf_history->SetHTMLHeader($header);
-			$pdf_history->SetHTMLFooter($footer);
-			$pdf_history->writeHTML($printable);
-			$pdf_history->Output($sugar_config['upload_dir'].'nfile.pdf','F');
+            $pdf_history->setAutoFont();
+            $pdf_history->SetHTMLHeader($header);
+            $pdf_history->SetHTMLFooter($footer);
+            $pdf_history->writeHTML($printable);
+            $pdf_history->Output($sugar_config['upload_dir'].'nfile.pdf','F');
 		
-			$pdf->AddPage();
-			$pdf->setAutoFont();
-			$pdf->SetHTMLHeader($header);
-			$pdf->SetHTMLFooter($footer);
-			$pdf->writeHTML($printable);
+            $pdf->AddPage();
+            $pdf->setAutoFont();
+            $pdf->SetHTMLHeader($header);
+            $pdf->SetHTMLFooter($footer);
+            $pdf->writeHTML($printable);
 		
-			rename($sugar_config['upload_dir'].'nfile.pdf',$sugar_config['upload_dir'].$note->id);
+            rename($sugar_config['upload_dir'].'nfile.pdf',$sugar_config['upload_dir'].$note->id);
 		
-		}catch(mPDF_exception $e){ 
-			echo $e;
-		}
-	}
+        }catch(mPDF_exception $e){ 
+            echo $e;
+        }
+    }
 	
-	$pdf->Output($file_name, "D");
+    $pdf->Output($file_name, "D");
 ?>

modules/ACLActions/actiondefs.override.php

Indentation +87 added lines, -87 removed lines

@@ -35,103 +35,103 @@
  * "Powered by SugarCRM".
  ********************************************************************************/
 
- if(!defined('ACL_ALLOW_NONE')){   
- 	define('ACL_ALLOW_ADMIN_DEV', 100);
- 	define('ACL_ALLOW_ADMIN', 99);
- 	define('ACL_ALLOW_ALL', 90);                        
- 	define('ACL_ALLOW_ENABLED', 89);
- 	/* BEGIN - SECURITY GROUPS */ 
- 	define('ACL_ALLOW_GROUP', 80); //securitygroup
- 	/* END - SECURITY GROUPS */ 
- 	define('ACL_ALLOW_OWNER', 75);
- 	define('ACL_ALLOW_NORMAL', 1);
- 	define('ACL_ALLOW_DEFAULT', 0);
- 	define('ACL_ALLOW_DISABLED', -98);
- 	define('ACL_ALLOW_NONE', -99);
- 	define('ACL_ALLOW_DEV', 95);
- }
- /**
-  * $GLOBALS['ACLActionAccessLevels
-  * these are rendering descriptions for Access Levels giving information such as the label, color, and text color to use when rendering the access level
-  */
- $GLOBALS['ACLActionAccessLevels'] = array(
- 	ACL_ALLOW_ALL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ALL', 'text_color'=>'white'),
- 	ACL_ALLOW_OWNER=>array('color'=>'#6F6800', 'label'=>'LBL_ACCESS_OWNER', 'text_color'=>'white'),
- 	ACL_ALLOW_NONE=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_NONE', 'text_color'=>'white'),
- 	ACL_ALLOW_ENABLED=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ENABLED', 'text_color'=>'white'),
- 	ACL_ALLOW_DISABLED=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_DISABLED', 'text_color'=>'white'),
- 	ACL_ALLOW_ADMIN=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN', 'text_color'=>'white'),
- 	ACL_ALLOW_NORMAL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_NORMAL', 'text_color'=>'white'),
- 	ACL_ALLOW_DEFAULT=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_DEFAULT', 'text_color'=>'white'),
- 	ACL_ALLOW_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_DEV', 'text_color'=>'white'),
- 	ACL_ALLOW_ADMIN_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN_DEV', 'text_color'=>'white'),
- 	/* BEGIN - SECURITY GROUPS */ 
- 	ACL_ALLOW_GROUP=>array('color'=>'#0000A0', 'label'=>'LBL_ACCESS_GROUP', 'text_color'=>'white'), //securitygroup
- 	/* END - SECURITY GROUPS */ 
- 	);
+    if(!defined('ACL_ALLOW_NONE')){   
+        define('ACL_ALLOW_ADMIN_DEV', 100);
+        define('ACL_ALLOW_ADMIN', 99);
+        define('ACL_ALLOW_ALL', 90);                        
+        define('ACL_ALLOW_ENABLED', 89);
+        /* BEGIN - SECURITY GROUPS */ 
+        define('ACL_ALLOW_GROUP', 80); //securitygroup
+        /* END - SECURITY GROUPS */ 
+        define('ACL_ALLOW_OWNER', 75);
+        define('ACL_ALLOW_NORMAL', 1);
+        define('ACL_ALLOW_DEFAULT', 0);
+        define('ACL_ALLOW_DISABLED', -98);
+        define('ACL_ALLOW_NONE', -99);
+        define('ACL_ALLOW_DEV', 95);
+    }
+    /**
+     * $GLOBALS['ACLActionAccessLevels
+     * these are rendering descriptions for Access Levels giving information such as the label, color, and text color to use when rendering the access level
+     */
+    $GLOBALS['ACLActionAccessLevels'] = array(
+        ACL_ALLOW_ALL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ALL', 'text_color'=>'white'),
+        ACL_ALLOW_OWNER=>array('color'=>'#6F6800', 'label'=>'LBL_ACCESS_OWNER', 'text_color'=>'white'),
+        ACL_ALLOW_NONE=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_NONE', 'text_color'=>'white'),
+        ACL_ALLOW_ENABLED=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_ENABLED', 'text_color'=>'white'),
+        ACL_ALLOW_DISABLED=>array('color'=>'#FF0000', 'label'=>'LBL_ACCESS_DISABLED', 'text_color'=>'white'),
+        ACL_ALLOW_ADMIN=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN', 'text_color'=>'white'),
+        ACL_ALLOW_NORMAL=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_NORMAL', 'text_color'=>'white'),
+        ACL_ALLOW_DEFAULT=>array('color'=>'#008000', 'label'=>'LBL_ACCESS_DEFAULT', 'text_color'=>'white'),
+        ACL_ALLOW_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_DEV', 'text_color'=>'white'),
+        ACL_ALLOW_ADMIN_DEV=>array('color'=>'#0000FF', 'label'=>'LBL_ACCESS_ADMIN_DEV', 'text_color'=>'white'),
+        /* BEGIN - SECURITY GROUPS */ 
+        ACL_ALLOW_GROUP=>array('color'=>'#0000A0', 'label'=>'LBL_ACCESS_GROUP', 'text_color'=>'white'), //securitygroup
+        /* END - SECURITY GROUPS */ 
+        );
 /**
- * $GLOBALS['ACLActions
- * These are the actions for a given type. It includes the ACCESS Levels for that action and the label for that action. Every an object of the category (e.g. module) is added all associated actions are added for that object
- */
+         * $GLOBALS['ACLActions
+         * These are the actions for a given type. It includes the ACCESS Levels for that action and the label for that action. Every an object of the category (e.g. module) is added all associated actions are added for that object
+         */
 /* BEGIN - SECURITY GROUPS */ 
 $GLOBALS['ACLActions'] = array(
-	'module'=>array('actions'=>
-						array(
-						'access'=>
-								array(
-									'aclaccess'=>array(ACL_ALLOW_ENABLED,ACL_ALLOW_DEFAULT, ACL_ALLOW_DISABLED),
-									'label'=>'LBL_ACTION_ACCESS',
-									'default'=>ACL_ALLOW_ENABLED,
-								),
+    'module'=>array('actions'=>
+                        array(
+                        'access'=>
+                                array(
+                                    'aclaccess'=>array(ACL_ALLOW_ENABLED,ACL_ALLOW_DEFAULT, ACL_ALLOW_DISABLED),
+                                    'label'=>'LBL_ACTION_ACCESS',
+                                    'default'=>ACL_ALLOW_ENABLED,
+                                ),
 							
-						'view'=>
-								array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
-									'label'=>'LBL_ACTION_VIEW',
-									'default'=>ACL_ALLOW_ALL,
-								),
+                        'view'=>
+                                array(
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+                                    'label'=>'LBL_ACTION_VIEW',
+                                    'default'=>ACL_ALLOW_ALL,
+                                ),
 					
-						'list'=>
-								array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
-									'label'=>'LBL_ACTION_LIST',
-									'default'=>ACL_ALLOW_ALL,
-								),
-						'edit'=>
-								array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
-									'label'=>'LBL_ACTION_EDIT',
-									'default'=>ACL_ALLOW_ALL,
+                        'list'=>
+                                array(
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+                                    'label'=>'LBL_ACTION_LIST',
+                                    'default'=>ACL_ALLOW_ALL,
+                                ),
+                        'edit'=>
+                                array(
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+                                    'label'=>'LBL_ACTION_EDIT',
+                                    'default'=>ACL_ALLOW_ALL,
 									
-								),
-						'delete'=>
-							array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
-									'label'=>'LBL_ACTION_DELETE',
-									'default'=>ACL_ALLOW_ALL,
+                                ),
+                        'delete'=>
+                            array(
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+                                    'label'=>'LBL_ACTION_DELETE',
+                                    'default'=>ACL_ALLOW_ALL,
 									
-								),
-						'import'=>
-							array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
-									'label'=>'LBL_ACTION_IMPORT',
-									'default'=>ACL_ALLOW_ALL,
-								),
-						'export'=>
-							array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
-									'label'=>'LBL_ACTION_EXPORT',
-									'default'=>ACL_ALLOW_ALL,
-								),
+                                ),
+                        'import'=>
+                            array(
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+                                    'label'=>'LBL_ACTION_IMPORT',
+                                    'default'=>ACL_ALLOW_ALL,
+                                ),
+                        'export'=>
+                            array(
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_GROUP,ACL_ALLOW_OWNER,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+                                    'label'=>'LBL_ACTION_EXPORT',
+                                    'default'=>ACL_ALLOW_ALL,
+                                ),
                         'massupdate'=>
-							array(
-									'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
-									'label'=>'LBL_ACTION_MASSUPDATE',
-									'default'=>ACL_ALLOW_ALL,
-								),
+                            array(
+                                    'aclaccess'=>array(ACL_ALLOW_ALL,ACL_ALLOW_DEFAULT, ACL_ALLOW_NONE),
+                                    'label'=>'LBL_ACTION_MASSUPDATE',
+                                    'default'=>ACL_ALLOW_ALL,
+                                ),
 						
 					
-				),),
+                ),),
 );
 /* END - SECURITY GROUPS */ 
 

modules/ACLActions/vardefs.php

Indentation +38 added lines, -38 removed lines

@@ -42,34 +42,34 @@ 
 
 
 $dictionary['ACLAction'] = array('table' => 'acl_actions', 'comment' => 'Determine the allowable actions available to users'
-                               ,'fields' => array (
-  'id' =>
-  array (
+                                ,'fields' => array (
+    'id' =>
+    array (
     'name' => 'id',
     'vname' => 'LBL_ID',
     'required'=>true,
     'type' => 'id',
     'reportable'=>false,
     'comment' => 'Unique identifier'
-  ),
-   'date_entered' =>
-  array (
+    ),
+    'date_entered' =>
+    array (
     'name' => 'date_entered',
     'vname' => 'LBL_DATE_ENTERED',
     'type' => 'datetime',
     'required'=>true,
     'comment' => 'Date record created'
-  ),
-  'date_modified' =>
-  array (
+    ),
+    'date_modified' =>
+    array (
     'name' => 'date_modified',
     'vname' => 'LBL_DATE_MODIFIED',
     'type' => 'datetime',
     'required'=>true,
     'comment' => 'Date record last modified'
-  ),
+    ),
     'modified_user_id' =>
-  array (
+    array (
     'name' => 'modified_user_id',
     'rname' => 'user_name',
     'id_name' => 'modified_user_id',
@@ -82,9 +82,9 @@ 
     'len' => 36,
     'reportable'=>true,
     'comment' => 'User who last modified record'
-  ),
+    ),
     'created_by' =>
-  array (
+    array (
     'name' => 'created_by',
     'rname' => 'user_name',
     'id_name' => 'created_by',
@@ -95,63 +95,63 @@ 
     'dbType' => 'id',
     'len' => 36,
     'comment' => 'User ID who created record'
-  ),
-   'name' =>
-  array (
+    ),
+    'name' =>
+    array (
     'name' => 'name',
     'type' => 'varchar',
     'vname' => 'LBL_NAME',
     'len' => 150,
     'comment' => 'Name of the allowable action (view, list, delete, edit)'
-  ),
-   'category' =>
-  array (
+    ),
+    'category' =>
+    array (
     'name' => 'category',
     'vname' => 'LBL_CATEGORY',
     'type' => 'varchar',
-	'len' =>100,
+    'len' =>100,
     'reportable'=>true,
     'comment' => 'Category of the allowable action (usually the name of a module)'
-  ),
+    ),
     'acltype' =>
-  array (
+    array (
     'name' => 'acltype',
     'vname' => 'LBL_TYPE',
     'type' => 'varchar',
-	'len' =>100,
+    'len' =>100,
     'reportable'=>true,
     'comment' => 'Specifier for Category, usually "module"'
-  ),
-  'aclaccess' =>
-  array (
+    ),
+    'aclaccess' =>
+    array (
     'name' => 'aclaccess',
     'vname' => 'LBL_ACCESS',
     'type' => 'int',
     'len'=>3,
     'reportable'=>true,
     'comment' => 'Number specifying access priority; highest access "wins"'
-  ),
-  'deleted' =>
-  array (
+    ),
+    'deleted' =>
+    array (
     'name' => 'deleted',
     'vname' => 'LBL_DELETED',
     'type' => 'bool',
     'reportable'=>false,
     'comment' => 'Record deletion indicator'
-  ),
-  'roles' =>
-  array (
-  	'name' => 'roles',
+    ),
+    'roles' =>
+    array (
+        'name' => 'roles',
     'type' => 'link',
     'relationship' => 'acl_roles_actions',
     'source'=>'non-db',
-	'vname'=>'LBL_USERS',
-  ),
+    'vname'=>'LBL_USERS',
+    ),
 ),
 'indices' => array (
-       array('name' =>'aclactionid', 'type' =>'primary', 'fields'=>array('id')),
-       array('name' =>'idx_aclaction_id_del', 'type' =>'index', 'fields'=>array('id', 'deleted')),
-       array('name' =>'idx_category_name', 'type' =>'index', 'fields'=>array('category', 'name')),                                                   )
+        array('name' =>'aclactionid', 'type' =>'primary', 'fields'=>array('id')),
+        array('name' =>'idx_aclaction_id_del', 'type' =>'index', 'fields'=>array('id', 'deleted')),
+        array('name' =>'idx_category_name', 'type' =>'index', 'fields'=>array('category', 'name')),                                                   )
 
                             );
 ?>
\ No newline at end of file

modules/ACLActions/Menu.php

Indentation +3 added lines, -3 removed lines

@@ -40,8 +40,8 @@
 
 global $mod_strings;
 $module_menu = Array(
-	Array("index.php?module=ACLRoles&action=index", $mod_strings['LIST_ROLES'],"Roles"),
-	Array("index.php?module=ACLRoles&action=ListUsers", $mod_strings['LIST_ROLES_BY_USER'],"Roles"),
+    Array("index.php?module=ACLRoles&action=index", $mod_strings['LIST_ROLES'],"Roles"),
+    Array("index.php?module=ACLRoles&action=ListUsers", $mod_strings['LIST_ROLES_BY_USER'],"Roles"),
 	
-	);
+    );
 ?>
\ No newline at end of file