From 9c0e2878b3dfb3bdf3848d2b04f42afa31a37d97 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Thu, 29 Oct 2020 12:25:14 +0100
Subject: [PATCH] Popravek delaya pri posiljanju emailov - default in min je 2
 / sekundo

---
 admin/survey/SurveyAdminSettings.php          |  6 +++---
 .../classes/class.SurveyInvitationsNew.php    | 12 ++++++------
 .../classes/objects/obj.MailAdapter.php       | 19 ++++++++++++++++---
 sql/update2.sql                               |  4 ++++
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php
index e945ebce1..420dd98c0 100644
--- a/admin/survey/SurveyAdminSettings.php
+++ b/admin/survey/SurveyAdminSettings.php
@@ -3264,13 +3264,13 @@ class SurveyAdminSettings {
 		echo '<p><label>'.$lang['srv_email_setting_host'].'<input type="text" name="SMTPHost2" value="'.$enkaSettings['SMTPHost'].'" ></label>';
 		echo '</p>';
                 #delay 
-		echo '<p><label>'.$lang['srv_email_setting_smtp_delay'].': <select name="SMTPDelay2">'
-                        . '<option value="0" '.($enkaSettings['SMTPDelay']=="0"?'selected="selected"':'') .'>0 </option>'
+		echo '<p><label>'.$lang['srv_email_setting_smtp_delay'].' '.Help::display('srv_inv_delay').': <select name="SMTPDelay2">'
+                        /*. '<option value="0" '.($enkaSettings['SMTPDelay']=="0"?'selected="selected"':'') .'>0 </option>'
                         . '<option value="10000" '.($enkaSettings['SMTPDelay']=="10000"?'selected="selected"':'') .'>0.01 sec (max 100 / sec)</option>'
                         . '<option value="20000" '.($enkaSettings['SMTPDelay']=="20000"?'selected="selected"':'') .'>0.02 sec (max 50 / sec)</option>'
                         . '<option value="50000" '.($enkaSettings['SMTPDelay']=="50000"?'selected="selected"':'') .'>0.05 sec (max 20 / sec)</option>'
                         . '<option value="100000" '.($enkaSettings['SMTPDelay']=="100000"?'selected="selected"':'') .'>0.1 sec (max 10 / sec)</option>'
-                        . '<option value="200000" '.($enkaSettings['SMTPDelay']=="200000"?'selected="selected"':'') .'>0.2 sec (max 5 / sec)</option>'
+                        . '<option value="200000" '.($enkaSettings['SMTPDelay']=="200000"?'selected="selected"':'') .'>0.2 sec (max 5 / sec)</option>'*/
                         . '<option value="500000" '.($enkaSettings['SMTPDelay']=="500000"?'selected="selected"':'') .'>0.5 sec (max 2 / sec)</option>'
                         . '<option value="1000000" '.($enkaSettings['SMTPDelay']=="1000000"?'selected="selected"':'') .'>1 sec (max 1 / sec)</option>'
                         . '<option value="2000000" '.($enkaSettings['SMTPDelay']=="2000000"?'selected="selected"':'') .'>2 sec (max 30 / min)</option>'
diff --git a/admin/survey/classes/class.SurveyInvitationsNew.php b/admin/survey/classes/class.SurveyInvitationsNew.php
index c9492e5c7..72e4273cd 100644
--- a/admin/survey/classes/class.SurveyInvitationsNew.php
+++ b/admin/survey/classes/class.SurveyInvitationsNew.php
@@ -9927,13 +9927,13 @@ class SurveyInvitationsNew {
 		echo '<p><label>'.$lang['srv_email_setting_reply'].'<input type="text" name="SMTPReplyTo0" value="'.$enkaSettings['SMTPReplyTo'].'" ></label>';
         echo '</p>';
         #delay 
-		echo '<p><label>'.$lang['srv_email_setting_smtp_delay'].': <select name="SMTPDelay0">'
-            . '<option value="0" '.($enkaSettings['SMTPDelay']=="0"?'selected="selected"':'') .'>0 </option>'
+		echo '<p><label>'.$lang['srv_email_setting_smtp_delay'].' '.Help::display('srv_inv_delay').': <select name="SMTPDelay0">'
+            /*. '<option value="0" '.($enkaSettings['SMTPDelay']=="0"?'selected="selected"':'') .'>0 </option>'
             . '<option value="10000" '.($enkaSettings['SMTPDelay']=="10000"?'selected="selected"':'') .'>0.01 sec (max 100 / sec)</option>'
             . '<option value="20000" '.($enkaSettings['SMTPDelay']=="20000"?'selected="selected"':'') .'>0.02 sec (max 50 / sec)</option>'
             . '<option value="50000" '.($enkaSettings['SMTPDelay']=="50000"?'selected="selected"':'') .'>0.05 sec (max 20 / sec)</option>'
             . '<option value="100000" '.($enkaSettings['SMTPDelay']=="100000"?'selected="selected"':'') .'>0.1 sec (max 10 / sec)</option>'
-            . '<option value="200000" '.($enkaSettings['SMTPDelay']=="200000"?'selected="selected"':'') .'>0.2 sec (max 5 / sec)</option>'
+            . '<option value="200000" '.($enkaSettings['SMTPDelay']=="200000"?'selected="selected"':'') .'>0.2 sec (max 5 / sec)</option>'*/
             . '<option value="500000" '.($enkaSettings['SMTPDelay']=="500000"?'selected="selected"':'') .'>0.5 sec (max 2 / sec)</option>'
             . '<option value="1000000" '.($enkaSettings['SMTPDelay']=="1000000"?'selected="selected"':'') .'>1 sec (max 1 / sec)</option>'
             . '<option value="2000000" '.($enkaSettings['SMTPDelay']=="2000000"?'selected="selected"':'') .'>2 sec (max 30 / min)</option>'
@@ -10009,13 +10009,13 @@ class SurveyInvitationsNew {
         echo '</p>';
         
         #delay 
-		echo '<p><label>'.$lang['srv_email_setting_smtp_delay'].': <select name="SMTPDelay2">'
-                        . '<option value="0" '.($enkaSettings['SMTPDelay']=="0"?'selected="selected"':'') .'>0 </option>'
+		echo '<p><label>'.$lang['srv_email_setting_smtp_delay'].' '.Help::display('srv_inv_delay').': <select name="SMTPDelay2">'
+                        /*. '<option value="0" '.($enkaSettings['SMTPDelay']=="0"?'selected="selected"':'') .'>0 </option>'
                         . '<option value="10000" '.($enkaSettings['SMTPDelay']=="10000"?'selected="selected"':'') .'>0.01 sec (max 100 / sec)</option>'
                         . '<option value="20000" '.($enkaSettings['SMTPDelay']=="20000"?'selected="selected"':'') .'>0.02 sec (max 50 / sec)</option>'
                         . '<option value="50000" '.($enkaSettings['SMTPDelay']=="50000"?'selected="selected"':'') .'>0.05 sec (max 20 / sec)</option>'
                         . '<option value="100000" '.($enkaSettings['SMTPDelay']=="100000"?'selected="selected"':'') .'>0.1 sec (max 10 / sec)</option>'
-                        . '<option value="200000" '.($enkaSettings['SMTPDelay']=="200000"?'selected="selected"':'') .'>0.2 sec (max 5 / sec)</option>'
+                        . '<option value="200000" '.($enkaSettings['SMTPDelay']=="200000"?'selected="selected"':'') .'>0.2 sec (max 5 / sec)</option>'*/
                         . '<option value="500000" '.($enkaSettings['SMTPDelay']=="500000"?'selected="selected"':'') .'>0.5 sec (max 2 / sec)</option>'
                         . '<option value="1000000" '.($enkaSettings['SMTPDelay']=="1000000"?'selected="selected"':'') .'>1 sec (max 1 / sec)</option>'
                         . '<option value="2000000" '.($enkaSettings['SMTPDelay']=="2000000"?'selected="selected"':'') .'>2 sec (max 30 / min)</option>'
diff --git a/admin/survey/classes/objects/obj.MailAdapter.php b/admin/survey/classes/objects/obj.MailAdapter.php
index 9811d19fc..393cc475c 100644
--- a/admin/survey/classes/objects/obj.MailAdapter.php
+++ b/admin/survey/classes/objects/obj.MailAdapter.php
@@ -140,6 +140,10 @@ class MailAdapter{
 				$this->settings['1ka']['SMTPUsername'] = $email_server_settings['secondary_mail']['SMTPUsername'];
 				$this->settings['1ka']['SMTPPassword'] = $email_server_settings['secondary_mail']['SMTPPassword'];
             }
+
+            // Nastavimo default delay
+            if(!isset($this->settings['1ka']['SMTPDelay']) || $this->settings['1ka']['SMTPDelay'] == '' || $this->settings['1ka']['SMTPDelay'] == '0')
+                $this->settings['1ka']['SMTPDelay'] = 500000;
         }
         // Nimamo se nicesar v bazi - nastavimo default nastavitve
         else{
@@ -160,6 +164,8 @@ class MailAdapter{
             if(isset($email_server_settings['SMTPSecure']))
                 $this->settings['1ka']['SMTPSecure'] = $email_server_settings['SMTPSecure'];
 
+            // Nastavimo default delay
+            $this->settings['1ka']['SMTPDelay'] = 500000;
 
             // Nastavimo gmail smtp
             $this->settings['google']['SMTPHost'] = 'smtp.gmail.com';
@@ -167,6 +173,9 @@ class MailAdapter{
             $this->settings['google']['SMTPSecure'] = 'tls';
             $this->settings['google']['SMTPAuth'] = 1;
 
+            // Nastavimo default delay
+            $this->settings['google']['SMTPDelay'] = 500000;
+
             
             // Ce imamo nastavljeno, da se za posiljanje iz ankete uporabi isti smtp streznik kot za generalno posiljanje
             if($email_server_fromSurvey){
@@ -234,6 +243,9 @@ class MailAdapter{
             $this->settings['smtp']['SMTPUsername'] = $email_server_settings['payments_mail']['SMTPUsername'];
             $this->settings['smtp']['SMTPPassword'] = $email_server_settings['payments_mail']['SMTPPassword'];
         }
+
+        // Nastavimo default delay
+        $this->settings['smtp']['SMTPDelay'] = 500000;
     }
 
 
@@ -569,9 +581,10 @@ class MailAdapter{
             $SL->write();
                         
 						
-            // Dodamo pavzo po pošiljanju ce je nastavljena!
-            if (isset($settings['SMTPDelay']) && intval($settings['SMTPDelay']) > 0) {
-                usleep ($settings['SMTPDelay']);
+            // Dodamo pavzo po pošiljanju ce je nastavljena - default je vedno 2 / sekundo
+            $delay = (isset($settings['SMTPDelay']) && intval($settings['SMTPDelay']) > 0) ? $settings['SMTPDelay'] : 500000;
+            if($delay > 0){
+                usleep ($delay);
             }
 
             return $success;
diff --git a/sql/update2.sql b/sql/update2.sql
index 1f9f1fa0b..8fd0c7562 100644
--- a/sql/update2.sql
+++ b/sql/update2.sql
@@ -9335,3 +9335,7 @@ UPDATE misc SET value='20.10.20' WHERE what="version";
 ALTER TABLE user_access_paypal_transaction CHANGE transaction_id transaction_id VARCHAR(100) NOT NULL DEFAULT '';
 
 UPDATE misc SET value='20.10.25' WHERE what="version";
+
+INSERT INTO srv_help (help, what) VALUES ('Pri pošiljanju email vabil na več naslovov je vklopljena zakasnitev, kar pomeni da med e-poštnim sporočilom, poslanim enemu naslovniku, in e-poštnim sporočilom, poslanim naslednjemu naslovniku, preteče najmanj 2 sekundi. Ta čas lahko po potrebi spremenite (glede na zmogljivosti vašega strežnika). ', 'srv_inv_delay');
+
+UPDATE misc SET value='20.10.29' WHERE what="version";