Completed
Push — master ( e40fee...8e8f82 )
by Adam
19:18
created
include/Smarty/plugins/function.sugar_number_format.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -37,7 +37,7 @@
 block discarded – undo
37 37
 function smarty_function_sugar_number_format($params, &$smarty) {
38 38
     global $locale;
39 39
     
40
-	if(!isset($params['var']) || $params['var'] === '') {  
40
+    if(!isset($params['var']) || $params['var'] === '') {  
41 41
         return '';
42 42
     } 
43 43
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,11 +37,11 @@
 block discarded – undo
37 37
 function smarty_function_sugar_number_format($params, &$smarty) {
38 38
     global $locale;
39 39
     
40
-	if(!isset($params['var']) || $params['var'] === '') {  
40
+	if (!isset($params['var']) || $params['var'] === '') {  
41 41
         return '';
42 42
     } 
43 43
 
44
-    if ( !isset($params['precision']) ) {
44
+    if (!isset($params['precision'])) {
45 45
         $params['precision'] = $locale->getPrecedentPreference('default_currency_significant_digits');
46 46
     }
47 47
 
Please login to merge, or discard this patch.
include/Smarty/plugins/modifier.wordwrap.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -21,9 +21,9 @@
 block discarded – undo
21 21
  * @param boolean
22 22
  * @return string
23 23
  */
24
-function smarty_modifier_wordwrap($string,$length=80,$break="\n",$cut=false)
24
+function smarty_modifier_wordwrap($string, $length = 80, $break = "\n", $cut = false)
25 25
 {
26
-    return wordwrap($string,$length,$break,$cut);
26
+    return wordwrap($string, $length, $break, $cut);
27 27
 }
28 28
 
29 29
 ?>
Please login to merge, or discard this patch.
include/Smarty/plugins/function.html_options.php 2 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -29,7 +29,7 @@  discard block
 block discarded – undo
29 29
  */
30 30
 function smarty_function_html_options($params, &$smarty)
31 31
 {
32
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
32
+    require_once $smarty->_get_plugin_filepath('shared', 'escape_special_chars');
33 33
     
34 34
     $name = null;
35 35
     $values = null;
@@ -39,8 +39,8 @@  discard block
 block discarded – undo
39 39
     
40 40
     $extra = '';
41 41
     
42
-    foreach($params as $_key => $_val) {
43
-        switch($_key) {
42
+    foreach ($params as $_key => $_val) {
43
+        switch ($_key) {
44 44
             case 'name':
45 45
                 $$_key = (string)$_val;
46 46
                 break;
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
                 break;
60 60
                 
61 61
             default:
62
-                if(!is_array($_val)) {
62
+                if (!is_array($_val)) {
63 63
                     $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
64 64
                 } else {
65 65
                     $smarty->trigger_error("html_options: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
@@ -87,8 +87,8 @@  discard block
 block discarded – undo
87 87
 
88 88
     }
89 89
 
90
-    if(!empty($name)) {
91
-        $_html_result = '<select name="' . $name . '"' . $extra . '>' . "\n" . $_html_result . '</select>' . "\n";
90
+    if (!empty($name)) {
91
+        $_html_result = '<select name="'.$name.'"'.$extra.'>'."\n".$_html_result.'</select>'."\n";
92 92
     }
93 93
 
94 94
     return $_html_result;
@@ -96,12 +96,12 @@  discard block
 block discarded – undo
96 96
 }
97 97
 
98 98
 function smarty_function_html_options_optoutput($key, $value, $selected) {
99
-    if(!is_array($value)) {
100
-        $_html_result = '<option label="' . smarty_function_escape_special_chars($value) . '" value="' .
101
-            smarty_function_escape_special_chars($key) . '"';
99
+    if (!is_array($value)) {
100
+        $_html_result = '<option label="'.smarty_function_escape_special_chars($value).'" value="'.
101
+            smarty_function_escape_special_chars($key).'"';
102 102
         if (in_array((string)$key, $selected))
103 103
             $_html_result .= ' selected="selected"';
104
-        $_html_result .= '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n";
104
+        $_html_result .= '>'.smarty_function_escape_special_chars($value).'</option>'."\n";
105 105
     } else {
106 106
         $_html_result = smarty_function_html_options_optgroup($key, $value, $selected);
107 107
     }
@@ -109,7 +109,7 @@  discard block
 block discarded – undo
109 109
 }
110 110
 
111 111
 function smarty_function_html_options_optgroup($key, $values, $selected) {
112
-    $optgroup_html = '<optgroup label="' . smarty_function_escape_special_chars($key) . '">' . "\n";
112
+    $optgroup_html = '<optgroup label="'.smarty_function_escape_special_chars($key).'">'."\n";
113 113
     foreach ($values as $key => $value) {
114 114
         $optgroup_html .= smarty_function_html_options_optoutput($key, $value, $selected);
115 115
     }
Please login to merge, or discard this patch.
Braces   +10 added lines, -6 removed lines patch added patch discarded remove patch
@@ -68,15 +68,18 @@  discard block
 block discarded – undo
68 68
         }
69 69
     }
70 70
 
71
-    if (!isset($options) && !isset($values))
72
-        return ''; /* raise error here? */
71
+    if (!isset($options) && !isset($values)) {
72
+            return '';
73
+    }
74
+    /* raise error here? */
73 75
 
74 76
     $_html_result = '';
75 77
 
76 78
     if (isset($options)) {
77 79
         
78
-        foreach ($options as $_key=>$_val)
79
-            $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
80
+        foreach ($options as $_key=>$_val) {
81
+                    $_html_result .= smarty_function_html_options_optoutput($_key, $_val, $selected);
82
+        }
80 83
 
81 84
     } else {
82 85
         
@@ -99,8 +102,9 @@  discard block
 block discarded – undo
99 102
     if(!is_array($value)) {
100 103
         $_html_result = '<option label="' . smarty_function_escape_special_chars($value) . '" value="' .
101 104
             smarty_function_escape_special_chars($key) . '"';
102
-        if (in_array((string)$key, $selected))
103
-            $_html_result .= ' selected="selected"';
105
+        if (in_array((string)$key, $selected)) {
106
+                    $_html_result .= ' selected="selected"';
107
+        }
104 108
         $_html_result .= '>' . smarty_function_escape_special_chars($value) . '</option>' . "\n";
105 109
     } else {
106 110
         $_html_result = smarty_function_html_options_optgroup($key, $value, $selected);
Please login to merge, or discard this patch.
include/Smarty/plugins/block.nocache.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -2,6 +2,6 @@
 block discarded – undo
2 2
 //implements Smarty 3 style {nocache}{/nocache} block to prevent caching of a section of a template.
3 3
 //remove this upon upgrade to Smarty 3
4 4
 function smarty_block_nocache($param, $content, &$smarty) {
5
-   return $content;
5
+    return $content;
6 6
 } 
7 7
 ?>
8 8
\ No newline at end of file
Please login to merge, or discard this patch.
include/Smarty/plugins/function.html_radios.php 3 patches
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
  */
41 41
 function smarty_function_html_radios($params, &$smarty)
42 42
 {
43
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
43
+    require_once $smarty->_get_plugin_filepath('shared', 'escape_special_chars');
44 44
    
45 45
     $name = 'radio';
46 46
     $values = null;
@@ -52,8 +52,8 @@  discard block
 block discarded – undo
52 52
     $output = null;
53 53
     $extra = '';
54 54
 
55
-    foreach($params as $_key => $_val) {
56
-        switch($_key) {
55
+    foreach ($params as $_key => $_val) {
56
+        switch ($_key) {
57 57
             case 'name':
58 58
             case 'separator':
59 59
                 $$_key = (string)$_val;
@@ -61,8 +61,8 @@  discard block
 block discarded – undo
61 61
 
62 62
             case 'checked':
63 63
             case 'selected':
64
-                if(is_array($_val)) {
65
-                    $smarty->trigger_error('html_radios: the "' . $_key . '" attribute cannot be an array', E_USER_WARNING);
64
+                if (is_array($_val)) {
65
+                    $smarty->trigger_error('html_radios: the "'.$_key.'" attribute cannot be an array', E_USER_WARNING);
66 66
                 } else {
67 67
                     $selected = (string)$_val;
68 68
                 }
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
                 break;
92 92
 
93 93
             default:
94
-                if(!is_array($_val)) {
94
+                if (!is_array($_val)) {
95 95
                     $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
96 96
                 } else {
97 97
                     $smarty->trigger_error("html_radios: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
@@ -119,10 +119,10 @@  discard block
 block discarded – undo
119 119
 
120 120
     }
121 121
 
122
-    if(!empty($params['assign'])) {
122
+    if (!empty($params['assign'])) {
123 123
         $smarty->assign($params['assign'], $_html_result);
124 124
     } else {
125
-        return implode("\n",$_html_result);
125
+        return implode("\n", $_html_result);
126 126
     }
127 127
 
128 128
 }
@@ -130,25 +130,25 @@  discard block
 block discarded – undo
130 130
 function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids) {
131 131
     $_output = '';
132 132
     if ($labels) {
133
-      if($label_ids) {
134
-          $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
135
-          $_output .= '<label for="' . $_id . '">';
133
+      if ($label_ids) {
134
+          $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name.'_'.$value));
135
+          $_output .= '<label for="'.$_id.'">';
136 136
       } else {
137 137
           $_output .= '<label>';           
138 138
       }
139 139
    }
140 140
    $_output .= '<input type="radio" name="'
141
-        . smarty_function_escape_special_chars($name) . '" value="'
142
-        . smarty_function_escape_special_chars($value) . '"';
141
+        . smarty_function_escape_special_chars($name).'" value="'
142
+        . smarty_function_escape_special_chars($value).'"';
143 143
 
144
-   if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
144
+   if ($labels && $label_ids) $_output .= ' id="'.$_id.'"';
145 145
 
146
-    if ((string)$value==$selected) {
146
+    if ((string)$value == $selected) {
147 147
         $_output .= ' checked="checked"';
148 148
     }
149
-    $_output .= $extra . ' />' . $output;
149
+    $_output .= $extra.' />'.$output;
150 150
     if ($labels) $_output .= '</label>';
151
-    $_output .=  $separator;
151
+    $_output .= $separator;
152 152
 
153 153
     return $_output;
154 154
 }
Please login to merge, or discard this patch.
Braces   +13 added lines, -6 removed lines patch added patch discarded remove patch
@@ -100,15 +100,18 @@  discard block
 block discarded – undo
100 100
         }
101 101
     }
102 102
 
103
-    if (!isset($options) && !isset($values))
104
-        return ''; /* raise error here? */
103
+    if (!isset($options) && !isset($values)) {
104
+            return '';
105
+    }
106
+    /* raise error here? */
105 107
 
106 108
     $_html_result = array();
107 109
 
108 110
     if (isset($options)) {
109 111
 
110
-        foreach ($options as $_key=>$_val)
111
-            $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
112
+        foreach ($options as $_key=>$_val) {
113
+                    $_html_result[] = smarty_function_html_radios_output($name, $_key, $_val, $selected, $extra, $separator, $labels, $label_ids);
114
+        }
112 115
 
113 116
     } else {
114 117
 
@@ -141,13 +144,17 @@  discard block
 block discarded – undo
141 144
         . smarty_function_escape_special_chars($name) . '" value="'
142 145
         . smarty_function_escape_special_chars($value) . '"';
143 146
 
144
-   if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
147
+   if ($labels && $label_ids) {
148
+       $_output .= ' id="' . $_id . '"';
149
+   }
145 150
 
146 151
     if ((string)$value==$selected) {
147 152
         $_output .= ' checked="checked"';
148 153
     }
149 154
     $_output .= $extra . ' />' . $output;
150
-    if ($labels) $_output .= '</label>';
155
+    if ($labels) {
156
+        $_output .= '</label>';
157
+    }
151 158
     $_output .=  $separator;
152 159
 
153 160
     return $_output;
Please login to merge, or discard this patch.
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -130,18 +130,18 @@
 block discarded – undo
130 130
 function smarty_function_html_radios_output($name, $value, $output, $selected, $extra, $separator, $labels, $label_ids) {
131 131
     $_output = '';
132 132
     if ($labels) {
133
-      if($label_ids) {
134
-          $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
135
-          $_output .= '<label for="' . $_id . '">';
136
-      } else {
137
-          $_output .= '<label>';           
138
-      }
139
-   }
140
-   $_output .= '<input type="radio" name="'
133
+        if($label_ids) {
134
+            $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!', '_', $name . '_' . $value));
135
+            $_output .= '<label for="' . $_id . '">';
136
+        } else {
137
+            $_output .= '<label>';           
138
+        }
139
+    }
140
+    $_output .= '<input type="radio" name="'
141 141
         . smarty_function_escape_special_chars($name) . '" value="'
142 142
         . smarty_function_escape_special_chars($value) . '"';
143 143
 
144
-   if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
144
+    if ($labels && $label_ids) $_output .= ' id="' . $_id . '"';
145 145
 
146 146
     if ((string)$value==$selected) {
147 147
         $_output .= ' checked="checked"';
Please login to merge, or discard this patch.
include/Smarty/plugins/function.sugar_getimage.php 3 patches
Indentation   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -53,28 +53,28 @@
 block discarded – undo
53 53
 
54 54
 function smarty_function_sugar_getimage($params, &$smarty) {
55 55
 
56
-	// error checking for required parameters
57
-	if(!isset($params['name'])) 
58
-		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
56
+    // error checking for required parameters
57
+    if(!isset($params['name'])) 
58
+        $smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
59 59
 
60
-	// temp hack to deprecate the use of other_attributes
61
-	if(isset($params['other_attributes']))
62
-		$params['attr'] = $params['other_attributes'];
60
+    // temp hack to deprecate the use of other_attributes
61
+    if(isset($params['other_attributes']))
62
+        $params['attr'] = $params['other_attributes'];
63 63
 
64
-	// set defaults
65
-	if(!isset($params['attr']))
66
-		$params['attr'] = '';
67
-	if(!isset($params['width']))
68
-		$params['width'] = null;
69
-	if(!isset($params['height']))
70
-		$params['height'] = null;
71
-	if(!isset($params['alt'])) 
72
-		$params['alt'] = '';
64
+    // set defaults
65
+    if(!isset($params['attr']))
66
+        $params['attr'] = '';
67
+    if(!isset($params['width']))
68
+        $params['width'] = null;
69
+    if(!isset($params['height']))
70
+        $params['height'] = null;
71
+    if(!isset($params['alt'])) 
72
+        $params['alt'] = '';
73 73
 
74
-	// deprecated ?
75
-	if(!isset($params['ext']))
76
-		$params['ext'] = null;
74
+    // deprecated ?
75
+    if(!isset($params['ext']))
76
+        $params['ext'] = null;
77 77
 
78
-	return SugarThemeRegistry::current()->getImage($params['name'], $params['attr'], $params['width'], $params['height'], $params['ext'], $params['alt']);	
78
+    return SugarThemeRegistry::current()->getImage($params['name'], $params['attr'], $params['width'], $params['height'], $params['ext'], $params['alt']);	
79 79
 }
80 80
 ?>
Please login to merge, or discard this patch.
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -54,25 +54,25 @@
 block discarded – undo
54 54
 function smarty_function_sugar_getimage($params, &$smarty) {
55 55
 
56 56
 	// error checking for required parameters
57
-	if(!isset($params['name'])) 
58
-		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
57
+	if (!isset($params['name'])) 
58
+		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'].'name');
59 59
 
60 60
 	// temp hack to deprecate the use of other_attributes
61
-	if(isset($params['other_attributes']))
61
+	if (isset($params['other_attributes']))
62 62
 		$params['attr'] = $params['other_attributes'];
63 63
 
64 64
 	// set defaults
65
-	if(!isset($params['attr']))
65
+	if (!isset($params['attr']))
66 66
 		$params['attr'] = '';
67
-	if(!isset($params['width']))
67
+	if (!isset($params['width']))
68 68
 		$params['width'] = null;
69
-	if(!isset($params['height']))
69
+	if (!isset($params['height']))
70 70
 		$params['height'] = null;
71
-	if(!isset($params['alt'])) 
71
+	if (!isset($params['alt'])) 
72 72
 		$params['alt'] = '';
73 73
 
74 74
 	// deprecated ?
75
-	if(!isset($params['ext']))
75
+	if (!isset($params['ext']))
76 76
 		$params['ext'] = null;
77 77
 
78 78
 	return SugarThemeRegistry::current()->getImage($params['name'], $params['attr'], $params['width'], $params['height'], $params['ext'], $params['alt']);	
Please login to merge, or discard this patch.
Braces   +21 added lines, -14 removed lines patch added patch discarded remove patch
@@ -54,26 +54,33 @@
 block discarded – undo
54 54
 function smarty_function_sugar_getimage($params, &$smarty) {
55 55
 
56 56
 	// error checking for required parameters
57
-	if(!isset($params['name'])) 
58
-		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
57
+	if(!isset($params['name'])) {
58
+			$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'name');
59
+	}
59 60
 
60 61
 	// temp hack to deprecate the use of other_attributes
61
-	if(isset($params['other_attributes']))
62
-		$params['attr'] = $params['other_attributes'];
62
+	if(isset($params['other_attributes'])) {
63
+			$params['attr'] = $params['other_attributes'];
64
+	}
63 65
 
64 66
 	// set defaults
65
-	if(!isset($params['attr']))
66
-		$params['attr'] = '';
67
-	if(!isset($params['width']))
68
-		$params['width'] = null;
69
-	if(!isset($params['height']))
70
-		$params['height'] = null;
71
-	if(!isset($params['alt'])) 
72
-		$params['alt'] = '';
67
+	if(!isset($params['attr'])) {
68
+			$params['attr'] = '';
69
+	}
70
+	if(!isset($params['width'])) {
71
+			$params['width'] = null;
72
+	}
73
+	if(!isset($params['height'])) {
74
+			$params['height'] = null;
75
+	}
76
+	if(!isset($params['alt'])) {
77
+			$params['alt'] = '';
78
+	}
73 79
 
74 80
 	// deprecated ?
75
-	if(!isset($params['ext']))
76
-		$params['ext'] = null;
81
+	if(!isset($params['ext'])) {
82
+			$params['ext'] = null;
83
+	}
77 84
 
78 85
 	return SugarThemeRegistry::current()->getImage($params['name'], $params['attr'], $params['width'], $params['height'], $params['ext'], $params['alt']);	
79 86
 }
Please login to merge, or discard this patch.
include/Smarty/plugins/function.config_load.php 3 patches
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -28,7 +28,7 @@  discard block
 block discarded – undo
28 28
 {
29 29
         if ($smarty->debugging) {
30 30
             $_params = array();
31
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
31
+            require_once(SMARTY_CORE_DIR.'core.get_microtime.php');
32 32
             $_debug_start_time = smarty_core_get_microtime($_params, $smarty);
33 33
         }
34 34
 
@@ -59,13 +59,13 @@  discard block
 block discarded – undo
59 59
                          'resource_base_path' => $smarty->config_dir,
60 60
                          'get_source' => false);
61 61
         $smarty->_parse_resource_name($_params);
62
-        $_file_path = $_params['resource_type'] . ':' . $_params['resource_name'];
62
+        $_file_path = $_params['resource_type'].':'.$_params['resource_name'];
63 63
         if (isset($_section))
64 64
             $_compile_file = $smarty->_get_compile_path($_file_path.'|'.$_section);
65 65
         else
66 66
             $_compile_file = $smarty->_get_compile_path($_file_path);
67 67
 
68
-        if($smarty->force_compile || !file_exists($_compile_file)) {
68
+        if ($smarty->force_compile || !file_exists($_compile_file)) {
69 69
             $_compile = true;
70 70
         } elseif ($smarty->compile_check) {
71 71
             $_params = array('resource_name' => $_file,
@@ -77,10 +77,10 @@  discard block
 block discarded – undo
77 77
             $_compile = false;
78 78
         }
79 79
 
80
-        if($_compile) {
80
+        if ($_compile) {
81 81
             // compile config file
82
-            if(!is_object($smarty->_conf_obj)) {
83
-                require_once SMARTY_DIR . $smarty->config_class . '.class.php';
82
+            if (!is_object($smarty->_conf_obj)) {
83
+                require_once SMARTY_DIR.$smarty->config_class.'.class.php';
84 84
                 $smarty->_conf_obj = new $smarty->config_class();
85 85
                 $smarty->_conf_obj->overwrite = $smarty->config_overwrite;
86 86
                 $smarty->_conf_obj->booleanize = $smarty->config_booleanize;
@@ -97,13 +97,13 @@  discard block
 block discarded – undo
97 97
             $smarty->_conf_obj->set_file_contents($_file, $_params['source_content']);
98 98
             $_config_vars = array_merge($smarty->_conf_obj->get($_file),
99 99
                     $smarty->_conf_obj->get($_file, $_section));
100
-            if(function_exists('var_export')) {
101
-                $_output = '<?php $_config_vars = ' . var_export($_config_vars, true) . '; ?>';
100
+            if (function_exists('var_export')) {
101
+                $_output = '<?php $_config_vars = '.var_export($_config_vars, true).'; ?>';
102 102
             } else {
103
-                $_output = '<?php $_config_vars = unserialize(\'' . strtr(serialize($_config_vars),array('\''=>'\\\'', '\\'=>'\\\\')) . '\'); ?>';
103
+                $_output = '<?php $_config_vars = unserialize(\''.strtr(serialize($_config_vars), array('\''=>'\\\'', '\\'=>'\\\\')).'\'); ?>';
104 104
             }
105 105
             $_params = (array('compile_path' => $_compile_file, 'compiled_content' => $_output, 'resource_timestamp' => $_params['resource_timestamp']));
106
-            require_once(SMARTY_CORE_DIR . 'core.write_compiled_resource.php');
106
+            require_once(SMARTY_CORE_DIR.'core.write_compiled_resource.php');
107 107
             smarty_core_write_compiled_resource($_params, $smarty);
108 108
         } else {
109 109
             include($_compile_file);
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 
129 129
         if ($smarty->debugging) {
130 130
             $_params = array();
131
-            require_once(SMARTY_CORE_DIR . 'core.get_microtime.php');
131
+            require_once(SMARTY_CORE_DIR.'core.get_microtime.php');
132 132
             $smarty->_smarty_debug_info[] = array('type'      => 'config',
133 133
                                                 'filename'  => $_file.' ['.$_section.'] '.$_scope,
134 134
                                                 'depth'     => $smarty->_inclusion_depth,
Please login to merge, or discard this patch.
Braces   +5 added lines, -4 removed lines patch added patch discarded remove patch
@@ -60,10 +60,11 @@
 block discarded – undo
60 60
                          'get_source' => false);
61 61
         $smarty->_parse_resource_name($_params);
62 62
         $_file_path = $_params['resource_type'] . ':' . $_params['resource_name'];
63
-        if (isset($_section))
64
-            $_compile_file = $smarty->_get_compile_path($_file_path.'|'.$_section);
65
-        else
66
-            $_compile_file = $smarty->_get_compile_path($_file_path);
63
+        if (isset($_section)) {
64
+                    $_compile_file = $smarty->_get_compile_path($_file_path.'|'.$_section);
65
+        } else {
66
+                    $_compile_file = $smarty->_get_compile_path($_file_path);
67
+        }
67 68
 
68 69
         if($smarty->force_compile || !file_exists($_compile_file)) {
69 70
             $_compile = true;
Please login to merge, or discard this patch.
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -56,8 +56,8 @@  discard block
 block discarded – undo
56 56
         }
57 57
 
58 58
         $_params = array('resource_name' => $_file,
59
-                         'resource_base_path' => $smarty->config_dir,
60
-                         'get_source' => false);
59
+                            'resource_base_path' => $smarty->config_dir,
60
+                            'get_source' => false);
61 61
         $smarty->_parse_resource_name($_params);
62 62
         $_file_path = $_params['resource_type'] . ':' . $_params['resource_name'];
63 63
         if (isset($_section))
@@ -69,8 +69,8 @@  discard block
 block discarded – undo
69 69
             $_compile = true;
70 70
         } elseif ($smarty->compile_check) {
71 71
             $_params = array('resource_name' => $_file,
72
-                             'resource_base_path' => $smarty->config_dir,
73
-                             'get_source' => false);
72
+                                'resource_base_path' => $smarty->config_dir,
73
+                                'get_source' => false);
74 74
             $_compile = $smarty->_fetch_resource_info($_params) &&
75 75
                 $_params['resource_timestamp'] > filemtime($_compile_file);
76 76
         } else {
@@ -89,8 +89,8 @@  discard block
 block discarded – undo
89 89
             }
90 90
 
91 91
             $_params = array('resource_name' => $_file,
92
-                             'resource_base_path' => $smarty->config_dir,
93
-                             $_params['get_source'] = true);
92
+                                'resource_base_path' => $smarty->config_dir,
93
+                                $_params['get_source'] = true);
94 94
             if (!$smarty->_fetch_resource_info($_params)) {
95 95
                 return;
96 96
             }
Please login to merge, or discard this patch.
include/Smarty/plugins/function.sugar_evalcolumn_old.php 2 patches
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -47,19 +47,19 @@  discard block
 block discarded – undo
47 47
 function smarty_function_sugar_evalcolumn_old($params, &$smarty)
48 48
 {
49 49
     if (!isset($params['var']) || !isset($params['rowData'])) {
50
-        if(!isset($params['var']))  
50
+        if (!isset($params['var']))  
51 51
             $smarty->trigger_error("evalcolumn: missing 'var' parameter");
52
-        if(!isset($params['rowData']))  
52
+        if (!isset($params['rowData']))  
53 53
             $smarty->trigger_error("evalcolumn: missing 'rowData' parameter");
54 54
         return;
55 55
     }
56 56
 
57
-    if($params['var'] == '') {
57
+    if ($params['var'] == '') {
58 58
         return;
59 59
     }
60 60
 
61
-    if(is_array($params['var'])) {
62
-        foreach($params['var'] as $key => $value) {
61
+    if (is_array($params['var'])) {
62
+        foreach ($params['var'] as $key => $value) {
63 63
             $params['var'][$key] = searchReplace($value, $params['rowData']);
64 64
         }
65 65
     }
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
         $params['var'] = searchReplace($params['var'], $params['rowData']);
68 68
     }
69 69
 
70
-    if(isset($params['toJSON'])) {
70
+    if (isset($params['toJSON'])) {
71 71
         $json = getJSONobj();
72 72
         $params['var'] = $json->encode($params['var']);
73 73
     }
@@ -82,8 +82,8 @@  discard block
 block discarded – undo
82 82
 function searchReplace($value, &$rowData) {
83 83
     preg_match_all('/\{\$(.*)\}/U', $value, $matches);
84 84
 
85
-    for($wp = 0; $wp < count($matches[0]); $wp++) {
86
-        if(isset($rowData[$matches[1][$wp]])) 
85
+    for ($wp = 0; $wp < count($matches[0]); $wp++) {
86
+        if (isset($rowData[$matches[1][$wp]])) 
87 87
             $value = str_replace($matches[0][$wp], $rowData[$matches[1][$wp]], $value);
88 88
         else 
89 89
             $value = str_replace($matches[0][$wp], '', $value);
Please login to merge, or discard this patch.
Braces   +12 added lines, -10 removed lines patch added patch discarded remove patch
@@ -47,10 +47,12 @@  discard block
 block discarded – undo
47 47
 function smarty_function_sugar_evalcolumn_old($params, &$smarty)
48 48
 {
49 49
     if (!isset($params['var']) || !isset($params['rowData'])) {
50
-        if(!isset($params['var']))  
51
-            $smarty->trigger_error("evalcolumn: missing 'var' parameter");
52
-        if(!isset($params['rowData']))  
53
-            $smarty->trigger_error("evalcolumn: missing 'rowData' parameter");
50
+        if(!isset($params['var'])) {
51
+                    $smarty->trigger_error("evalcolumn: missing 'var' parameter");
52
+        }
53
+        if(!isset($params['rowData'])) {
54
+                    $smarty->trigger_error("evalcolumn: missing 'rowData' parameter");
55
+        }
54 56
         return;
55 57
     }
56 58
 
@@ -62,8 +64,7 @@  discard block
 block discarded – undo
62 64
         foreach($params['var'] as $key => $value) {
63 65
             $params['var'][$key] = searchReplace($value, $params['rowData']);
64 66
         }
65
-    }
66
-    else {
67
+    } else {
67 68
         $params['var'] = searchReplace($params['var'], $params['rowData']);
68 69
     }
69 70
 
@@ -83,10 +84,11 @@  discard block
 block discarded – undo
83 84
     preg_match_all('/\{\$(.*)\}/U', $value, $matches);
84 85
 
85 86
     for($wp = 0; $wp < count($matches[0]); $wp++) {
86
-        if(isset($rowData[$matches[1][$wp]])) 
87
-            $value = str_replace($matches[0][$wp], $rowData[$matches[1][$wp]], $value);
88
-        else 
89
-            $value = str_replace($matches[0][$wp], '', $value);
87
+        if(isset($rowData[$matches[1][$wp]])) {
88
+                    $value = str_replace($matches[0][$wp], $rowData[$matches[1][$wp]], $value);
89
+        } else {
90
+                    $value = str_replace($matches[0][$wp], '', $value);
91
+        }
90 92
     }
91 93
     return $value;
92 94
 }
Please login to merge, or discard this patch.
include/Smarty/plugins/function.sugar_replace_vars.php 3 patches
Indentation   +24 added lines, -24 removed lines patch added patch discarded remove patch
@@ -40,12 +40,12 @@  discard block
 block discarded – undo
40 40
  */
41 41
 function smarty_function_sugar_replace_vars($params, &$smarty)
42 42
 {
43
-	if(empty($params['subject']))  {
44
-	    $smarty->trigger_error("sugarvar: missing 'subject' parameter");
45
-	    return;
46
-	} 
47
-	$fields = empty($params['fields']) ? $smarty->get_template_vars('fields') : $params['fields'];
48
-	$lDelim = "[";
43
+    if(empty($params['subject']))  {
44
+        $smarty->trigger_error("sugarvar: missing 'subject' parameter");
45
+        return;
46
+    } 
47
+    $fields = empty($params['fields']) ? $smarty->get_template_vars('fields') : $params['fields'];
48
+    $lDelim = "[";
49 49
     $rDelim = "]";
50 50
     if ($params['use_curly'])
51 51
     {
@@ -53,10 +53,10 @@  discard block
 block discarded – undo
53 53
         $rDelim = "}";
54 54
     }
55 55
     $subject = $params['subject'];
56
-	$matches = array();
57
-	$count = preg_match_all('/\\' . $lDelim . '([^\\' . $rDelim . ']*)\\' . $rDelim . '/', $subject, $matches);
56
+    $matches = array();
57
+    $count = preg_match_all('/\\' . $lDelim . '([^\\' . $rDelim . ']*)\\' . $rDelim . '/', $subject, $matches);
58 58
     for($i = 0; $i < $count; $i++) {
59
-		$match = $matches[1][$i];
59
+        $match = $matches[1][$i];
60 60
         //List views will have fields be an array where all the keys are upper case and the values are jsut strings
61 61
         if (!isset($fields[$match]) && isset($fields[strtoupper($match)]))
62 62
             $match = strtoupper($match);
@@ -74,21 +74,21 @@  discard block
 block discarded – undo
74 74
             }
75 75
 
76 76
             if (isset($fields[$match]['type']) && $fields[$match]['type']=='enum'
77
-				&& isset($fields[$match]['options']) && isset($fields[$match]['options'][$value]))
78
-			{
79
-				$subject = str_replace($matches[0][$i], $fields[$match]['options'][$value], $subject);
80
-			} else 
81
-			{
82
-				$subject = str_replace($matches[0][$i], $value, $subject);
83
-			}
84
-		}
85
-	}
77
+                && isset($fields[$match]['options']) && isset($fields[$match]['options'][$value]))
78
+            {
79
+                $subject = str_replace($matches[0][$i], $fields[$match]['options'][$value], $subject);
80
+            } else 
81
+            {
82
+                $subject = str_replace($matches[0][$i], $value, $subject);
83
+            }
84
+        }
85
+    }
86 86
 		
87
-	if (!empty($params['assign']))
88
-	{
89
-		$smarty->assign($params['assign'], $subject);
90
-		return '';
91
-	}
87
+    if (!empty($params['assign']))
88
+    {
89
+        $smarty->assign($params['assign'], $subject);
90
+        return '';
91
+    }
92 92
 	
93
-	return $subject;
93
+    return $subject;
94 94
 }
95 95
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
  */
41 41
 function smarty_function_sugar_replace_vars($params, &$smarty)
42 42
 {
43
-	if(empty($params['subject']))  {
43
+	if (empty($params['subject'])) {
44 44
 	    $smarty->trigger_error("sugarvar: missing 'subject' parameter");
45 45
 	    return;
46 46
 	} 
@@ -54,8 +54,8 @@  discard block
 block discarded – undo
54 54
     }
55 55
     $subject = $params['subject'];
56 56
 	$matches = array();
57
-	$count = preg_match_all('/\\' . $lDelim . '([^\\' . $rDelim . ']*)\\' . $rDelim . '/', $subject, $matches);
58
-    for($i = 0; $i < $count; $i++) {
57
+	$count = preg_match_all('/\\'.$lDelim.'([^\\'.$rDelim.']*)\\'.$rDelim.'/', $subject, $matches);
58
+    for ($i = 0; $i < $count; $i++) {
59 59
 		$match = $matches[1][$i];
60 60
         //List views will have fields be an array where all the keys are upper case and the values are jsut strings
61 61
         if (!isset($fields[$match]) && isset($fields[strtoupper($match)]))
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
                 $value = $value['value'];
74 74
             }
75 75
 
76
-            if (isset($fields[$match]['type']) && $fields[$match]['type']=='enum'
76
+            if (isset($fields[$match]['type']) && $fields[$match]['type'] == 'enum'
77 77
 				&& isset($fields[$match]['options']) && isset($fields[$match]['options'][$value]))
78 78
 			{
79 79
 				$subject = str_replace($matches[0][$i], $fields[$match]['options'][$value], $subject);
Please login to merge, or discard this patch.
Braces   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -58,8 +58,9 @@  discard block
 block discarded – undo
58 58
     for($i = 0; $i < $count; $i++) {
59 59
 		$match = $matches[1][$i];
60 60
         //List views will have fields be an array where all the keys are upper case and the values are jsut strings
61
-        if (!isset($fields[$match]) && isset($fields[strtoupper($match)]))
62
-            $match = strtoupper($match);
61
+        if (!isset($fields[$match]) && isset($fields[strtoupper($match)])) {
62
+                    $match = strtoupper($match);
63
+        }
63 64
 
64 65
         $value = isset($fields[$match]) ? $fields[$match] : null;
65 66
         if (!is_null($value)) {
@@ -67,8 +68,7 @@  discard block
 block discarded – undo
67 68
             {
68 69
                 $bean  = $smarty->get_template_vars('bean');
69 70
                 $value = $bean->$match;
70
-            }
71
-            else if (is_array($value) && isset($value['value']))
71
+            } else if (is_array($value) && isset($value['value']))
72 72
             {
73 73
                 $value = $value['value'];
74 74
             }
Please login to merge, or discard this patch.