From 2f7ddd989d2e0db4e33c2fc9e55408ebefddba2d Mon Sep 17 00:00:00 2001
From: Pentium44 <cdorm245@gmail.com>
Date: Sun, 13 Dec 2020 18:41:34 -0800
Subject: [PATCH] Call this v1.3.3

---
 README.md   |  5 +++++
 config.php  |  5 +++--
 index.php   | 43 +++++++++++++++++++++++++++++++++----------
 style.css   |  3 ++-
 version.php | 10 ++++++++++
 5 files changed, 53 insertions(+), 13 deletions(-)
 create mode 100644 version.php

diff --git a/README.md b/README.md
index f65871c..c5ba079 100755
--- a/README.md
+++ b/README.md
@@ -60,6 +60,11 @@ Read-Write access for working directory
 
 
 #### Changelog
+* v1.3.3:
+    * Tweaked main page from "Connected to:" to "Using:"
+    * Keep JS from processing if irc.php is not active.
+    * CSS tweaks
+
 * v1.3.2:
     * Fix irc.php private message bug with array.
     * Fix irc.php saving logs in incorrect locations.
diff --git a/config.php b/config.php
index 45c3e97..c758194 100755
--- a/config.php
+++ b/config.php
@@ -17,8 +17,9 @@ $allowMultiServer = "true"; // [true/false] Allow users to set other IRC servers
 ///// WEBCLIENT LAYOUT /////
 $ipcolor = "#00FF00";
 
-///// NO TOUCHY SECTION /////
-$version = "1.3.2"; // IdleIRC version
+///// NO TOUCH /////
+// Include software version in another php file for the sake of git pull
+include_once("version.php");
 
 function doLog($string) {
 	file_put_contents($GLOBALS['logfile'], $string . "\r\n", FILE_APPEND);
diff --git a/index.php b/index.php
index aa443f4..b144077 100755
--- a/index.php
+++ b/index.php
@@ -173,6 +173,12 @@ if (isset($_GET['do']) && $_GET['do']=="login" && isset($_POST['submitBtn']) &&
    <meta http-equiv="content-type" content="text/html; charset=utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=.5, shrink-to-fit=yes">
     <script language="javascript" type="text/javascript">
+<?php
+
+if(file_exists("users/." . $_SESSION['idleirc-user'] . ".pingfile"))
+{
+
+?>
     <!--
 		var httpObject = null;
 		var link = "";
@@ -355,15 +361,15 @@ if (isset($_GET['do']) && $_GET['do']=="login" && isset($_POST['submitBtn']) &&
 		}
 
 		function doClearLog() {
-                        ajaxVar = getHTTPObject();
-                        if(ajaxVar != null) {
-                                link = "server.php?do=clearlog&nick="+nickName;
-                                ajaxVar.open("GET", link, true);
-                                ajaxVar.onreadystatechange = setHtml;
-                                ajaxVar.send(null);
+            ajaxVar = getHTTPObject();
+            if(ajaxVar != null) {
+                link = "server.php?do=clearlog&nick="+nickName;
+                ajaxVar.open("GET", link, true);
+                ajaxVar.onreadystatechange = setHtml;
+                ajaxVar.send(null);
 				setTimeout(function() { window.location.reload(); },1000);
-                        }
-                }
+            }
+        }
 
 		function doLogout() {
 			ajaxVar = getHTTPObject();
@@ -392,12 +398,29 @@ if (isset($_GET['do']) && $_GET['do']=="login" && isset($_POST['submitBtn']) &&
         if(Notification.permission !== "granted") {
             Notification.requestPermission();
         }
+<?php
+    } else {
+?>
+
+        function getInput() {
+            // IRC bouncer not running, warn
+            alert("You're not connected to the server, please connect your bouncer to send messages");
+        }
+
+        function keypressed(e) {
+            if(e.keyCode=='13'){
+                getInput();
+            }
+        }
+<?php
+    }
+?>
     //-->
     </script>   
 </head>
-<body<?php if(!isset($_GET['register']) && !isset($_GET['logs']) && !isset($_GET['settings']) && isset($_SESSION['idleirc-user'])) { echo ' onload="UpdateTimer();"'; } ?>>
+<body<?php if(!isset($_GET['register']) && !isset($_GET['logs']) && !isset($_GET['settings']) && isset($_SESSION['idleirc-user']) && file_exists("users/." . $_SESSION['idleirc-user'] . ".pingfile")) { echo ' onload="UpdateTimer();"'; } ?>>
      <div class="info"><?php echo $title . " " . $version;
-     if(isset($_SESSION['idleirc-user'])) { echo " ~ Connected to: " . $_SESSION['idleirc-servaddr'] . ":" . $_SESSION['idleirc-servport'] . " on " . $_SESSION['idleirc-channel']; } ?></div>
+     if(isset($_SESSION['idleirc-user'])) { echo " ~ Using: " . $_SESSION['idleirc-servaddr'] . ":" . $_SESSION['idleirc-servport'] . " on " . $_SESSION['idleirc-channel']; } ?></div>
 <?php
 
 if (isset($_GET['register'])) {
diff --git a/style.css b/style.css
index 54aa6d8..6dfac25 100755
--- a/style.css
+++ b/style.css
@@ -59,7 +59,8 @@ input, button, select, textarea{
 }
 
 .form table {
-    width: 60%;
+    min-width: 250px;
+    max-width: 600px;
     margin: auto;
 }
 
diff --git a/version.php b/version.php
new file mode 100644
index 0000000..e54c715
--- /dev/null
+++ b/version.php
@@ -0,0 +1,10 @@
+<?php
+///////
+// IdleIRC - 2020
+// (C) Chris Dorman, GPLv3
+// https://github.com/Pentium44/idleirc
+///////
+
+$version = "1.3.3"; // IdleIRC version
+
+?>