Merge branch '2.0' into 'master'
links on status/force rename Couch See merge request !25
This commit is contained in:
Karl
commit
4ed930b9c5
@ -394,8 +394,8 @@ findstr "localversion" config.php >nul 2>&1
|
||||
goto END
|
||||
:END
|
||||
:ONE
|
||||
cscript replace.vbs "config.php" "2.2" "2.3"
|
||||
echo Version Updated to 2.3
|
||||
cscript replace.vbs "config.php" "2.3" "2.4"
|
||||
echo Version Updated to 2.4
|
||||
goto END
|
||||
:END
|
||||
|
||||
|
||||
@ -30,46 +30,6 @@ 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>";
|
||||
|
||||
# Process all services montiored.
|
||||
foreach( $configs['servicesKloud'] as $serviceName => $servicePort )
|
||||
{
|
||||
# Determine Port Status.
|
||||
$status = @fsockopen($configs['server_ip2'], $servicePort, $errno, $errstr, 5);
|
||||
|
||||
# What is the result.
|
||||
if( !$status )
|
||||
{
|
||||
$statusText = "<font color='red'>Down</font>";
|
||||
}
|
||||
else
|
||||
{
|
||||
$statusText = "<font color='green'>Up</font>";
|
||||
}
|
||||
|
||||
# Set the status Row.
|
||||
$serverStatus .= "<tbody><td BGCOLOR='#FFFFFF'><font color='#0066FF'>{$serviceName}</font></td><td BGCOLOR='#FFFFFF'><font color='white'>{$statusText}</font></td></tr>";
|
||||
}
|
||||
|
||||
# Process all services montiored.
|
||||
foreach( $configs['servicesSpot'] as $serviceName => $servicePort )
|
||||
{
|
||||
# Determine Port Status.
|
||||
$status = @fsockopen($configs['server_ip3'], $servicePort, $errno, $errstr, 5);
|
||||
|
||||
# What is the result.
|
||||
if( !$status )
|
||||
{
|
||||
$statusText = "<font color='red'>Down</font>";
|
||||
}
|
||||
else
|
||||
{
|
||||
$statusText = "<font color='green'>Up</font>";
|
||||
}
|
||||
|
||||
# Set the status Row.
|
||||
$serverStatus .= "<td BGCOLOR='#FFFFFF'><font color='#0066FF'>{$serviceName}</font></td><td BGCOLOR='#FFFFFF'><font color='white'>{$statusText}</font></td></tr>";
|
||||
}
|
||||
|
||||
# Process all services montiored.
|
||||
foreach( $configs['services'] as $serviceName => $servicePort )
|
||||
{
|
||||
@ -87,7 +47,7 @@ foreach( $configs['services'] as $serviceName => $servicePort )
|
||||
}
|
||||
|
||||
# Set the status Row.
|
||||
$serverStatus .= "<td BGCOLOR='#FFFFFF'><font color='#0066FF'>{$serviceName}</font></td><td BGCOLOR='#FFFFFF'><font color='white'>{$statusText}</font></td></tr></tbody>";
|
||||
$serverStatus .= "<td BGCOLOR='#FFFFFF'><font color='#0066FF'><a href=\"http://$base:{$servicePort}/\"target=\"_blank\">{$serviceName}</a></font></td><td BGCOLOR='#FFFFFF'><font color='white'>{$statusText}</font></td></tr></tbody>";
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -81,7 +81,7 @@ global $sickpicname;
|
||||
|
||||
echo '<select name="cpapic">'."\n".
|
||||
dropdown_cpa(image_filenames($folder), @$_POST['image2']).
|
||||
'</select>'."\n".'</br></br>';
|
||||
'</select>'."\n".'</br>';
|
||||
|
||||
function dropdown_cpa($options_array, $selected = null)
|
||||
{
|
||||
@ -97,6 +97,9 @@ global $cpadultspicname;
|
||||
}
|
||||
|
||||
?>
|
||||
<?php echo "<a href=\"http://$base:$cpadults/api/$CPAdultsAPI/renamer.scan\"target=\"_blank\">Click here To Force Process</a>"; ?>
|
||||
<br />
|
||||
<br />
|
||||
Couch Kids : <input type="radio" name="cpkidsvisible" value="1" <?php if($cpkidsvisible > "0") echo "checked=checked; "; ?>>Enabled / <input type="radio" name="cpkidsvisible" value="2" <?php if($cpkidsvisible < "1") echo "checked=checked; "; ?>>Disabled<br />
|
||||
Couch Kids Port: <input type="text" value="<?php echo $cpkids ?>" name="cpkids" /><br />
|
||||
Couch Kids Name: <input type="text" value="<?php echo $cpkidsname ?>" name="cpkidsname" /><br />
|
||||
@ -105,7 +108,7 @@ global $cpadultspicname;
|
||||
|
||||
echo '<select name="cpkpic">'."\n".
|
||||
dropdown_cpk(image_filenames($folder), @$_POST['image2']).
|
||||
'</select>'."\n".'</br></br>';
|
||||
'</select>'."\n".'</br>';
|
||||
|
||||
function dropdown_cpk($options_array, $selected = null)
|
||||
{
|
||||
@ -121,6 +124,9 @@ global $cpkidspicname;
|
||||
}
|
||||
|
||||
?>
|
||||
<?php echo "<a href=\"http://$base:$cpkids/api/$CPKidsAPI/renamer.scan\"target=\"_blank\">Click here To Force Process</a>"; ?>
|
||||
<br />
|
||||
<br />
|
||||
<input type="submit" name="submit" value="Update" />
|
||||
</form>
|
||||
</div>
|
||||
20
right.php
20
right.php
@ -80,16 +80,6 @@ if ($webclipfeedvisible > "0") {
|
||||
}
|
||||
?>
|
||||
<?php
|
||||
if ($mediawidget > "0") {
|
||||
if ($mediawidget2 > "0") {
|
||||
require "/feeds/SickBeard_i_todaySoon.php";
|
||||
} else {
|
||||
require "/feeds/SickBeard_i_today.php";
|
||||
}
|
||||
}
|
||||
?>
|
||||
</p>
|
||||
<?php
|
||||
if ($customfeed1visible > "0") {
|
||||
require "/feeds/custom1.php";
|
||||
} else {
|
||||
@ -111,6 +101,16 @@ if ($customfeed3visible > "0") {
|
||||
|
||||
}
|
||||
?>
|
||||
<?php
|
||||
if ($mediawidget > "0") {
|
||||
if ($mediawidget2 > "0") {
|
||||
require "/feeds/SickBeard_i_todaySoon.php";
|
||||
} else {
|
||||
require "/feeds/SickBeard_i_today.php";
|
||||
}
|
||||
}
|
||||
?>
|
||||
</p>
|
||||
</p>
|
||||
<table id='themetable' width='275' border="0" cellpadding="1" cellspacing="0">
|
||||
<thead>
|
||||
|
||||
119
ss_bootstrap_kworld.php
Normal file
119
ss_bootstrap_kworld.php
Normal file
@ -0,0 +1,119 @@
|
||||
<head>
|
||||
<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.js" type="text/javascript"></script>
|
||||
<style>
|
||||
.hiddenRow { display: none; }
|
||||
</style>
|
||||
<script>
|
||||
function toggleNextRow(row) {
|
||||
var nextRow = $(row).next();
|
||||
nextRow.toggle();
|
||||
}
|
||||
function togglebodyServers() {
|
||||
$('#serverstable tbody').toggle();
|
||||
}
|
||||
|
||||
</script>
|
||||
</head>
|
||||
<?php
|
||||
/*
|
||||
* Script: Server Status
|
||||
* Author: Martin Dixon
|
||||
* From: Tutorial-Resource.com
|
||||
* URL: www.tutorial-resource.com
|
||||
* Version: 1.0
|
||||
* License: Free
|
||||
*/
|
||||
|
||||
# Load the configurations.
|
||||
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>";
|
||||
}
|
||||
|
||||
# Process all services1 montiored.
|
||||
foreach( $configs['services1'] as $serviceName => $servicePort )
|
||||
{
|
||||
# Determine Port Status.
|
||||
$status = @fsockopen($configs['server_ip'], $servicePort, $errno, $errstr, 5);
|
||||
|
||||
# What is the result.
|
||||
if( !$status )
|
||||
{
|
||||
$statusText = "<font color='red'>Down</font>";
|
||||
}
|
||||
else
|
||||
{
|
||||
$statusText = "<font color='green'>Up</font>";
|
||||
}
|
||||
|
||||
# Set the status Row.
|
||||
$serverStatus .= "<tbody><td BGCOLOR='#FFFFFF'>{$serviceName}</td><td BGCOLOR='#FFFFFF'>{$statusText}</td></tr>";
|
||||
}
|
||||
|
||||
# Process all services1 montiored.
|
||||
foreach( $configs['services2'] as $serviceName => $servicePort )
|
||||
{
|
||||
# Determine Port Status.
|
||||
$status = @fsockopen($configs['server_ip2'], $servicePort, $errno, $errstr, 5);
|
||||
|
||||
# What is the result.
|
||||
if( !$status )
|
||||
{
|
||||
$statusText = "<font color='red'>Down</font>";
|
||||
}
|
||||
else
|
||||
{
|
||||
$statusText = "<font color='green'>Up</font>";
|
||||
}
|
||||
|
||||
# Set the status Row.
|
||||
$serverStatus .= "<td BGCOLOR='#FFFFFF'>{$serviceName}</td><td BGCOLOR='#FFFFFF'>{$statusText}</td></tr>";
|
||||
}
|
||||
|
||||
# Process all services1 montiored.
|
||||
foreach( $configs['services3'] as $serviceName => $servicePort )
|
||||
{
|
||||
# Determine Port Status.
|
||||
$status = @fsockopen($configs['server_ip3'], $servicePort, $errno, $errstr, 5);
|
||||
|
||||
# What is the result.
|
||||
if( !$status )
|
||||
{
|
||||
$statusText = "<font color='red'>Down</font>";
|
||||
}
|
||||
else
|
||||
{
|
||||
$statusText = "<font color='green'>Up</font>";
|
||||
}
|
||||
|
||||
# Set the status Row.
|
||||
$serverStatus .= "<td BGCOLOR='#FFFFFF'>{$serviceName}</td><td BGCOLOR='#FFFFFF'>{$statusText}</td></tr>";
|
||||
}
|
||||
|
||||
# Process all services1 montiored.
|
||||
foreach( $configs['services4'] as $serviceName => $servicePort )
|
||||
{
|
||||
# Determine Port Status.
|
||||
$status = @fsockopen($configs['server_ip4'], $servicePort, $errno, $errstr, 5);
|
||||
|
||||
# What is the result.
|
||||
if( !$status )
|
||||
{
|
||||
$statusText = "<font color='red'>Down</font>";
|
||||
}
|
||||
else
|
||||
{
|
||||
$statusText = "<font color='green'>Up</font>";
|
||||
}
|
||||
|
||||
# Set the status Row.
|
||||
$serverStatus .= "<td BGCOLOR='#FFFFFF'>{$serviceName}</td><td BGCOLOR='#FFFFFF'>{$statusText}</td></tbody></tr>";
|
||||
}
|
||||
|
||||
# Finish service status table.
|
||||
$serverStatus .= "</table>";
|
||||
# File Complete.
|
||||
|
||||
?>
|
||||
39
ss_configs_kworld.php
Normal file
39
ss_configs_kworld.php
Normal file
@ -0,0 +1,39 @@
|
||||
<?php
|
||||
include 'config.php';
|
||||
/*
|
||||
* Script: Server Status
|
||||
* Author: Martin Dixon
|
||||
* From: Tutorial-Resource.com
|
||||
* URL: www.tutorial-resource.com
|
||||
* Version: 1.0
|
||||
* License: Free
|
||||
*/
|
||||
/********
|
||||
DO NOT EDIT THESE CONFIG LINES.
|
||||
*/
|
||||
$configs = array();
|
||||
$configs['services1'] = array();
|
||||
$configs['services2'] = array();
|
||||
$configs['services3'] = array();
|
||||
$configs['services4'] = array();
|
||||
|
||||
/********
|
||||
DO NOT EDIT THESE CONFIG LINES.
|
||||
********/
|
||||
|
||||
|
||||
|
||||
# You may edit these configs.
|
||||
$configs['server_ip'] = $server1url; // The Servers URL or IP to check.
|
||||
$configs['server_ip2'] = $server2url; // The Servers URL or IP to check.
|
||||
$configs['server_ip3'] = $server3url; // The Servers URL or IP to check.
|
||||
$configs['server_ip4'] = $server4url; // The Servers URL or IP to check.
|
||||
|
||||
|
||||
|
||||
# For services1 simply add new lines with the Name and port number.
|
||||
$configs['services1']["<a href='$http/$server1url' target=\'_blank\'>$server1name</a>"] = 80;
|
||||
$configs['services2']["<a href='$http/$server2url' target=\'_blank\'>$server2name</a>"] = 80;
|
||||
$configs['services3']["<a href='$http/$server3url' target=\'_blank\'>$server3name</a>"] = 80;
|
||||
$configs['services4']["<a href='$http/$server4url' target=\'_blank\'>$server4name</a>"] = 80;
|
||||
?>
|
||||
@ -1,4 +1,4 @@
|
||||
<?php
|
||||
//// KLANDING VERSION
|
||||
$remoteversion = "2.3"; //
|
||||
$remoteversion = "2.4"; //
|
||||
?>
|
||||
Loading…
x
Reference in New Issue
Block a user