adamjakab / SuiteCRM

modules/Project/metadata/detailviewdefs.php

Indentation +84 added lines, -84 removed lines

@@ -42,176 +42,176 @@
 
 $viewdefs ['Project'] =
 array (
-  'DetailView' => 
-  array (
+    'DetailView' => 
+    array (
     'templateMeta' => 
     array (
-      'maxColumns' => '2',
-      'widths' => 
-      array (
+        'maxColumns' => '2',
+        'widths' => 
+        array (
         0 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
         ),
         1 => 
         array (
-          'label' => '10',
-          'field' => '30',
+            'label' => '10',
+            'field' => '30',
+        ),
         ),
-      ),
-      'includes' => 
-      array (
+        'includes' => 
+        array (
         0 => 
         array (
-          'file' => 'modules/Project/Project.js',
+            'file' => 'modules/Project/Project.js',
         ),
         1 => 
         array (
-          'file' => 'modules/Project/js/custom_project.js',
+            'file' => 'modules/Project/js/custom_project.js',
+        ),
         ),
-      ),
-      'form' => 
-      array (
+        'form' => 
+        array (
         'buttons' => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'customCode' => '<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="button" type="submit" name="Edit" id="edit_button" value="{$APP.LBL_EDIT_BUTTON_LABEL}"onclick="{if $IS_TEMPLATE}this.form.return_module.value=\'Project\'; this.form.return_action.value=\'ProjectTemplatesDetailView\'; this.form.return_id.value=\'{$id}\'; this.form.action.value=\'ProjectTemplatesEditView\';{else}this.form.return_module.value=\'Project\'; this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$id}\'; this.form.action.value=\'EditView\'; {/if}"/>',
             'sugar_html' => 
             array (
-              'type' => 'submit',
-              'value' => ' {$APP.LBL_EDIT_BUTTON_LABEL} ',
-              'htmlOptions' => 
-              array (
+                'type' => 'submit',
+                'value' => ' {$APP.LBL_EDIT_BUTTON_LABEL} ',
+                'htmlOptions' => 
+                array (
                 'id' => 'edit_button',
                 'class' => 'button',
                 'accessKey' => '{$APP.LBL_EDIT_BUTTON_KEY}',
                 'name' => 'Edit',
                 'onclick' => '{if $IS_TEMPLATE}this.form.return_module.value=\'Project\'; this.form.return_action.value=\'ProjectTemplatesDetailView\'; this.form.return_id.value=\'{$id}\'; this.form.action.value=\'ProjectTemplatesEditView\';{else}this.form.return_module.value=\'Project\'; this.form.return_action.value=\'DetailView\'; this.form.return_id.value=\'{$id}\'; this.form.action.value=\'EditView\'; {/if}',
-              ),
+                ),
             ),
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'customCode' => '<input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="button" type="button" name="Delete" id="delete_button" value="{$APP.LBL_DELETE_BUTTON_LABEL}" onclick="project_delete(this);"/>',
             'sugar_html' => 
             array (
-              'type' => 'button',
-              'id' => 'delete_button',
-              'value' => '{$APP.LBL_DELETE_BUTTON_LABEL}',
-              'htmlOptions' => 
-              array (
+                'type' => 'button',
+                'id' => 'delete_button',
+                'value' => '{$APP.LBL_DELETE_BUTTON_LABEL}',
+                'htmlOptions' => 
+                array (
                 'title' => '{$APP.LBL_DELETE_BUTTON_TITLE}',
                 'accessKey' => '{$APP.LBL_DELETE_BUTTON_KEY}',
                 'id' => 'delete_button',
                 'class' => 'button',
                 'onclick' => 'project_delete(this);',
-              ),
+                ),
+            ),
             ),
-          ),
-          2 => 
-          array (
+            2 => 
+            array (
             'customCode' => '<input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="button" type="submit" name="Duplicate" id="duplicate_button" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}"onclick="{if $IS_TEMPLATE}this.form.return_module.value=\'Project\'; this.form.return_action.value=\'ProjectTemplatesDetailView\'; this.form.isDuplicate.value=true; this.form.action.value=\'projecttemplateseditview\'; this.form.return_id.value=\'{$id}\';{else}this.form.return_module.value=\'Project\'; this.form.return_action.value=\'DetailView\'; this.form.isDuplicate.value=true; this.form.action.value=\'EditView\'; this.form.return_id.value=\'{$id}\';{/if}""/>',
             'sugar_html' => 
             array (
-              'type' => 'submit',
-              'value' => '{$APP.LBL_DUPLICATE_BUTTON_LABEL}',
-              'htmlOptions' => 
-              array (
+                'type' => 'submit',
+                'value' => '{$APP.LBL_DUPLICATE_BUTTON_LABEL}',
+                'htmlOptions' => 
+                array (
                 'title' => '{$APP.LBL_DUPLICATE_BUTTON_TITLE}',
                 'accessKey' => '{$APP.LBL_DUPLICATE_BUTTON_KEY}',
                 'class' => 'button',
                 'name' => 'Duplicate',
                 'id' => 'duplicate_button',
                 'onclick' => '{if $IS_TEMPLATE}this.form.return_module.value=\'Project\'; this.form.return_action.value=\'ProjectTemplatesDetailView\'; this.form.isDuplicate.value=true; this.form.action.value=\'projecttemplateseditview\'; this.form.return_id.value=\'{$id}\';{else}this.form.return_module.value=\'Project\'; this.form.return_action.value=\'DetailView\'; this.form.isDuplicate.value=true; this.form.action.value=\'EditView\'; this.form.return_id.value=\'{$id}\';{/if}',
-              ),
+                ),
             ),
-          ),
-          3 => 
-          array (
+            ),
+            3 => 
+            array (
             'customCode' => '<input title="{$APP.LBL_VIEW_GANTT_TITLE}" class="button" type="button" name="view_gantt" id="view_gantt" value="{$APP.LBL_GANTT_BUTTON_LABEL}" onclick="javascript:window.location.href=\'index.php?module=Project&action=view_GanttChart&project_id={$id}\'"/>',
-          ),
+            ),
+        ),
         ),
-      ),
-      'useTabs' => true,
-      'tabDefs' => 
-      array (
+        'useTabs' => true,
+        'tabDefs' => 
+        array (
         'LBL_PROJECT_INFORMATION' => 
         array (
-          'newTab' => true,
-          'panelDefault' => 'expanded',
+            'newTab' => true,
+            'panelDefault' => 'expanded',
         ),
         'LBL_PANEL_ASSIGNMENT' => 
         array (
-          'newTab' => true,
-          'panelDefault' => 'expanded',
+            'newTab' => true,
+            'panelDefault' => 'expanded',
+        ),
         ),
-      ),
     ),
     'panels' => 
     array (
-      'lbl_project_information' => 
-      array (
+        'lbl_project_information' => 
+        array (
         0 => 
         array (
-          0 => 'name',
-          1 => 'status',
+            0 => 'name',
+            1 => 'status',
         ),
         1 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'estimated_start_date',
             'label' => 'LBL_DATE_START',
-          ),
-          1 => 'priority',
+            ),
+            1 => 'priority',
         ),
         2 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'estimated_end_date',
             'label' => 'LBL_DATE_END',
-          ),
-          1 => '',
+            ),
+            1 => '',
         ),
         3 => 
         array (
-          0 => 'description',
+            0 => 'description',
         ),
-      ),
-      'LBL_PANEL_ASSIGNMENT' => 
-      array (
+        ),
+        'LBL_PANEL_ASSIGNMENT' => 
+        array (
         0 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'assigned_user_name',
             'label' => 'LBL_ASSIGNED_TO',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'am_projecttemplates_project_1_name',
-          ),
+            ),
         ),
         1 => 
         array (
-          0 => 
-          array (
+            0 => 
+            array (
             'name' => 'date_entered',
             'comment' => 'Date record created',
             'label' => 'LBL_DATE_ENTERED',
-          ),
-          1 => 
-          array (
+            ),
+            1 => 
+            array (
             'name' => 'date_modified',
             'comment' => 'Date record last modified',
             'label' => 'LBL_DATE_MODIFIED',
-          ),
+            ),
         ),
-      ),
+        ),
+    ),
     ),
-  ),
 );
 ?>

modules/Project/metadata/quickcreatedefs.php

Indentation +12 added lines, -12 removed lines

@@ -40,34 +40,34 @@
 
 
 $viewdefs['Project']['QuickCreate'] = array(
-					'templateMeta' => array('maxColumns' => '2', 
+                    'templateMeta' => array('maxColumns' => '2', 
                         'widths' => array(
                                         array('label' => '10', 'field' => '30'), 
                                         array('label' => '10', 'field' => '30')
                                         ),
-                       ),
+                        ),
 'panels' =>
 
 array (
   
-  array (
+    array (
     'name',
     'status'
-  ),
+    ),
   
-  array (
+    array (
     'estimated_start_date',
     'estimated_end_date'
-  ),
+    ),
   
-  array('priority',),
-  array('assigned_user_name',
-  ),
-  array (
+    array('priority',),
+    array('assigned_user_name',
+    ),
+    array (
     array (
-      'name' => 'description',
+        'name' => 'description',
+    ),
     ),
-  ),
 
 ),
 

modules/Project/metadata/metafiles.php

Indentation +8 added lines, -8 removed lines

@@ -38,13 +38,13 @@
  ********************************************************************************/
 
 
- $metafiles['Project'] = array(
-	'detailviewdefs'  => 	'modules/Project/metadata/detailviewdefs.php', 	
-	'editviewdefs'    => 	'modules/Project/metadata/editviewdefs.php',
- 	'listviewdefs'    => 	'modules/Project/metadata/listviewdefs.php',
- 	'searchdefs'      =>    'modules/Project/metadata/searchdefs.php',
- 	'popupdefs'	      =>    'modules/Project/metadata/popupdefs.php',
- 	'searchfields'	  =>    'modules/Project/metadata/SearchFields.php',
+    $metafiles['Project'] = array(
+    'detailviewdefs'  => 	'modules/Project/metadata/detailviewdefs.php', 	
+    'editviewdefs'    => 	'modules/Project/metadata/editviewdefs.php',
+        'listviewdefs'    => 	'modules/Project/metadata/listviewdefs.php',
+        'searchdefs'      =>    'modules/Project/metadata/searchdefs.php',
+        'popupdefs'	      =>    'modules/Project/metadata/popupdefs.php',
+        'searchfields'	  =>    'modules/Project/metadata/SearchFields.php',
 
- );
+    );
 ?>

modules/Project/metadata/listviewdefs.php

Indentation +18 added lines, -18 removed lines

@@ -43,48 +43,48 @@
 
 $listViewDefs ['Project'] =
 array (
-  'NAME' => 
-  array (
+    'NAME' => 
+    array (
     'width' => '25%',
     'label' => 'LBL_LIST_NAME',
     'link' => true,
     'default' => true,
-  ),
-  'PRIORITY' => 
-  array (
+    ),
+    'PRIORITY' => 
+    array (
     'type' => 'enum',
     'label' => 'LBL_PRIORITY',
     'width' => '10%',
     'default' => true,
-  ),
-  'STATUS' => 
-  array (
+    ),
+    'STATUS' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_STATUS',
     'link' => false,
     'default' => true,
-  ),
-  'ESTIMATED_START_DATE' => 
-  array (
+    ),
+    'ESTIMATED_START_DATE' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_DATE_START',
     'link' => false,
     'default' => true,
-  ),
-  'ASSIGNED_USER_NAME' => 
-  array (
+    ),
+    'ASSIGNED_USER_NAME' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_LIST_ASSIGNED_USER_ID',
     'module' => 'Employees',
     'id' => 'ASSIGNED_USER_ID',
     'default' => true,
-  ),
-  'ESTIMATED_END_DATE' => 
-  array (
+    ),
+    'ESTIMATED_END_DATE' => 
+    array (
     'width' => '10%',
     'label' => 'LBL_DATE_END',
     'link' => false,
     'default' => true,
-  ),
+    ),
 );
 ?>

modules/SugarFeed/Dashlets/SugarFeedDashlet/SugarFeedDashlet.meta.php

Indentation +5 added lines, -5 removed lines

@@ -49,8 +49,8 @@
 global $app_strings;
 
 $dashletMeta['SugarFeedDashlet'] = array('module'		=> 'SugarFeed',
-										  'title'       => translate('LBL_HOMEPAGE_TITLE', 'SugarFeed'), 
-                                          'description' => 'A customizable view into Sugar_Feed',
-                                          'icon'        => 'themes/default/images/icon_SugarFeed_32.gif',
-                                          'dynamic_hide' => true,
-                                          'category'    => 'Tools');
\ No newline at end of file
+                                            'title'       => translate('LBL_HOMEPAGE_TITLE', 'SugarFeed'), 
+                                            'description' => 'A customizable view into Sugar_Feed',
+                                            'icon'        => 'themes/default/images/icon_SugarFeed_32.gif',
+                                            'dynamic_hide' => true,
+                                            'category'    => 'Tools');
\ No newline at end of file

modules/SugarFeed/Dashlets/SugarFeedDashlet/SugarFeedDashlet.php

Indentation +152 added lines, -152 removed lines

@@ -53,21 +53,21 @@ 
 
 
     function SugarFeedDashlet($id, $def = null) {
-		global $current_user, $app_strings, $app_list_strings;
+        global $current_user, $app_strings, $app_list_strings;
 
-		require_once('modules/SugarFeed/metadata/dashletviewdefs.php');
-		$this->myItemsOnly = false;
+        require_once('modules/SugarFeed/metadata/dashletviewdefs.php');
+        $this->myItemsOnly = false;
         parent::DashletGeneric($id, $def);
-		$this->myItemsOnly = false;
-		$this->isConfigurable = true;
-		$this->hasScript = true;
-		$pattern = array();
-		$pattern[] = "/-/";
-		$pattern[] = "/[0-9]/";
-		$replacements = array();
-		$replacements[] = '';
-		$replacements[] = '';
-		$this->idjs = preg_replace($pattern,$replacements,$this->id);
+        $this->myItemsOnly = false;
+        $this->isConfigurable = true;
+        $this->hasScript = true;
+        $pattern = array();
+        $pattern[] = "/-/";
+        $pattern[] = "/[0-9]/";
+        $replacements = array();
+        $replacements[] = '';
+        $replacements[] = '';
+        $this->idjs = preg_replace($pattern,$replacements,$this->id);
         // Add in some default categories.
         $this->categories['ALL'] = translate('LBL_ALL','SugarFeed');
         // Need to get the rest of the active SugarFeed modules
@@ -93,9 +93,9 @@ 
 
 
         if(empty($def['title'])) $this->title = translate('LBL_HOMEPAGE_TITLE', 'SugarFeed');
-		if(!empty($def['rows']))$this->displayRows = $def['rows'];
-		if(!empty($def['categories']))$this->selectedCategories = $def['categories'];
-		if(!empty($def['userfeed_created'])) $this->userfeed_created = $def['userfeed_created'];
+        if(!empty($def['rows']))$this->displayRows = $def['rows'];
+        if(!empty($def['categories']))$this->selectedCategories = $def['categories'];
+        if(!empty($def['userfeed_created'])) $this->userfeed_created = $def['userfeed_created'];
         $this->searchFields = $dashletData['SugarFeedDashlet']['searchFields'];
         $this->columns = $dashletData['SugarFeedDashlet']['columns'];
 
@@ -110,20 +110,20 @@ 
             $this->categories["Twitter"] = "Twitter";
         }
 
-		$catCount = count($this->categories);
-		ACLController::filterModuleList($this->categories, false);
-		if(count($this->categories) < $catCount){
-			if(!empty($this->selectedCategories)){
-				ACLController::filterModuleList($this->selectedCategories, true);
-			}else{
-				$this->selectedCategories = array_keys($this->categories);
-				unset($this->selectedCategories[0]);
-			}
-		}
+        $catCount = count($this->categories);
+        ACLController::filterModuleList($this->categories, false);
+        if(count($this->categories) < $catCount){
+            if(!empty($this->selectedCategories)){
+                ACLController::filterModuleList($this->selectedCategories, true);
+            }else{
+                $this->selectedCategories = array_keys($this->categories);
+                unset($this->selectedCategories[0]);
+            }
+        }
         $this->seedBean = new SugarFeed();
     }
 
-	function process($lvsParams = array()) {
+    function process($lvsParams = array()) {
         global $current_user;
 
         $currentSearchFields = array();
@@ -139,7 +139,7 @@ 
 
         $this->lvs->export = false;
         $this->lvs->multiSelect = false;
-		$this->lvs->quickViewLinks = false;
+        $this->lvs->quickViewLinks = false;
         // columns
     foreach($this->columns as $name => $val) {
                 if(!empty($val['default']) && $val['default']) {
@@ -170,11 +170,11 @@ 
         $owner_modules = array();
         $regular_modules = array();
         foreach($mod_list as $module => $ignore) {
-			// Handle the UserFeed differently
-			if ( $module == 'UserFeed') {
-				$regular_modules[] = 'UserFeed';
-				continue;
-			}
+            // Handle the UserFeed differently
+            if ( $module == 'UserFeed') {
+                $regular_modules[] = 'UserFeed';
+                continue;
+            }
             if($module == 'Facebook'){
                 $regular_modules[] = "Facebook";
                 continue;
@@ -187,12 +187,12 @@ 
             if ( in_array($module,$this->externalAPIList) ) {
                 $external_modules[] = $module;
             }
-			if (ACLAction::getUserAccessLevel($current_user->id,$module,'view') <= ACL_ALLOW_NONE ) {
-				// Not enough access to view any records, don't add it to any lists
-				continue;
-			}
-			if ( ACLAction::getUserAccessLevel($current_user->id,$module,'view') == ACL_ALLOW_OWNER ) {
-				$owner_modules[] = $module;
+            if (ACLAction::getUserAccessLevel($current_user->id,$module,'view') <= ACL_ALLOW_NONE ) {
+                // Not enough access to view any records, don't add it to any lists
+                continue;
+            }
+            if ( ACLAction::getUserAccessLevel($current_user->id,$module,'view') == ACL_ALLOW_OWNER ) {
+                $owner_modules[] = $module;
             } else {
                 $regular_modules[] = $module;
             }
@@ -203,7 +203,7 @@ 
 
         if(!empty($this->displayTpl))
         {
-        	//MFH BUG #14296
+            //MFH BUG #14296
             $where = '';
             if(!empty($whereArray)){
                 $where = '(' . implode(') AND (', $whereArray) . ')';
@@ -213,35 +213,35 @@ 
             $additional_where = '';
 
 
-			$module_limiter = " sugarfeed.related_module in ('" . implode("','", $regular_modules) . "')";
+            $module_limiter = " sugarfeed.related_module in ('" . implode("','", $regular_modules) . "')";
 
-			if( is_admin($GLOBALS['current_user'] ) )
+            if( is_admin($GLOBALS['current_user'] ) )
             {
                 $all_modules = array_merge($regular_modules, $owner_modules, $admin_modules);
                 $module_limiter = " sugarfeed.related_module in ('" . implode("','", $all_modules) . "')";
             }
             else if ( count($owner_modules) > 0
-				) {
+                ) {
                 $module_limiter = " ((sugarfeed.related_module IN ('".implode("','", $regular_modules)."') "
-					.") ";
-				if ( count($owner_modules) > 0 ) {
-					$module_limiter .= "OR (sugarfeed.related_module IN('".implode("','", $owner_modules)."') AND sugarfeed.assigned_user_id = '".$current_user->id."' "
-						.") ";
-				}
-				$module_limiter .= ")";
+                    .") ";
+                if ( count($owner_modules) > 0 ) {
+                    $module_limiter .= "OR (sugarfeed.related_module IN('".implode("','", $owner_modules)."') AND sugarfeed.assigned_user_id = '".$current_user->id."' "
+                        .") ";
+                }
+                $module_limiter .= ")";
             }
-			if(!empty($where)) { $where .= ' AND '; }
+            if(!empty($where)) { $where .= ' AND '; }
 
 
-			$where .= $module_limiter;
+            $where .= $module_limiter;
 
             $this->lvs->setup($this->seedBean, $this->displayTpl, $where , $lvsParams, 0, $this->displayRows,
-                              array('name',
+                                array('name',
                                     'description',
                                     'date_entered',
                                     'created_by',
                                     /* BEGIN - SECURITY GROUPS */
-									//related_module now included but keep this here just in case
+                                    //related_module now included but keep this here just in case
                                     'related_module', 
                                     'related_id', 
                                     /* END - SECURITY GROUPS */
@@ -277,7 +277,7 @@ 
 
             // assign a baseURL w/ the action set as DisplayDashlet
             foreach($this->lvs->data['pageData']['urls'] as $type => $url) {
-            	// awu Replacing action=DisplayDashlet with action=DynamicAction&DynamicAction=DisplayDashlet
+                // awu Replacing action=DisplayDashlet with action=DynamicAction&DynamicAction=DisplayDashlet
                 $this->lvs->data['pageData']['urls'][$type] = $url.'&action=DynamicAction&DynamicAction=displayDashlet';
                 if($type != 'orderBy')
                     $this->lvs->data['pageData']['urls'][$type] = $url.'&action=DynamicAction&DynamicAction=displayDashlet&sugar_body_only=1&id=' . $this->id;
@@ -335,58 +335,58 @@ 
         $this->lvs->data['data'] = $resortQueue;
     }
 
-	  function deleteUserFeed() {
-    	if(!empty($_REQUEST['record'])) {
-			$feed = new SugarFeed();
-			$feed->retrieve($_REQUEST['record']);
-			if(is_admin($GLOBALS['current_user']) || $feed->created_by == $GLOBALS['current_user']->id){
-            	$feed->mark_deleted($_REQUEST['record']);
+        function deleteUserFeed() {
+        if(!empty($_REQUEST['record'])) {
+            $feed = new SugarFeed();
+            $feed->retrieve($_REQUEST['record']);
+            if(is_admin($GLOBALS['current_user']) || $feed->created_by == $GLOBALS['current_user']->id){
+                $feed->mark_deleted($_REQUEST['record']);
 
-			}
+            }
         }
     }
-	 function pushUserFeed() {
-    	if(!empty($_REQUEST['text']) || (!empty($_REQUEST['link_url']) && !empty($_REQUEST['link_type']))) {
-			$text = htmlspecialchars($_REQUEST['text']);
-			//allow for bold and italic user tags
-			$text = preg_replace('/&amp;lt;(\/*[bi])&amp;gt;/i','<$1>', $text);
+        function pushUserFeed() {
+        if(!empty($_REQUEST['text']) || (!empty($_REQUEST['link_url']) && !empty($_REQUEST['link_type']))) {
+            $text = htmlspecialchars($_REQUEST['text']);
+            //allow for bold and italic user tags
+            $text = preg_replace('/&amp;lt;(\/*[bi])&amp;gt;/i','<$1>', $text);
             SugarFeed::pushFeed($text, 'UserFeed', $GLOBALS['current_user']->id,
-								$GLOBALS['current_user']->id,
+                                $GLOBALS['current_user']->id,
                                 $_REQUEST['link_type'], $_REQUEST['link_url']
                                 );
         }
 
     }
 
-	 function pushUserFeedReply( ) {
-         if(!empty($_REQUEST['text'])&&!empty($_REQUEST['parentFeed'])) {
-			$text = htmlspecialchars($_REQUEST['text']);
-			//allow for bold and italic user tags
-			$text = preg_replace('/&amp;lt;(\/*[bi])&amp;gt;/i','<$1>', $text);
+        function pushUserFeedReply( ) {
+            if(!empty($_REQUEST['text'])&&!empty($_REQUEST['parentFeed'])) {
+            $text = htmlspecialchars($_REQUEST['text']);
+            //allow for bold and italic user tags
+            $text = preg_replace('/&amp;lt;(\/*[bi])&amp;gt;/i','<$1>', $text);
             SugarFeed::pushFeed($text, 'SugarFeed', $_REQUEST['parentFeed'],
-								$GLOBALS['current_user']->id,
+                                $GLOBALS['current_user']->id,
                                 '', ''
                                 );
         }
 
     }
 
-	  function displayOptions() {
+        function displayOptions() {
         global $app_strings;
         global $app_list_strings;
         $ss = new Sugar_Smarty();
         $ss->assign('titleLBL', translate('LBL_TITLE', 'SugarFeed'));
-		$ss->assign('categoriesLBL', translate('LBL_CATEGORIES', 'SugarFeed'));
-		$ss->assign('autenticationPendingLBL', translate('LBL_AUTHENTICATION_PENDING', 'SugarFeed'));
+        $ss->assign('categoriesLBL', translate('LBL_CATEGORIES', 'SugarFeed'));
+        $ss->assign('autenticationPendingLBL', translate('LBL_AUTHENTICATION_PENDING', 'SugarFeed'));
         $ss->assign('rowsLBL', translate('LBL_ROWS', 'SugarFeed'));
         $ss->assign('saveLBL', $app_strings['LBL_SAVE_BUTTON_LABEL']);
         $ss->assign('clearLBL', $app_strings['LBL_CLEAR_BUTTON_LABEL']);
         $ss->assign('title', $this->title);
-		$ss->assign('categories', $this->categories);
+        $ss->assign('categories', $this->categories);
         if ( empty($this->selectedCategories) ) {
             $this->selectedCategories['ALL'] = 'ALL';
         }
-		$ss->assign('selectedCategories', $this->selectedCategories);
+        $ss->assign('selectedCategories', $this->selectedCategories);
         $ss->assign('rows', $this->displayRows);
         $externalApis = array();
         foreach ( $this->externalAPIList as $apiObj => $apiName ) {
@@ -399,58 +399,58 @@ 
         $ss->assign('authenticateLBL', translate('LBL_AUTHENTICATE', 'SugarFeed'));
         $ss->assign('id', $this->id);
         if($this->isAutoRefreshable()) {
-       		$ss->assign('isRefreshable', true);
-			$ss->assign('autoRefresh', $GLOBALS['app_strings']['LBL_DASHLET_CONFIGURE_AUTOREFRESH']);
-			$ss->assign('autoRefreshOptions', $this->getAutoRefreshOptions());
-			$ss->assign('autoRefreshSelect', $this->autoRefresh);
-		}
+                $ss->assign('isRefreshable', true);
+            $ss->assign('autoRefresh', $GLOBALS['app_strings']['LBL_DASHLET_CONFIGURE_AUTOREFRESH']);
+            $ss->assign('autoRefreshOptions', $this->getAutoRefreshOptions());
+            $ss->assign('autoRefreshSelect', $this->autoRefresh);
+        }
 
         return  $ss->fetch('custom/modules/SugarFeed/Dashlets/SugarFeedDashlet/Options.tpl');
     }
 
-	/**
-	 * creats the values
-	 * @return
-	 * @param $req Object
-	 */
-	  function saveOptions($req) {
+    /**
+     * creats the values
+     * @return
+     * @param $req Object
+     */
+        function saveOptions($req) {
         global $sugar_config, $timedate, $current_user, $theme;
         $options = array();
         $options['title'] = $req['title'];
-		$rows = intval($_REQUEST['rows']);
+        $rows = intval($_REQUEST['rows']);
         if($rows <= 0) {
             $rows = 15;
         }
-		if($rows > 100){
-			$rows = 100;
-		}
+        if($rows > 100){
+            $rows = 100;
+        }
         if ( isset($req['autoRefresh']) )
             $options['autoRefresh'] = $req['autoRefresh'];
         $options['rows'] = $rows;
-		$options['categories'] = $req['categories'];
-		foreach($options['categories'] as $cat){
-			if($cat == 'ALL'){
-				unset($options['categories']);
-			}
-		}
+        $options['categories'] = $req['categories'];
+        foreach($options['categories'] as $cat){
+            if($cat == 'ALL'){
+                unset($options['categories']);
+            }
+        }
 
 
         return $options;
     }
 
 
-      function sugarFeedDisplayScript() {
-          // Forces the quicksearch to reload anytime the dashlet gets refreshed
-          return '<script type="text/javascript">
+        function sugarFeedDisplayScript() {
+            // Forces the quicksearch to reload anytime the dashlet gets refreshed
+            return '<script type="text/javascript">
 enableQS(false);
 </script>';
-      }
-	/**
-	 *
-	 * @return javascript including QuickSearch for SugarFeeds
-	 */
-	 function displayScript() {
-	 	require_once('include/QuickSearchDefaults.php');
+        }
+    /**
+     *
+     * @return javascript including QuickSearch for SugarFeeds
+     */
+        function displayScript() {
+            require_once('include/QuickSearchDefaults.php');
         $ss = new Sugar_Smarty();
         $ss->assign('saving', translate('LBL_SAVING', 'SugarFeed'));
         $ss->assign('saved', translate('LBL_SAVED', 'SugarFeed'));
@@ -461,15 +461,15 @@ 
         return $str; // return parent::display for title and such
     }
 
-	/**
-	 *
-	 * @return the fully rendered dashlet
-	 */
-	function display(){
+    /**
+     *
+     * @return the fully rendered dashlet
+     */
+    function display(){
 
-		$listview = parent::display();
-		$GLOBALS['current_sugarfeed'] = $this;
-		$listview = preg_replace_callback('/\{([^\^ }]+)\.([^\}]+)\}/', create_function(
+        $listview = parent::display();
+        $GLOBALS['current_sugarfeed'] = $this;
+        $listview = preg_replace_callback('/\{([^\^ }]+)\.([^\}]+)\}/', create_function(
             '$matches',
             'if($matches[1] == "this"){$var = $matches[2]; return $GLOBALS[\'current_sugarfeed\']->$var;}else{return translate($matches[2], $matches[1]);}'
         ),$listview);
@@ -479,7 +479,7 @@ 
         preg_match_all('/\[(\w+)\:/', $listview, $alt_modules);
 
         //now process each token to create the proper url and image tags in feed, leaving a string for the alt to be replaced in next step
-		$listview = preg_replace('/\[(\w+)\:([\w\-\d]*)\:([^\]]*)\]/', '<a href="index.php?module=$1&action=DetailView&record=$2"><img src="themes/default/images/$1.gif" border=0 REPLACE_ALT>$3</a>', $listview); /*SKIP_IMAGE_TAG*/
+        $listview = preg_replace('/\[(\w+)\:([\w\-\d]*)\:([^\]]*)\]/', '<a href="index.php?module=$1&action=DetailView&record=$2"><img src="themes/default/images/$1.gif" border=0 REPLACE_ALT>$3</a>', $listview); /*SKIP_IMAGE_TAG*/
 
 
         //process each module for the singular version so we can populate the alt tag on the image
@@ -493,25 +493,25 @@ 
 
 
 
-		return $listview.'</div></div>';
-	}
+        return $listview.'</div></div>';
+    }
 
 
-	/**
-	 *
-	 * @return the title and the user post form
-	 * @param $text Object
-	 */
-	function getHeader($text='') {
-		return parent::getHeader($text) . $this->getPostForm().$this->getDisabledWarning().$this->sugarFeedDisplayScript().'<div class="sugarFeedDashlet"><div id="contentScroller'.$this->idjs.'">';
-	}
+    /**
+     *
+     * @return the title and the user post form
+     * @param $text Object
+     */
+    function getHeader($text='') {
+        return parent::getHeader($text) . $this->getPostForm().$this->getDisabledWarning().$this->sugarFeedDisplayScript().'<div class="sugarFeedDashlet"><div id="contentScroller'.$this->idjs.'">';
+    }
 
 
-	/**
-	 *
-	 * @return a warning message if the sugar feed system is not enabled currently
-	 */
-	function getDisabledWarning(){
+    /**
+     *
+     * @return a warning message if the sugar feed system is not enabled currently
+     */
+    function getDisabledWarning(){
         /* Check to see if the sugar feed system is enabled */
         if ( ! $this->shouldDisplay() ) {
             // The Sugar Feeds are disabled, populate the warning message
@@ -521,29 +521,29 @@ 
         }
     }
 
-	/**
-	 *
-	 * @return the form for users posting custom messages to the feed stream
-	 */
-	function getPostForm(){
+    /**
+     *
+     * @return the form for users posting custom messages to the feed stream
+     */
+    function getPostForm(){
         global $current_user;
 
         if ( (!empty($this->selectedCategories) && !in_array('UserFeed',$this->selectedCategories))
-			) {
+            ) {
             // The user feed system isn't enabled, don't let them post notes
             return '';
         }
-		$user_name = ucfirst($GLOBALS['current_user']->user_name);
-		$moreimg = SugarThemeRegistry::current()->getImage('advanced_search' , 'onclick="toggleDisplay(\'more_' . $this->id . '\'); toggleDisplay(\'more_img_'.$this->id.'\'); toggleDisplay(\'less_img_'.$this->id.'\');"',null,null,'.gif',translate('LBL_SHOW_MORE_OPTIONS','SugarFeed'));
-		$lessimg = SugarThemeRegistry::current()->getImage('basic_search' , 'onclick="toggleDisplay(\'more_' . $this->id . '\'); toggleDisplay(\'more_img_'.$this->id.'\'); toggleDisplay(\'less_img_'.$this->id.'\');"',null,null,'.gif',translate('LBL_HIDE_OPTIONS','SugarFeed'));
-		$ss = new Sugar_Smarty();
-		$ss->assign('LBL_TO', translate('LBL_TO', 'SugarFeed'));
-		$ss->assign('LBL_POST', translate('LBL_POST', 'SugarFeed'));
-		$ss->assign('LBL_SELECT', translate('LBL_SELECT', 'SugarFeed'));
-		$ss->assign('LBL_IS', translate('LBL_IS', 'SugarFeed'));
-		$ss->assign('id', $this->id);
-		$ss->assign('more_img', $moreimg);
-		$ss->assign('less_img', $lessimg);
+        $user_name = ucfirst($GLOBALS['current_user']->user_name);
+        $moreimg = SugarThemeRegistry::current()->getImage('advanced_search' , 'onclick="toggleDisplay(\'more_' . $this->id . '\'); toggleDisplay(\'more_img_'.$this->id.'\'); toggleDisplay(\'less_img_'.$this->id.'\');"',null,null,'.gif',translate('LBL_SHOW_MORE_OPTIONS','SugarFeed'));
+        $lessimg = SugarThemeRegistry::current()->getImage('basic_search' , 'onclick="toggleDisplay(\'more_' . $this->id . '\'); toggleDisplay(\'more_img_'.$this->id.'\'); toggleDisplay(\'less_img_'.$this->id.'\');"',null,null,'.gif',translate('LBL_HIDE_OPTIONS','SugarFeed'));
+        $ss = new Sugar_Smarty();
+        $ss->assign('LBL_TO', translate('LBL_TO', 'SugarFeed'));
+        $ss->assign('LBL_POST', translate('LBL_POST', 'SugarFeed'));
+        $ss->assign('LBL_SELECT', translate('LBL_SELECT', 'SugarFeed'));
+        $ss->assign('LBL_IS', translate('LBL_IS', 'SugarFeed'));
+        $ss->assign('id', $this->id);
+        $ss->assign('more_img', $moreimg);
+        $ss->assign('less_img', $lessimg);
 
         include_once("include/social/get_feed_data.php");
         $ss->assign('facebook', $html );
@@ -559,12 +559,12 @@ 
         foreach ( $linkTypesIn as $key => $value ) {
             $linkTypes[$key] = translate('LBL_LINK_TYPE_'.$value,'SugarFeed');
         }
-		$ss->assign('link_types', $linkTypes);
+        $ss->assign('link_types', $linkTypes);
 
         $userPostFormTplFile = 'modules/SugarFeed/Dashlets/SugarFeedDashlet/UserPostForm.tpl';
         $fetch = $ss->fetch(get_custom_file_if_exists($userPostFormTplFile));
         return $fetch;
-	}
+    }
 
     // This is called from the include/MySugar/DashletsDialog/DashletsDialog.php and determines if we should display the SugarFeed dashlet as an option or not
     static function shouldDisplay() {

modules/ProjectTask/ProjectTaskQuickCreate.php

Indentation +20 added lines, -20 removed lines

@@ -75,29 +75,29 @@
 ///
 /// SETUP PARENT POPUP
 
-	$popup_request_data = array(
-		'call_back_function' => 'set_return',
-		'form_name' => 'projectTypeQuickCreate',
-		'field_to_name_array' => array(
-			'id' => 'parent_id',
-			'name' => 'parent_name',
-			),
-		);
+    $popup_request_data = array(
+        'call_back_function' => 'set_return',
+        'form_name' => 'projectTypeQuickCreate',
+        'field_to_name_array' => array(
+            'id' => 'parent_id',
+            'name' => 'parent_name',
+            ),
+        );
 
-	$encoded_parent_popup_request_data = $json->encode($popup_request_data);
-	$this->ss->assign('encoded_parent_popup_request_data', $encoded_parent_popup_request_data);        
+    $encoded_parent_popup_request_data = $json->encode($popup_request_data);
+    $this->ss->assign('encoded_parent_popup_request_data', $encoded_parent_popup_request_data);        
         
-		$popup_request_data = array(
-			'call_back_function' => 'set_return',
-			'form_name' => 'projectTaskQuickCreate',
-			'field_to_name_array' => array(
-				'id' => 'account_id',
-				'name' => 'account_name',
-			),
-		);
+        $popup_request_data = array(
+            'call_back_function' => 'set_return',
+            'form_name' => 'projectTaskQuickCreate',
+            'field_to_name_array' => array(
+                'id' => 'account_id',
+                'name' => 'account_name',
+            ),
+        );
 	
-		$encoded_popup_request_data = $json->encode($popup_request_data);
-		$this->ss->assign('encoded_popup_request_data', $encoded_popup_request_data);        
+        $encoded_popup_request_data = $json->encode($popup_request_data);
+        $this->ss->assign('encoded_popup_request_data', $encoded_popup_request_data);        
 
         
     }   

modules/ProjectTask/MyProjectTasks.php

Indentation +8 added lines, -8 removed lines

@@ -59,19 +59,19 @@
 $ListView = new ListView();
 $seedProjectTask = new ProjectTask();
 $where = "project_task.assigned_user_id='{$current_user->id}'"
-	. " AND (project_task.status IS NULL OR (project_task.status!='Completed' AND project_task.status!='Deferred'))"
-	. " AND (project_task.date_start IS NULL OR project_task.date_start <= '$today')";
+    . " AND (project_task.status IS NULL OR (project_task.status!='Completed' AND project_task.status!='Deferred'))"
+    . " AND (project_task.date_start IS NULL OR project_task.date_start <= '$today')";
 $ListView->initNewXTemplate('modules/ProjectTask/MyProjectTasks.html',
-	$current_module_strings);
+    $current_module_strings);
 $header_text = '';
 
 if(is_admin($current_user)
-	&& $_REQUEST['module'] != 'DynamicLayout'
-	&& !empty($_SESSION['editinplace']))
+    && $_REQUEST['module'] != 'DynamicLayout'
+    && !empty($_SESSION['editinplace']))
 {	
-	$header_text = "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=MyTasks&from_module=Tasks'>"
-		. SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDITLAYOUT'])
-		. '</a>';
+    $header_text = "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=MyTasks&from_module=Tasks'>"
+        . SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDITLAYOUT'])
+        . '</a>';
 }
 $ListView->setHeaderTitle($current_module_strings['LBL_LIST_MY_PROJECT_TASKS'].$header_text);
 $ListView->setQuery($where, "", "date_due,priority desc", "PROJECT_TASK");

modules/ProjectTask/metadata/additionalDetails.php

Indentation +21 added lines, -21 removed lines

@@ -42,31 +42,31 @@
 
 
 function additionalDetailsProjectTask($fields) {
-	static $mod_strings;
-	if(empty($mod_strings)) {
-		global $current_language;
-		$mod_strings = return_module_language($current_language, 'ProjectTask');
-	}
+    static $mod_strings;
+    if(empty($mod_strings)) {
+        global $current_language;
+        $mod_strings = return_module_language($current_language, 'ProjectTask');
+    }
 		
-	$overlib_string = '';
-	if(!empty($fields['PRIORITY'])) $overlib_string .= '<b>' . $mod_strings['LBL_PRIORITY'] . '</b> ' . $fields['PRIORITY'] . '<br>';
-	if(!empty($fields['PERCENT_COMPLETE'])) $overlib_string .= '<b>' . $mod_strings['LBL_PERCENT_COMPLETE'] . '</b> ' . $fields['PERCENT_COMPLETE'] . '%<br>';	
-	if(!empty($fields['ESTIMATED_EFFORT'])) $overlib_string .= '<b>' . $mod_strings['LBL_ESTIMATED_EFFORT'] . '</b> ' . $fields['ESTIMATED_EFFORT'] . '<br>';	
-	if(!empty($fields['ACTUAL_EFFORT'])) $overlib_string .= '<b>' . $mod_strings['LBL_ACTUAL_EFFORT'] . '</b> ' . $fields['ACTUAL_EFFORT'] . '<br>';
-	if(!empty($fields['TASK_NUMBER'])) $overlib_string .= '<b>' . $mod_strings['LBL_TASK_NUMBER'] . '</b> ' . $fields['TASK_NUMBER'] . '<br>';
-	if(!empty($fields['DATE_START'])) $overlib_string .= '<b>' . $mod_strings['LBL_DATE_START'] . '</b> ' . $fields['DATE_START'] . ' ' . $fields['TIME_START'] . '<br>';
+    $overlib_string = '';
+    if(!empty($fields['PRIORITY'])) $overlib_string .= '<b>' . $mod_strings['LBL_PRIORITY'] . '</b> ' . $fields['PRIORITY'] . '<br>';
+    if(!empty($fields['PERCENT_COMPLETE'])) $overlib_string .= '<b>' . $mod_strings['LBL_PERCENT_COMPLETE'] . '</b> ' . $fields['PERCENT_COMPLETE'] . '%<br>';	
+    if(!empty($fields['ESTIMATED_EFFORT'])) $overlib_string .= '<b>' . $mod_strings['LBL_ESTIMATED_EFFORT'] . '</b> ' . $fields['ESTIMATED_EFFORT'] . '<br>';	
+    if(!empty($fields['ACTUAL_EFFORT'])) $overlib_string .= '<b>' . $mod_strings['LBL_ACTUAL_EFFORT'] . '</b> ' . $fields['ACTUAL_EFFORT'] . '<br>';
+    if(!empty($fields['TASK_NUMBER'])) $overlib_string .= '<b>' . $mod_strings['LBL_TASK_NUMBER'] . '</b> ' . $fields['TASK_NUMBER'] . '<br>';
+    if(!empty($fields['DATE_START'])) $overlib_string .= '<b>' . $mod_strings['LBL_DATE_START'] . '</b> ' . $fields['DATE_START'] . ' ' . $fields['TIME_START'] . '<br>';
 		
-	if(!empty($fields['DESCRIPTION'])) {
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
-	}	
+    if(!empty($fields['DESCRIPTION'])) {
+        $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
+        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
+    }	
 
-	return array('fieldToAddTo' => 'NAME', 
-				 'string' => $overlib_string, 
-				 'editLink' => "index.php?action=EditView&module=ProjectTask&return_module=ProjectTask&record={$fields['ID']}", 
-				 'viewLink' => "index.php?action=DetailView&module=ProjectTask&return_module=ProjectTask&record={$fields['ID']}");
+    return array('fieldToAddTo' => 'NAME', 
+                    'string' => $overlib_string, 
+                    'editLink' => "index.php?action=EditView&module=ProjectTask&return_module=ProjectTask&record={$fields['ID']}", 
+                    'viewLink' => "index.php?action=DetailView&module=ProjectTask&return_module=ProjectTask&record={$fields['ID']}");
 }
  
- ?>
+    ?>
  
  
\ No newline at end of file