Karl/KLanding
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.0' into 'master'

Browse Source 
2.5.3



See merge request !31
This commit is contained in:
Karl 2016-04-07 08:26:36 -04:00
commit 044104efa6
35 changed files with 113 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog.txt
View File

@ -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

22
Update.bat
View File

@ -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 ^<?php >>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

2
bootstrap_services.php
View File

@ -28,7 +28,7 @@
require "configs_services.php";
# Start a variable to contain Service Status.
$serverStatus = "<table id='servicestable' width='190' border='0' cellspacing='0' cellpadding='1'><thead><tr onclick='togglebodyServices()' ><th style='text-align: left;'><font color='white'>Service</font></th><th style='text-align: left;'><font color='white'>Status</font></th></tr></thead>";
$serverStatus = "<div class=\"Widgets\"><table id='servicestable' width='190' border='0' cellspacing='0' cellpadding='1'><thead><tr onclick='togglebodyServices()' ><th>Service</font></th><th>Status</font></th></tr></thead>";
# Process all services montiored.
foreach( $configs['services'] as $serviceName => $servicePort )

6
clock.php
View File

@ -11,9 +11,10 @@
}
</script>
</head>
<div class="Widgets">
<table width='275' cellspacing='0' cellpadding='1'>
<tr onclick="toggleNextRow(this)">
<th style='text-align: left;'><font color='white'>Time</font></th>
<th>Time</font></th>
</tr>
<tr>
<td BGCOLOR='#FFFFFF'>
@ -48,4 +49,5 @@ setInterval(GetClock,1000);
</select>
</form>
</td>
</table>
</table>
</div>

2
config/set1.php
View File

@ -23,6 +23,8 @@
<br />
Widget Header Colour:<input class="color" name="widgetcolor" value="<?php echo $widgetcolour ?>"</td>
<br />
Widget Header Text Colour:<input class="color" name="WidgetTextColour" value="<?php echo $WidgetTextColour ?>"</td>
<br />
<br />
KWorld Enabled: <input name="kworldenabled" id="id" type="checkbox" <?php if($KWorldEnabled > "0") echo "checked=checked; "; ?> /><br />
KWorld Widget Enabled: <input name="KworldWidget" id="id" type="checkbox" <?php if($KworldWidget > "0") echo "checked=checked; "; ?> /><br />

2
config/set2.php
View File

@ -45,7 +45,7 @@ global $sabpicname;
?>
Sick Enabled: <input name="sickvisible" id="id" type="checkbox" <?php if($sickvisible > "0") echo "checked=checked; "; ?> /><br />
Sick Type : <input type="radio" name="sicktype" value="1" <?php if($sicktype < "2") echo "checked=checked; "; ?>>SickBeard / <input type="radio" name="sicktype" value="2" <?php if($sicktype > "1") echo "checked=checked; "; ?>>SickRage<br />
Sick Type : <input type="radio" name="sicktype" value="1" <?php if($sicktype < "2") echo "checked=checked; "; ?>>SickBeard / <input type="radio" name="sicktype" value="2" <?php if($sicktype > "1") echo "checked=checked; "; ?>>SickGear<br />
Sick Port: <input type="text" value="<?php echo $sickport ?>" name="sickport" /><br />
Sick Name: <input type="text" value="<?php echo $sickname ?>" name="sickname" /><br />
Sick API: <input type="text" value="<?php echo $SICKAPI ?>" name="SICKAPI" /><br />

2
config/write1.php
View File

@ -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)) {

2
config/write2.php
View File

@ -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

7
css/black.css
View File

@ -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;

7
css/blue.css
View File

@ -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;

5
css/custom.php
View File

@ -121,6 +121,11 @@ div.version {
color: <?php echo $custombackground; ?>;
}
div.Widgets {
color: <?php echo $WidgetTextColour; ?>;
text-align: left;
}
div#config a:link { color: <?php echo $custombackground; ?>; }
div#config a:visited { color: <?php echo $custombackground; ?>; }

5
css/red.css
View File

@ -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; }

5
css/white.css
View File

@ -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; }

1
drives/drive1.php
View File

@ -40,3 +40,4 @@ require_once 'DiskStatus.class.php';
</div>
</td>
</tr>
</div>

1
drives/drive2.php
View File

@ -41,3 +41,4 @@ require_once 'DiskStatus.class.php';
</div>
</td>
</tr>
</div>

1
drives/drive3.php
View File

@ -40,3 +40,4 @@ require_once 'DiskStatus.class.php';
</div>
</td>
</tr>
</div>

1
drives/drive4.php
View File

@ -40,3 +40,4 @@ require_once 'DiskStatus.class.php';
</div>
</td>
</tr>
</div>

1
drives/drive5.php
View File

@ -40,3 +40,4 @@ require_once 'DiskStatus.class.php';
</div>
</td>
</tr>
</div>

1
drives/drive6.php
View File

@ -40,3 +40,4 @@ require_once 'DiskStatus.class.php';
</div>
</td>
</tr>
</div>

1
drives/drive7.php
View File

@ -40,3 +40,4 @@ require_once 'DiskStatus.class.php';
</div>
</td>
</tr>
</div>

6
drives/head.php
View File

@ -1,5 +1,7 @@
<thead>
<div class="Widgets">
<tr onclick='togglebody()'>
<th style='text-align: left;'><font color='white'>Drive Space</font></th>
<th>Drive Space</font></th>
</tr>
</thead>
</thead>
</div>

5
feeds/SickBeard_i_today.php
View File

@ -11,10 +11,10 @@
nextRow.toggle();
}
</script>
</head>
</head> <div class="Widgets">
<table width='275' border='0' cellspacing='0' cellpadding='0'>
<tr onclick="toggleNextRow(this)" >
<th style='text-align: left;'><font color='white'>Coming Episodes</font></th>
<th>Coming Episodes</font></th>
</tr>
<tr class="hiddenRow">
<td bgcolor='#FFFFFF'>
@ -25,6 +25,7 @@
</form>
</td>
</table>
</div>
</p>
</body>
</html>

5
feeds/SickBeard_i_todaySoon.php
View File

@ -11,10 +11,10 @@
nextRow.toggle();
}
</script>
</head>
</head> <div class="Widgets">
<table width='275' border='0' cellspacing='0' cellpadding='0'>
<tr onclick="toggleNextRow(this)" >
<th style='text-align: left;'><font color='white'>Coming Episodes</font></th>
<th>Coming Episodes</font></th>
</tr>
<tr class="hiddenRow">
<td bgcolor='#FFFFFF'>
@ -25,6 +25,7 @@
</form>
</td>
</table>
</div>
</p>
</body>
</html>

5
feeds/custom1.php
View File

@ -11,10 +11,10 @@
}
</script>
</head>
<?php include 'config.php'; ?>
<?php include 'config.php'; ?><div class="Widgets">
<table width='275' border='0' cellspacing='0' cellpadding='0'>
<tr onclick="toggleNextRow(this)" BGCOLOR='#0066FF'>
<th style='text-align: left;'><font color='white'><?php echo $customfeed1name?></font></th>
<th><?php echo $customfeed1name?></font></th>
</tr>
<tr class="hiddenRow">
<td bgcolor='#FFFFFF'>
@ -24,6 +24,7 @@
</form>
</td>
</table>
</div>
</p>
</body>
</html>

4
feeds/custom2.php
View File

@ -12,9 +12,10 @@
</script>
</head>
<?php include 'config.php'; ?>
<div class="Widgets">
<table width='275' border='0' cellspacing='0' cellpadding='0'>
<tr onclick="toggleNextRow(this)" BGCOLOR='#0066FF'>
<th style='text-align: left;'><font color='white'><?php echo $customfeed2name?></font></th>
<th><?php echo $customfeed2name?></font></th>
</tr>
<tr class="hiddenRow">
<td bgcolor='#FFFFFF'>
@ -24,6 +25,7 @@
</form>
</td>
</table>
</div>
</p>
</body>
</html>

5
feeds/custom3.php
View File

@ -11,10 +11,10 @@
}
</script>
</head>
<?php include 'config.php'; ?>
<?php include 'config.php'; ?><div class="Widgets">
<table width='275' border='0' cellspacing='0' cellpadding='0'>
<tr onclick="toggleNextRow(this)" BGCOLOR='#0066FF'>
<th style='text-align: left;'><font color='white'><?php echo $customfeed3name?></font></th>
<th><?php echo $customfeed3name?></font></th>
</tr>
<tr class="hiddenRow">
<td bgcolor='#FFFFFF'>
@ -24,6 +24,7 @@
</form>
</td>
</table>
</div>
</p>
</body>
</html>

7
feeds/google.php
View File

@ -1,7 +1,7 @@
<body>
<body><div class="Widgets">
<table width='275' cellspacing='0' cellpadding='1'>
<tr onclick="toggleNextRow(this)">
<th style='text-align: left;'><font color='white'>Google Search</font></th>
<th>Google Search</font></th>
</tr>
<tr>
<td BGCOLOR='#FFFFFF'>
@ -20,4 +20,5 @@ maxlength="255" value="" />
</select>
</form>
</td>
</table>
</table>
</div>

5
feeds/kknowledgefeed.php
View File

@ -12,10 +12,10 @@
}
</script>
</head>
<?php include '../config.php';?>
<?php include '../config.php';?><div class="Widgets">
<table width='275' border='0' cellspacing='0' cellpadding='0'>
<tr onclick="toggleNextRow(this)">
<th style='text-align: left;'><font color='white'>KKnowledge</font></th>
<th>KKnowledge</font></th>
</tr>
<tr class="hiddenRow">
<td bgcolor='#FFFFFF'>
@ -25,6 +25,7 @@
</form>
</td>
</table>
</div>
</p>
</body>
</html>

7
feeds/uptime.php
View File

@ -1,7 +1,7 @@
<body>
<body><div class="Widgets">
<table width='275' cellspacing='0' cellpadding='1'>
<tr onclick="toggleNextRow(this)">
<th style='text-align: left;'><font color='white'>Server Up Time</font></th>
<th>Server Up Time</font></th>
</tr>
<tr>
<td BGCOLOR='#FFFFFF'>
@ -16,4 +16,5 @@ echo $windowsUptime->uptime(); // Default output format
</select>
</form>
</td>
</table>
</table>
</div>

4
feeds/webclipfeed.php
View File

@ -11,9 +11,10 @@
}
</script>
</head>
<div class="Widgets">
<table width='275' border='0' cellspacing='0' cellpadding='0'>
<tr onclick="toggleNextRow(this)" >
<th style='text-align: left;'><font color='white'>Latest Klips</font></th>
<th>Latest Klips</font></th>
</tr>
<tr class="hiddenRow">
<td bgcolor='#FFFFFF'>
@ -23,6 +24,7 @@
</form>
</td>
</table>
</div>
</p>
</body>
</html>

7
konvos.php
View File

@ -10,10 +10,10 @@
nextRow.toggle();
}
</script>
</head>
</head> <div class="Widgets">
<table width='275' cellspacing='0' cellpadding='1'>
<tr onclick="toggleNextRow(this)">
<th style='text-align: left;'><font color='white'>Konvos Status</font></th>
<th>Konvos Status</font></th>
</tr>
<tr class="hiddenRow">
<td BGCOLOR='#FFFFFF'>
@ -30,4 +30,5 @@
</select>
</form>
</td>
</table>
</table>
</div>

5
right.php
View File

@ -118,11 +118,11 @@ if ($mediawidget > "0") {
}
?>
</p>
</p>
</p><div class="Widgets">
<table id='themetable' width='275' border="0" cellpadding="1" cellspacing="0">
<thead>
<tr onclick='togglebodytheme()'>
<td style="text-align: left;"><font color="white"><b>Theme</b></font></td>
<td><b>Theme</b></font></td>
<td >&nbsp;</td>
<td >&nbsp;</td>
<td >&nbsp;</td>
@ -139,6 +139,7 @@ if ($mediawidget > "0") {
</tr>
</tbody>
</table>
</div>
</p>
<?php

2
ss_bootstrap_kworld.php
View File

@ -29,7 +29,7 @@ require "ss_configs_kworld.php";
# Start a variable to contain Service Status.
if ($serverstatusvisible > "0") {
$serverStatus = "<table id='kworldstable' width='190' border='0' cellspacing='0' cellpadding='1'><thead><tr onclick='togglebodykworld()'><th style='text-align: left;'><font color='white'>K-World Status</font></th><th style='text-align: left;'><font color='white'></font></th></tr></thead>";
$serverStatus = "<div class=\"Widgets\"><table id='kworldstable' width='190' border='0' cellspacing='0' cellpadding='1'><thead><tr onclick='togglebodykworld()'><th>K-World Status</font></th><th><font color='white'></font></th></tr></thead>";
}
# Process all services1 montiored.

2
ss_bootstrap_servers.php
View File

@ -29,7 +29,7 @@ require "ss_configs_servers.php";
# Start a variable to contain Service Status.
if ($serverstatusvisible > "0") {
$serverStatus = "<table id='serverstable' width='190' border='0' cellspacing='0' cellpadding='1'><thead><tr onclick='togglebodyServers()'><th style='text-align: left;'><font color='white'>Server</font></th><th style='text-align: left;'><font color='white'>Status</font></th></tr></thead>";
$serverStatus = "<div class=\"Widgets\"><table id='serverstable' width='190' border='0' cellspacing='0' cellpadding='1'><thead><tr onclick='togglebodyServers()'><th>Server</font></th><th>Status</font></th></tr></thead>";
}
# Process all services1 montiored.

2
version.txt
View File

@ -1,4 +1,4 @@
<?php
//// KLANDING VERSION
$remoteversion = "2.5.2"; //
$remoteversion = "2.5.3"; //
?>