big fix

2016-03-30 08:06:51 +01:00 · 2016-03-30 08:06:51 +01:00 · d1f6ed97a7
commit d1f6ed97a7
parent 3e34755212
10 changed files with 100 additions and 21 deletions
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@ -1,6 +1,8 @@
 2.5.2
 Removed Old Update Code
 Added Change Log
-Removed MovieLib
+Replaced Movielib with Kodi Remote
 Fixed K-Loud Status
-Repllace SickRage with SickGear (Set name manually via config)
+Replaced SickRage with SickGear (Set name manually via config)
+Blocked search engines crawling website via robots.txt
+Added Google Search Widget
--- a/Update.bat
+++ b/Update.bat
@ -401,7 +401,7 @@ findstr "KworldWidget" config.php >nul 2>&1
   :ONE
     echo ^<?php >>config.php
 	 echo //// KworldWidget >> config.php
-	 echo $KworldWidget = "1"; >> config.php
+	 echo $KworldWidget = "0"; >> config.php
 	 echo $http2 = "http://"; >> config.php
 	 echo $https = "https://"; >> config.php
 	 echo //// >> config.php
@ -410,8 +410,44 @@ findstr "KworldWidget" config.php >nul 2>&1
 	 goto END
   :END
   
+        rem KodiSettings episodes
+findstr "KodiIP" config.php >nul 2>&1
+   if errorlevel 1 goto ONE
+   if errorlevel 0 goto ZERO
+   goto END
+   :ZERO
+     echo Kodi Remote Already Updated
+	 goto END
+   :ONE
+     echo ^<?php >>config.php
+	 echo //// KodiRemote >> config.php
+	 echo $KodiIP = ""; >> config.php
+	 echo $KodiUser = ""; >> config.php
+	 echo $KodiPass = ""; >> config.php
+	 echo //// >> config.php
+	 echo ^?^> >> config.php
+	 echo KodiRemote Updated
+	 goto END
+   :END
   
-   
+       rem google
+findstr "GoogleSearch" config.php >nul 2>&1
+   if errorlevel 1 goto ONE
+   if errorlevel 0 goto ZERO
+   goto END
+   :ZERO
+     echo GoogleSearch Already Updated
+	 goto END
+   :ONE
+     echo ^<?php >>config.php
+	 echo //// GoogleSearch >> config.php
+	 echo $GoogleSearch = "1"; >> config.php
+	 echo //// >> config.php
+	 echo ^?^> >> config.php
+	 echo GoogleSearch Updated
+	 goto END
+   :END
+      
   rem Update Version
 findstr "localversion" config.php >nul 2>&1
   if errorlevel 1 goto ONE
--- a/config/menu.php
+++ b/config/menu.php
@ -1,2 +1 @@
-<a href="set1.php" target="main">General</a> - <a href="set2.php" target="main">SAB/Couch/Sick</a> - <a href="set3.php" target="main">Others</a> - <a href="set4.php" target="main">Drive Space</a> - <a href="set5.php" target="main">RSS/Server Statuses</a> - <a href="PicUpload.html" target="main">Picture Upload</a> - <a href="/../ManUpdate.php" target="main">Manual Update</a> - <a href="/../download.php" target="main">Download Config File</a>
-
+<a href="set1.php" target="main">General</a> - <a href="set2.php" target="main">SAB/Couch/Sick</a> - <a href="set3.php" target="main">Others</a> - <a href="set4.php" target="main">Drive Space</a> - <a href="set5.php" target="main">RSS/Server Statuses</a> - <a href="PicUpload.html" target="main">Picture Upload</a> - <a href="/../download.php" target="main">Download Config File</a>
--- a/config/set1.php
+++ b/config/set1.php
@ -32,14 +32,20 @@
 	KKnowledge Widget Enabled:  <input name="kknowledgefeedvisible" id="id" type="checkbox" <?php if($kknowledgefeedvisible > "0")  echo "checked=checked; "; ?> /><br />
 	Klips Widget Enabled:  <input name="webclipfeedvisible" id="id" type="checkbox" <?php if($webclipfeedvisible > "0")  echo "checked=checked; "; ?> /><br />
 	Server Uptime Widget Enabled:  <input name="uptimevisible" id="id" type="checkbox" <?php if($uptimevisible > "0")  echo "checked=checked; "; ?> /><br />
-	Coming Episodes Widget Enabled:  <input name="mediawidget" id="id" type="checkbox" <?php if($mediawidget > "0")  echo "checked=checked; "; ?> /> - Week View:  <input name="mediawidget2" id="id" type="checkbox" <?php if($mediawidget2 > "0")  echo "checked=checked; "; ?> /><br /><br />
+	Google Search Widget Enabled:  <input name="GoogleSearch" id="id" type="checkbox" <?php if($GoogleSearch > "0")  echo "checked=checked; "; ?> /><br />
 	</div>
 <div style="float:right; width:50%; ">	
 	Konvos Chatbox Enabled:  <input name="konvoschat" id="id" type="checkbox" <?php if($konvoschat > "0")  echo "checked=checked; "; ?> /><br />
 	Konvos Widget Enabled:  <input name="konvosvisible" id="id" type="checkbox" <?php if($konvosvisible > "0")  echo "checked=checked; "; ?> /><br />
 	<br />
+	Kodi Remote:  <input name="kodivisible" id="id" type="checkbox" <?php if($kodivisible > "0")  echo "checked=checked; "; ?> /> - (IP:PORT)  <input type="text" value="<?php echo $KodiIP ?>" name="KIP" /><br />
+	Kodi Username  <input type="text" value="<?php echo $KodiUser ?>" name="KodiUser" /><br />
+	Kodi Password  <input type="text" value="<?php echo $KodiPass ?>" name="KodiPass" />
+	<br />
+	<br />
 	Kodi Libary Stats:  <input name="MStatusEnabled" id="id" type="checkbox" <?php if($MStatusEnabled > "0")  echo "checked=checked; "; ?> />
 	<br />
+	Coming Episodes Widget Enabled:  <input name="mediawidget" id="id" type="checkbox" <?php if($mediawidget > "0")  echo "checked=checked; "; ?> /> - Week View:  <input name="mediawidget2" id="id" type="checkbox" <?php if($mediawidget2 > "0")  echo "checked=checked; "; ?> /><br />
 	Kodi Libary Background Colour: <input class="color" name="mediastatscolour" value="<?php echo $mediastatscolour ?>"</td>
 	<br />
 	Kodi Libary Text Colour: <input class="color" name="mediastatstextcolour" value="<?php echo $mediastatstextcolour ?>"</td>
--- a/config/write1.php
+++ b/config/write1.php
@ -24,6 +24,10 @@ $mediastatscolour1 = $_POST['mediastatscolour'];
 $mediastatstextcolour1 = $_POST['mediastatstextcolour'];
 $uptimevisible1 = $_POST['uptimevisible'];
 $KworldWidget1 = $_POST['KworldWidget'];
+$KIP1 = $_POST['KIP'];
+$KodiUser1 = $_POST['KodiUser'];
+$KodiPass1 = $_POST['KodiPass'];
+$GoogleSearch1 = $_POST['GoogleSearch'];

 //
 $fl='../config.php'; 
@ -46,6 +50,16 @@ $content =   preg_replace( '/\$widgetcolour = \"(.*?)\";/', '$widgetcolour = "#'
 } else {
 $content =   preg_replace( '/\$showversion = \"(.*?)\";/', '$showversion = "1";', $content);
 }
+ // google Settings
+ if (empty($GoogleSearch1)) {
+    $content =   preg_replace( '/\$GoogleSearch = \"(.*?)\";/', '$GoogleSearch = "0";', $content);
+ } else {
+ $content =   preg_replace( '/\$GoogleSearch = \"(.*?)\";/', '$GoogleSearch = "1";', $content);
+ }
+ // Kodi IP
+ $content =   preg_replace( '/\$KodiIP = \"(.*?)\";/', '$KodiIP = "'.$KIP1.'";', $content);
+ $content =   preg_replace( '/\$KodiUser = \"(.*?)\";/', '$KodiUser = "'.$KodiUser1.'";', $content);
+ $content =   preg_replace( '/\$KodiPass = \"(.*?)\";/', '$KodiPass = "'.$KodiPass1.'";', $content);
 // KworldWidget Settings
 if (empty($KworldWidget1)) {
    $content =   preg_replace( '/\$KworldWidget = \"(.*?)\";/', '$KworldWidget = "0";', $content);
--- a/feeds/google.php
+++ b/feeds/google.php
@ -0,0 +1,23 @@
+<body>
+<table width='275' cellspacing='0' cellpadding='1'>
+  <tr onclick="toggleNextRow(this)">
+    <th style='text-align: left;'><font color='white'>Google Search</font></th>
+  </tr>
+  <tr>
+    <td  BGCOLOR='#FFFFFF'>
+	<div id="Uptime" style="font:11pt Arial; color:#0066FF;">
+<form method="get" action="http://www.google.co.uk/search" target="_blank">
+<div>
+<table border="0" cellpadding="0">
+<tr><td>
+<input type="text"   name="q" size="24"
+maxlength="255" value="" />
+<input type="submit" value="Search" /></td></tr>
+<tr></tr></table>
+</div>
+</form>
+</div>
+</select>
+</form>
+</td>
+</table>
--- a/links/kodi.php
+++ b/links/kodi.php
@ -1,9 +1,9 @@
 <?php include 'config.php';?>
 <?php
 if (empty($kodipicname)) {
-    echo "<li id=\"kodi\" data-row=\"4\" data-col=\"2\" data-sizex=\"1\" data-sizey=\"1\"><a href=\"/movielib/\" target=\"_blank\"><img src=\"$myurl/Pic/kodi.png\" style=\"width: 130px; height: 130px;\"/></a></li>";
+    echo "<li id=\"kodi\" data-row=\"4\" data-col=\"2\" data-sizex=\"1\" data-sizey=\"1\"><a href=\"$http2$KodiUser:$KodiPass@$KodiIP\" target=\"_blank\"><img src=\"$myurl/Pic/kodi.png\" style=\"width: 130px; height: 130px;\"/></a></li>";
 }
 else {
-    echo "<li id=\"kodi\" data-row=\"4\" data-col=\"2\" data-sizex=\"1\" data-sizey=\"1\"><a href=\"/movielib/\" target=\"_blank\"><img src=\"$myurl/Pic/Upload/$kodipicname\" style=\"width: 130px; height: 130px;\"/></a></li>";
+    echo "<li id=\"kodi\" data-row=\"4\" data-col=\"2\" data-sizex=\"1\" data-sizey=\"1\"><a href=\"$http2$KodiUser:$KodiPass@$KodiIP\" target=\"_blank\"><img src=\"$myurl/Pic/Upload/$kodipicname\" style=\"width: 130px; height: 130px;\"/></a></li>";
 }
 ?>
--- a/right.php
+++ b/right.php
@ -139,6 +139,15 @@ if ($mediawidget > "0") {
 		</tr>
 	</tbody>
 </table>
+</p>
+
+<?php
+if ($GoogleSearch > "0") {
+    require "/feeds/google.php";
+} else {
+    
+}
+?>
 <?php
 $colour = $_POST['CustColor'];
 echo $colour;
--- a/robots.txt
+++ b/robots.txt
@ -1,5 +1,2 @@
-
-# This file can be used to affect how search engines and other web site crawlers see your site.
-# For more information, please see http://www.w3.org/TR/html4/appendix/notes.html#h-B.4.1.1
-# WebMatrix 2.0
-
+User-agent: *
+Disallow: /
--- a/uptime.php
+++ b/uptime.php
@ -1,7 +0,0 @@
-<?php
-require_once ('WindowsUptime.class.php');
-
-$windowsUptime = new WindowsUptime();
-echo "Server Uptime - ";
-echo $windowsUptime->uptime(); // Default output format
-?>