| Index: trunk/extensions/TradeTrack/SpecialTradeTrack.php |
| — | — | @@ -99,7 +99,7 @@ |
| 100 | 100 | 'errmsgs' => array( |
| 101 | 101 | 'max' => 'tradetrack-errors-generic-too-long', |
| 102 | 102 | 'required' => 'tradetrack-errors-generic-empty', |
| 103 | | - 'equals' => 'tradetrack-errors-emails-do-not-match' |
| | 103 | + 'equals' => 'tradetrack-errors-e-mails-do-not-match' |
| 104 | 104 | ), |
| 105 | 105 | 'tests' => array( |
| 106 | 106 | 'max' => 200, |
| — | — | @@ -222,7 +222,7 @@ |
| 223 | 223 | |
| 224 | 224 | // This is our template data array. |
| 225 | 225 | $tData = array(); |
| 226 | | - $tData['formURL'] = $this->getTitle()->getLinkURL( $query ); |
| | 226 | + $tData['formURL'] = $this->getTitle()->getLinkURL( ); |
| 227 | 227 | |
| 228 | 228 | // First, see if it's supplied from the page. |
| 229 | 229 | $doaction = $wgRequest->getVal( 'doaction' ); |
| — | — | @@ -443,9 +443,10 @@ |
| 444 | 444 | $mailer->send( new MailAddress( $toEmail ) , new MailAddress( $wgTradeTrackFromEmail ), $wgTradeTrackEmailSubject, $generatedEmail); |
| 445 | 445 | |
| 446 | 446 | // debug line to dump this to the end screen. |
| | 447 | + $wgOut->addHtml( "<pre>" ); |
| 447 | 448 | $wgOut->addHtml( $generatedEmail ); |
| | 449 | + $wgOut->addHtml( "</pre>" ); |
| 448 | 450 | |
| 449 | | - |
| 450 | 451 | } |
| 451 | 452 | |
| 452 | 453 | } |
| — | — | @@ -526,13 +527,7 @@ |
| 527 | 528 | return true; |
| 528 | 529 | } |
| 529 | 530 | |
| 530 | | - |
| 531 | | - function sendEmailMail( array $tData ) { |
| 532 | | - |
| 533 | | - |
| 534 | | - } |
| 535 | | - |
| 536 | | - |
| | 531 | + |
| 537 | 532 | private function insertTradeTrackRequest( array $tData ) { |
| 538 | 533 | $dbw = wfGetDB( DB_MASTER ); |
| 539 | 534 | |
| Index: trunk/extensions/TradeTrack/templates/TradeTrackEmail.php |
| — | — | @@ -18,6 +18,7 @@ |
| 19 | 19 | A new request to utilize a Wikimedia trademark has arrived. |
| 20 | 20 | |
| 21 | 21 | Purpose: <?php echo $this->data['tData']['purpose'] ?> |
| | 22 | + |
| 22 | 23 | <?php if ( $this->data['tData']['agreementType'] ) { ?>Agreement Type: <?php echo $this->data['tData']['agreementType'] ?><?php } ?> |
| 23 | 24 | |
| 24 | 25 | Usage: <?php echo $this->data['tData']['usage'] ?> |
| — | — | @@ -31,12 +32,16 @@ |
| 32 | 33 | } |
| 33 | 34 | } |
| 34 | 35 | } ?> |
| | 36 | + |
| 35 | 37 | Mailing Address: |
| 36 | 38 | <?php echo $this->data['tData']['mailingaddress'] ?> |
| 37 | 39 | |
| 38 | 40 | Name: <?php echo $this->data['tData']['name'] ?> |
| | 41 | + |
| 39 | 42 | Organization Name: <?php echo $this->data['tData']['orgname'] ?> |
| | 43 | + |
| 40 | 44 | Email: <?php echo $this->data['tData']['email'] ?> |
| | 45 | + |
| 41 | 46 | Phone: <?php echo $this->data['tData']['phone'] ?> |
| 42 | 47 | |
| 43 | 48 | <?php } } |
| \ No newline at end of file |
| Index: trunk/extensions/TradeTrack/templates/TradeTrackScreenDetailsForm.php |
| — | — | @@ -6,7 +6,7 @@ |
| 7 | 7 | <form method="post" action="<?php echo $this->data['tData']['formURL'] ?>" class="tradetrack-master" id="tradetrack-form"> |
| 8 | 8 | <input type="hidden" name="doaction" value="details" /> |
| 9 | 9 | <input type="hidden" name="tradetrack-purpose" value="<?php echo $this->data['tData']['purpose'] ?>" /> |
| 10 | | - <?php if ( $this->data['tData']['agreementType'] ) { ?> |
| | 10 | + <?php if ( isset ( $this->data['tData']['agreementType'] ) ) { ?> |
| 11 | 11 | <input type="hidden" name="tradetrack-elements-agreement" value="<?php echo $this->data['tData']['agreementType'] ?>" /> |
| 12 | 12 | <?php } ?> |
| 13 | 13 | |
| — | — | @@ -73,18 +73,18 @@ |
| 74 | 74 | <input type="text" name="tradetrack-elements-orgname" maxlength="200" value="<?php echo $this->data['tData']['orgname'] ?>" /><br /> |
| 75 | 75 | </div> |
| 76 | 76 | <div class="<?php echo ( $this->hasError( 'tradetrack-elements-email' ) ? 'tradetrack-element-error' : 'tradetrack-element' ) ?>"> |
| 77 | | - <label class="tradetrack-question-label"><?php echo wfMsg( 'tradetrack-about-label-email' ) ?></label> |
| | 77 | + <label class="tradetrack-question-label"><?php echo wfMsg( 'tradetrack-about-label-e-mail' ) ?></label> |
| 78 | 78 | <span class="tradetrack-field-hint" |
| 79 | | - title="<?php echo wfMsg( 'tradetrack-about-expanse-email' ) ?>" |
| 80 | | - original-title="<?php echo wfMsg( 'tradetrack-about-expanse-email' ) ?>"></span><br style="clear:both" /> |
| | 79 | + title="<?php echo wfMsg( 'tradetrack-about-expanse-e-mail' ) ?>" |
| | 80 | + original-title="<?php echo wfMsg( 'tradetrack-about-expanse-e-mail' ) ?>"></span><br style="clear:both" /> |
| 81 | 81 | <?php $this->showErrors( 'tradetrack-elements-email' ) ?> |
| 82 | 82 | <input type="text" name="tradetrack-elements-email" maxlength="200" value="<?php echo $this->data['tData']['email'] ?>" /><br /> |
| 83 | 83 | </div> |
| 84 | | - <div class="<?php echo ( $this->hasError( 'tradetrack-elements-confirmemail' ) ? 'tradetrack-element-error' : 'tradetrack-element' ) ?>"> |
| 85 | | - <label class="tradetrack-question-label"><?php echo wfMsg( 'tradetrack-about-label-confirmemail' ) ?></label> |
| | 84 | + <div class="<?php echo ( $this->hasError( 'tradetrack-elements-confirme-mail' ) ? 'tradetrack-element-error' : 'tradetrack-element' ) ?>"> |
| | 85 | + <label class="tradetrack-question-label"><?php echo wfMsg( 'tradetrack-about-label-confirme-mail' ) ?></label> |
| 86 | 86 | <span class="tradetrack-field-hint" |
| 87 | | - title="<?php echo wfMsg( 'tradetrack-about-expanse-confirmemail' ) ?>" |
| 88 | | - original-title="<?php echo wfMsg( 'tradetrack-about-expanse-confirmemail' ) ?>"></span><br style="clear:both" /> |
| | 87 | + title="<?php echo wfMsg( 'tradetrack-about-expanse-confirme-mail' ) ?>" |
| | 88 | + original-title="<?php echo wfMsg( 'tradetrack-about-expanse-confirme-mail' ) ?>"></span><br style="clear:both" /> |
| 89 | 89 | <?php $this->showErrors( 'tradetrack-elements-confirmemail' ) ?> |
| 90 | 90 | <input type="text" name="tradetrack-elements-confirmemail" maxlength="200" value="<?php echo $this->data['tData']['confirmemail'] ?>" /><br /> |
| 91 | 91 | </div> |