Merge branch '2.0' into 'master'
coming eps widget See merge request !14
This commit is contained in:
		
						commit
						15594ee357
					
				
							
								
								
									
										18
									
								
								Update.bat
									
									
									
									
									
								
							
							
						
						
									
										18
									
								
								Update.bat
									
									
									
									
									
								
							@ -298,6 +298,24 @@ findstr "API" config.php >nul 2>&1
 | 
			
		||||
	 goto END
 | 
			
		||||
   :END
 | 
			
		||||
   
 | 
			
		||||
    rem coming episodes
 | 
			
		||||
findstr "mediawidget" config.php >nul 2>&1
 | 
			
		||||
   if errorlevel 1 goto ONE
 | 
			
		||||
   if errorlevel 0 goto ZERO
 | 
			
		||||
   goto END
 | 
			
		||||
   :ZERO
 | 
			
		||||
     echo mediawidget Already Updated
 | 
			
		||||
	 goto END
 | 
			
		||||
   :ONE
 | 
			
		||||
     echo ^<?php >>config.php
 | 
			
		||||
	 echo //// mediawidget >> config.php
 | 
			
		||||
	 echo $mediawidget = "0"; >> config.php
 | 
			
		||||
	 echo //// >> config.php
 | 
			
		||||
	 echo ^?^> >> config.php
 | 
			
		||||
	 echo mediawidget Updated
 | 
			
		||||
	 goto END
 | 
			
		||||
   :END
 | 
			
		||||
   
 | 
			
		||||
   
 | 
			
		||||
   rem Update Version
 | 
			
		||||
findstr "localversion" config.php >nul 2>&1
 | 
			
		||||
 | 
			
		||||
@ -29,7 +29,8 @@
 | 
			
		||||
	Services Widget Enabled:  <input name="servicesvisible" id="id" type="checkbox" <?php if($servicesvisible > "0")  echo "checked=checked; "; ?> /><br />
 | 
			
		||||
	Clock Widget Enabled:  <input name="clockvisible" id="id" type="checkbox" <?php if($clockvisible > "0")  echo "checked=checked; "; ?> /><br />
 | 
			
		||||
	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 /><br />
 | 
			
		||||
	Klips Widget Enabled:  <input name="webclipfeedvisible" id="id" type="checkbox" <?php if($webclipfeedvisible > "0")  echo "checked=checked; "; ?> /><br />
 | 
			
		||||
	Coming Episodes Enabled:  <input name="mediawidget" id="id" type="checkbox" <?php if($mediawidget > "0")  echo "checked=checked; "; ?> /><br /><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 />
 | 
			
		||||
 | 
			
		||||
@ -18,6 +18,7 @@ $widgetbackgroudcolour1 = $_POST['widgetbackgroudcolour'];
 | 
			
		||||
$KWorldEnabled1 = $_POST['kworldenabled'];
 | 
			
		||||
$widgetcolor1 = $_POST['widgetcolor'];
 | 
			
		||||
$MStatusEnabled1 = $_POST['MStatusEnabled'];
 | 
			
		||||
$mediawidget1 = $_POST['mediawidget'];
 | 
			
		||||
 | 
			
		||||
//
 | 
			
		||||
$fl='../config.php'; 
 | 
			
		||||
@ -80,6 +81,12 @@ $content =   preg_replace( '/\$widgetcolour = \"(.*?)\";/', '$widgetcolour = "#'
 | 
			
		||||
 } else {
 | 
			
		||||
 $content =   preg_replace( '/\$MStatusEnabled = \"(.*?)\";/', '$MStatusEnabled = "1";', $content);
 | 
			
		||||
 }
 | 
			
		||||
 // comingepisodes Settings
 | 
			
		||||
 if (empty($mediawidget1)) {
 | 
			
		||||
    $content =   preg_replace( '/\$mediawidget = \"(.*?)\";/', '$mediawidget = "0";', $content);
 | 
			
		||||
 } else {
 | 
			
		||||
 $content =   preg_replace( '/\$mediawidget = \"(.*?)\";/', '$mediawidget = "1";', $content);
 | 
			
		||||
 }
 | 
			
		||||
 // Widget Config
 | 
			
		||||
if (empty($widgetbackgroud1)) {
 | 
			
		||||
    $content =   preg_replace( '/\$widgetbackgroud = \"(.*?)\";/', '$widgetbackgroud = "0";', $content);
 | 
			
		||||
 | 
			
		||||
@ -1,12 +1,5 @@
 | 
			
		||||
<html> 
 | 
			
		||||
<head> 
 | 
			
		||||
<link rel="stylesheet" type="text/css" href="../css/white.css" />
 | 
			
		||||
<link rel="stylesheet" type="text/css" href="../css/static.php" />
 | 
			
		||||
<link rel="alternate stylesheet" type="text/css" media="screen" title="black" href="../css/black.css" />
 | 
			
		||||
<link rel="alternate stylesheet" type="text/css" media="screen" title="white" href="../css/white.css" />
 | 
			
		||||
<link rel="alternate stylesheet" type="text/css" media="screen" title="blue" href="../css/blue.css" />
 | 
			
		||||
<link rel="alternate stylesheet" type="text/css" media="screen" title="red" href="../css/red.css" />
 | 
			
		||||
<link rel="alternate stylesheet" type="text/css" media="screen" title="custom" href="../css/custom.php" />
 | 
			
		||||
  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.js" type="text/javascript"></script>
 | 
			
		||||
  <style>
 | 
			
		||||
        .hiddenRow { display: none; }
 | 
			
		||||
@ -26,9 +19,16 @@
 | 
			
		||||
            <td bgcolor='#FFFFFF'>
 | 
			
		||||
<?php
 | 
			
		||||
include '../config.php';
 | 
			
		||||
$Sick = json_decode(file_get_contents("http://$base:$sickport/api/$SICKAPI/?cmd=future&sort=date"), TRUE);
 | 
			
		||||
    echo $Sick["data"]["today"][2]["data_show_name"];
 | 
			
		||||
?>
 | 
			
		||||
$Sick = json_decode(file_get_contents("http://$base:$sickport/api/$SICKAPI/?cmd=future&sort=date&type=today"), TRUE); ?>
 | 
			
		||||
    <ul>
 | 
			
		||||
<?php foreach($Sick['data'] as $day) : ?>
 | 
			
		||||
    <?php foreach($day as $item) : ?>
 | 
			
		||||
	        <li><?php echo $item['show_name'] ?> </br> <?php echo $item['ep_name'] ?></li>
 | 
			
		||||
    <?php endforeach ?>
 | 
			
		||||
<?php endforeach ?>
 | 
			
		||||
<li>
 | 
			
		||||
<?php echo "<a href=\"http://$base:$sickport/api/$SICKAPI/?cmd=sb.forcesearch\"target=\"_blank\">Click here To Force Search</a>"; ?> </li>
 | 
			
		||||
</ul>
 | 
			
		||||
			            </td>
 | 
			
		||||
        </tr>
 | 
			
		||||
</form>
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user