Fixes #631, #243: Option to reset to default provided to outgoing server

layouts/v7/modules/Settings/Vtiger/OutgoingServerEdit.tpl

@@ -29,6 +29,9 @@
 					</div>
 					<div class="block">
 						<div>
+							<div class="btn-group pull-right">
+								<button class="btn t-btn resetButton" type="button" title="{vtranslate('LBL_RESET_TO_DEFAULT', $QUALIFIED_MODULE)}"><strong>{vtranslate('LBL_RESET_TO_DEFAULT', $QUALIFIED_MODULE)}</strong></button>
+							</div>
 							<h4>{vtranslate('LBL_MAIL_SERVER_SMTP', $QUALIFIED_MODULE)}</h4>
 						</div>
 						<hr>
@@ -86,4 +89,4 @@
 			</form>
 		</div>
 	</div>
-{/strip}
\ No newline at end of file
+{/strip}

modules/Settings/Vtiger/actions/OutgoingServerSaveAjax.php

@@ -21,9 +21,13 @@ class Settings_Vtiger_OutgoingServerSaveAjax_Action extends Settings_Vtiger_Basi
         }
         $response = new Vtiger_Response();
         try{
-            $id = $outgoingServerSettingsModel->save($request);
-            $data = $outgoingServerSettingsModel->getData();
-            $response->setResult($data);
+            if ($loadDefaultSettings == "true") {
+                $response->setResult('OK');
+            } else {
+                $id = $outgoingServerSettingsModel->save($request);
+                $data = $outgoingServerSettingsModel->getData();
+                $response->setResult($data);
+            }
         }catch(Exception $e) {
             $response->setError($e->getCode(), $e->getMessage());
         }
@@ -33,4 +37,4 @@ class Settings_Vtiger_OutgoingServerSaveAjax_Action extends Settings_Vtiger_Basi
     public function validateRequest(Vtiger_Request $request) {
         $request->validateWriteAccess();
     }
-}
\ No newline at end of file
+}

modules/Settings/Vtiger/models/OutgoingServer.php

@@ -24,11 +24,17 @@ class Settings_Vtiger_OutgoingServer_Model extends Settings_Vtiger_Systems_Model
                 <br><br>Thanks  and  Regards,<br> Team vTiger <br><br>';
     }
     
-    public function loadDefaultValues() {
+	public function loadDefaultValues() {
         $defaultOutgoingServerDetails = VtigerConfig::getOD('DEFAULT_OUTGOING_SERVER_DETAILS');
+        if (empty($defaultOutgoingServerDetails)) {
+            $db = PearDatabase::getInstance();
+            $db->pquery('DELETE FROM vtiger_systems WHERE server_type = ?', array('email'));
+            return;
+        }
         foreach ($defaultOutgoingServerDetails as $key=>$value){
             $this->set($key,$value);
         }
+
         $this->defaultLoaded = true;
     }
 	
@@ -76,4 +82,4 @@ class Settings_Vtiger_OutgoingServer_Model extends Settings_Vtiger_Systems_Model
         } 
         return parent::save();
     }
-}
\ No newline at end of file
+}