Completed
Push — console-installer ( 3d54e5...e2b50d )
by Adam
69:10 queued 48:24
created
include/Smarty/plugins/modifier.truncate.php 3 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
  * @return string
26 26
  */
27 27
 function smarty_modifier_truncate($string, $length = 80, $etc = '...',
28
-                                  $break_words = false, $middle = false)
28
+                                    $break_words = false, $middle = false)
29 29
 {
30 30
     if ($length == 0)
31 31
         return '';
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -33,12 +33,12 @@
 block discarded – undo
33 33
     if (strlen($string) > $length) {
34 34
         $length -= min($length, strlen($etc));
35 35
         if (!$break_words && !$middle) {
36
-            $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length+1));
36
+            $string = preg_replace('/\s+?(\S+)?$/', '', substr($string, 0, $length + 1));
37 37
         }
38
-        if(!$middle) {
39
-            return substr($string, 0, $length) . $etc;
38
+        if (!$middle) {
39
+            return substr($string, 0, $length).$etc;
40 40
         } else {
41
-            return substr($string, 0, $length/2) . $etc . substr($string, -$length/2);
41
+            return substr($string, 0, $length / 2).$etc.substr($string, -$length / 2);
42 42
         }
43 43
     } else {
44 44
         return $string;
Please login to merge, or discard this patch.
Braces   +3 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,8 +27,9 @@
 block discarded – undo
27 27
 function smarty_modifier_truncate($string, $length = 80, $etc = '...',
28 28
                                   $break_words = false, $middle = false)
29 29
 {
30
-    if ($length == 0)
31
-        return '';
30
+    if ($length == 0) {
31
+            return '';
32
+    }
32 33
 
33 34
     if (strlen($string) > $length) {
34 35
         $length -= min($length, strlen($etc));
Please login to merge, or discard this patch.
include/Smarty/plugins/function.sugar_menu.php 2 patches
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
3 3
 /*********************************************************************************
4 4
  * SugarCRM Community Edition is a customer relationship management program developed by
5 5
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -94,20 +94,20 @@  discard block
 block discarded – undo
94 94
     $root_options = array(
95 95
         "id" => array_key_exists('id', $params) ? $params['id'] : ""
96 96
     );
97
-    if(array_key_exists('htmlOptions', $params)) {
98
-        foreach($params['htmlOptions'] as $attr => $value) {
97
+    if (array_key_exists('htmlOptions', $params)) {
98
+        foreach ($params['htmlOptions'] as $attr => $value) {
99 99
             $root_options[$attr] = $value;
100 100
         }
101 101
     }
102 102
     $output = SugarHtml::createOpenTag("ul", $root_options);
103
-    foreach($params['items'] as $item) {
104
-        if(strpos($item['html'], "</") === 0) {
103
+    foreach ($params['items'] as $item) {
104
+        if (strpos($item['html'], "</") === 0) {
105 105
             $output .= $item['html'];
106 106
             continue;
107 107
         }
108 108
         $output .= SugarHtml::createOpenTag('li', !empty($params['itemOptions']) ? $params['itemOptions'] : array())
109 109
             .$item['html'];
110
-        if(isset($item['items']) && count($item['items'])) {
110
+        if (isset($item['items']) && count($item['items'])) {
111 111
             $output .= smarty_function_sugar_menu(array(
112 112
                 'items' => $item['items'],
113 113
                 'htmlOptions' => !empty($params['submenuHtmlOptions']) ? $params['submenuHtmlOptions'] : (!empty($item['submenuHtmlOptions']) ? $item['submenuHtmlOptions'] : array())
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if(!defined('sugarEntry') || !sugarEntry) {
3
+    die('Not A Valid Entry Point');
4
+}
3 5
 /*********************************************************************************
4 6
  * SugarCRM Community Edition is a customer relationship management program developed by
5 7
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
Please login to merge, or discard this patch.
include/Smarty/plugins/modifier.indent.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -20,9 +20,9 @@
 block discarded – undo
20 20
  * @param string
21 21
  * @return string
22 22
  */
23
-function smarty_modifier_indent($string,$chars=4,$char=" ")
23
+function smarty_modifier_indent($string, $chars = 4, $char = " ")
24 24
 {
25
-    return preg_replace('!^!m',str_repeat($char,$chars),$string);
25
+    return preg_replace('!^!m', str_repeat($char, $chars), $string);
26 26
 }
27 27
 
28 28
 ?>
Please login to merge, or discard this patch.
include/Smarty/plugins/modifier.cat.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -25,7 +25,7 @@
 block discarded – undo
25 25
  */
26 26
 function smarty_modifier_cat($string, $cat)
27 27
 {
28
-    return $string . $cat;
28
+    return $string.$cat;
29 29
 }
30 30
 
31 31
 /* vim: set expandtab: */
Please login to merge, or discard this patch.
include/Smarty/plugins/modifier.escape.php 3 patches
Indentation   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -74,17 +74,17 @@
 block discarded – undo
74 74
         case 'nonstd':
75 75
            // escape non-standard chars, such as ms document quotes
76 76
            $_res = '';
77
-           for($_i = 0, $_len = strlen($string); $_i < $_len; $_i++) {
78
-               $_ord = ord(substr($string, $_i, 1));
79
-               // non-standard char, escape it
80
-               if($_ord >= 126){
81
-                   $_res .= '&#' . $_ord . ';';
82
-               }
83
-               else {
84
-                   $_res .= substr($string, $_i, 1);
85
-               }
86
-           }
87
-           return $_res;
77
+            for($_i = 0, $_len = strlen($string); $_i < $_len; $_i++) {
78
+                $_ord = ord(substr($string, $_i, 1));
79
+                // non-standard char, escape it
80
+                if($_ord >= 126){
81
+                    $_res .= '&#' . $_ord . ';';
82
+                }
83
+                else {
84
+                    $_res .= substr($string, $_i, 1);
85
+                }
86
+            }
87
+            return $_res;
88 88
 
89 89
         default:
90 90
             return $string;
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -35,7 +35,7 @@  discard block
 block discarded – undo
35 35
             return rawurlencode($string);
36 36
 
37 37
         case 'urlpathinfo':
38
-            return str_replace('%2F','/',rawurlencode($string));
38
+            return str_replace('%2F', '/', rawurlencode($string));
39 39
             
40 40
         case 'quotes':
41 41
             // escape unescaped single quotes
@@ -44,41 +44,41 @@  discard block
 block discarded – undo
44 44
         case 'hex':
45 45
             // escape every character into hex
46 46
             $return = '';
47
-            for ($x=0; $x < strlen($string); $x++) {
48
-                $return .= '%' . bin2hex($string[$x]);
47
+            for ($x = 0; $x < strlen($string); $x++) {
48
+                $return .= '%'.bin2hex($string[$x]);
49 49
             }
50 50
             return $return;
51 51
             
52 52
         case 'hexentity':
53 53
             $return = '';
54
-            for ($x=0; $x < strlen($string); $x++) {
55
-                $return .= '&#x' . bin2hex($string[$x]) . ';';
54
+            for ($x = 0; $x < strlen($string); $x++) {
55
+                $return .= '&#x'.bin2hex($string[$x]).';';
56 56
             }
57 57
             return $return;
58 58
 
59 59
         case 'decentity':
60 60
             $return = '';
61
-            for ($x=0; $x < strlen($string); $x++) {
62
-                $return .= '&#' . ord($string[$x]) . ';';
61
+            for ($x = 0; $x < strlen($string); $x++) {
62
+                $return .= '&#'.ord($string[$x]).';';
63 63
             }
64 64
             return $return;
65 65
 
66 66
         case 'javascript':
67 67
             // escape quotes and backslashes, newlines, etc.
68
-            return strtr($string, array('\\'=>'\\\\',"'"=>"\\'",'"'=>'\\"',"\r"=>'\\r',"\n"=>'\\n','</'=>'<\/'));
68
+            return strtr($string, array('\\'=>'\\\\', "'"=>"\\'", '"'=>'\\"', "\r"=>'\\r', "\n"=>'\\n', '</'=>'<\/'));
69 69
             
70 70
         case 'mail':
71 71
             // safe way to display e-mail address on a web page
72
-            return str_replace(array('@', '.'),array(' [AT] ', ' [DOT] '), $string);
72
+            return str_replace(array('@', '.'), array(' [AT] ', ' [DOT] '), $string);
73 73
             
74 74
         case 'nonstd':
75 75
            // escape non-standard chars, such as ms document quotes
76 76
            $_res = '';
77
-           for($_i = 0, $_len = strlen($string); $_i < $_len; $_i++) {
77
+           for ($_i = 0, $_len = strlen($string); $_i < $_len; $_i++) {
78 78
                $_ord = ord(substr($string, $_i, 1));
79 79
                // non-standard char, escape it
80
-               if($_ord >= 126){
81
-                   $_res .= '&#' . $_ord . ';';
80
+               if ($_ord >= 126) {
81
+                   $_res .= '&#'.$_ord.';';
82 82
                }
83 83
                else {
84 84
                    $_res .= substr($string, $_i, 1);
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -79,8 +79,7 @@
 block discarded – undo
79 79
                // non-standard char, escape it
80 80
                if($_ord >= 126){
81 81
                    $_res .= '&#' . $_ord . ';';
82
-               }
83
-               else {
82
+               } else {
84 83
                    $_res .= substr($string, $_i, 1);
85 84
                }
86 85
            }
Please login to merge, or discard this patch.
include/Smarty/plugins/function.sugar_getimagepath.php 2 patches
Indentation   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -54,9 +54,9 @@
 block discarded – undo
54 54
  */
55 55
 function smarty_function_sugar_getimagepath($params, &$smarty)
56 56
 {
57
-	if(!isset($params['file'])) {
58
-		   $smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'file');
59
-	}
60
- 	return SugarThemeRegistry::current()->getImageURL($params['file']);
57
+    if(!isset($params['file'])) {
58
+            $smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'file');
59
+    }
60
+        return SugarThemeRegistry::current()->getImageURL($params['file']);
61 61
 }
62 62
 ?>
63 63
\ No newline at end of file
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -43,8 +43,8 @@
 block discarded – undo
43 43
  */
44 44
 function smarty_function_sugar_getjspath($params, &$smarty)
45 45
 {
46
-	if(!isset($params['file'])) {
47
-		   $smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'file');
46
+	if (!isset($params['file'])) {
47
+		   $smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'].'file');
48 48
 	}
49 49
  	return getJSPath($params['file']);
50 50
 }
Please login to merge, or discard this patch.
include/Smarty/plugins/function.cycle.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -51,13 +51,13 @@  discard block
 block discarded – undo
51 51
     $reset = (isset($params['reset'])) ? (bool)$params['reset'] : false;
52 52
             
53 53
     if (!in_array('values', array_keys($params))) {
54
-        if(!isset($cycle_vars[$name]['values'])) {
54
+        if (!isset($cycle_vars[$name]['values'])) {
55 55
             $smarty->trigger_error("cycle: missing 'values' parameter");
56 56
             return;
57 57
         }
58 58
     } else {
59
-        if(isset($cycle_vars[$name]['values'])
60
-            && $cycle_vars[$name]['values'] != $params['values'] ) {
59
+        if (isset($cycle_vars[$name]['values'])
60
+            && $cycle_vars[$name]['values'] != $params['values']) {
61 61
             $cycle_vars[$name]['index'] = 0;
62 62
         }
63 63
         $cycle_vars[$name]['values'] = $params['values'];
@@ -69,13 +69,13 @@  discard block
 block discarded – undo
69 69
         $cycle_vars[$name]['delimiter'] = ',';       
70 70
     }
71 71
     
72
-    if(is_array($cycle_vars[$name]['values'])) {
72
+    if (is_array($cycle_vars[$name]['values'])) {
73 73
         $cycle_array = $cycle_vars[$name]['values'];
74 74
     } else {
75
-        $cycle_array = explode($cycle_vars[$name]['delimiter'],$cycle_vars[$name]['values']);
75
+        $cycle_array = explode($cycle_vars[$name]['delimiter'], $cycle_vars[$name]['values']);
76 76
     }
77 77
     
78
-    if(!isset($cycle_vars[$name]['index']) || $reset ) {
78
+    if (!isset($cycle_vars[$name]['index']) || $reset) {
79 79
         $cycle_vars[$name]['index'] = 0;
80 80
     }
81 81
     
@@ -84,14 +84,14 @@  discard block
 block discarded – undo
84 84
         $smarty->assign($params['assign'], $cycle_array[$cycle_vars[$name]['index']]);
85 85
     }
86 86
         
87
-    if($print) {
87
+    if ($print) {
88 88
         $retval = $cycle_array[$cycle_vars[$name]['index']];
89 89
     } else {
90 90
         $retval = null;
91 91
     }
92 92
 
93
-    if($advance) {
94
-        if ( $cycle_vars[$name]['index'] >= count($cycle_array) -1 ) {
93
+    if ($advance) {
94
+        if ($cycle_vars[$name]['index'] >= count($cycle_array) - 1) {
95 95
             $cycle_vars[$name]['index'] = 0;
96 96
         } else {
97 97
             $cycle_vars[$name]['index']++;
Please login to merge, or discard this patch.
include/Smarty/plugins/function.sugar_phone.php 3 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -102,18 +102,18 @@
 block discarded – undo
102 102
  */
103 103
 function smarty_function_sugar_phone($params, &$smarty)
104 104
 {
105
-	if (!isset($params['value'])){
106
-		$smarty->trigger_error("sugar_phone: missing 'value' parameter");
107
-		return '';
108
-	}
105
+    if (!isset($params['value'])){
106
+        $smarty->trigger_error("sugar_phone: missing 'value' parameter");
107
+        return '';
108
+    }
109 109
 	
110
-	global $system_config;
110
+    global $system_config;
111 111
     if(isset($system_config->settings['system_skypeout_on']) && $system_config->settings['system_skypeout_on'] == 1
112
-    	&& isset($params['value']) && skype_formatted($params['value'])  ) {
113
-    		$GLOBALS['log']->debug($params['value']);
114
-			return '<a href="callto:'.format_skype($params['value']).'">'.$params['value'].'</a>';
112
+        && isset($params['value']) && skype_formatted($params['value'])  ) {
113
+            $GLOBALS['log']->debug($params['value']);
114
+            return '<a href="callto:'.format_skype($params['value']).'">'.$params['value'].'</a>';
115 115
     } else {
116
-    	return $params['value'];
116
+        return $params['value'];
117 117
     }
118 118
 }
119 119
 ?>
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -43,7 +43,7 @@  discard block
 block discarded – undo
43 43
 */
44 44
 
45 45
 
46
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
46
+if (!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
47 47
 /*********************************************************************************
48 48
  * SugarCRM Community Edition is a customer relationship management program developed by
49 49
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
@@ -102,14 +102,14 @@  discard block
 block discarded – undo
102 102
  */
103 103
 function smarty_function_sugar_phone($params, &$smarty)
104 104
 {
105
-	if (!isset($params['value'])){
105
+	if (!isset($params['value'])) {
106 106
 		$smarty->trigger_error("sugar_phone: missing 'value' parameter");
107 107
 		return '';
108 108
 	}
109 109
 	
110 110
 	global $system_config;
111
-    if(isset($system_config->settings['system_skypeout_on']) && $system_config->settings['system_skypeout_on'] == 1
112
-    	&& isset($params['value']) && skype_formatted($params['value'])  ) {
111
+    if (isset($system_config->settings['system_skypeout_on']) && $system_config->settings['system_skypeout_on'] == 1
112
+    	&& isset($params['value']) && skype_formatted($params['value'])) {
113 113
     		$GLOBALS['log']->debug($params['value']);
114 114
 			return '<a href="callto:'.format_skype($params['value']).'">'.$params['value'].'</a>';
115 115
     } else {
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,5 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if(!defined('sugarEntry') || !sugarEntry) die('Not A Valid Entry Point');
2
+if(!defined('sugarEntry') || !sugarEntry) {
3
+    die('Not A Valid Entry Point');
4
+}
3 5
 /*********************************************************************************
4 6
  * SugarCRM Community Edition is a customer relationship management program developed by
5 7
  * SugarCRM, Inc. Copyright (C) 2004-2013 SugarCRM Inc.
Please login to merge, or discard this patch.
include/Smarty/plugins/function.html_image.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
  */
37 37
 function smarty_function_html_image($params, &$smarty)
38 38
 {
39
-    require_once $smarty->_get_plugin_filepath('shared','escape_special_chars');
39
+    require_once $smarty->_get_plugin_filepath('shared', 'escape_special_chars');
40 40
     
41 41
     $alt = '';
42 42
     $file = '';
@@ -48,8 +48,8 @@  discard block
 block discarded – undo
48 48
     $path_prefix = '';
49 49
     $server_vars = ($smarty->request_use_auto_globals) ? $_SERVER : $GLOBALS['HTTP_SERVER_VARS'];
50 50
     $basedir = isset($server_vars['DOCUMENT_ROOT']) ? $server_vars['DOCUMENT_ROOT'] : '';
51
-    foreach($params as $_key => $_val) {
52
-        switch($_key) {
51
+    foreach ($params as $_key => $_val) {
52
+        switch ($_key) {
53 53
             case 'file':
54 54
             case 'height':
55 55
             case 'width':
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
                 break;
61 61
 
62 62
             case 'alt':
63
-                if(!is_array($_val)) {
63
+                if (!is_array($_val)) {
64 64
                     $$_key = smarty_function_escape_special_chars($_val);
65 65
                 } else {
66 66
                     $smarty->trigger_error("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
@@ -69,12 +69,12 @@  discard block
 block discarded – undo
69 69
 
70 70
             case 'link':
71 71
             case 'href':
72
-                $prefix = '<a href="' . $_val . '">';
72
+                $prefix = '<a href="'.$_val.'">';
73 73
                 $suffix = '</a>';
74 74
                 break;
75 75
 
76 76
             default:
77
-                if(!is_array($_val)) {
77
+                if (!is_array($_val)) {
78 78
                     $extra .= ' '.$_key.'="'.smarty_function_escape_special_chars($_val).'"';
79 79
                 } else {
80 80
                     $smarty->trigger_error("html_image: extra attribute '$_key' cannot be an array", E_USER_NOTICE);
@@ -88,18 +88,18 @@  discard block
 block discarded – undo
88 88
         return;
89 89
     }
90 90
 
91
-    if (substr($file,0,1) == '/') {
92
-        $_image_path = $basedir . $file;
91
+    if (substr($file, 0, 1) == '/') {
92
+        $_image_path = $basedir.$file;
93 93
     } else {
94 94
         $_image_path = $file;
95 95
     }
96 96
     
97
-    if(!isset($params['width']) || !isset($params['height'])) {
98
-        if(!$_image_data = @getimagesize($_image_path)) {
99
-            if(!file_exists($_image_path)) {
97
+    if (!isset($params['width']) || !isset($params['height'])) {
98
+        if (!$_image_data = @getimagesize($_image_path)) {
99
+            if (!file_exists($_image_path)) {
100 100
                 $smarty->trigger_error("html_image: unable to find '$_image_path'", E_USER_NOTICE);
101 101
                 return;
102
-            } else if(!is_readable($_image_path)) {
102
+            } else if (!is_readable($_image_path)) {
103 103
                 $smarty->trigger_error("html_image: unable to read '$_image_path'", E_USER_NOTICE);
104 104
                 return;
105 105
             } else {
@@ -109,32 +109,32 @@  discard block
 block discarded – undo
109 109
         }
110 110
         if ($smarty->security &&
111 111
             ($_params = array('resource_type' => 'file', 'resource_name' => $_image_path)) &&
112
-            (require_once(SMARTY_CORE_DIR . 'core.is_secure.php')) &&
113
-            (!smarty_core_is_secure($_params, $smarty)) ) {
112
+            (require_once(SMARTY_CORE_DIR.'core.is_secure.php')) &&
113
+            (!smarty_core_is_secure($_params, $smarty))) {
114 114
             $smarty->trigger_error("html_image: (secure) '$_image_path' not in secure directory", E_USER_NOTICE);
115 115
         }        
116 116
         
117
-        if(!isset($params['width'])) {
117
+        if (!isset($params['width'])) {
118 118
             $width = $_image_data[0];
119 119
         }
120
-        if(!isset($params['height'])) {
120
+        if (!isset($params['height'])) {
121 121
             $height = $_image_data[1];
122 122
         }
123 123
 
124 124
     }
125 125
 
126
-    if(isset($params['dpi'])) {
127
-        if(strstr($server_vars['HTTP_USER_AGENT'], 'Mac')) {
126
+    if (isset($params['dpi'])) {
127
+        if (strstr($server_vars['HTTP_USER_AGENT'], 'Mac')) {
128 128
             $dpi_default = 72;
129 129
         } else {
130 130
             $dpi_default = 96;
131 131
         }
132
-        $_resize = $dpi_default/$params['dpi'];
132
+        $_resize = $dpi_default / $params['dpi'];
133 133
         $width = round($width * $_resize);
134 134
         $height = round($height * $_resize);
135 135
     }
136 136
 
137
-    return $prefix . '<img src="'.$path_prefix.$file.'" alt="'.$alt.'" width="'.$width.'" height="'.$height.'"'.$extra.' />' . $suffix;
137
+    return $prefix.'<img src="'.$path_prefix.$file.'" alt="'.$alt.'" width="'.$width.'" height="'.$height.'"'.$extra.' />'.$suffix;
138 138
 }
139 139
 
140 140
 /* vim: set expandtab: */
Please login to merge, or discard this patch.