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

Merge branch '2.0' into 'master'

Browse Source 
trying to fix update



See merge request !7
This commit is contained in:
Karl 2016-02-07 06:56:03 -05:00
commit 69d0053487
7 changed files with 57 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
KWorld.php Normal file
View File

@ -0,0 +1,2 @@
<p style="text-align: center;">
<?php echo "<a href=\"#test-popup2\" class=\"open-popup-link\"><img src=\"$myurl/Pic/KWorld.png\"/></a>"; ?>

16
ManUpdate.php
View File

@ -1,18 +1,22 @@
<html>
<head>
<title>Manual Update</title>
</head>
<body>
<?php <?php
if(isset($_POST['submit'])) if(isset($_POST['submit']))
{ {
//echo exec('Update.bat'); exec('cmd /c Update.bat', $output);
// DEBUG
echo exec('Update.bat', $output);
print_r($output); print_r($output);
//echo '<script>parent.window.location.reload(true);</script>'; echo "Done!";
} else { } else {
// display the form // display the form
?> ?>
<form action="" method="post"> <form action="" method="post">
<input type="submit" name="submit" value="GET IT!"> <input type="submit" name="submit" value="DO IT!">
</form> </form>
<?php <?php
} }
?> ?>
</body>
</html>

18
Update.bat
View File

@ -220,6 +220,24 @@ findstr "widgetbackgroud" config.php >nul 2>&1
goto END goto END
:END :END
rem KWorld
findstr "KWorldEnabled" config.php >nul 2>&1
if errorlevel 1 goto ONE
if errorlevel 0 goto ZERO
goto END
:ZERO
echo KWorld Toggle Already Updated
goto END
:ONE
echo ^<?php >>config.php
echo //// KWorld Toggle Settings >> config.php
echo $KWorldEnabled = "1"; >> config.php
echo //// >> config.php
echo ^?^> >> config.php
echo KWorld Toggle Updated
goto END
:END
rem Update Version rem Update Version
findstr "localversion" config.php >nul 2>&1 findstr "localversion" config.php >nul 2>&1
if errorlevel 1 goto ONE if errorlevel 1 goto ONE

2
config/set1.php
View File

@ -22,6 +22,8 @@
Custom Background Colour:<input class="color" name="backgroundcolor" value="<?php echo $custombackground ?>"</td> Custom Background Colour:<input class="color" name="backgroundcolor" value="<?php echo $custombackground ?>"</td>
<br /> <br />
<br /> <br />
KWorld Enabled: <input name="kworldenabled" id="id" type="checkbox" <?php if($KWorldEnabled > "0") echo "checked=checked; "; ?> /><br />
<br />
Services Widget Enabled: <input name="servicesvisible" id="id" type="checkbox" <?php if($servicesvisible > "0") echo "checked=checked; "; ?> /><br /> 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 /> 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 /> KKnowledge Widget Enabled: <input name="kknowledgefeedvisible" id="id" type="checkbox" <?php if($kknowledgefeedvisible > "0") echo "checked=checked; "; ?> /><br />

9
config/test2.php
View File

@ -1,9 +0,0 @@
<?php
$p = popen('Update.bat', 'r');
if ($p)
{
while (!feof($p))
echo gets($p); // get output line-by-line
pclose($p);
}
?>

7
config/write1.php
View File

@ -15,6 +15,7 @@ $showversion1 = $_POST['showversion'];
$widgetbackgroud1 = $_POST['widgetvisible']; $widgetbackgroud1 = $_POST['widgetvisible'];
$customwidgetbackgroud1 = $_POST['customwidget']; $customwidgetbackgroud1 = $_POST['customwidget'];
$widgetbackgroudcolour1 = $_POST['widgetbackgroudcolour']; $widgetbackgroudcolour1 = $_POST['widgetbackgroudcolour'];
$KWorldEnabled1 = $_POST['kworldenabled'];
// //
$fl='../config.php'; $fl='../config.php';
@ -82,6 +83,12 @@ if (empty($widgetbackgroud1)) {
$content = preg_replace( '/\$customwidgetbackgroud = \"(.*?)\";/', '$customwidgetbackgroud = "1";', $content); $content = preg_replace( '/\$customwidgetbackgroud = \"(.*?)\";/', '$customwidgetbackgroud = "1";', $content);
} }
$content = preg_replace( '/\$widgetbackgroudcolour = \"(.*?)\";/', '$widgetbackgroudcolour = "#'.$widgetbackgroudcolour1.'";', $content); $content = preg_replace( '/\$widgetbackgroudcolour = \"(.*?)\";/', '$widgetbackgroudcolour = "#'.$widgetbackgroudcolour1.'";', $content);
// kworld Settings
if (empty($KWorldEnabled1)) {
$content = preg_replace( '/\$KWorldEnabled = \"(.*?)\";/', '$KWorldEnabled = "0";', $content);
} else {
$content = preg_replace( '/\$KWorldEnabled = \"(.*?)\";/', '$KWorldEnabled = "1";', $content);
}
/*write operation ->*/ $tmp =fopen($fl, "w"); fwrite($tmp, $content); fclose($tmp); /*write operation ->*/ $tmp =fopen($fl, "w"); fwrite($tmp, $content); fclose($tmp);
//sleep for 5 seconds //sleep for 5 seconds

7
main.php
View File

@ -98,8 +98,11 @@ $('.window').hide();
<?php echo "<p style=\" text-align: center;\">$yourname's Server Access</p>";?> <?php echo "<p style=\" text-align: center;\">$yourname's Server Access</p>";?>
</div> </div>
<p style="text-align: center;"> <?php
<?php echo "<a href=\"#test-popup2\" class=\"open-popup-link\"><img src=\"$myurl/Pic/KWorld.png\"/></a>"; ?> if ($KWorldEnabled > "0") {
require "KWorld.php";
}
?>
</p> </p>
<div class="gridWrapper"> <div class="gridWrapper">