From 041264e0d4276ebcb906535b6b6b137d1c1837f3 Mon Sep 17 00:00:00 2001 From: Karl Hudgell Date: Thu, 7 Apr 2016 13:25:35 +0100 Subject: [PATCH] 2.5.3 --- ChangeLog.txt | 5 +++++ Update.bat | 22 ++++++++++++++++++++-- bootstrap_services.php | 2 +- clock.php | 6 ++++-- config/set1.php | 2 ++ config/set2.php | 2 +- config/write1.php | 2 ++ config/write2.php | 2 +- css/black.css | 7 ++++++- css/blue.css | 7 ++++++- css/custom.php | 5 +++++ css/red.css | 5 +++++ css/white.css | 5 +++++ drives/drive1.php | 1 + drives/drive2.php | 1 + drives/drive3.php | 1 + drives/drive4.php | 1 + drives/drive5.php | 1 + drives/drive6.php | 1 + drives/drive7.php | 1 + drives/head.php | 6 ++++-- feeds/SickBeard_i_today.php | 5 +++-- feeds/SickBeard_i_todaySoon.php | 5 +++-- feeds/custom1.php | 5 +++-- feeds/custom2.php | 4 +++- feeds/custom3.php | 5 +++-- feeds/google.php | 7 ++++--- feeds/kknowledgefeed.php | 5 +++-- feeds/uptime.php | 7 ++++--- feeds/webclipfeed.php | 4 +++- konvos.php | 7 ++++--- right.php | 5 +++-- ss_bootstrap_kworld.php | 2 +- ss_bootstrap_servers.php | 2 +- version.txt | 2 +- 35 files changed, 113 insertions(+), 37 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index b00ab24..1a580fc 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,8 @@ +2.5.3 +Fixed SickGear in Config +Konvos Status CSS fix +Enabled Custom Widget Header Text Colour + 2.5.2 Removed Old Update Code Added Change Log diff --git a/Update.bat b/Update.bat index f2f1432..335a63b 100644 --- a/Update.bat +++ b/Update.bat @@ -447,6 +447,24 @@ findstr "GoogleSearch" config.php >nul 2>&1 echo GoogleSearch Updated goto END :END + + rem widgettextcolour +findstr "WidgetTextColour" config.php >nul 2>&1 + if errorlevel 1 goto ONE + if errorlevel 0 goto ZERO + goto END + :ZERO + echo WidgetTextColour Already Updated + goto END + :ONE + echo ^>config.php + echo //// WidgetTextColour >> config.php + echo $WidgetTextColour = "#FFFFFF"; >> config.php + echo //// >> config.php + echo ^?^> >> config.php + echo WidgetTextColour Updated + goto END + :END rem Update Version findstr "localversion" config.php >nul 2>&1 @@ -468,8 +486,8 @@ findstr "localversion" config.php >nul 2>&1 goto END :END :ONE - cscript replace.vbs "config.php" "2.5.1" "2.5.2" - echo Version Updated to 2.5.2 + cscript replace.vbs "config.php" "2.5.2" "2.5.3" + echo Version Updated to 2.5.3 goto END :END diff --git a/bootstrap_services.php b/bootstrap_services.php index ef98f4e..59f75f1 100644 --- a/bootstrap_services.php +++ b/bootstrap_services.php @@ -28,7 +28,7 @@ require "configs_services.php"; # Start a variable to contain Service Status. -$serverStatus = ""; +$serverStatus = "
ServiceStatus
"; # Process all services montiored. foreach( $configs['services'] as $serviceName => $servicePort ) diff --git a/clock.php b/clock.php index 330764f..bf34eb0 100644 --- a/clock.php +++ b/clock.php @@ -11,9 +11,10 @@ } +
ServiceStatus
- + -
TimeTime
@@ -48,4 +49,5 @@ setInterval(GetClock,1000);
\ No newline at end of file + + \ No newline at end of file diff --git a/config/set1.php b/config/set1.php index ff1fa06..5daefbf 100644 --- a/config/set1.php +++ b/config/set1.php @@ -23,6 +23,8 @@
Widget Header Colour:
+ Widget Header Text Colour: +

KWorld Enabled: "0") echo "checked=checked; "; ?> />
KWorld Widget Enabled: "0") echo "checked=checked; "; ?> />
diff --git a/config/set2.php b/config/set2.php index 95226b6..5770382 100644 --- a/config/set2.php +++ b/config/set2.php @@ -45,7 +45,7 @@ global $sabpicname; ?> Sick Enabled: "0") echo "checked=checked; "; ?> />
- Sick Type : >SickBeard / "1") echo "checked=checked; "; ?>>SickRage
+ Sick Type : >SickBeard / "1") echo "checked=checked; "; ?>>SickGear
Sick Port:
Sick Name:
Sick API:
diff --git a/config/write1.php b/config/write1.php index a85aef0..5752e65 100644 --- a/config/write1.php +++ b/config/write1.php @@ -28,6 +28,7 @@ $KIP1 = $_POST['KIP']; $KodiUser1 = $_POST['KodiUser']; $KodiPass1 = $_POST['KodiPass']; $GoogleSearch1 = $_POST['GoogleSearch']; +$WidgetTextColour1 = $_POST['WidgetTextColour']; // $fl='../config.php'; @@ -43,6 +44,7 @@ $content = preg_replace( '/\$pass = \"(.*?)\";/', '$pass = "'.$pass1.'";', $co $content = preg_replace( '/\$custombackground = \"(.*?)\";/', '$custombackground = "#'.$backgroundcolor1.'";', $content); $content = preg_replace( '/\$mediastatscolour = \"(.*?)\";/', '$mediastatscolour = "#'.$mediastatscolour1.'";', $content); $content = preg_replace( '/\$mediastatstextcolour = \"(.*?)\";/', '$mediastatstextcolour = "#'.$mediastatstextcolour1.'";', $content); +$content = preg_replace( '/\$WidgetTextColour = \"(.*?)\";/', '$WidgetTextColour = "#'.$WidgetTextColour1.'";', $content); $content = preg_replace( '/\$widgetcolour = \"(.*?)\";/', '$widgetcolour = "#'.$widgetcolor1.'";', $content); // version Settings if (empty($showversion1)) { diff --git a/config/write2.php b/config/write2.php index bdb683d..5e8ffbb 100644 --- a/config/write2.php +++ b/config/write2.php @@ -51,7 +51,7 @@ if ($sicktype1 > "1") { $content = preg_replace( '/\$sicktype = \"(.*?)\";/', '$sicktype = "1";', $content); } $content = preg_replace( '/\$sickport = \"(.*?)\";/', '$sickport = "'.$sickport1.'";', $content); -$content = preg_replace( '/\$sickname = \"(.*?)\";/', '$sickname = "'.$sickname1.'";', $content); +// $content = preg_replace( '/\$sickname = \"(.*?)\";/', '$sickname = "'.$sickname1.'";', $content); $content = preg_replace( '/\$SICKAPI = \"(.*?)\";/', '$SICKAPI = "'.$SICKAPI1.'";', $content); $content = preg_replace( '/\$sickpicname = \"(.*?)\";/', '$sickpicname = "'.$sickpicname1.'";', $content); // End of Sick Settigns diff --git a/css/black.css b/css/black.css index c730162..aa1abb6 100644 --- a/css/black.css +++ b/css/black.css @@ -40,7 +40,7 @@ background: #000000; .innertube{ margin: 15px; /*Margins for inner DIV inside each DIV (to provide padding)*/ -color: white; +color: black; } * html body{ /*IE6 hack*/ @@ -123,6 +123,11 @@ div.version { color: black; } +div.Widgets { + color: white; + text-align: left; +} + div.head { font-size: 16pt; color: white; diff --git a/css/blue.css b/css/blue.css index 9cb340d..3be57ee 100644 --- a/css/blue.css +++ b/css/blue.css @@ -45,7 +45,7 @@ background: #000000; .innertube{ margin: 15px; /*Margins for inner DIV inside each DIV (to provide padding)*/ -color: white; +color: black; } * html body{ /*IE6 hack*/ @@ -133,6 +133,11 @@ font-size: 16pt; color: white; } +div.Widgets { + color: white; + text-align: left; +} + div.UpdateNotify { color: Red; font-size: 12pt; diff --git a/css/custom.php b/css/custom.php index 2690e87..494d47b 100644 --- a/css/custom.php +++ b/css/custom.php @@ -121,6 +121,11 @@ div.version { color: ; } + div.Widgets { + color: ; + text-align: left; +} + div#config a:link { color: ; } div#config a:visited { color: ; } diff --git a/css/red.css b/css/red.css index 95d6e48..5e65306 100644 --- a/css/red.css +++ b/css/red.css @@ -125,6 +125,11 @@ font-size: 16pt; color: Black; font-size: 12pt; } + +div.Widgets { + color: white; + text-align: left; +} div#config a:link { color: red; } div#config a:visited { color: red; } div#config a:hover { color: red; } diff --git a/css/white.css b/css/white.css index 5f227f1..022851f 100644 --- a/css/white.css +++ b/css/white.css @@ -126,6 +126,11 @@ div.UpdateNotify { font-size: 12pt; } +div.Widgets { + color: white; + text-align: left; +} + div#config a:link { color: white; } div#config a:visited { color: white; } div#config a:hover { color: white; } diff --git a/drives/drive1.php b/drives/drive1.php index 8968f17..24c47db 100644 --- a/drives/drive1.php +++ b/drives/drive1.php @@ -40,3 +40,4 @@ require_once 'DiskStatus.class.php'; + \ No newline at end of file diff --git a/drives/drive2.php b/drives/drive2.php index 2ddea76..f2c9b4a 100644 --- a/drives/drive2.php +++ b/drives/drive2.php @@ -41,3 +41,4 @@ require_once 'DiskStatus.class.php'; + \ No newline at end of file diff --git a/drives/drive3.php b/drives/drive3.php index 1b71aee..8769758 100644 --- a/drives/drive3.php +++ b/drives/drive3.php @@ -40,3 +40,4 @@ require_once 'DiskStatus.class.php'; + \ No newline at end of file diff --git a/drives/drive4.php b/drives/drive4.php index b0d06c4..83cc7fb 100644 --- a/drives/drive4.php +++ b/drives/drive4.php @@ -40,3 +40,4 @@ require_once 'DiskStatus.class.php'; + \ No newline at end of file diff --git a/drives/drive5.php b/drives/drive5.php index cdf8a17..79ea0e8 100644 --- a/drives/drive5.php +++ b/drives/drive5.php @@ -40,3 +40,4 @@ require_once 'DiskStatus.class.php'; + \ No newline at end of file diff --git a/drives/drive6.php b/drives/drive6.php index a4d7187..2014c7c 100644 --- a/drives/drive6.php +++ b/drives/drive6.php @@ -40,3 +40,4 @@ require_once 'DiskStatus.class.php'; + \ No newline at end of file diff --git a/drives/drive7.php b/drives/drive7.php index 074f6d7..82ff477 100644 --- a/drives/drive7.php +++ b/drives/drive7.php @@ -40,3 +40,4 @@ require_once 'DiskStatus.class.php'; + \ No newline at end of file diff --git a/drives/head.php b/drives/head.php index 076a7a3..fc73e65 100644 --- a/drives/head.php +++ b/drives/head.php @@ -1,5 +1,7 @@ +
- Drive Space + Drive Space - \ No newline at end of file + +
\ No newline at end of file diff --git a/feeds/SickBeard_i_today.php b/feeds/SickBeard_i_today.php index ac24faa..1467bf1 100644 --- a/feeds/SickBeard_i_today.php +++ b/feeds/SickBeard_i_today.php @@ -11,10 +11,10 @@ nextRow.toggle(); } - +
- +
Coming EpisodesComing Episodes
@@ -25,6 +25,7 @@
+

diff --git a/feeds/SickBeard_i_todaySoon.php b/feeds/SickBeard_i_todaySoon.php index 280ba6a..795ccb3 100644 --- a/feeds/SickBeard_i_todaySoon.php +++ b/feeds/SickBeard_i_todaySoon.php @@ -11,10 +11,10 @@ nextRow.toggle(); } - +
- +
Coming EpisodesComing Episodes
@@ -25,6 +25,7 @@
+

diff --git a/feeds/custom1.php b/feeds/custom1.php index 2e31766..25756e7 100644 --- a/feeds/custom1.php +++ b/feeds/custom1.php @@ -11,10 +11,10 @@ } - +
- +
@@ -24,6 +24,7 @@
+

diff --git a/feeds/custom2.php b/feeds/custom2.php index 3fd91db..a31d2e1 100644 --- a/feeds/custom2.php +++ b/feeds/custom2.php @@ -12,9 +12,10 @@ +
- +
@@ -24,6 +25,7 @@
+

diff --git a/feeds/custom3.php b/feeds/custom3.php index 6c24fc9..25d38f4 100644 --- a/feeds/custom3.php +++ b/feeds/custom3.php @@ -11,10 +11,10 @@ } - +
- +
@@ -24,6 +24,7 @@
+

diff --git a/feeds/google.php b/feeds/google.php index cd927b2..de9af12 100644 --- a/feeds/google.php +++ b/feeds/google.php @@ -1,7 +1,7 @@ - +
- + -
Google SearchGoogle Search
@@ -20,4 +20,5 @@ maxlength="255" value="" />
\ No newline at end of file + +
\ No newline at end of file diff --git a/feeds/kknowledgefeed.php b/feeds/kknowledgefeed.php index f9c22da..6d8ee68 100644 --- a/feeds/kknowledgefeed.php +++ b/feeds/kknowledgefeed.php @@ -12,10 +12,10 @@ } - +
- +
KKnowledgeKKnowledge
@@ -25,6 +25,7 @@
+

diff --git a/feeds/uptime.php b/feeds/uptime.php index efab0fe..9cf4cc8 100644 --- a/feeds/uptime.php +++ b/feeds/uptime.php @@ -1,7 +1,7 @@ - +
- + -
Server Up TimeServer Up Time
@@ -16,4 +16,5 @@ echo $windowsUptime->uptime(); // Default output format
\ No newline at end of file + +
\ No newline at end of file diff --git a/feeds/webclipfeed.php b/feeds/webclipfeed.php index 69561a7..ab04241 100644 --- a/feeds/webclipfeed.php +++ b/feeds/webclipfeed.php @@ -11,9 +11,10 @@ } +
- +
Latest KlipsLatest Klips
@@ -23,6 +24,7 @@
+

diff --git a/konvos.php b/konvos.php index 9a82119..a3298f9 100644 --- a/konvos.php +++ b/konvos.php @@ -10,10 +10,10 @@ nextRow.toggle(); } - +
- + -
Konvos StatusKonvos Status
@@ -30,4 +30,5 @@
\ No newline at end of file + +
\ No newline at end of file diff --git a/right.php b/right.php index 8e5f22a..dea5561 100644 --- a/right.php +++ b/right.php @@ -118,11 +118,11 @@ if ($mediawidget > "0") { } ?>

-

+

- + @@ -139,6 +139,7 @@ if ($mediawidget > "0") {
ThemeTheme      
+

"0") { - $serverStatus = ""; + $serverStatus = "
K-World Status
"; } # Process all services1 montiored. diff --git a/ss_bootstrap_servers.php b/ss_bootstrap_servers.php index 62ea25c..54497f5 100644 --- a/ss_bootstrap_servers.php +++ b/ss_bootstrap_servers.php @@ -29,7 +29,7 @@ require "ss_configs_servers.php"; # Start a variable to contain Service Status. if ($serverstatusvisible > "0") { - $serverStatus = "
K-World Status
"; + $serverStatus = "
ServerStatus
"; } # Process all services1 montiored. diff --git a/version.txt b/version.txt index 77e5f2f..c4da1ba 100644 --- a/version.txt +++ b/version.txt @@ -1,4 +1,4 @@ \ No newline at end of file
ServerStatus