Completed
Push — develop ( 7c1bda...edae1e )
by Adam
18:38 queued 03:14
created
modules/Import/maps/ImportMapOther.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -47,11 +47,11 @@  discard block
 block discarded – undo
47 47
 
48 48
 class ImportMapOther
49 49
 {
50
-	/**
50
+    /**
51 51
      * String identifier for this import
52 52
      */
53 53
     public $name = 'other';
54
-	/**
54
+    /**
55 55
      * Field delimiter
56 56
      */
57 57
     public $delimiter;
@@ -59,18 +59,18 @@  discard block
 block discarded – undo
59 59
      * Field enclosure
60 60
      */
61 61
     public $enclosure;
62
-	/**
62
+    /**
63 63
      * Do we have a header?
64 64
      */
65 65
     public $has_header = true;
66 66
 
67
-	/**
67
+    /**
68 68
      * Gets the default mapping for a module
69 69
      *
70 70
      * @param  string $module
71 71
      * @return array field mappings
72 72
      */
73
-	public function getMapping(
73
+    public function getMapping(
74 74
         $module
75 75
         )
76 76
     {
@@ -142,18 +142,18 @@  discard block
 block discarded – undo
142 142
         }
143 143
     }
144 144
 	
145
-	/**
145
+    /**
146 146
      * Returns a list of fields that should be ignorred for the module during import
147 147
      *
148 148
      * @param  string $module
149 149
      * @return array of fields to ignor
150 150
      */
151
-	public function getIgnoredFields(
152
-		$module
153
-		)
154
-	{
155
-		return array();
156
-	}
151
+    public function getIgnoredFields(
152
+        $module
153
+        )
154
+    {
155
+        return array();
156
+    }
157 157
 }
158 158
 
159 159
 
Please login to merge, or discard this patch.
modules/Import/maps/ImportMap.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -175,19 +175,19 @@  discard block
 block discarded – undo
175 175
      * @see SugarBean::retrieve()
176 176
      */
177 177
     public function retrieve($id = -1, $encode=true,$deleted=true)
178
-	{
179
-	    $returnVal = parent::retrieve($id,$encode,$deleted);
178
+    {
179
+        $returnVal = parent::retrieve($id,$encode,$deleted);
180 180
 
181
-	    if ( !($returnVal instanceOf $this) ) {
182
-	        return $returnVal;
183
-	    }
181
+        if ( !($returnVal instanceOf $this) ) {
182
+            return $returnVal;
183
+        }
184 184
 
185
-	    if ( $this->source == 'tab' && $this->delimiter == '' ) {
186
-	        $this->delimiter = "\t";
187
-	    }
185
+        if ( $this->source == 'tab' && $this->delimiter == '' ) {
186
+            $this->delimiter = "\t";
187
+        }
188 188
 
189
-	    return $this;
190
-	}
189
+        return $this;
190
+    }
191 191
 
192 192
     /**
193 193
      * Save
@@ -372,10 +372,10 @@  discard block
 block discarded – undo
372 372
         //list of field values we track during import wizard
373 373
         $import_step_fields = array(
374 374
         //step1
375
-          //  'import_module', 'source', 'custom_enclosure', 'custom_enclosure_other', 'custom_delimiter', 'type',
375
+            //  'import_module', 'source', 'custom_enclosure', 'custom_enclosure_other', 'custom_delimiter', 'type',
376 376
         //step2
377
-           // 'custom_delimiter', 'custom_enclosure', 'type', 'source', 'source_id', 'import_module', 'has_header',
378
-         //step3
377
+            // 'custom_delimiter', 'custom_enclosure', 'type', 'source', 'source_id', 'import_module', 'has_header',
378
+            //step3
379 379
             'display_tabs_def','custom_delimiter', 'custom_enclosure', 'import_type', 'source', 'source_id', 'import_module', 'has_header', 'importlocale_charset',
380 380
             'importlocale_dateformat', 'importlocale_timeformat', 'importlocale_timezone', 'importlocale_currency',
381 381
             'importlocale_default_currency_significant_digits', 'importlocale_num_grp_sep', 'importlocale_dec_sep',
Please login to merge, or discard this patch.
modules/Cases/metadata/accountsquickcreatedefs.php 1 patch
Indentation   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -40,39 +40,39 @@
 block discarded – undo
40 40
 $viewdefs['Cases']['AccountsQuickCreate'] = array(
41 41
 'templateMeta' => array('form' => 
42 42
                             array (
43
-                              'hidden' => 
44
-                              array (
43
+                                'hidden' => 
44
+                                array (
45 45
                                 0 => '<input type="hidden" name="account_id" value="{$smarty.request.account_id}">',
46 46
                                 1 => '<input type="hidden" name="account_name" value="{$smarty.request.account_name}">',
47
-                              ),
47
+                                ),
48 48
                             ),
49 49
                         'maxColumns' => '2', 
50 50
                         'widths' => array(
51 51
                                         array('label' => '10', 'field' => '30'), 
52 52
                                         array('label' => '10', 'field' => '30')
53 53
                                         ),
54
-                       ),
54
+                        ),
55 55
 'panels' =>
56 56
 
57 57
 array (
58 58
   
59
-  array (
59
+    array (
60 60
     array ('name'=>'name', 'displayParams'=>array('size'=>65, 'required'=>true)),
61 61
     'priority'
62
-  ),
62
+    ),
63 63
   
64
-  array (
64
+    array (
65 65
     'status',
66 66
     array('name'=>'account_name', 'type'=>'readonly'),
67
-  ),
67
+    ),
68 68
   
69
-  array (
70 69
     array (
71
-      'name' => 'description',
72
-      'displayParams' => array ('rows' => '4','cols' => '60'),
73
-      'nl2br' => true,
70
+    array (
71
+        'name' => 'description',
72
+        'displayParams' => array ('rows' => '4','cols' => '60'),
73
+        'nl2br' => true,
74
+    ),
74 75
     ),
75
-  ),
76 76
 
77 77
 ),
78 78
 
Please login to merge, or discard this patch.
modules/Cases/metadata/additionalDetails.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -42,31 +42,31 @@
 block discarded – undo
42 42
     return additionalDetailsaCase($fields);
43 43
 }
44 44
 function additionalDetailsaCase($fields) {
45
-	static $mod_strings;
46
-	if(empty($mod_strings)) {
47
-		global $current_language;
48
-		$mod_strings = return_module_language($current_language, 'Cases');
49
-	}
45
+    static $mod_strings;
46
+    if(empty($mod_strings)) {
47
+        global $current_language;
48
+        $mod_strings = return_module_language($current_language, 'Cases');
49
+    }
50 50
 		
51
-	$overlib_string = '';
51
+    $overlib_string = '';
52 52
 		
53
-	if(!empty($fields['DESCRIPTION'])) { 
54
-		$overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
55
-		if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
56
-		$overlib_string .= '<br>';
57
-	}
58
-	if(!empty($fields['RESOLUTION'])) { 
59
-		$overlib_string .= '<b>'. $mod_strings['LBL_RESOLUTION'] . '</b> ' . substr($fields['RESOLUTION'], 0, 300);
60
-		if(strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
61
-	}		
53
+    if(!empty($fields['DESCRIPTION'])) { 
54
+        $overlib_string .= '<b>'. $mod_strings['LBL_DESCRIPTION'] . '</b> ' . substr($fields['DESCRIPTION'], 0, 300);
55
+        if(strlen($fields['DESCRIPTION']) > 300) $overlib_string .= '...';
56
+        $overlib_string .= '<br>';
57
+    }
58
+    if(!empty($fields['RESOLUTION'])) { 
59
+        $overlib_string .= '<b>'. $mod_strings['LBL_RESOLUTION'] . '</b> ' . substr($fields['RESOLUTION'], 0, 300);
60
+        if(strlen($fields['RESOLUTION']) > 300) $overlib_string .= '...';
61
+    }		
62 62
 	
63
-	return array('fieldToAddTo' => 'NAME', 
64
-				 'string' => $overlib_string, 
65
-				 'width' => '400',
66
-				 'editLink' => "index.php?action=EditView&module=Cases&return_module=Cases&record={$fields['ID']}", 
67
-				 'viewLink' => "index.php?action=DetailView&module=Cases&return_module=Cases&record={$fields['ID']}");
63
+    return array('fieldToAddTo' => 'NAME', 
64
+                    'string' => $overlib_string, 
65
+                    'width' => '400',
66
+                    'editLink' => "index.php?action=EditView&module=Cases&return_module=Cases&record={$fields['ID']}", 
67
+                    'viewLink' => "index.php?action=DetailView&module=Cases&return_module=Cases&record={$fields['ID']}");
68 68
 }
69 69
  
70
- ?>
70
+    ?>
71 71
  
72 72
  
73 73
\ No newline at end of file
Please login to merge, or discard this patch.
modules/Cases/metadata/detailviewdefs.php 1 patch
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -39,129 +39,129 @@
 block discarded – undo
39 39
 
40 40
 $viewdefs ['Cases'] = 
41 41
 array (
42
-  'DetailView' => 
43
-  array (
42
+    'DetailView' => 
43
+    array (
44 44
     'templateMeta' => 
45 45
     array (
46
-      'form' => 
47
-      array (
46
+        'form' => 
47
+        array (
48 48
         'buttons' => 
49 49
         array (
50
-          0 => 'EDIT',
51
-          1 => 'DUPLICATE',
52
-          2 => 'DELETE',
53
-          3 => 'FIND_DUPLICATES',
50
+            0 => 'EDIT',
51
+            1 => 'DUPLICATE',
52
+            2 => 'DELETE',
53
+            3 => 'FIND_DUPLICATES',
54 54
         ),
55
-      ),
56
-      'maxColumns' => '2',
57
-      'widths' => 
58
-      array (
55
+        ),
56
+        'maxColumns' => '2',
57
+        'widths' => 
58
+        array (
59 59
         0 => 
60 60
         array (
61
-          'label' => '10',
62
-          'field' => '30',
61
+            'label' => '10',
62
+            'field' => '30',
63 63
         ),
64 64
         1 => 
65 65
         array (
66
-          'label' => '10',
67
-          'field' => '30',
66
+            'label' => '10',
67
+            'field' => '30',
68 68
         ),
69
-      ),
70
-      'useTabs' => true,
71
-      'tabDefs' => 
72
-      array (
69
+        ),
70
+        'useTabs' => true,
71
+        'tabDefs' => 
72
+        array (
73 73
         'LBL_CASE_INFORMATION' => 
74 74
         array (
75
-          'newTab' => true,
76
-          'panelDefault' => 'expanded',
75
+            'newTab' => true,
76
+            'panelDefault' => 'expanded',
77 77
         ),
78 78
         'LBL_AOP_CASE_UPDATES' => 
79 79
         array (
80
-          'newTab' => false,
81
-          'panelDefault' => 'expanded',
80
+            'newTab' => false,
81
+            'panelDefault' => 'expanded',
82
+        ),
82 83
         ),
83
-      ),
84 84
     ),
85 85
     'panels' => 
86 86
     array (
87
-      'lbl_case_information' => 
88
-      array (
87
+        'lbl_case_information' => 
88
+        array (
89 89
         0 => 
90 90
         array (
91
-          0 => 
92
-          array (
91
+            0 => 
92
+            array (
93 93
             'name' => 'case_number',
94 94
             'label' => 'LBL_CASE_NUMBER',
95
-          ),
96
-          1 => 'priority',
95
+            ),
96
+            1 => 'priority',
97 97
         ),
98 98
         1 => 
99 99
         array (
100
-          0 => 
101
-          array (
100
+            0 => 
101
+            array (
102 102
             'name' => 'state',
103 103
             'comment' => 'The state of the case (i.e. open/closed)',
104 104
             'label' => 'LBL_STATE',
105
-          ),
106
-          1 => 'status',
105
+            ),
106
+            1 => 'status',
107 107
         ),
108 108
         2 => 
109 109
         array (
110
-          0 => 'type',
111
-          1 => 'account_name',
110
+            0 => 'type',
111
+            1 => 'account_name',
112 112
         ),
113 113
         3 => 
114 114
         array (
115
-          0 => 
116
-          array (
115
+            0 => 
116
+            array (
117 117
             'name' => 'name',
118 118
             'label' => 'LBL_SUBJECT',
119
-          ),
119
+            ),
120 120
         ),
121 121
         4 => 
122 122
         array (
123
-          0 => 'description',
123
+            0 => 'description',
124 124
         ),
125 125
         5 => 
126 126
         array (
127
-          0 => 'resolution',
127
+            0 => 'resolution',
128 128
         ),
129 129
         6 => 
130 130
         array (
131
-          0 => 
132
-          array (
131
+            0 => 
132
+            array (
133 133
             'name' => 'assigned_user_name',
134 134
             'label' => 'LBL_ASSIGNED_TO',
135
-          ),
135
+            ),
136 136
         ),
137 137
         7 => 
138 138
         array (
139
-          0 => 
140
-          array (
139
+            0 => 
140
+            array (
141 141
             'name' => 'date_entered',
142 142
             'customCode' => '{$fields.date_entered.value} {$APP.LBL_BY} {$fields.created_by_name.value}',
143
-          ),
144
-          1 => 
145
-          array (
143
+            ),
144
+            1 => 
145
+            array (
146 146
             'name' => 'date_modified',
147 147
             'label' => 'LBL_DATE_MODIFIED',
148 148
             'customCode' => '{$fields.date_modified.value} {$APP.LBL_BY} {$fields.modified_by_name.value}',
149
-          ),
149
+            ),
150
+        ),
150 151
         ),
151
-      ),
152
-      'LBL_AOP_CASE_UPDATES' => 
153
-      array (
152
+        'LBL_AOP_CASE_UPDATES' => 
153
+        array (
154 154
         0 => 
155 155
         array (
156
-          0 => 
157
-          array (
156
+            0 => 
157
+            array (
158 158
             'name' => 'aop_case_updates_threaded',
159 159
             'studio' => 'visible',
160 160
             'label' => 'LBL_AOP_CASE_UPDATES_THREADED',
161
-          ),
161
+            ),
162
+        ),
162 163
         ),
163
-      ),
164 164
     ),
165
-  ),
165
+    ),
166 166
 );
167 167
 ?>
Please login to merge, or discard this patch.
modules/Cases/metadata/quickcreatedefs.php 1 patch
Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -45,32 +45,32 @@
 block discarded – undo
45 45
                                         array('label' => '10', 'field' => '30'), 
46 46
                                         array('label' => '10', 'field' => '30')
47 47
                                         ),
48
-                       ),
48
+                        ),
49 49
 'panels' =>
50 50
 
51 51
 array (
52 52
   
53
-  array (
53
+    array (
54 54
     array ('name'=>'name', 'displayParams'=>array('size'=>65, 'required'=>true)),
55 55
     'priority'
56
-  ),
56
+    ),
57 57
   
58
-  array (
58
+    array (
59 59
     'status',
60 60
     array('name'=>'account_name'),
61
-  ),
61
+    ),
62 62
   
63
-  array (
63
+    array (
64 64
     'assigned_user_name',
65
-  ),
65
+    ),
66 66
   
67
-  array (
68 67
     array (
69
-      'name' => 'description',
70
-      'displayParams' => array ('rows' => '4','cols' => '60'),
71
-      'nl2br' => true,
68
+    array (
69
+        'name' => 'description',
70
+        'displayParams' => array ('rows' => '4','cols' => '60'),
71
+        'nl2br' => true,
72
+    ),
72 73
     ),
73
-  ),
74 74
 
75 75
 ),
76 76
 
Please login to merge, or discard this patch.
modules/Cases/metadata/listviewdefs.php 1 patch
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -43,41 +43,41 @@
 block discarded – undo
43 43
 
44 44
 
45 45
 $listViewDefs['Cases'] = array(
46
-	'CASE_NUMBER' => array(
47
-		'width' => '5', 
48
-		'label' => 'LBL_LIST_NUMBER',
46
+    'CASE_NUMBER' => array(
47
+        'width' => '5', 
48
+        'label' => 'LBL_LIST_NUMBER',
49 49
         'default' => true), 
50
-	'NAME' => array(
51
-		'width' => '25', 
52
-		'label' => 'LBL_LIST_SUBJECT', 
53
-		'link' => true,
50
+    'NAME' => array(
51
+        'width' => '25', 
52
+        'label' => 'LBL_LIST_SUBJECT', 
53
+        'link' => true,
54 54
         'default' => true), 
55
-	'ACCOUNT_NAME' => array(
56
-		'width' => '20', 
57
-		'label' => 'LBL_LIST_ACCOUNT_NAME', 
58
-		'module' => 'Accounts',
59
-		'id' => 'ACCOUNT_ID',
60
-		'link' => true,
55
+    'ACCOUNT_NAME' => array(
56
+        'width' => '20', 
57
+        'label' => 'LBL_LIST_ACCOUNT_NAME', 
58
+        'module' => 'Accounts',
59
+        'id' => 'ACCOUNT_ID',
60
+        'link' => true,
61 61
         'default' => true,
62 62
         'ACLTag' => 'ACCOUNT',
63 63
         'related_fields' => array('account_id')),
64
-	'PRIORITY' => array(
65
-		'width' => '10', 
66
-		'label' => 'LBL_LIST_PRIORITY',
64
+    'PRIORITY' => array(
65
+        'width' => '10', 
66
+        'label' => 'LBL_LIST_PRIORITY',
67 67
         'default' => true),  
68
-	'STATUS' => array(
69
-		'width' => '10', 
70
-		'label' => 'LBL_LIST_STATUS',
68
+    'STATUS' => array(
69
+        'width' => '10', 
70
+        'label' => 'LBL_LIST_STATUS',
71 71
         'default' => true),
72
-	'ASSIGNED_USER_NAME' => array(
73
-		'width' => '10', 
74
-		'label' => 'LBL_ASSIGNED_TO_NAME',
75
-		'module' => 'Employees',
72
+    'ASSIGNED_USER_NAME' => array(
73
+        'width' => '10', 
74
+        'label' => 'LBL_ASSIGNED_TO_NAME',
75
+        'module' => 'Employees',
76 76
         'id' => 'ASSIGNED_USER_ID',
77 77
         'default' => true),
78
-	'DATE_ENTERED' => array (
79
-	    'width' => '10',
80
-	    'label' => 'LBL_DATE_ENTERED',
81
-	    'default' => true),
78
+    'DATE_ENTERED' => array (
79
+        'width' => '10',
80
+        'label' => 'LBL_DATE_ENTERED',
81
+        'default' => true),
82 82
 );
83 83
 ?>
Please login to merge, or discard this patch.
modules/Opportunities/field_arrays.php 1 patch
Indentation   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -46,27 +46,27 @@
 block discarded – undo
46 46
  * Contributor(s): ______________________________________..
47 47
  ********************************************************************************/
48 48
 $fields_array['Opportunity'] = array ('column_fields' => Array("id"
49
-		, "name"
50
-		, "opportunity_type"
51
-		, "lead_source"
52
-		, "amount"
53
-		, "currency_id"
54
-		, "amount_usdollar"
55
-		, "date_entered"
56
-		, "date_modified"
57
-		, "modified_user_id"
58
-		, "assigned_user_id"
59
-		, "created_by"
60
-		, "date_closed"
61
-		, "next_step"
62
-		, "sales_stage"
63
-		, "probability"
64
-		, "description"
65
-		,"campaign_id"
66
-		),
49
+        , "name"
50
+        , "opportunity_type"
51
+        , "lead_source"
52
+        , "amount"
53
+        , "currency_id"
54
+        , "amount_usdollar"
55
+        , "date_entered"
56
+        , "date_modified"
57
+        , "modified_user_id"
58
+        , "assigned_user_id"
59
+        , "created_by"
60
+        , "date_closed"
61
+        , "next_step"
62
+        , "sales_stage"
63
+        , "probability"
64
+        , "description"
65
+        ,"campaign_id"
66
+        ),
67 67
         'list_fields' => Array('id', 'name', 'account_id', 'sales_stage', 'account_name', 'date_closed', 'amount', 'assigned_user_name', 'assigned_user_id','sales_stage','probability','lead_source','opportunity_type'
68
-	, "amount_usdollar"
69
-	),
68
+    , "amount_usdollar"
69
+    ),
70 70
         'required_fields' => Array('name'=>1, 'date_closed'=>2, 'amount'=>3, 'sales_stage'=>4, 'account_name'=>5),
71 71
 );
72 72
 ?>
73 73
\ No newline at end of file
Please login to merge, or discard this patch.
modules/Opportunities/SubPanelViewProjects.php 1 patch
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -71,12 +71,12 @@  discard block
 block discarded – undo
71 71
 /// SETUP PARENT POPUP
72 72
 
73 73
 $popup_request_data = array(
74
-	'call_back_function' => 'set_return_and_save',
75
-	'form_name' => 'DetailView',
76
-	'field_to_name_array' => array(
77
-		'id' => 'opportunity_id',
78
-		),
79
-	);
74
+    'call_back_function' => 'set_return_and_save',
75
+    'form_name' => 'DetailView',
76
+    'field_to_name_array' => array(
77
+        'id' => 'opportunity_id',
78
+        ),
79
+    );
80 80
 
81 81
 $json = getJSONobj();
82 82
 $encoded_popup_request_data = $json->encode($popup_request_data);
@@ -94,14 +94,14 @@  discard block
 block discarded – undo
94 94
 $button .= "<input type='hidden' name='return_id' value='".$focus->id."'>\n";
95 95
 $button .= "<input type='hidden' name='action'>\n";
96 96
 $button .= "<input title='".$app_strings['LBL_SELECT_BUTTON_TITLE']
97
-	."' accessyKey='".$app_strings['LBL_SELECT_BUTTON_KEY']
98
-	."' type='button' class='button' value='  "
99
-	.$app_strings['LBL_SELECT_BUTTON_LABEL']
100
-	."  ' name='button' onclick='open_popup(\"Opportunities\", 600, 400, \"\", false, true, {$encoded_popup_request_data});'>\n";
97
+    ."' accessyKey='".$app_strings['LBL_SELECT_BUTTON_KEY']
98
+    ."' type='button' class='button' value='  "
99
+    .$app_strings['LBL_SELECT_BUTTON_LABEL']
100
+    ."  ' name='button' onclick='open_popup(\"Opportunities\", 600, 400, \"\", false, true, {$encoded_popup_request_data});'>\n";
101 101
 $button .= "</form>\n";
102 102
 $header_text = '';
103 103
 if(is_admin($current_user) && $_REQUEST['module'] != 'DynamicLayout' && !empty($_SESSION['editinplace'])){	
104
-		$header_text = "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=SubPanelView&from_module=Opportunities&record=". $_REQUEST['record']."'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDITLAYOUT'])."</a>";
104
+        $header_text = "&nbsp;<a href='index.php?action=index&module=DynamicLayout&from_action=SubPanelView&from_module=Opportunities&record=". $_REQUEST['record']."'>".SugarThemeRegistry::current()->getImage("EditLayout","border='0' align='bottom'",null,null,'.gif',$mod_strings['LBL_EDITLAYOUT'])."</a>";
105 105
 }
106 106
 $ListView = new ListView();
107 107
 $ListView->initNewXTemplate('modules/Opportunities/SubPanelViewProjects.html',$current_module_strings);
Please login to merge, or discard this patch.