adding session data to preserve form input in the event of a submission error.

diff --git a/includes/payment-display.php b/includes/payment-display.php
index 8434b61..08f32b2 100755 (executable)
--- a/includes/payment-display.php
+++ b/includes/payment-display.php
@@ -8,8 +8,10 @@
  *\r
 */\r
 global $wpdb;\r
+echo $_REQUEST['first_name'];\r
+$out1 = ob_get_contents();\r
 if(isset($_REQUEST['action']))\r
-{\r
+{  \r
     if($_REQUEST['action']=='submitpayment')\r
     {\r
         // Check the form for reCaptcha\r
@@ -27,14 +29,27 @@ if(isset($_REQUEST['action']))
             ),\r
             'cookies' => array()\r
         ) );\r
+        \r
         $response_code = wp_remote_retrieve_response_code( $response );\r
         $api_response = json_decode( wp_remote_retrieve_body( $response ), true );\r
         if ( $api_response['success'] != true ) {\r
+            \r
+            get_form_input();\r
             $_SESSION['payment_msg'] = 'Captcha did not verify!';\r
+            \r
             header("Location:".site_url().$_SERVER['REQUEST_URI']);\r
             exit;\r
+        } else {\r
+            \r
+            $_SESSION['payment_msg'] = 'Captcha did not verify!';\r
+            foreach($_SESSION as $key => $val){\r
+                if ($key !== 'payment_msg'){\r
+                    unset($_SESSION[$key]);\r
+                }\r
+            }\r
         }\r
-               $first_name = $_REQUEST['first_name'];\r
+\r
+               $first_name = (isset($_REQUEST['first_name'])) ? $_REQUEST['first_name'] : '';\r
                $last_name = $_REQUEST['last_name'];\r
                $organization = $_REQUEST['organization'];\r
                $address = $_REQUEST['address'];\r
@@ -48,7 +63,7 @@ if(isset($_REQUEST['action']))
                $r_frequency = $_REQUEST['r_frequency'];\r
                $r_times = $_REQUEST['r_times'];\r
                $amount = $_REQUEST['amount'];\r
-                $invoice_num = $_REQUEST['invoice_num'];\r
+        $invoice_num = $_REQUEST['invoice_num'];\r
                $card_type = $_REQUEST['card_type'];\r
                $x_card_num = $_REQUEST['x_card_num'];\r
                $exp_month = $_REQUEST['exp_month'];\r
@@ -59,7 +74,7 @@ if(isset($_REQUEST['action']))
 \r
                // Adjust this to point to the Authorize.Net PHP SDK\r
                include dirname(__FILE__) .'/../anet_php_sdk/AuthorizeNet.php';\r
-\r
+        \r
                $METHOD_TO_USE = "AIM";\r
                $mysetting = $wpdb->get_results( "SELECT * FROM ".$wpdb->prefix."payment_setting" );\r
                define("AUTHORIZENET_API_LOGIN_ID",$mysetting[0]->api_login);    // Add your API LOGIN ID\r
@@ -106,7 +121,7 @@ if(isset($_REQUEST['action']))
                }\r
                else\r
                {\r
-                       // wp_mail( 'anthony@localhost', 'test1c', 'pass');\r
+            get_form_input();\r
                        header("Location:".site_url().$_SERVER['REQUEST_URI']);\r
                        exit;\r
                }\r
@@ -117,7 +132,7 @@ if(isset($_REQUEST['action']))
 function glm_payment_form() {\r
     wp_enqueue_script('reCaptcha', 'https://www.google.com/recaptcha/api.js');\r
     ob_start();\r
-        global $wpdb;\r
+    global $wpdb;\r
     ?>\r
        <form method="post" name="payment_form" id="payment_form" action="<?php echo site_url().$_SERVER['REQUEST_URI'];?>" autocomplete="off">\r
                        <input type="hidden" name="action" value="submitpayment" />\r
@@ -141,31 +156,31 @@ function glm_payment_form() {
                                <tr>\r
                                        <td class="title_cell">First name<span class="required">*</span></td>\r
                                        <td class="field_cell">\r
-                                               <input type="text" class="inputbox" name="first_name" id="first_name" value="" size="25" />\r
+                        <input type="text" class="inputbox" name="first_name" id="first_name" value="<?php echo isset($_SESSION['first_name']) ? $_SESSION['first_name'] : ''; ?>"  size="25" />\r
                                        </td>\r
                                </tr>\r
                                <tr>\r
                                        <td class="title_cell">Last name<span class="required">*</span></td>\r
                                        <td class="field_cell">\r
-                                               <input type="text" class="inputbox" name="last_name" value="" size="25" />\r
+                                               <input type="text" class="inputbox" name="last_name" value="<?php echo isset($_SESSION['last_name']) ? $_SESSION['last_name'] : ''; ?>" size="25" />\r
                                        </td>\r
                                </tr>\r
                                <tr>\r
                                        <td class="title_cell">Organization</td>\r
                                        <td class="field_cell">\r
-                                               <input type="text" class="inputbox" name="organization" value="" size="30" />\r
+                                               <input type="text" class="inputbox" name="organization" value="<?php echo isset($_SESSION['organization']) ? $_SESSION['organization'] : ''; ?>" size="30" />\r
                                        </td>\r
                                </tr>\r
                                <tr>\r
                                        <td class="title_cell">Address<span class="required">*</span></td>\r
                                        <td class="field_cell">\r
-                                               <input type="text" class="inputbox" name="address" value="" size="50" />\r
+                                               <input type="text" class="inputbox" name="address" value="<?php echo isset($_SESSION['address']) ? $_SESSION['address'] : ''; ?>" size="50" />\r
                                        </td>\r
                                </tr>\r
                                <tr>\r
                                        <td class="title_cell">City<span class="required">*</span></td>\r
                                        <td class="field_cell">\r
-                                               <input type="text" class="inputbox" name="city" value="" size="15" />\r
+                                               <input type="text" class="inputbox" name="city" value="<?php echo isset($_SESSION['city']) ? $_SESSION['city'] : ''; ?>" size="15" />\r
                                        </td>\r
                                </tr>\r
                                <tr style="display: none">\r
@@ -426,76 +441,76 @@ function glm_payment_form() {
                                        <td class="field_cell">\r
                                                <select id="state" name="state" class="">\r
                                                <option value="" selected="selected">Select State</option>\r
-                                               <option value="AK">Alaska</option>\r
-                                               <option value="AL">Alabama</option>\r
-                                               <option value="AR">Arkansas</option>\r
-                                               <option value="AZ">Arizona</option>\r
-                                               <option value="CA">California</option>\r
-                                               <option value="CO">Colorado</option>\r
-                                               <option value="CT">Connecticut</option>\r
-                                               <option value="DC">District Of Columbia</option>\r
-                                               <option value="DE">Delaware</option>\r
-                                               <option value="FL">Florida</option>\r
-                                               <option value="GA">Georgia</option>\r
-                                               <option value="HI">Hawaii</option>\r
-                                               <option value="IA">Iowa</option>\r
-                                               <option value="ID">Idaho</option>\r
-                                               <option value="IL">Illinois</option>\r
-                                               <option value="IN">Indiana</option>\r
-                                               <option value="KS">Kansas</option>\r
-                                               <option value="KY">Kentucky</option>\r
-                                               <option value="LA">Louisiana</option>\r
-                                               <option value="MA">Massachusetts</option>\r
-                                               <option value="MD">Maryland</option>\r
-                                               <option value="ME">Maine</option>\r
-                                               <option value="MI">Michigan</option>\r
-                                               <option value="MN">Minnesota</option>\r
-                                               <option value="MO">Missouri</option>\r
-                                               <option value="MS">Mississippi</option>\r
-                                               <option value="MT">Montana</option>\r
-                                               <option value="NC">North Carolina</option>\r
-                                               <option value="ND">North Dakota</option>\r
-                                               <option value="NE">Nebraska</option>\r
-                                               <option value="NH">New Hampshire</option>\r
-                                               <option value="NJ">New Jersey</option>\r
-                                               <option value="NM">New Mexico</option>\r
-                                               <option value="NV">Nevada</option>\r
-                                               <option value="NY">New York</option>\r
-                                               <option value="OH">Ohio</option>\r
-                                               <option value="OK">Oklahoma</option>\r
-                                               <option value="OR">Oregon</option>\r
-                                               <option value="PA">Pennsylvania</option>\r
-                                               <option value="RI">Rhode Island</option>\r
-                                               <option value="SC">South Carolina</option>\r
-                                               <option value="SD">South Dakota</option>\r
-                                               <option value="TN">Tennessee</option>\r
-                                               <option value="TX">Texas</option>\r
-                                               <option value="UT">Utah</option>\r
-                                               <option value="VA">Virginia</option>\r
-                                               <option value="VT">Vermont</option>\r
-                                               <option value="WA">Washington</option>\r
-                                               <option value="WI">Wisconsin</option>\r
-                                               <option value="WV">West Virginia</option>\r
-                                               <option value="WY">Wyoming</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "AK" ) echo "selected";?> value="AK">Alaska</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "AL" ) echo "selected";?> value="AL">Alabama</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "AR" ) echo "selected";?> value="AR">Arkansas</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "AZ" ) echo "selected";?> value="AZ">Arizona</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "CA" ) echo "selected";?> value="CA">California</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "CO" ) echo "selected";?> value="CO">Colorado</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "CT" ) echo "selected";?> value="CT">Connecticut</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "DC" ) echo "selected";?> value="DC">District Of Columbia</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "DE" ) echo "selected";?> value="DE">Delaware</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "FL" ) echo "selected";?> value="FL">Florida</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "GA" ) echo "selected";?> value="GA">Georgia</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "HI" ) echo "selected";?> value="HI">Hawaii</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "IA" ) echo "selected";?> value="IA">Iowa</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "ID" ) echo "selected";?> value="ID">Idaho</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "IL" ) echo "selected";?> value="IL">Illinois</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "IN" ) echo "selected";?> value="IN">Indiana</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "KS" ) echo "selected";?> value="KS">Kansas</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "KY" ) echo "selected";?> value="KY">Kentucky</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "LA" ) echo "selected";?> value="LA">Louisiana</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "MA" ) echo "selected";?> value="MA">Massachusetts</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "MD" ) echo "selected";?> value="MD">Maryland</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "ME" ) echo "selected";?> value="ME">Maine</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "MI" ) echo "selected";?> value="MI">Michigan</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "MN" ) echo "selected";?> value="MN">Minnesota</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "MO" ) echo "selected";?> value="MO">Missouri</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "MS" ) echo "selected";?> value="MS">Mississippi</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "MT" ) echo "selected";?> value="MT">Montana</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "NC" ) echo "selected";?> value="NC">North Carolina</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "ND" ) echo "selected";?> value="ND">North Dakota</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "NE" ) echo "selected";?> value="NE">Nebraska</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "NH" ) echo "selected";?> value="NH">New Hampshire</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "NJ" ) echo "selected";?> value="NJ">New Jersey</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "NM" ) echo "selected";?> value="NM">New Mexico</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "NV" ) echo "selected";?> value="NV">Nevada</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "NY" ) echo "selected";?> value="NY">New York</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "OH" ) echo "selected";?> value="OH">Ohio</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "OK" ) echo "selected";?> value="OK">Oklahoma</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "OR" ) echo "selected";?> value="OR">Oregon</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "PA" ) echo "selected";?> value="PA">Pennsylvania</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "RI" ) echo "selected";?> value="RI">Rhode Island</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "SC" ) echo "selected";?> value="SC">South Carolina</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "SD" ) echo "selected";?> value="SD">South Dakota</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "TN" ) echo "selected";?> value="TN">Tennessee</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "TX" ) echo "selected";?> value="TX">Texas</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "UT" ) echo "selected";?> value="UT">Utah</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "VA" ) echo "selected";?> value="VA">Virginia</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "VT" ) echo "selected";?> value="VT">Vermont</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "WA" ) echo "selected";?> value="WA">Washington</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "WI" ) echo "selected";?> value="WI">Wisconsin</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "WV" ) echo "selected";?> value="WV">West Virginia</option>\r
+                                               <option <?php if ( isset($_SESSION['state'] ) && $_SESSION['state'] === "WY" ) echo "selected";?> value="WY">Wyoming</option>\r
                                        </select>\r
                                        </td>\r
                                </tr>\r
                                <tr>\r
                                        <td class="title_cell">Zip<span class="required">*</span></td>\r
                                        <td class="field_cell">\r
-                                               <input type="text" class="inputbox" name="zip" value="" size="15" />\r
+                                               <input type="text" class="inputbox" name="zip" value="<?php echo isset($_SESSION['zip']) ? $_SESSION['zip'] : ''; ?>" size="15" />\r
                                        </td>\r
                                </tr>\r
                                <tr>\r
                                        <td class="title_cell">Phone</td>\r
                                        <td class="field_cell">\r
-                                               <input type="text" class="inputbox" name="phone" value="" size="15" />\r
+                                               <input type="text" class="inputbox" name="phone" value="<?php echo isset($_SESSION['phone']) ? $_SESSION['phone'] : ''; ?>" size="15" />\r
                                        </td>\r
                                </tr>\r
                                <tr>\r
                                        <td class="title_cell">Email<span class="required">*</span></td>\r
                                        <td class="field_cell">\r
-                                               <input type="text" class="inputbox" name="email" value="" size="40" />\r
+                                               <input type="text" class="inputbox" name="email" value="<?php echo isset($_SESSION['invoice_num']) ? $_SESSION['email'] : ''; ?>" size="40" />\r
                                        </td>\r
                                </tr>\r
                                <tr>\r
@@ -507,7 +522,7 @@ function glm_payment_form() {
                                        <td class="title_cell" valign="top">Amount<span class="required">*</span></td>\r
                                        <td id="amount_container">\r
                                                $ <div style="display: inline-block">\r
-                                                    <input type="text" class="inputbox" name="amount" value="" onchange="deSelectRadio();" size="10" style="display: inline-block" />\r
+                                                    <input type="text" class="inputbox" name="amount" value="<?php echo isset($_SESSION['amount']) ? $_SESSION['amount'] : ''; ?>" onchange="deSelectRadio();" size="10" style="display: inline-block" />\r
                                                     </div>\r
                                        </td>\r
                                </tr>\r
@@ -515,7 +530,7 @@ function glm_payment_form() {
                                <tr id="invoice_num" >\r
                                        <td class="title_cell">Invoice Number</td>\r
                                        <td class="field_cell">\r
-                                               <input type="text" name="invoice_num" class="inputbox" value="" size="20" />\r
+                                               <input type="text" name="invoice_num" class="inputbox" value="<?php echo isset($_SESSION['invoice_num']) ? $_SESSION['invoice_num'] : ''; ?>" size="20" />\r
                                        </td>\r
                                </tr>\r
 \r
@@ -523,16 +538,16 @@ function glm_payment_form() {
                                        <td class="title_cell">Card type<span class="required">*</span></td>\r
                                        <td class="field_cell">\r
                                                <select id="card_type" name="card_type" class="inputbox" >\r
-                                                       <option value="Visa">Visa</option>\r
-                                                       <option value="MasterCard">MasterCard</option>\r
-                                                       <option value="Discover">Discover</option>\r
+                                                       <option <?php if ( isset($_SESSION['card_type'] ) && $_SESSION['card_type'] === "Visa" ) echo "selected";?> value="Visa">Visa</option>\r
+                                                       <option <?php if ( isset($_SESSION['card_type'] ) && $_SESSION['card_type'] === "MasterCard" ) echo "selected";?> value="MasterCard">MasterCard</option>\r
+<!--                                                   <option value="Discover">Discover</option>-->\r
                                                </select>\r
                                        </td>\r
                                </tr>\r
                                <tr id="tr_card_number" >\r
                                        <td class="title_cell">Credit Card Number<span class="required">*</span></td>\r
                                        <td class="field_cell">\r
-                                               <input type="text" name="x_card_num" class="inputbox" onkeyup="checkNumber(this)" value="" size="20" />\r
+                                               <input type="text" name="x_card_num" class="inputbox" onkeyup="checkNumber(this)" value="<?php echo isset($_SESSION['x_card_num']) ? $_SESSION['x_card_num'] : ''; ?>" size="20" />\r
                                        </td>\r
                                </tr>\r
                                <tr id="tr_exp_date" >\r
@@ -540,23 +555,23 @@ function glm_payment_form() {
                                        </td>\r
                                        <td class="field_cell">\r
                                                <select name="exp_month" class="inputbox exp_month" >\r
-                                                       <option value="1" <?php if(date('m')=='01'){?>  selected="selected"<?php }?>>01</option>\r
-                                                       <option value="2" <?php if(date('m')=='02'){?>  selected="selected"<?php }?>>02</option>\r
-                                                       <option value="3" <?php if(date('m')=='03'){?>  selected="selected"<?php }?>>03</option>\r
-                                                       <option value="4" <?php if(date('m')=='04'){?>  selected="selected"<?php }?>>04</option>\r
-                                                       <option value="5" <?php if(date('m')=='05'){?>  selected="selected"<?php }?>>05</option>\r
-                                                       <option value="6" <?php if(date('m')=='06'){?>  selected="selected"<?php }?>>06</option>\r
-                                                       <option value="7" <?php if(date('m')=='07'){?>  selected="selected"<?php }?>>07</option>\r
-                                                       <option value="8" <?php if(date('m')=='08'){?>  selected="selected"<?php }?>>08</option>\r
-                                                       <option value="9" <?php if(date('m')=='09'){?>  selected="selected"<?php }?>>09</option>\r
-                                                       <option value="10" <?php if(date('m')=='10'){?>  selected="selected"<?php }?>>10</option>\r
-                                                       <option value="11" <?php if(date('m')=='11'){?>  selected="selected"<?php }?>>11</option>\r
-                                                       <option value="12" <?php if(date('m')=='12'){?>  selected="selected"<?php }?>>12</option>\r
+                                                       <option value="1" <?php if(isset($_SESSION['exp_month'] ) && $_SESSION['exp_month'] === "1") echo "selected"; if(date('m')=='01'){?>  selected="selected"<?php }?>>01</option>\r
+                                                       <option value="2" <?php if(isset($_SESSION['exp_month'] ) && $_SESSION['exp_month'] === "2") echo "selected"; if(date('m')=='02'){?>  selected="selected"<?php }?>>02</option>\r
+                                                       <option value="3" <?php if(isset($_SESSION['exp_month'] ) && $_SESSION['exp_month'] === "3") echo "selected"; if(date('m')=='03'){?>  selected="selected"<?php }?>>03</option>\r
+                                                       <option value="4" <?php if(isset($_SESSION['exp_month'] ) && $_SESSION['exp_month'] === "4") echo "selected"; if(date('m')=='04'){?>  selected="selected"<?php }?>>04</option>\r
+                                                       <option value="5" <?php if(isset($_SESSION['exp_month'] ) && $_SESSION['exp_month'] === "5") echo "selected"; if(date('m')=='05'){?>  selected="selected"<?php }?>>05</option>\r
+                                                       <option value="6" <?php if(isset($_SESSION['exp_month'] ) && $_SESSION['exp_month'] === "6") echo "selected"; if(date('m')=='06'){?>  selected="selected"<?php }?>>06</option>\r
+                                                       <option value="7" <?php if(isset($_SESSION['exp_month'] ) && $_SESSION['state'] === "7") echo "selected"; if(date('m')=='07'){?>  selected="selected"<?php }?>>07</option>\r
+                                                       <option value="8" <?php if(isset($_SESSION['exp_month'] ) && $_SESSION['exp_month'] === "8") echo "selected"; if(date('m')=='08'){?>  selected="selected"<?php }?>>08</option>\r
+                                                       <option value="9" <?php if(isset($_SESSION['exp_month'] ) && $_SESSION['exp_month'] === "9") echo "selected"; if(date('m')=='09'){?>  selected="selected"<?php }?>>09</option>\r
+                                                       <option value="10" <?php if(isset($_SESSION['exp_month'] ) && $_SESSION['state'] === "10") echo "selected"; if(date('m')=='10'){?>  selected="selected"<?php }?>>10</option>\r
+                                                       <option value="11" <?php if(isset($_SESSION['state'] ) && $_SESSION['exp_month'] === "11") echo "selected"; if(date('m')=='11'){?>  selected="selected"<?php }?>>11</option>\r
+                                                       <option value="12" <?php if(isset($_SESSION['exp_month'] ) && $_SESSION['exp_month'] === "12") echo "selected"; if(date('m')=='12'){?>  selected="selected"<?php }?>>12</option>\r
                                                </select> /\r
                                                <select id="exp_year" name="exp_year" class="inputbox exp_month" >\r
                                                        <?php $year = date(Y,time()); $num = 1;\r
                                                                while ( $num <= 7 ) {\r
-                                                                       echo '<option value="' . $year .'">' . $year . '</option>';$year++; $num++;\r
+                                    echo '<option value="' . $year .'"'. (($_SESSION['exp_year'] == $year)?' selected="selected"':"") . '>' . $year . '</option>';$year++; $num++;\r
                                                                }\r
                                                        ?>\r
                                                </select>\r
@@ -565,7 +580,7 @@ function glm_payment_form() {
                                <tr id="tr_cvv_code" >\r
                                        <td class="title_cell">Card (CVV) Code<span class="required">*</span></td>\r
                                        <td class="field_cell">\r
-                                               <input type="text" name="x_card_code" class="inputbox" onKeyUp="checkNumber(this)" value="" size="20" />\r
+                                               <input type="text" name="x_card_code" class="inputbox" onKeyUp="checkNumber(this)" value="<?php echo isset($_SESSION['x_card_code']) ? $_SESSION['x_card_code'] : ''; ?>" size="20" />\r
                                        </td>\r
                                </tr>\r
 \r
@@ -573,7 +588,7 @@ function glm_payment_form() {
                                <tr>\r
                                        <td class="title_cell">Comment</td>\r
                                        <td class="field_cell">\r
-                                               <textarea rows="7" cols="50" name="comment" class="inputbox"></textarea>\r
+                                               <textarea rows="7" cols="50" name="comment" class="inputbox"><?php echo isset($_SESSION['comment']) ? $_SESSION['comment'] : ''; ?></textarea>\r
                                        </td>\r
                                </tr>\r
                                 <tr id="submit-button">\r
@@ -1217,11 +1232,6 @@ function glm_payment_form() {
                                                return ;\r
                                        }\r
 \r
-\r
-\r
-\r
-\r
-\r
                                        var paymentMethod = "";\r
                                        paymentMethod = "os_authnet";\r
 \r
@@ -1424,7 +1434,8 @@ function glm_payment_form() {
 <?php\r
     $output = apply_filters( 'glm_payment_filter_form', ob_get_contents());\r
     ob_end_clean();\r
-\r
+    \r
     return $output;\r
 }\r
+\r
 ?>\r

diff --git a/includes/payment-function.php b/includes/payment-function.php
index 4b8914b..665cac4 100755 (executable)
--- a/includes/payment-function.php
+++ b/includes/payment-function.php
@@ -7,7 +7,7 @@ function authorizepayment($METHOD_TO_USE,$REQUEST,$address1='',$city='',$state='
         }\r
        else if (!checkCreditCard($REQUEST['x_card_num'], $REQUEST['card_type'], $ccerror, $ccerrortext))\r
        {\r
-               $_SESSION['payment_msg'] = 'Please enter a valid credit card number.';\r
+               $_SESSION['payment_msg'] = 'Please ensure the credit card number, CVV code and expiration date are correct';\r
                return false;\r
        }\r
        else\r
@@ -40,7 +40,6 @@ function authorizepayment($METHOD_TO_USE,$REQUEST,$address1='',$city='',$state='
                        }\r
                        else\r
                        {\r
-                               //echo "1";\r
                                $_SESSION['payment_msg'] = $response->response_reason_text;                             \r
                        }\r
                }\r
@@ -54,8 +53,7 @@ function authorizepayment($METHOD_TO_USE,$REQUEST,$address1='',$city='',$state='
                                        // Transaction approved! Do your logic here.\r
                                        // Redirect the user back to your site.\r
                                        //$return_url = $site_root . 'thank_you_page.php?transaction_id=' .$response->transaction_id;\r
-                                       //echo "2";\r
-                                    paymentemail();\r
+                   paymentemail();\r
                                        \r
                                        return true;\r
                                }\r
@@ -64,7 +62,7 @@ function authorizepayment($METHOD_TO_USE,$REQUEST,$address1='',$city='',$state='
                                        // There was a problem. Do your logic here.\r
                                        // Redirect the user back to your site.\r
                                        $_SESSION['payment_msg'] = $response->response_reason_text;\r
-                                  // echo "3";\r
+       \r
                                        header("Location:".site_url().$_SERVER['REQUEST_URI']);\r
                                        exit;\r
                \r
@@ -73,7 +71,6 @@ function authorizepayment($METHOD_TO_USE,$REQUEST,$address1='',$city='',$state='
                        }\r
                        else\r
                        {\r
-                               //echo "4";\r
                                $_SESSION['payment_msg'] =  "MD5 Hash failed. Check to make sure your MD5 Setting matches the one in";                          \r
                        }\r
                }\r
@@ -282,5 +279,25 @@ function checkCreditCard($cardnumber, $cardname, &$errornumber, &$errortext) {
        // The credit card is in the required format.\r
        return true;\r
 }\r
-\r
+function get_form_input(){\r
+    $_SESSION['first_name']     = (isset($_REQUEST['first_name'])) ? $_REQUEST['first_name'] : '';\r
+    $_SESSION['last_name']      = (isset($_REQUEST['last_name'])) ? $_REQUEST['last_name'] : '';\r
+    $_SESSION['organization']   = (isset($_REQUEST['organization'])) ? $_REQUEST['organization'] : '';\r
+    $_SESSION['address']        = (isset($_REQUEST['address'])) ? $_REQUEST['address'] : '';\r
+    $_SESSION['country']        = (isset($_REQUEST['country'])) ? $_REQUEST['country'] : '';\r
+    $_SESSION['city']           = (isset($_REQUEST['city'])) ? $_REQUEST['city'] : '';\r
+    $_SESSION['state']          = (isset($_REQUEST['state'])) ? $_REQUEST['state'] : '';\r
+    $_SESSION['zip']            = (isset($_REQUEST['zip'])) ? $_REQUEST['zip'] : '';\r
+    $_SESSION['phone']          = (isset($_REQUEST['phone'])) ? $_REQUEST['phone'] : '';\r
+    $_SESSION['email']          = (isset($_REQUEST['email'])) ? $_REQUEST['email'] : '';\r
+    $_SESSION['amount']         = (isset($_REQUEST['amount'])) ? $_REQUEST['amount'] : '';\r
+    $_SESSION['invoice_num']    = (isset($_REQUEST['invoice_num'])) ? $_REQUEST['invoice_num'] : '';\r
+    $_SESSION['card_type']      = (isset($_REQUEST['card_type'])) ? $_REQUEST['card_type'] : '';\r
+    $_SESSION['x_card_num']     = (isset($_REQUEST['x_card_num'])) ? $_REQUEST['x_card_num'] : '';\r
+    $_SESSION['exp_month']      = (isset($_REQUEST['exp_month'])) ? $_REQUEST['exp_month'] : '';\r
+    $_SESSION['exp_year']       = (isset($_REQUEST['exp_year'])) ? $_REQUEST['exp_year'] : '';\r
+    $_SESSION['x_card_code']    = (isset($_REQUEST['x_card_code'])) ? $_REQUEST['x_card_code'] : '';\r
+    $_SESSION['comment']        = (isset($_REQUEST['comment'])) ? $_REQUEST['comment'] : '';\r
+    $_SESSION['payment_method'] = (isset($_REQUEST['payment_method'])) ? $_REQUEST['payment_method'] : '';\r
+}\r
 ?>\r