Changeset 9221
- Timestamp:
- 03/15/10 13:26:52 (2 years ago)
- Files:
-
- modules/branches/2.5 (modified) (1 prop)
- modules/branches/2.5/sipstation/page.sipstation.php (modified) (3 diffs)
- modules/branches/2.5/sipstation/sipstation.utility.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
modules/branches/2.5
- Property svnmerge-integrated changed from /modules/branches/2.4:1-5852,5908 /modules/branches/2.6:1-7080,7132,7158-7174,7177,7179-7186,7191-7202,7204-7226,7228-7250,7252-7273,7279-7286,7289-7292,7294-7295,7297-7312,7317-7331,7333-7340,7411,7413,7415-7417,7419-7420,7423-7434,7438-7439,7441-7442,7444-7446,7458-7469,7553,7609-7622,7697,7699-7701,7703-7707,7709-7710,7713-7722,7725-7731,7735-7736,7739-7740,7744-7751,7753-7759,7761-7774,7776-7787,7789-7791,7793-7795,7798,7806-7809,7811-7813,7816,7818-7821,7838,7858-7867,7871,7874-7882,7886-7893,7895-7896,7901,8589,8613,8620,8651,8672,8691,8710,8822,8884 to /modules/branches/2.4:1-5852,5908 /modules/branches/2.6:1-7080,7132,7158-7174,7177,7179-7186,7191-7202,7204-7226,7228-7250,7252-7273,7279-7286,7289-7292,7294-7295,7297-7312,7317-7331,7333-7340,7411,7413,7415-7417,7419-7420,7423-7434,7438-7439,7441-7442,7444-7446,7458-7469,7553,7609-7622,7697,7699-7701,7703-7707,7709-7710,7713-7722,7725-7731,7735-7736,7739-7740,7744-7751,7753-7759,7761-7774,7776-7787,7789-7791,7793-7795,7798,7806-7809,7811-7813,7816,7818-7821,7838,7858-7867,7871,7874-7882,7886-7893,7895-7896,7901,8589,8613,8620,8651,8672,8691,8710,8822,8884,9220
modules/branches/2.5/sipstation/page.sipstation.php
r8823 r9221 38 38 default: 39 39 } 40 $status = sipstation_check_key(); // nokey, valid, invalid, noserver 40 $status = sipstation_check_key(); // nokey, valid, invalid, noserver, tempnotavail 41 41 ?> 42 42 </div> … … 93 93 case 'invalid': // nokey 94 94 case 'noserver': 95 case 'tempnotavail': 95 96 ?> 96 97 <tr class="account_access_section"> … … 116 117 <ul> 117 118 <?php 118 if ($status == 'invalid') { 119 switch ($status) { 120 case 'invalid': 119 121 echo _("Your key is no longer valid. Click below to remove the current key. To obtain a new key and use this module, visit the portal at https://store.freepbx.com and log into your account."); 120 } else { 122 break; 123 case 'tempnotavail': 124 echo _("The server is currenlty unavailable and we can not process you request. Please check back with us later. We apologize for the inconvenience."); 125 break; 126 default: 121 127 echo _("The server is currently not responding. It is either unavailable or access is being blocked. If the server is unavailable, please try again later."); 122 128 } modules/branches/2.5/sipstation/sipstation.utility.php
r8823 r9221 146 146 case 'SUCCESS': 147 147 return 'valid'; 148 case 'TEMPNOTAVAIL': 149 return 'tempnotavail'; 148 150 case 'BADKEY': 149 151 sipstation_remove_key(); … … 159 161 global $db; 160 162 $status = sipstation_confirm_key($key); 161 if ($status == 'valid' ) {163 if ($status == 'valid' || $status == 'tempnotavail') { 162 164 $data4sql = $db->escapeSimple($key); 163 165 sql("DELETE FROM `module_xml` WHERE `id` = 'sipstation_key'"); … … 259 261 // freepbx_debug(curl_getinfo($ch)); 260 262 261 // TODO: if ($xml === false) {handle it, retry, etc.263 // TODO: if ($xml === false) handle it, retry, etc. 262 264 // TODO: or at least toss in some error xml response 263 265 curl_close ($ch);
