Merge pull request #384 from mkoch227/bug-fix-screen-res

Closes #383 Fix screen res on index page

admin/admin_submit_ticket.php

@@ -234,8 +234,8 @@ $tmpvar['html'] = $modsForHesk_settings['rich_text_for_tickets'];
 
 // Set user agent and screen res to null
 $tmpvar['user_agent'] = NULL;
-$tmpvar['screen_resolution_height'] = NULL;
-$tmpvar['screen_resolution_width'] = NULL;
+$tmpvar['screen_resolution_height'] = "NULL";
+$tmpvar['screen_resolution_width'] = "NULL";
 
 // Insert ticket to database
 $ticket = hesk_newTicket($tmpvar);

inc/pipe_functions.inc.php

@@ -304,8 +304,8 @@ function hesk_email2ticket($results, $pop3 = 0, $set_category = 1, $set_priority
     $tmpvar['longitude'] = NULL;
     $tmpvar['html'] = 0;
     $tmpvar['user_agent'] = NULL;
-    $tmpvar['screen_resolution_width'] = NULL;
-    $tmpvar['screen_resolution_height'] = NULL;
+    $tmpvar['screen_resolution_width'] = "NULL";
+    $tmpvar['screen_resolution_height'] = "NULL";
 
     // Insert ticket to database
     $ticket = hesk_newTicket($tmpvar);

inc/posting_functions.inc.php

@@ -147,8 +147,8 @@ function hesk_newTicket($ticket, $isVerified = true)
 		'" . hesk_dbEscape($ticket['longitude']) . "',
 		'" . hesk_dbEscape($ticket['html']) . "',
 		'" . hesk_dbEscape($ticket['user_agent']) . "',
-		'" . hesk_dbEscape($ticket['screen_resolution_height']) . "',
-		'" . hesk_dbEscape($ticket['screen_resolution_width']) . "'
+		" . hesk_dbEscape($ticket['screen_resolution_height']) . ",
+		" . hesk_dbEscape($ticket['screen_resolution_width']) . "
 	)
 	");
 

index.php

@@ -1121,6 +1121,8 @@ function print_add_ticket()
                                 <input type="hidden" id="latitude" name="latitude" value="E-0">
                                 <input type="hidden" id="longitude" name="longitude" value="E-0">
                                 <input type="hidden" name="token" value="<?php hesk_token_echo(); ?>">
+                                <input type="hidden" id="screen-resolution-height" name="screen_resolution_height">
+                                <input type="hidden" id="screen-resolution-width" name="screen_resolution_width">
                                 <input type="submit" value="<?php echo $hesklang['sub_ticket']; ?>"
                                        class="btn btn-default">
                             </div>

submit_ticket.php

@@ -364,8 +364,8 @@ $tmpvar['longitude'] = hesk_POST('longitude');
 $tmpvar['html'] = $modsForHesk_settings['rich_text_for_tickets_for_customers'];
 
 // Set screen res and user agent
-$tmpvar['screen_resolution_height'] = hesk_POST('screen_resolution_height');
-$tmpvar['screen_resolution_width'] = hesk_POST('screen_resolution_width');
+$tmpvar['screen_resolution_height'] = hesk_POST('screen_resolution_height', "NULL");
+$tmpvar['screen_resolution_width'] = hesk_POST('screen_resolution_width', "NULL");
 $tmpvar['user_agent'] = $_SERVER['HTTP_USER_AGENT'];
 
 // Should the helpdesk validate emails?