adamjakab / SuiteCRM

include/Smarty/plugins/modifier.regex_replace.php

Indentation +3 added lines, -3 removed lines

@@ -23,10 +23,10 @@ 
 function smarty_modifier_regex_replace($string, $search, $replace)
 {
     if(is_array($search)) {
-      foreach($search as $idx => $s)
+        foreach($search as $idx => $s)
         $search[$idx] = _smarty_regex_replace_check($s);
     } else {
-      $search = _smarty_regex_replace_check($search);
+        $search = _smarty_regex_replace_check($search);
     }       
 
     return preg_replace($search, $replace, $string);
@@ -35,7 +35,7 @@ 
 function _smarty_regex_replace_check($search)
 {
     if (($pos = strpos($search,"\0")) !== false)
-      $search = substr($search,0,$pos);
+        $search = substr($search,0,$pos);
     if (preg_match('!([a-zA-Z\s]+)$!s', $search, $match) && (strpos($match[1], 'e') !== false)) {
         /* remove eval-modifier from $search */
         $search = substr($search, 0, -strlen($match[1])) . preg_replace('![e\s]+!', '', $match[1]);

include/Smarty/plugins/function.sugar_getlink.php

Indentation +22 added lines, -22 removed lines

@@ -51,29 +51,29 @@
 
 function smarty_function_sugar_getlink($params, &$smarty) {
 
-	// error checking for required parameters
-	if(!isset($params['url'])) 
-		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'url');
-	if(!isset($params['title']))
-		$smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'title');
+    // error checking for required parameters
+    if(!isset($params['url'])) 
+        $smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'url');
+    if(!isset($params['title']))
+        $smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'title');
 
-	// set defaults
-	if(!isset($params['attr']))
-		$params['attr'] = '';
-	if(!isset($params['img_name'])) 
-		$params['img_name'] = '';
-	if(!isset($params['img_attr']))
-		$params['img_attr'] = '';
-	if(!isset($params['img_width']))
-		$params['img_width'] = null;
-	if(!isset($params['img_height']))
-		$params['height'] = null;
-	if(!isset($params['img_placement']))
-		$params['img_placement'] = 'imageonly';
-	if(!isset($params['img_alt']))
-		$params['img_alt'] = '';
+    // set defaults
+    if(!isset($params['attr']))
+        $params['attr'] = '';
+    if(!isset($params['img_name'])) 
+        $params['img_name'] = '';
+    if(!isset($params['img_attr']))
+        $params['img_attr'] = '';
+    if(!isset($params['img_width']))
+        $params['img_width'] = null;
+    if(!isset($params['img_height']))
+        $params['height'] = null;
+    if(!isset($params['img_placement']))
+        $params['img_placement'] = 'imageonly';
+    if(!isset($params['img_alt']))
+        $params['img_alt'] = '';
 
-	return SugarThemeRegistry::current()->getLink($params['url'], $params['title'], $params['attr'], $params['img_name'], 
-		$params['img_attr'], $params['img_width'], $params['img_height'], $params['img_alt'], $params['img_placement']);	
+    return SugarThemeRegistry::current()->getLink($params['url'], $params['title'], $params['attr'], $params['img_name'], 
+        $params['img_attr'], $params['img_width'], $params['img_height'], $params['img_alt'], $params['img_placement']);	
 }
 ?>

include/Smarty/plugins/function.sugar_connector_display.php

Indentation +3 added lines, -3 removed lines

@@ -102,11 +102,11 @@
     $field = $params['field'];
     $type = $bean->field_name_map[$field]['type'];
     if($type == 'text') {
-       echo strlen($bean->$field) > 50 ? substr($bean->$field, 0, 47) . '...' : $bean->field;
+        echo strlen($bean->$field) > 50 ? substr($bean->$field, 0, 47) . '...' : $bean->field;
     } else if($type == 'link') {
-       echo "<a href='{$bean->$field}' target='_blank'>{$bean->$field}</a>"; 
+        echo "<a href='{$bean->$field}' target='_blank'>{$bean->$field}</a>"; 
     } else {
-       echo $bean->$field;
+        echo $bean->$field;
     }
 }
 

include/Smarty/plugins/function.sugar_getjspath.php

Indentation +4 added lines, -4 removed lines

@@ -43,9 +43,9 @@
  */
 function smarty_function_sugar_getjspath($params, &$smarty)
 {
-	if(!isset($params['file'])) {
-		   $smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'file');
-	}
- 	return getJSPath($params['file']);
+    if(!isset($params['file'])) {
+            $smarty->trigger_error($GLOBALS['app_strings']['ERR_MISSING_REQUIRED_FIELDS'] . 'file');
+    }
+        return getJSPath($params['file']);
 }
 ?>
\ No newline at end of file

include/Smarty/plugins/function.sugar_currency_format.php

Indentation +8 added lines, -8 removed lines

@@ -64,19 +64,19 @@
 function smarty_function_sugar_currency_format($params, &$smarty) {
 
     // Bug #47406 : Currency field doesn't accept 0.00 as default value
-	if(!isset($params['var']) || $params['var'] === '') {
+    if(!isset($params['var']) || $params['var'] === '') {
         return '';
     } 
     
     global $locale;
     if(empty($params['currency_id'])){
-    	$params['currency_id'] = $locale->getPrecedentPreference('currency');
-    	if(!isset($params['convert'])) {
-    	    $params['convert'] = true;
-    	}
-    	if(!isset($params['currency_symbol'])) {
-    	   $params['currency_symbol'] = $locale->getPrecedentPreference('default_currency_symbol');
-    	}
+        $params['currency_id'] = $locale->getPrecedentPreference('currency');
+        if(!isset($params['convert'])) {
+            $params['convert'] = true;
+        }
+        if(!isset($params['currency_symbol'])) {
+            $params['currency_symbol'] = $locale->getPrecedentPreference('default_currency_symbol');
+        }
     }
    
     $_contents = currency_format_number($params['var'], $params);

include/Smarty/plugins/function.multienum_to_array.php

Indentation +13 added lines, -13 removed lines

@@ -65,29 +65,29 @@
  */
 function smarty_function_multienum_to_array($params, &$smarty)
 {
-	$ret = "";
-	if(empty($params['string'])) {
+    $ret = "";
+    if(empty($params['string'])) {
         if (empty($params['default']))
             $ret = array();
         else if(is_array($params['default']))
             $ret = $params['default'];
         else
-           $ret = unencodeMultienum($params['default']);
+            $ret = unencodeMultienum($params['default']);
     } else {
-    	if (is_array($params['string']))
-    	  $ret = $params['string'];
-    	else
-    	  $ret = unencodeMultienum($params['string']);
+        if (is_array($params['string']))
+            $ret = $params['string'];
+        else
+            $ret = unencodeMultienum($params['string']);
     }
 	
     
-	if (!empty($params['assign']))
-	{
-		$smarty->assign($params['assign'], $ret);
-		return "";
-	}
+    if (!empty($params['assign']))
+    {
+        $smarty->assign($params['assign'], $ret);
+        return "";
+    }
 	
-	return ($ret);
+    return ($ret);
 }
 
 ?>

include/Smarty/plugins/function.sugar_button.php

Indentation +109 added lines, -110 removed lines

@@ -281,28 +281,28 @@ 
  */
 function smarty_function_sugar_button($params, &$smarty)
 {
-   if(empty($params['module'])) {
-   	  $smarty->trigger_error("sugar_button: missing required param (module)");
-   } else if(empty($params['id'])) {
-   	  $smarty->trigger_error("sugar_button: missing required param (id)");
-   } else if(empty($params['view'])) {
-   	  $smarty->trigger_error("sugar_button: missing required param (view)");
-   }
-
-   $js_form = (empty($params['form_id'])) ? "var _form = (this.form) ? this.form : document.forms[0];" : "var _form = document.getElementById('{$params['form_id']}');";
-
-   $type = $params['id'];
-   $location = (empty($params['location'])) ? "" : "_".$params['location'];
-
-   if(!is_array($type)) {
-   	  $module = $params['module'];
-   	  $view = $params['view'];
-   	  switch(strtoupper($type)) {
-			case "SEARCH":
+    if(empty($params['module'])) {
+            $smarty->trigger_error("sugar_button: missing required param (module)");
+    } else if(empty($params['id'])) {
+            $smarty->trigger_error("sugar_button: missing required param (id)");
+    } else if(empty($params['view'])) {
+            $smarty->trigger_error("sugar_button: missing required param (view)");
+    }
+
+    $js_form = (empty($params['form_id'])) ? "var _form = (this.form) ? this.form : document.forms[0];" : "var _form = document.getElementById('{$params['form_id']}');";
+
+    $type = $params['id'];
+    $location = (empty($params['location'])) ? "" : "_".$params['location'];
+
+    if(!is_array($type)) {
+            $module = $params['module'];
+            $view = $params['view'];
+            switch(strtoupper($type)) {
+            case "SEARCH":
                 $output = '<input tabindex="2" title="{$APP.LBL_SEARCH_BUTTON_TITLE}" onclick="SUGAR.savedViews.setChooser();" class="button" type="submit" name="button" value="{$APP.LBL_SEARCH_BUTTON_LABEL}" id="search_form_submit"/>&nbsp;';
-			break;
+            break;
 
-			case "CANCEL":
+            case "CANCEL":
                 $cancelButton  = '{if !empty($smarty.request.return_action) && ($smarty.request.return_action == "DetailView" && !empty($smarty.request.return_id))}';
                 $cancelButton .= '<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="SUGAR.ajaxUI.loadContent(\'index.php?action=DetailView&module={$smarty.request.return_module|escape:"url"}&record={$smarty.request.return_id|escape:"url"}\'); return false;" name="button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}" type="button" id="'.$type.$location.'"> ';
                 $cancelButton .= '{elseif !empty($smarty.request.return_action) && ($smarty.request.return_action == "DetailView" && !empty($fields.id.value))}';
@@ -314,30 +314,30 @@ 
                 $cancelButton .= '{/if}';
 
                 $output = $cancelButton;
-			break;
+            break;
 
-			case "DELETE":
+            case "DELETE":
                 $output = '{if $bean->aclAccess("delete")}<input title="{$APP.LBL_DELETE_BUTTON_TITLE}" accessKey="{$APP.LBL_DELETE_BUTTON_KEY}" class="button" onclick="'.$js_form.' _form.return_module.value=\'' . $module . '\'; _form.return_action.value=\'ListView\'; _form.action.value=\'Delete\'; if(confirm(\'{$APP.NTC_DELETE_CONFIRMATION}\')) SUGAR.ajaxUI.submitForm(_form);" type="submit" name="Delete" value="{$APP.LBL_DELETE_BUTTON_LABEL}" id="delete_button">{/if} ';
             break;
 
-			case "DUPLICATE":
-			    $output = '{if $bean->aclAccess("edit")}<input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="button" onclick="'.$js_form.' _form.return_module.value=\''. $module . '\'; _form.return_action.value=\'DetailView\'; _form.isDuplicate.value=true; _form.action.value=\'' . $view . '\'; _form.return_id.value=\'{$id}\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}" id="duplicate_button">{/if} ';
+            case "DUPLICATE":
+                $output = '{if $bean->aclAccess("edit")}<input title="{$APP.LBL_DUPLICATE_BUTTON_TITLE}" accessKey="{$APP.LBL_DUPLICATE_BUTTON_KEY}" class="button" onclick="'.$js_form.' _form.return_module.value=\''. $module . '\'; _form.return_action.value=\'DetailView\'; _form.isDuplicate.value=true; _form.action.value=\'' . $view . '\'; _form.return_id.value=\'{$id}\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Duplicate" value="{$APP.LBL_DUPLICATE_BUTTON_LABEL}" id="duplicate_button">{/if} ';
             break;
 
-			case "EDIT";
-			    $output = '{if $bean->aclAccess("edit")}<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' _form.return_module.value=\'' . $module . '\'; _form.return_action.value=\'DetailView\'; _form.return_id.value=\'{$id}\'; _form.action.value=\'EditView\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Edit" id="edit_button" value="{$APP.LBL_EDIT_BUTTON_LABEL}">{/if} ';
+            case "EDIT";
+                $output = '{if $bean->aclAccess("edit")}<input title="{$APP.LBL_EDIT_BUTTON_TITLE}" accessKey="{$APP.LBL_EDIT_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' _form.return_module.value=\'' . $module . '\'; _form.return_action.value=\'DetailView\'; _form.return_id.value=\'{$id}\'; _form.action.value=\'EditView\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Edit" id="edit_button" value="{$APP.LBL_EDIT_BUTTON_LABEL}">{/if} ';
             break;
 
-			case "FIND_DUPLICATES":
-			    $output = '{if $bean->aclAccess("edit") && $bean->aclAccess("delete")}<input title="{$APP.LBL_DUP_MERGE}" class="button" onclick="'.$js_form.' _form.return_module.value=\'' . $module . '\'; _form.return_action.value=\'DetailView\'; _form.return_id.value=\'{$id}\'; _form.action.value=\'Step1\'; _form.module.value=\'MergeRecords\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Merge" value="{$APP.LBL_DUP_MERGE}" id="merge_duplicate_button">{/if} ';
+            case "FIND_DUPLICATES":
+                $output = '{if $bean->aclAccess("edit") && $bean->aclAccess("delete")}<input title="{$APP.LBL_DUP_MERGE}" class="button" onclick="'.$js_form.' _form.return_module.value=\'' . $module . '\'; _form.return_action.value=\'DetailView\'; _form.return_id.value=\'{$id}\'; _form.action.value=\'Step1\'; _form.module.value=\'MergeRecords\';SUGAR.ajaxUI.submitForm(_form);" type="button" name="Merge" value="{$APP.LBL_DUP_MERGE}" id="merge_duplicate_button">{/if} ';
             break;
 
-			case "SAVE":
-				$view = ($_REQUEST['action'] == 'EditView') ? 'EditView' : (($view == 'EditView') ? 'EditView' : $view);
-				$output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' {if $isDuplicate}_form.return_id.value=\'\'; {/if}_form.action.value=\'Save\'; if(check_form(\'' . $view . '\'))SUGAR.ajaxUI.submitForm(_form);return false;" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" id="'.$type.$location.'">{/if} ';
-			break;
+            case "SAVE":
+                $view = ($_REQUEST['action'] == 'EditView') ? 'EditView' : (($view == 'EditView') ? 'EditView' : $view);
+                $output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' {if $isDuplicate}_form.return_id.value=\'\'; {/if}_form.action.value=\'Save\'; if(check_form(\'' . $view . '\'))SUGAR.ajaxUI.submitForm(_form);return false;" type="submit" name="button" value="{$APP.LBL_SAVE_BUTTON_LABEL}" id="'.$type.$location.'">{/if} ';
+            break;
 
-			case "SUBPANELSAVE":
+            case "SUBPANELSAVE":
                 if($view == 'QuickCreate' || (isset($_REQUEST['target_action']) && strtolower($_REQUEST['target_action']) == 'quickcreate')) $view =  "form_SubpanelQuickCreate_{$module}";
 
                 /* BEGIN - SECURITY GROUPS - redirect a subpanel save to the detail view if select popup and user in more than 1 group*/ 
@@ -353,112 +353,111 @@ 
                 }
                 //if different here then change the group return right above
                 $output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}"  class="button" onclick="'.$js_form.' disableOnUnloadEditView(); _form.action.value=\'Save\';if(check_form(\''.$view.'\'))return SUGAR.subpanelUtils.inlineSave(_form.id, \'' . $params['module'] . '_subpanel_save_button\');return false;" type="submit" name="' . $params['module'] . '_subpanel_save_button" id="' . $params['module'] . '_subpanel_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
-                
-                */
+                 */
                 $output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}"  class="button" onclick="'.$js_form.' disableOnUnloadEditView(); _form.action.value=\'Save\';if(check_form(\''.$view.'\'))return SUGAR.subpanelUtils.inlineSave(_form.id, \'' . $params['module'] . '_subpanel_save_button\');return false;" type="submit" name="' . $params['module'] . '_subpanel_save_button" id="' . $params['module'] . '_subpanel_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
                 /* END - SECURITY GROUPS */
 
             break;
-			case "SUBPANELCANCEL":
+            case "SUBPANELCANCEL":
                 $output = '<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" class="button" onclick="return SUGAR.subpanelUtils.cancelCreate($(this).attr(\'id\'));return false;" type="submit" name="' . $params['module'] . '_subpanel_cancel_button" id="' . $params['module'] . '_subpanel_cancel_button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"> ';
 
             break;
-		    case "SUBPANELFULLFORM":
+            case "SUBPANELFULLFORM":
                 $output = '<input title="{$APP.LBL_FULL_FORM_BUTTON_TITLE}" class="button" onclick="'.$js_form.' disableOnUnloadEditView(_form); _form.return_action.value=\'DetailView\'; _form.action.value=\'EditView\'; if(typeof(_form.to_pdf)!=\'undefined\') _form.to_pdf.value=\'0\';" type="submit" name="' . $params['module'] . '_subpanel_full_form_button" id="' . $params['module'] . '_subpanel_full_form_button" value="{$APP.LBL_FULL_FORM_BUTTON_LABEL}"> ';
                 $output .= '<input type="hidden" name="full_form" value="full_form">';
             break;
-			case "DCMENUCANCEL":
+            case "DCMENUCANCEL":
                 $output = '<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="button" onclick="javascript:lastLoadedMenu=undefined;DCMenu.closeOverlay();return false;" type="submit" name="' . $params['module'] . '_dcmenu_cancel_button" id="' . $params['module'] . '_dcmenu_cancel_button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"> ';
             break;
-			case "DCMENUSAVE":
+            case "DCMENUSAVE":
                             if ($view == 'QuickCreate') {
                                 $view = "form_DCQuickCreate_{$module}";
                             } else if ($view == 'EditView') {
                                 $view = "form_DCEditView_{$module}";
                             }
-				$output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' _form.action.value=\'Save\';if(check_form(\''.$view.'\'))return DCMenu.save(_form.id, \'' . $params['module'] . '_subpanel_save_button\');return false;" type="submit" name="' . $params['module'] . '_dcmenu_save_button" id="' . $params['module'] . '_dcmenu_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
+                $output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" class="button primary" onclick="'.$js_form.' _form.action.value=\'Save\';if(check_form(\''.$view.'\'))return DCMenu.save(_form.id, \'' . $params['module'] . '_subpanel_save_button\');return false;" type="submit" name="' . $params['module'] . '_dcmenu_save_button" id="' . $params['module'] . '_dcmenu_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
             break;
-			case "DCMENUFULLFORM":
+            case "DCMENUFULLFORM":
                 $output = '<input title="{$APP.LBL_FULL_FORM_BUTTON_TITLE}" accessKey="{$APP.LBL_FULL_FORM_BUTTON_KEY}" class="button" onclick="'.$js_form.' disableOnUnloadEditView(_form); _form.return_action.value=\'DetailView\'; _form.action.value=\'EditView\'; _form.return_module.value=\'' . $params['module'] . '\';_form.return_id.value=_form.record.value;if(typeof(_form.to_pdf)!=\'undefined\') _form.to_pdf.value=\'0\';SUGAR.ajaxUI.submitForm(_form,null,true);DCMenu.closeOverlay();" type="button" name="' . $params['module'] . '_subpanel_full_form_button" id="' . $params['module'] . '_subpanel_full_form_button" value="{$APP.LBL_FULL_FORM_BUTTON_LABEL}"> ';
                 $output .= '<input type="hidden" name="full_form" value="full_form">';
                 $output .= '<input type="hidden" name="is_admin" value="">';
             break;
-			case "POPUPSAVE":
-				$view = ($view == 'QuickCreate') ? "form_QuickCreate_{$module}" : $view;
-				$output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" '
-					 . 'class="button primary" onclick="'.$js_form.' _form.action.value=\'Popup\';'
-					 . 'return check_form(\''.$view.'\')" type="submit" name="' . $params['module']
-					 . '_popupcreate_save_button" id="' . $params['module']
-					 . '_popupcreate_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
+            case "POPUPSAVE":
+                $view = ($view == 'QuickCreate') ? "form_QuickCreate_{$module}" : $view;
+                $output = '{if $bean->aclAccess("save")}<input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accessKey="{$APP.LBL_SAVE_BUTTON_KEY}" '
+                        . 'class="button primary" onclick="'.$js_form.' _form.action.value=\'Popup\';'
+                        . 'return check_form(\''.$view.'\')" type="submit" name="' . $params['module']
+                        . '_popupcreate_save_button" id="' . $params['module']
+                        . '_popupcreate_save_button" value="{$APP.LBL_SAVE_BUTTON_LABEL}">{/if} ';
             break;
-			case "POPUPCANCEL":
+            case "POPUPCANCEL":
                 $output = '<input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accessKey="{$APP.LBL_CANCEL_BUTTON_KEY}" '
-					 . 'class="button" onclick="toggleDisplay(\'addform\');return false;" '
-					 . 'name="' . $params['module'] . '_popup_cancel_button" type="submit"'
-					 . 'id="' . $params['module'] . '_popup_cancel_button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"> ';
+                        . 'class="button" onclick="toggleDisplay(\'addform\');return false;" '
+                        . 'name="' . $params['module'] . '_popup_cancel_button" type="submit"'
+                        . 'id="' . $params['module'] . '_popup_cancel_button" value="{$APP.LBL_CANCEL_BUTTON_LABEL}"> ';
             break;
-			case "AUDIT":
-	            $popup_request_data = array(
-			        'call_back_function' => 'set_return',
-			        'form_name' => 'EditView',
-			        'field_to_name_array' => array(),
-			    );
-	            $json = getJSONobj();
-
-	            require_once('include/SugarFields/Parsers/MetaParser.php');
-	            $encoded_popup_request_data = MetaParser::parseDelimiters($json->encode($popup_request_data));
-	 			$audit_link = '<input id="btn_view_change_log" title="{$APP.LNK_VIEW_CHANGE_LOG}" class="button" onclick=\'open_popup("Audit", "600", "400", "&record={$fields.id.value}&module_name=' . $params['module'] . '", true, false, ' . $encoded_popup_request_data . '); return false;\' type="button" value="{$APP.LNK_VIEW_CHANGE_LOG}">';
+            case "AUDIT":
+                $popup_request_data = array(
+                    'call_back_function' => 'set_return',
+                    'form_name' => 'EditView',
+                    'field_to_name_array' => array(),
+                );
+                $json = getJSONobj();
+
+                require_once('include/SugarFields/Parsers/MetaParser.php');
+                $encoded_popup_request_data = MetaParser::parseDelimiters($json->encode($popup_request_data));
+                    $audit_link = '<input id="btn_view_change_log" title="{$APP.LNK_VIEW_CHANGE_LOG}" class="button" onclick=\'open_popup("Audit", "600", "400", "&record={$fields.id.value}&module_name=' . $params['module'] . '", true, false, ' . $encoded_popup_request_data . '); return false;\' type="button" value="{$APP.LNK_VIEW_CHANGE_LOG}">';
                 $output = '{if $bean->aclAccess("detail")}{if !empty($fields.id.value) && $isAuditEnabled}'.$audit_link.'{/if}{/if}';
             break;
 
 
-   	  } //switch
-      if(isset($params['appendTo'])) {
-          $smarty->append($params['appendTo'], $output);
-          return;
-      }
-      return $output;
-   } else if(is_array($type) && isset($type['sugar_html'])) {
-       require_once('include/SugarHtml/SugarHtml.php');
-
-       $dom_tree = SugarHtml::parseSugarHtml($type['sugar_html']);
-       replaceFormClick($dom_tree, $js_form);
-       $output = SugarHtml::createHtml($dom_tree);
-
-       if(isset($params['appendTo'])) {
-           $smarty->append($params['appendTo'], $output);
-           return;
-       }
-       return $output;
-   } else if(is_array($type) && isset($type['customCode'])) {
-       require_once('include/SugarHtml/SugarHtml.php');
-
-       $dom_tree = SugarHtml::parseHtmlTag($type['customCode']);
-       $hidden_exists = false;
-
-       replaceFormClick($dom_tree, $js_form, $hidden_exists);
-       if($hidden_exists) {
-           //If the customCode contains hidden fields, the extracted hidden fields need to append in the original form
-           $form = $smarty->get_template_vars('form');
-           $hidden_fields = $dom_tree;
-           extractHiddenInputs($hidden_fields);
-           if(!isset($form)) {
-               $form = array();
-           }
-           if(!isset($form['hidden'])) {
-               $form['hidden'] = array();
-           }
-           $form['hidden'][] = SugarHtml::createHtml($hidden_fields);
-           $smarty->assign('form', $form);
-       }
-       $output = SugarHtml::createHtml($dom_tree);
-
-       if(isset($params['appendTo'])) {
-           $smarty->append($params['appendTo'], $output);
-           return;
-       }
-       return $output;
-   }
+            } //switch
+        if(isset($params['appendTo'])) {
+            $smarty->append($params['appendTo'], $output);
+            return;
+        }
+        return $output;
+    } else if(is_array($type) && isset($type['sugar_html'])) {
+        require_once('include/SugarHtml/SugarHtml.php');
+
+        $dom_tree = SugarHtml::parseSugarHtml($type['sugar_html']);
+        replaceFormClick($dom_tree, $js_form);
+        $output = SugarHtml::createHtml($dom_tree);
+
+        if(isset($params['appendTo'])) {
+            $smarty->append($params['appendTo'], $output);
+            return;
+        }
+        return $output;
+    } else if(is_array($type) && isset($type['customCode'])) {
+        require_once('include/SugarHtml/SugarHtml.php');
+
+        $dom_tree = SugarHtml::parseHtmlTag($type['customCode']);
+        $hidden_exists = false;
+
+        replaceFormClick($dom_tree, $js_form, $hidden_exists);
+        if($hidden_exists) {
+            //If the customCode contains hidden fields, the extracted hidden fields need to append in the original form
+            $form = $smarty->get_template_vars('form');
+            $hidden_fields = $dom_tree;
+            extractHiddenInputs($hidden_fields);
+            if(!isset($form)) {
+                $form = array();
+            }
+            if(!isset($form['hidden'])) {
+                $form['hidden'] = array();
+            }
+            $form['hidden'][] = SugarHtml::createHtml($hidden_fields);
+            $smarty->assign('form', $form);
+        }
+        $output = SugarHtml::createHtml($dom_tree);
+
+        if(isset($params['appendTo'])) {
+            $smarty->append($params['appendTo'], $output);
+            return;
+        }
+        return $output;
+    }
 
 }
 /**

include/Smarty/plugins/shared.make_timestamp.php

Indentation +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
     } elseif (preg_match('/^\d{14}$/', $string)) {
         // it is mysql timestamp format of YYYYMMDDHHMMSS?            
         $time = mktime(substr($string, 8, 2),substr($string, 10, 2),substr($string, 12, 2),
-                       substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4));
+                        substr($string, 4, 2),substr($string, 6, 2),substr($string, 0, 4));
         
     } elseif (is_numeric($string)) {
         // it is a numeric string, we handle it as timestamp

include/Smarty/plugins/modifier.in_array.php

Indentation +2 added lines, -2 removed lines

@@ -44,9 +44,9 @@
  */
 function smarty_modifier_in_array($needle = null, $haystack = null)
 {
-	//Smarty barfs if Array is empty
+    //Smarty barfs if Array is empty
     if($haystack == null || empty($haystack)) {
-       return false;	
+        return false;	
     }
     return in_array($needle, $haystack);
 }