Calc form submit time for Fast Reply form

CleanTalk · Jan 14, 2015 · 6336614 · 6336614
1 parent 7e8db4b
commit 6336614
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 14 deletions.
diff --git a/CleantalkMod.php b/CleantalkMod.php
@@ -50,9 +50,7 @@ function cleantalk_check_register(&$regOptions, $theme_vars)
 
     $ct_request->sender_nickname = isset($regOptions['username']) ? $regOptions['username'] : '';
 
-    if (isset($_SESSION['cleantalk_registration_form_start_time'])) {
-        $ct_request->submit_time = time() - $_SESSION['cleantalk_registration_form_start_time'];
-    }
+    $ct_request->submit_time = cleantalk_get_form_submit_time(-1);
 
     if (isset($_POST['ct_checkjs'])) {
         $ct_request->js_on = $_POST['ct_checkjs'] == cleantalk_get_checkjs_code() ? 1 : 0;
@@ -135,10 +133,7 @@ function cleantalk_check_message(&$msgOptions, $topicOptions, $posterOptions)
     $ct_request->sender_nickname = isset($posterOptions['name']) ? $posterOptions['name'] : '';
     $ct_request->message = $msgOptions['body'];
 
-    $formSeq = $_POST['seqnum'];
-    if (isset($_SESSION['cleantalk_post_form_start_time'][$formSeq])) {
-        $ct_request->submit_time = time() - $_SESSION['cleantalk_post_form_start_time'][$formSeq];
-    }
+    $ct_request->submit_time = cleantalk_get_form_submit_time($_POST['seqnum']);
 
     if (isset($_POST['ct_checkjs'])) {
         $ct_request->js_on = $_POST['ct_checkjs'] == cleantalk_get_checkjs_code() ? 1 : 0;
@@ -272,5 +267,24 @@ function cleantalk_print_js_input()
 {
     $id = uniqid('ct_checkjs');
     echo '<input type="hidden" name="ct_checkjs" id="', $id, '" value="ok" />',
-        '<script type="text/javascript">document.getElementById("', $id, '").value ="', cleantalk_get_checkjs_code(), '</script>';
+    '<script type="text/javascript">document.getElementById("', $id, '").value ="', cleantalk_get_checkjs_code(), '"</script>';
+}
+
+/**
+ * Store form start time
+ * @param int $formSeq
+ */
+function cleantalk_store_form_start_time($formSeq)
+{
+    $_SESSION['cleantalk_form_start_time'][$formSeq] = time();
+}
+
+/**
+ * Get form submit time
+ * @param int $formSeq
+ * @return int|null
+ */
+function cleantalk_get_form_submit_time($formSeq)
+{
+    return isset($_SESSION['cleantalk_form_start_time'][$formSeq]) ? time() - $_SESSION['cleantalk_form_start_time'][$formSeq] : null;
 }
diff --git a/modification.xml b/modification.xml
@@ -9,12 +9,19 @@
 			<add><![CDATA[if (!isset($_POST['regSubmit']))
 	{
 		// cleantalk set start time of registration
-		$_SESSION['cleantalk_registration_form_start_time'] = time();
+		cleantalk_store_form_start_time(-1);
 	}
 ]]>
 </add>
 		</operation>
 	</file>
+    <file name="$sourcedir/Security.php">
+        <operation>
+            <search position="before"><![CDATA[$context['form_sequence_number'] = mt_rand(1, 16000000);]]></search>
+            <add><![CDATA[cleantalk_store_form_start_time($context['form_sequence_number']);]]>
+</add>
+        </operation>
+    </file>
 
 	<file name="$themedir/Register.template.php">
 		<operation>
@@ -30,11 +37,6 @@
             <add><![CDATA[cleantalk_check_message($msgOptions, $topicOptions, $posterOptions);]]>
             </add>
         </operation>
-        <operation>
-            <search position="after"><![CDATA[// Finally, load the template.]]></search>
-            <add><![CDATA[/*For CleanTalk form submit time*/ if ($context['current_action'] == 'post'){ $_SESSION['cleantalk_post_form_start_time'][$context['form_sequence_number']] = time();}]]>
-</add>
-        </operation>
     </file>
     <file name="$sourcedir/Subs-Post.php">
         <operation>