Changeset 519
- Timestamp:
- 01/21/08 03:32:11 (1 year ago)
- Files:
-
- branches/1.3/A2Billing_UI/Public/form_data/FG_var_mailtemplate.inc (modified) (2 diffs)
- branches/1.3/A2Billing_UI/signup/signup_confirmation.php (modified) (2 diffs)
- trunk/A2Billing_UI/Public/form_data/FG_var_mailtemplate.inc (modified) (2 diffs)
- trunk/A2Billing_UI/signup/signup_confirmation.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.3/A2Billing_UI/Public/form_data/FG_var_mailtemplate.inc
r390 r519 97 97 98 98 99 100 99 $HD_Form -> FG_INTRO_TEXT_EDITION= gettext("Modify the contents of the email template below."); 101 100 $HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this").$HD_Form->FG_INSTANCE_NAME." ".gettext("click on the delete button."); 102 101 $HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new")." ".$HD_Form->FG_INSTANCE_NAME.".<br>".gettext("Fill the following fields and confirm by clicking on the button add."); 103 104 105 102 106 103 … … 111 108 112 109 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC = Images_Path . "/cormfirmboton.gif"; 113 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Variables can be set within the email will be replaced when the email is sent. Variables are:")." \$name; \$card_gen; \$password ; \$cardalias."; 114 115 110 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Then MailType is signupconfirmed, some variables can be set within the email that will be replaced when the email is sent. Variables are:")." \$name; \$card_gen; \$password ; \$cardalias ; \$loginkey ; \$email."; 116 111 117 112 branches/1.3/A2Billing_UI/signup/signup_confirmation.php
r449 r519 87 87 88 88 $messagetext = str_replace('$name', $lastname, $messagetext); 89 //$message = str_replace('$username', $form->getValue('username'), $messagetext);90 89 $messagetext = str_replace('$card_gen', $username, $messagetext); 91 90 $messagetext = str_replace('$password', $uipass, $messagetext); … … 94 93 $messagetext = str_replace('=$loginkey', "=$loginkey", $messagetext); 95 94 $messagetext = str_replace('$loginkey', "=$loginkey", $messagetext); 96 95 $messagetext = str_replace('$email', "$email", $messagetext); 96 97 97 $em_headers = "From: ".$fromname." <".$from.">\n"; 98 98 $em_headers .= "Reply-To: ".$from."\n"; trunk/A2Billing_UI/Public/form_data/FG_var_mailtemplate.inc
r390 r519 99 99 "" , "", "", "", "" , "", "", ""); 100 100 101 $HD_Form -> FieldEditElement ('mailtype, fromemail, fromname, subject, messagetext');101 $HD_Form -> FieldEditElement ('mailtype, fromemail, fromname, subject, messagetext'); 102 102 103 $HD_Form ->FG_QUERY_ADITION_HIDDEN_FIELDS = "id";104 $HD_Form ->FG_QUERY_ADITION_HIDDEN_VALUE = "$latest_id";103 $HD_Form ->FG_QUERY_ADITION_HIDDEN_FIELDS = "id"; 104 $HD_Form ->FG_QUERY_ADITION_HIDDEN_VALUE = "$latest_id"; 105 105 106 106 107 $HD_Form ->FG_QUERY_EDITION_HIDDEN_FIELDS = "id_language";108 $HD_Form ->FG_QUERY_EDITION_HIDDEN_VALUE = "$id_language";109 110 $HD_Form -> FG_EDITION_CLAUSE = "id ='%id' ";111 if($id_language != '' || !is_null($id_language)){112 $HD_Form -> FG_EDITION_CLAUSE .= "andid_language = '$id_language'";113 } 114 107 $HD_Form ->FG_QUERY_EDITION_HIDDEN_FIELDS = "id_language"; 108 $HD_Form ->FG_QUERY_EDITION_HIDDEN_VALUE = "$id_language"; 109 110 $HD_Form -> FG_EDITION_CLAUSE = "id ='%id' "; 111 if($id_language != '' || !is_null($id_language)){ 112 $HD_Form -> FG_EDITION_CLAUSE .= "AND id_language = '$id_language'"; 113 } 114 115 115 116 116 $HD_Form -> FG_INTRO_TEXT_EDITION= gettext("Modify the contents of the email template below."); 117 117 $HD_Form -> FG_INTRO_TEXT_ASK_DELETION = gettext("If you really want remove this").$HD_Form->FG_INSTANCE_NAME." ".gettext("click on the delete button."); 118 118 $HD_Form -> FG_INTRO_TEXT_ADD = gettext("you can add easily a new")." ".$HD_Form->FG_INSTANCE_NAME.".<br>".gettext("Fill the following fields and confirm by clicking on the button add."); 119 119 120 120 121 $HD_Form -> FG_INTRO_TEXT_ADITION = gettext("Add a new mail template"); … … 123 124 124 125 $HD_Form -> FG_BUTTON_EDITION_SRC = $HD_Form -> FG_BUTTON_ADITION_SRC = Images_Path . "/cormfirmboton.gif"; 125 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Variables can be set within the email will be replaced when the email is sent. Variables are:")." \$name; \$card_gen; \$password ; \$cardalias."; 126 127 128 126 $HD_Form -> FG_BUTTON_EDITION_BOTTOM_TEXT = $HD_Form -> FG_BUTTON_ADITION_BOTTOM_TEXT = gettext("Then MailType is signupconfirmed, some variables can be set within the email that will be replaced when the email is sent. Variables are:")." \$name; \$card_gen; \$password ; \$cardalias ; \$loginkey ; \$email."; 129 127 130 128 trunk/A2Billing_UI/signup/signup_confirmation.php
r435 r519 100 100 101 101 $messagetext = str_replace('$name', $lastname, $messagetext); 102 //$message = str_replace('$username', $form->getValue('username'), $messagetext);103 102 $messagetext = str_replace('$card_gen', $username, $messagetext); 104 103 $messagetext = str_replace('$password', $uipass, $messagetext); … … 107 106 $messagetext = str_replace('=$loginkey', "=$loginkey", $messagetext); 108 107 $messagetext = str_replace('$loginkey', "=$loginkey", $messagetext); 108 $messagetext = str_replace('$email', "$email", $messagetext); 109 109 110 110 a2b_mail($recordset[3], $subject, $messagetext, $from, $fromname);
