@@ -42,9 +42,9 @@ |
||
42 | 42 | |
43 | 43 | |
44 | 44 | function smarty_modifier_lookup($value='', $from=array()){ |
45 | - $value = trim($value); |
|
46 | - if (array_key_exists($value, $from)) { |
|
47 | - return $from[$value]; |
|
48 | - } |
|
49 | - return ''; |
|
45 | + $value = trim($value); |
|
46 | + if (array_key_exists($value, $from)) { |
|
47 | + return $from[$value]; |
|
48 | + } |
|
49 | + return ''; |
|
50 | 50 | } |
@@ -74,14 +74,14 @@ |
||
74 | 74 | |
75 | 75 | function smarty_function_sugarvar_connector($params, &$smarty) { |
76 | 76 | |
77 | - $displayParams = $smarty->get_template_vars('displayParams'); |
|
78 | - if(!isset($displayParams['module'])) { |
|
79 | - $smarty->trigger_error("sugarvar_connector: missing 'module' parameter"); |
|
80 | - $GLOBALS['log']->error("sugarvar_connector: missing 'module' parameter"); |
|
81 | - return; |
|
82 | - } |
|
77 | + $displayParams = $smarty->get_template_vars('displayParams'); |
|
78 | + if(!isset($displayParams['module'])) { |
|
79 | + $smarty->trigger_error("sugarvar_connector: missing 'module' parameter"); |
|
80 | + $GLOBALS['log']->error("sugarvar_connector: missing 'module' parameter"); |
|
81 | + return; |
|
82 | + } |
|
83 | 83 | |
84 | - require_once('include/connectors/utils/ConnectorUtils.php'); |
|
85 | - echo ConnectorUtils::getConnectorButtonScript($displayParams, $smarty); |
|
84 | + require_once('include/connectors/utils/ConnectorUtils.php'); |
|
85 | + echo ConnectorUtils::getConnectorButtonScript($displayParams, $smarty); |
|
86 | 86 | } |
87 | 87 | ?> |
88 | 88 | \ No newline at end of file |
@@ -57,33 +57,33 @@ |
||
57 | 57 | global $app_strings; |
58 | 58 | |
59 | 59 | if(isset($params['type']) && $params['type'] == 'php') { |
60 | - if(!isset($params['file'])) { |
|
61 | - $smarty->trigger_error($app_strings['ERR_MISSING_REQUIRED_FIELDS'] . 'include'); |
|
62 | - } |
|
60 | + if(!isset($params['file'])) { |
|
61 | + $smarty->trigger_error($app_strings['ERR_MISSING_REQUIRED_FIELDS'] . 'include'); |
|
62 | + } |
|
63 | 63 | |
64 | - $includeFile = $params['file']; |
|
65 | - if(!file_exists($includeFile)) { |
|
66 | - $smarty->trigger_error($app_strings['ERR_NO_SUCH_FILE'] . ': ' . $includeFile); |
|
67 | - } |
|
64 | + $includeFile = $params['file']; |
|
65 | + if(!file_exists($includeFile)) { |
|
66 | + $smarty->trigger_error($app_strings['ERR_NO_SUCH_FILE'] . ': ' . $includeFile); |
|
67 | + } |
|
68 | 68 | |
69 | - ob_start(); |
|
70 | - require($includeFile); |
|
71 | - $output_html = ob_get_contents(); |
|
72 | - ob_end_clean(); |
|
73 | - echo $output_html; |
|
69 | + ob_start(); |
|
70 | + require($includeFile); |
|
71 | + $output_html = ob_get_contents(); |
|
72 | + ob_end_clean(); |
|
73 | + echo $output_html; |
|
74 | 74 | } else if(is_array($params['include'])) { |
75 | - $code = ''; |
|
76 | - foreach($params['include'] as $include) { |
|
77 | - if(isset($include['file'])) { |
|
78 | - $file = $include['file']; |
|
79 | - if(preg_match('/[\.]js$/si',$file)) { |
|
80 | - $code .= "<script src=\"". getJSPath($include['file']) ."\"></script>"; |
|
81 | - } else if(preg_match('/[\.]php$/si', $file)) { |
|
82 | - require_once($file); |
|
83 | - } |
|
84 | - } |
|
85 | - } //foreach |
|
86 | - return $code; |
|
87 | - } //if |
|
75 | + $code = ''; |
|
76 | + foreach($params['include'] as $include) { |
|
77 | + if(isset($include['file'])) { |
|
78 | + $file = $include['file']; |
|
79 | + if(preg_match('/[\.]js$/si',$file)) { |
|
80 | + $code .= "<script src=\"". getJSPath($include['file']) ."\"></script>"; |
|
81 | + } else if(preg_match('/[\.]php$/si', $file)) { |
|
82 | + require_once($file); |
|
83 | + } |
|
84 | + } |
|
85 | + } //foreach |
|
86 | + return $code; |
|
87 | + } //if |
|
88 | 88 | } |
89 | 89 | ?> |
90 | 90 | \ No newline at end of file |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | |
131 | 131 | // matches all valid variables (no quotes, no modifiers) |
132 | 132 | $this->_avar_regexp = '(?:' . $this->_dvar_regexp . '|' |
133 | - . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')'; |
|
133 | + . $this->_cvar_regexp . '|' . $this->_svar_regexp . ')'; |
|
134 | 134 | |
135 | 135 | // matches valid variable syntax: |
136 | 136 | // $foo |
@@ -172,7 +172,7 @@ discard block |
||
172 | 172 | // |foo|bar |
173 | 173 | // |foo:$foo->bar |
174 | 174 | $this->_mod_regexp = '(?:\|@?\w+(?::(?:\w+|' . $this->_num_const_regexp . '|' |
175 | - . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)'; |
|
175 | + . $this->_obj_call_regexp . '|' . $this->_avar_regexp . '|' . $this->_qstr_regexp .'))*)'; |
|
176 | 176 | |
177 | 177 | // matches valid function name: |
178 | 178 | // foo123 |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | // "text"|bar |
194 | 194 | // $foo->bar |
195 | 195 | $this->_param_regexp = '(?:\s*(?:' . $this->_obj_call_regexp . '|' |
196 | - . $this->_var_regexp . '|' . $this->_num_const_regexp . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)'; |
|
196 | + . $this->_var_regexp . '|' . $this->_num_const_regexp . '|\w+)(?>' . $this->_mod_regexp . '*)\s*)'; |
|
197 | 197 | |
198 | 198 | // matches valid parenthesised function parameters: |
199 | 199 | // |
@@ -210,7 +210,7 @@ discard block |
||
210 | 210 | // _foo_bar($foo,"bar") |
211 | 211 | // foo123($foo,$foo->bar(),"foo") |
212 | 212 | $this->_func_call_regexp = '(?:' . $this->_func_regexp . '\s*(?:' |
213 | - . $this->_parenth_param_regexp . '))'; |
|
213 | + . $this->_parenth_param_regexp . '))'; |
|
214 | 214 | } |
215 | 215 | |
216 | 216 | /** |
@@ -263,11 +263,11 @@ discard block |
||
263 | 263 | |
264 | 264 | /* replace special blocks by "{php}" */ |
265 | 265 | $source_content = preg_replace_callback($search, create_function ('$matches', "return '" |
266 | - . $this->_quote_replace($this->left_delimiter) . 'php' |
|
267 | - . "' . str_repeat(\"\n\", substr_count('\$matches[1]', \"\n\")) .'" |
|
268 | - . $this->_quote_replace($this->right_delimiter) |
|
269 | - . "';") |
|
270 | - , $source_content); |
|
266 | + . $this->_quote_replace($this->left_delimiter) . 'php' |
|
267 | + . "' . str_repeat(\"\n\", substr_count('\$matches[1]', \"\n\")) .'" |
|
268 | + . $this->_quote_replace($this->right_delimiter) |
|
269 | + . "';") |
|
270 | + , $source_content); |
|
271 | 271 | |
272 | 272 | /* Gather all template tags. */ |
273 | 273 | preg_match_all("~{$ldq}\s*(.*?)\s*{$rdq}~s", $source_content, $_match); |
@@ -388,7 +388,7 @@ discard block |
||
388 | 388 | if ($postfilter === false) continue; |
389 | 389 | if ($postfilter[3] || is_callable($postfilter[0])) { |
390 | 390 | $compiled_content = call_user_func_array($postfilter[0], |
391 | - array($compiled_content, &$this)); |
|
391 | + array($compiled_content, &$this)); |
|
392 | 392 | $this->_plugins['postfilter'][$filter_name][3] = true; |
393 | 393 | } else { |
394 | 394 | $this->_trigger_fatal_error("Smarty plugin error: postfilter '$filter_name' is not implemented"); |
@@ -649,8 +649,8 @@ discard block |
||
649 | 649 | $output = call_user_func_array($plugin_func, array($tag_args, &$this)); |
650 | 650 | if($output != '') { |
651 | 651 | $output = '<?php ' . $this->_push_cacheable_state('compiler', $tag_command) |
652 | - . $output |
|
653 | - . $this->_pop_cacheable_state('compiler', $tag_command) . ' ?>'; |
|
652 | + . $output |
|
653 | + . $this->_pop_cacheable_state('compiler', $tag_command) . ' ?>'; |
|
654 | 654 | } |
655 | 655 | } else { |
656 | 656 | $this->_syntax_error($message, E_USER_WARNING, __FILE__, __LINE__); |
@@ -1115,7 +1115,7 @@ discard block |
||
1115 | 1115 | $output .= "{$section_props}['max'] = {$section_props}['loop'];\n"; |
1116 | 1116 | else |
1117 | 1117 | $output .= "if ({$section_props}['max'] < 0)\n" . |
1118 | - " {$section_props}['max'] = {$section_props}['loop'];\n"; |
|
1118 | + " {$section_props}['max'] = {$section_props}['loop'];\n"; |
|
1119 | 1119 | |
1120 | 1120 | if (!isset($attrs['step'])) |
1121 | 1121 | $output .= "{$section_props}['step'] = 1;\n"; |
@@ -1124,9 +1124,9 @@ discard block |
||
1124 | 1124 | $output .= "{$section_props}['start'] = {$section_props}['step'] > 0 ? 0 : {$section_props}['loop']-1;\n"; |
1125 | 1125 | else { |
1126 | 1126 | $output .= "if ({$section_props}['start'] < 0)\n" . |
1127 | - " {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" . |
|
1128 | - "else\n" . |
|
1129 | - " {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n"; |
|
1127 | + " {$section_props}['start'] = max({$section_props}['step'] > 0 ? 0 : -1, {$section_props}['loop'] + {$section_props}['start']);\n" . |
|
1128 | + "else\n" . |
|
1129 | + " {$section_props}['start'] = min({$section_props}['start'], {$section_props}['step'] > 0 ? {$section_props}['loop'] : {$section_props}['loop']-1);\n"; |
|
1130 | 1130 | } |
1131 | 1131 | |
1132 | 1132 | $output .= "if ({$section_props}['show']) {\n"; |
@@ -1136,9 +1136,9 @@ discard block |
||
1136 | 1136 | $output .= " {$section_props}['total'] = min(ceil(({$section_props}['step'] > 0 ? {$section_props}['loop'] - {$section_props}['start'] : {$section_props}['start']+1)/abs({$section_props}['step'])), {$section_props}['max']);\n"; |
1137 | 1137 | } |
1138 | 1138 | $output .= " if ({$section_props}['total'] == 0)\n" . |
1139 | - " {$section_props}['show'] = false;\n" . |
|
1140 | - "} else\n" . |
|
1141 | - " {$section_props}['total'] = 0;\n"; |
|
1139 | + " {$section_props}['show'] = false;\n" . |
|
1140 | + "} else\n" . |
|
1141 | + " {$section_props}['total'] = 0;\n"; |
|
1142 | 1142 | |
1143 | 1143 | $output .= "if ({$section_props}['show']):\n"; |
1144 | 1144 | $output .= " |
@@ -1987,8 +1987,8 @@ discard block |
||
1987 | 1987 | } |
1988 | 1988 | if (!isset($this->_plugin_info[$type][$name])) { |
1989 | 1989 | $this->_plugin_info[$type][$name] = array($this->_current_file, |
1990 | - $this->_current_line_no, |
|
1991 | - $delayed_loading); |
|
1990 | + $this->_current_line_no, |
|
1991 | + $delayed_loading); |
|
1992 | 1992 | } |
1993 | 1993 | } |
1994 | 1994 | |
@@ -2056,7 +2056,7 @@ discard block |
||
2056 | 2056 | case 'get': |
2057 | 2057 | if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) { |
2058 | 2058 | $this->_syntax_error("(secure mode) super global access not permitted", |
2059 | - E_USER_WARNING, __FILE__, __LINE__); |
|
2059 | + E_USER_WARNING, __FILE__, __LINE__); |
|
2060 | 2060 | return; |
2061 | 2061 | } |
2062 | 2062 | $compiled_ref = "\$_GET"; |
@@ -2065,7 +2065,7 @@ discard block |
||
2065 | 2065 | case 'post': |
2066 | 2066 | if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) { |
2067 | 2067 | $this->_syntax_error("(secure mode) super global access not permitted", |
2068 | - E_USER_WARNING, __FILE__, __LINE__); |
|
2068 | + E_USER_WARNING, __FILE__, __LINE__); |
|
2069 | 2069 | return; |
2070 | 2070 | } |
2071 | 2071 | $compiled_ref = "\$_POST"; |
@@ -2074,7 +2074,7 @@ discard block |
||
2074 | 2074 | case 'cookies': |
2075 | 2075 | if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) { |
2076 | 2076 | $this->_syntax_error("(secure mode) super global access not permitted", |
2077 | - E_USER_WARNING, __FILE__, __LINE__); |
|
2077 | + E_USER_WARNING, __FILE__, __LINE__); |
|
2078 | 2078 | return; |
2079 | 2079 | } |
2080 | 2080 | $compiled_ref = "\$_COOKIE"; |
@@ -2083,7 +2083,7 @@ discard block |
||
2083 | 2083 | case 'env': |
2084 | 2084 | if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) { |
2085 | 2085 | $this->_syntax_error("(secure mode) super global access not permitted", |
2086 | - E_USER_WARNING, __FILE__, __LINE__); |
|
2086 | + E_USER_WARNING, __FILE__, __LINE__); |
|
2087 | 2087 | return; |
2088 | 2088 | } |
2089 | 2089 | $compiled_ref = "\$_ENV"; |
@@ -2092,7 +2092,7 @@ discard block |
||
2092 | 2092 | case 'server': |
2093 | 2093 | if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) { |
2094 | 2094 | $this->_syntax_error("(secure mode) super global access not permitted", |
2095 | - E_USER_WARNING, __FILE__, __LINE__); |
|
2095 | + E_USER_WARNING, __FILE__, __LINE__); |
|
2096 | 2096 | return; |
2097 | 2097 | } |
2098 | 2098 | $compiled_ref = "\$_SERVER"; |
@@ -2101,7 +2101,7 @@ discard block |
||
2101 | 2101 | case 'session': |
2102 | 2102 | if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) { |
2103 | 2103 | $this->_syntax_error("(secure mode) super global access not permitted", |
2104 | - E_USER_WARNING, __FILE__, __LINE__); |
|
2104 | + E_USER_WARNING, __FILE__, __LINE__); |
|
2105 | 2105 | return; |
2106 | 2106 | } |
2107 | 2107 | $compiled_ref = "\$_SESSION"; |
@@ -2114,7 +2114,7 @@ discard block |
||
2114 | 2114 | case 'request': |
2115 | 2115 | if ($this->security && !$this->security_settings['ALLOW_SUPER_GLOBALS']) { |
2116 | 2116 | $this->_syntax_error("(secure mode) super global access not permitted", |
2117 | - E_USER_WARNING, __FILE__, __LINE__); |
|
2117 | + E_USER_WARNING, __FILE__, __LINE__); |
|
2118 | 2118 | return; |
2119 | 2119 | } |
2120 | 2120 | if ($this->request_use_auto_globals) { |
@@ -2141,7 +2141,7 @@ discard block |
||
2141 | 2141 | case 'const': |
2142 | 2142 | if ($this->security && !$this->security_settings['ALLOW_CONSTANTS']) { |
2143 | 2143 | $this->_syntax_error("(secure mode) constants not permitted", |
2144 | - E_USER_WARNING, __FILE__, __LINE__); |
|
2144 | + E_USER_WARNING, __FILE__, __LINE__); |
|
2145 | 2145 | return; |
2146 | 2146 | } |
2147 | 2147 | array_shift($indexes); |
@@ -2197,7 +2197,7 @@ discard block |
||
2197 | 2197 | return ((is_object($this->_plugins[$type][$name][0][0])) ? |
2198 | 2198 | "\$this->_plugins['$type']['$name'][0][0]->" /* method callback */ |
2199 | 2199 | : (string)($this->_plugins[$type][$name][0][0]).'::' /* class callback */ |
2200 | - ). $this->_plugins[$type][$name][0][1]; |
|
2200 | + ). $this->_plugins[$type][$name][0][1]; |
|
2201 | 2201 | |
2202 | 2202 | } else { |
2203 | 2203 | /* function callback */ |
@@ -2342,7 +2342,7 @@ discard block |
||
2342 | 2342 | $message = " expected {/$_open_tag} (opened line $_line_no)."; |
2343 | 2343 | } |
2344 | 2344 | $this->_syntax_error("mismatched tag {/$close_tag}.$message", |
2345 | - E_USER_ERROR, __FILE__, __LINE__); |
|
2345 | + E_USER_ERROR, __FILE__, __LINE__); |
|
2346 | 2346 | } |
2347 | 2347 | |
2348 | 2348 | } |
@@ -102,9 +102,9 @@ |
||
102 | 102 | |
103 | 103 | //join the related module's table |
104 | 104 | $join .= "$join_type $targetTableWithAlias ON $targetTable.$targetKey=$startingTable.$startingKey" |
105 | - . " AND $targetTable.deleted=$deleted\n" |
|
105 | + . " AND $targetTable.deleted=$deleted\n" |
|
106 | 106 | //Next add any role filters |
107 | - . $this->getRoleWhere(); |
|
107 | + . $this->getRoleWhere(); |
|
108 | 108 | |
109 | 109 | if($return_array){ |
110 | 110 | return array( |
@@ -295,7 +295,7 @@ discard block |
||
295 | 295 | //First join the relationship table |
296 | 296 | $join .= "$join_type $targetTableWithAlias ON $startingTable.$startingKey=$targetTable.$targetKey AND $targetTable.deleted=0\n" |
297 | 297 | //Next add any role filters |
298 | - . $this->getRoleWhere(($linkIsLHS) ? $targetTable : $startingTable) . "\n"; |
|
298 | + . $this->getRoleWhere(($linkIsLHS) ? $targetTable : $startingTable) . "\n"; |
|
299 | 299 | |
300 | 300 | if($return_array){ |
301 | 301 | return array( |
@@ -354,7 +354,7 @@ discard block |
||
354 | 354 | |
355 | 355 | $query .= "$join_type $targetTableWithAlias ON $startingTable.$startingKey=$targetTable.$targetKey AND $targetTable.deleted=0\n" |
356 | 356 | //Next add any role filters |
357 | - . $this->getRoleWhere($tableInRoleFilter) . "\n"; |
|
357 | + . $this->getRoleWhere($tableInRoleFilter) . "\n"; |
|
358 | 358 | |
359 | 359 | if (!empty($params['return_as_array'])) { |
360 | 360 | $return_array = true; |
@@ -131,28 +131,28 @@ discard block |
||
131 | 131 | $lhsLinkName = $this->lhsLink; |
132 | 132 | $rhsLinkName = $this->rhsLink; |
133 | 133 | |
134 | - /* BEGIN - SECURITY GROUPS */ |
|
135 | - //Need to hijack this as security groups will not contain a link on the module side |
|
136 | - //due to the way the module works. Plus it would remove the relative ease of adding custom module support |
|
134 | + /* BEGIN - SECURITY GROUPS */ |
|
135 | + //Need to hijack this as security groups will not contain a link on the module side |
|
136 | + //due to the way the module works. Plus it would remove the relative ease of adding custom module support |
|
137 | 137 | |
138 | - if(get_class($rhs) != 'User' && get_class($rhs) != 'ACLRole' && get_class($lhs) == 'SecurityGroup') { |
|
139 | - $rhs->$rhsLinkName->addBean($lhs); |
|
140 | - $this->callBeforeAdd($rhs, $lhs, $rhsLinkName); |
|
141 | - |
|
142 | - $dataToInsert = $this->getRowToInsert($lhs, $rhs, $additionalFields); |
|
143 | - $this->addRow($dataToInsert); |
|
144 | - $rhs->$rhsLinkName->addBean($lhs); |
|
145 | - $this->callAfterAdd($lhs, $rhs, $lhsLinkName); |
|
146 | - } else if(get_class($lhs) != 'User' && get_class($lhs) != 'ACLRole' && get_class($rhs) == 'SecurityGroup') { |
|
147 | - $lhs->$lhsLinkName->addBean($rhs); |
|
148 | - $this->callBeforeAdd($lhs, $rhs, $lhsLinkName); |
|
149 | - |
|
150 | - $dataToInsert = $this->getRowToInsert($lhs, $rhs, $additionalFields); |
|
151 | - $this->addRow($dataToInsert); |
|
152 | - $lhs->$lhsLinkName->addBean($rhs); |
|
153 | - $this->callAfterAdd($rhs, $lhs, $rhsLinkName); |
|
154 | - } else { |
|
155 | - /* END - SECURITY GROUPS */ |
|
138 | + if(get_class($rhs) != 'User' && get_class($rhs) != 'ACLRole' && get_class($lhs) == 'SecurityGroup') { |
|
139 | + $rhs->$rhsLinkName->addBean($lhs); |
|
140 | + $this->callBeforeAdd($rhs, $lhs, $rhsLinkName); |
|
141 | + |
|
142 | + $dataToInsert = $this->getRowToInsert($lhs, $rhs, $additionalFields); |
|
143 | + $this->addRow($dataToInsert); |
|
144 | + $rhs->$rhsLinkName->addBean($lhs); |
|
145 | + $this->callAfterAdd($lhs, $rhs, $lhsLinkName); |
|
146 | + } else if(get_class($lhs) != 'User' && get_class($lhs) != 'ACLRole' && get_class($rhs) == 'SecurityGroup') { |
|
147 | + $lhs->$lhsLinkName->addBean($rhs); |
|
148 | + $this->callBeforeAdd($lhs, $rhs, $lhsLinkName); |
|
149 | + |
|
150 | + $dataToInsert = $this->getRowToInsert($lhs, $rhs, $additionalFields); |
|
151 | + $this->addRow($dataToInsert); |
|
152 | + $lhs->$lhsLinkName->addBean($rhs); |
|
153 | + $this->callAfterAdd($rhs, $lhs, $rhsLinkName); |
|
154 | + } else { |
|
155 | + /* END - SECURITY GROUPS */ |
|
156 | 156 | |
157 | 157 | if (empty($lhs->$lhsLinkName) && !$lhs->load_relationship($lhsLinkName)) |
158 | 158 | { |
@@ -262,50 +262,50 @@ discard block |
||
262 | 262 | return false; |
263 | 263 | } |
264 | 264 | |
265 | - /* BEGIN - SECURITY GROUPS */ |
|
266 | - //Need to hijack this as security groups will not contain a link on the module side |
|
267 | - //due to the way the module works. Plus it would remove the relative ease of adding custom module support |
|
265 | + /* BEGIN - SECURITY GROUPS */ |
|
266 | + //Need to hijack this as security groups will not contain a link on the module side |
|
267 | + //due to the way the module works. Plus it would remove the relative ease of adding custom module support |
|
268 | 268 | |
269 | - if(get_class($lhs) == 'SecurityGroup' || get_class($rhs) == 'SecurityGroup') { |
|
270 | - $dataToRemove = array( |
|
271 | - $this->def['join_key_lhs'] => $lhs->id, |
|
272 | - $this->def['join_key_rhs'] => $rhs->id |
|
273 | - ); |
|
274 | - |
|
275 | - |
|
276 | - if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes") |
|
277 | - { |
|
278 | - if (get_class($lhs) != 'SecurityGroup' && $lhs->$lhsLinkName instanceof Link2) |
|
279 | - { |
|
280 | - $lhs->$lhsLinkName->load(); |
|
281 | - $this->callBeforeDelete($lhs, $rhs, $lhsLinkName); |
|
282 | - } |
|
283 | - |
|
284 | - if (get_class($rhs) != 'SecurityGroup' && $rhs->$rhsLinkName instanceof Link2) |
|
285 | - { |
|
286 | - $rhs->$rhsLinkName->load(); |
|
287 | - $this->callBeforeDelete($rhs, $lhs, $rhsLinkName); |
|
288 | - } |
|
289 | - } |
|
290 | - |
|
291 | - $this->removeRow($dataToRemove); |
|
269 | + if(get_class($lhs) == 'SecurityGroup' || get_class($rhs) == 'SecurityGroup') { |
|
270 | + $dataToRemove = array( |
|
271 | + $this->def['join_key_lhs'] => $lhs->id, |
|
272 | + $this->def['join_key_rhs'] => $rhs->id |
|
273 | + ); |
|
274 | + |
|
275 | + |
|
276 | + if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes") |
|
277 | + { |
|
278 | + if (get_class($lhs) != 'SecurityGroup' && $lhs->$lhsLinkName instanceof Link2) |
|
279 | + { |
|
280 | + $lhs->$lhsLinkName->load(); |
|
281 | + $this->callBeforeDelete($lhs, $rhs, $lhsLinkName); |
|
282 | + } |
|
283 | + |
|
284 | + if (get_class($rhs) != 'SecurityGroup' && $rhs->$rhsLinkName instanceof Link2) |
|
285 | + { |
|
286 | + $rhs->$rhsLinkName->load(); |
|
287 | + $this->callBeforeDelete($rhs, $lhs, $rhsLinkName); |
|
288 | + } |
|
289 | + } |
|
290 | + |
|
291 | + $this->removeRow($dataToRemove); |
|
292 | 292 | |
293 | - if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes") |
|
294 | - { |
|
295 | - if (get_class($lhs) != 'SecurityGroup' && $lhs->$lhsLinkName instanceof Link2) |
|
296 | - { |
|
297 | - $lhs->$lhsLinkName->load(); |
|
298 | - $this->callAfterDelete($lhs, $rhs, $lhsLinkName); |
|
299 | - } |
|
300 | - |
|
301 | - if (get_class($rhs) != 'SecurityGroup' && $rhs->$rhsLinkName instanceof Link2) |
|
302 | - { |
|
303 | - $rhs->$rhsLinkName->load(); |
|
304 | - $this->callAfterDelete($rhs, $lhs, $rhsLinkName); |
|
305 | - } |
|
306 | - } |
|
307 | - } else { |
|
308 | - /* END - SECURITY GROUPS */ |
|
293 | + if (empty($_SESSION['disable_workflow']) || $_SESSION['disable_workflow'] != "Yes") |
|
294 | + { |
|
295 | + if (get_class($lhs) != 'SecurityGroup' && $lhs->$lhsLinkName instanceof Link2) |
|
296 | + { |
|
297 | + $lhs->$lhsLinkName->load(); |
|
298 | + $this->callAfterDelete($lhs, $rhs, $lhsLinkName); |
|
299 | + } |
|
300 | + |
|
301 | + if (get_class($rhs) != 'SecurityGroup' && $rhs->$rhsLinkName instanceof Link2) |
|
302 | + { |
|
303 | + $rhs->$rhsLinkName->load(); |
|
304 | + $this->callAfterDelete($rhs, $lhs, $rhsLinkName); |
|
305 | + } |
|
306 | + } |
|
307 | + } else { |
|
308 | + /* END - SECURITY GROUPS */ |
|
309 | 309 | if (empty($lhs->$lhsLinkName) && !$lhs->load_relationship($lhsLinkName)) |
310 | 310 | { |
311 | 311 | $GLOBALS['log']->fatal("could not load LHS $lhsLinkName"); |
@@ -512,9 +512,9 @@ discard block |
||
512 | 512 | //First join the relationship table |
513 | 513 | $join .= "$join_type $joinTableWithAlias ON $join1 AND $joinTable.deleted=0\n" |
514 | 514 | //Next add any role filters |
515 | - . $this->getRoleWhere($joinTable) . "\n" |
|
515 | + . $this->getRoleWhere($joinTable) . "\n" |
|
516 | 516 | //Then finally join the related module's table |
517 | - . "$join_type $targetTableWithAlias ON $join2 AND $targetTable.deleted=0\n"; |
|
517 | + . "$join_type $targetTableWithAlias ON $join2 AND $targetTable.deleted=0\n"; |
|
518 | 518 | |
519 | 519 | if($return_array){ |
520 | 520 | return array( |
@@ -566,7 +566,7 @@ discard block |
||
566 | 566 | //First join the relationship table |
567 | 567 | $query .= "$join_type $joinTableWithAlias ON $where AND $joinTable.deleted=0\n" |
568 | 568 | //Next add any role filters |
569 | - . $this->getRoleWhere($joinTable, $ignoreRole) . "\n"; |
|
569 | + . $this->getRoleWhere($joinTable, $ignoreRole) . "\n"; |
|
570 | 570 | |
571 | 571 | if (!empty($params['return_as_array'])) { |
572 | 572 | $return_array = true; |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | ); |
101 | 101 | if (!isset($this->lhsLinkDef['name']) && isset($this->lhsLinkDef[0])) |
102 | 102 | { |
103 | - $this->lhsLinkDef = $this->lhsLinkDef[0]; |
|
103 | + $this->lhsLinkDef = $this->lhsLinkDef[0]; |
|
104 | 104 | } |
105 | 105 | if (!isset($this->rhsLinkDef['name']) && isset($this->rhsLinkDef[0])) { |
106 | 106 | $this->rhsLinkDef = $this->rhsLinkDef[0]; |
@@ -128,35 +128,35 @@ discard block |
||
128 | 128 | //If the current data matches the existing data, don't do anything |
129 | 129 | if (!$this->checkExisting($dataToInsert)) |
130 | 130 | { |
131 | - // Pre-load the RHS relationship, which is used later in the add() function and expects a Bean |
|
132 | - // and we also use it for clearing relationships in case of non self-referencing O2M relations |
|
133 | - // (should be preloaded because when using the relate_to field for updating/saving relationships, |
|
134 | - // only the bean id is loaded into $rhs->$rhsLinkName) |
|
135 | - $rhsLinkName = $this->rhsLink; |
|
136 | - $rhs->load_relationship($rhsLinkName); |
|
131 | + // Pre-load the RHS relationship, which is used later in the add() function and expects a Bean |
|
132 | + // and we also use it for clearing relationships in case of non self-referencing O2M relations |
|
133 | + // (should be preloaded because when using the relate_to field for updating/saving relationships, |
|
134 | + // only the bean id is loaded into $rhs->$rhsLinkName) |
|
135 | + $rhsLinkName = $this->rhsLink; |
|
136 | + $rhs->load_relationship($rhsLinkName); |
|
137 | 137 | |
138 | - // If it's a One2Many self-referencing relationship |
|
139 | - // the positions of the default One (LHS) and Many (RHS) are swaped |
|
140 | - // so we should clear the links from the many (left) side |
|
141 | - if ($this->selfReferencing) { |
|
142 | - // Load right hand side relationship name |
|
143 | - $linkName = $this->rhsLink; |
|
144 | - // Load the relationship into the left hand side bean |
|
145 | - $lhs->load_relationship($linkName); |
|
138 | + // If it's a One2Many self-referencing relationship |
|
139 | + // the positions of the default One (LHS) and Many (RHS) are swaped |
|
140 | + // so we should clear the links from the many (left) side |
|
141 | + if ($this->selfReferencing) { |
|
142 | + // Load right hand side relationship name |
|
143 | + $linkName = $this->rhsLink; |
|
144 | + // Load the relationship into the left hand side bean |
|
145 | + $lhs->load_relationship($linkName); |
|
146 | 146 | |
147 | - // Pick the loaded link |
|
148 | - $link = $lhs->$linkName; |
|
149 | - // Get many (LHS) side bean |
|
150 | - $focus = $link->getFocus(); |
|
151 | - // Get relations |
|
152 | - $related = $link->getBeans(); |
|
147 | + // Pick the loaded link |
|
148 | + $link = $lhs->$linkName; |
|
149 | + // Get many (LHS) side bean |
|
150 | + $focus = $link->getFocus(); |
|
151 | + // Get relations |
|
152 | + $related = $link->getBeans(); |
|
153 | 153 | |
154 | - // Clear the relations from many side bean |
|
155 | - foreach($related as $relBean) { |
|
156 | - $this->remove($focus, $relBean); |
|
157 | - } |
|
154 | + // Clear the relations from many side bean |
|
155 | + foreach($related as $relBean) { |
|
156 | + $this->remove($focus, $relBean); |
|
157 | + } |
|
158 | 158 | } else { // For non self-referencing, remove all the relationships from the many (RHS) side |
159 | - $this->removeAll($rhs->$rhsLinkName); |
|
159 | + $this->removeAll($rhs->$rhsLinkName); |
|
160 | 160 | } |
161 | 161 | |
162 | 162 | // Add relationship |
@@ -213,9 +213,9 @@ |
||
213 | 213 | $buildingRelCache = false; |
214 | 214 | } |
215 | 215 | |
216 | - protected function getCacheFile() { |
|
217 | - return sugar_cached("Relationships/relationships.cache.php"); |
|
218 | - } |
|
216 | + protected function getCacheFile() { |
|
217 | + return sugar_cached("Relationships/relationships.cache.php"); |
|
218 | + } |
|
219 | 219 | |
220 | 220 | |
221 | 221 |