Merge branch '2.0' into 'master'

fix kknowledge



See merge request !12
This commit is contained in:
Karl 2016-03-04 07:52:45 -05:00
commit a552e08fc9
3 changed files with 19 additions and 4 deletions

View File

@ -101,7 +101,22 @@ findstr "http://webclip.ml" config.php >nul 2>&1
goto END
:END
rem Update Kris URL
rem Update kknowledge URL
findstr "http://kknowledge.tk" config.php >nul 2>&1
if errorlevel 1 goto ONE
if errorlevel 0 goto ZERO
goto END
:ZERO
cscript replace.vbs "config.php" "http://kknowledge.tk" "kknowledge.ml"
echo kknowledge URL Updated
:ONE
echo kknowledge URL Already Updated
goto END
:END
rem Update kknowledge URL
findstr "smifftser.youdontcare.com" config.php >nul 2>&1
if errorlevel 1 goto ONE
if errorlevel 0 goto ZERO
@ -113,7 +128,7 @@ findstr "smifftser.youdontcare.com" config.php >nul 2>&1
echo Kris URL Already Updated
goto END
:END
rem Add KodiVisible
findstr "kodivisible" config.php >nul 2>&1
if errorlevel 1 goto ONE

View File

@ -19,7 +19,7 @@
</tr>
<tr class="hiddenRow">
<td bgcolor='#FFFFFF'>
<!-- start feedwind code --><script type="text/javascript">document.write('\x3Cscript type="text/javascript" src="' + ('https:' == document.location.protocol ? 'https://' : 'http://') + 'feed.mikle.com/js/rssmikle.js">\x3C/script>');</script><script type="text/javascript">(function() {var params = {rssmikle_url: "http://<?php echo $kkuser;?>:<?php echo $kkpass;?>@kknowledge.tk/feed/latest/rss.php",rssmikle_frame_width: "275",rssmikle_frame_height: "400",frame_height_by_article: "5",rssmikle_target: "_blank",rssmikle_font: "Arial, Helvetica, sans-serif",rssmikle_font_size: "12",rssmikle_border: "off",responsive: "off",rssmikle_css_url: "",text_align: "left",text_align2: "left",corner: "off",scrollbar: "on",autoscroll: "on",scrolldirection: "up",scrollstep: "3",mcspeed: "20",sort: "Off",rssmikle_title: "off",rssmikle_title_sentence: "",rssmikle_title_link: "",rssmikle_title_bgcolor: "#0066FF",rssmikle_title_color: "#FFFFFF",rssmikle_title_bgimage: "",rssmikle_item_bgcolor: "#FFFFFF",rssmikle_item_bgimage: "",rssmikle_item_title_length: "55",rssmikle_item_title_color: "#0066FF",rssmikle_item_border_bottom: "on",rssmikle_item_description: "on",item_link: "off",rssmikle_item_description_length: "150",rssmikle_item_description_color: "#666666",rssmikle_item_date: "gl1",rssmikle_timezone: "Etc/GMT",datetime_format: "%b %e, %Y %l:%M:%S %p",item_description_style: "text+tn",item_thumbnail: "full",item_thumbnail_selection: "auto",article_num: "15",rssmikle_item_podcast: "off",keyword_inc: "",keyword_exc: ""};feedwind_show_widget_iframe(params);})();</script><div style="font-size:10px; text-align:center; width:275px;"></div><!-- end feedwind code -->
<!-- start feedwind code --><script type="text/javascript">document.write('\x3Cscript type="text/javascript" src="' + ('https:' == document.location.protocol ? 'https://' : 'http://') + 'feed.mikle.com/js/rssmikle.js">\x3C/script>');</script><script type="text/javascript">(function() {var params = {rssmikle_url: "http://<?php echo $kkuser;?>:<?php echo $kkpass;?>@<?php echo $kknowledge;?>/feed/latest/rss.php",rssmikle_frame_width: "275",rssmikle_frame_height: "400",frame_height_by_article: "5",rssmikle_target: "_blank",rssmikle_font: "Arial, Helvetica, sans-serif",rssmikle_font_size: "12",rssmikle_border: "off",responsive: "off",rssmikle_css_url: "",text_align: "left",text_align2: "left",corner: "off",scrollbar: "on",autoscroll: "on",scrolldirection: "up",scrollstep: "3",mcspeed: "20",sort: "Off",rssmikle_title: "off",rssmikle_title_sentence: "",rssmikle_title_link: "",rssmikle_title_bgcolor: "#0066FF",rssmikle_title_color: "#FFFFFF",rssmikle_title_bgimage: "",rssmikle_item_bgcolor: "#FFFFFF",rssmikle_item_bgimage: "",rssmikle_item_title_length: "55",rssmikle_item_title_color: "#0066FF",rssmikle_item_border_bottom: "on",rssmikle_item_description: "on",item_link: "off",rssmikle_item_description_length: "150",rssmikle_item_description_color: "#666666",rssmikle_item_date: "gl1",rssmikle_timezone: "Etc/GMT",datetime_format: "%b %e, %Y %l:%M:%S %p",item_description_style: "text+tn",item_thumbnail: "full",item_thumbnail_selection: "auto",article_num: "15",rssmikle_item_podcast: "off",keyword_inc: "",keyword_exc: ""};feedwind_show_widget_iframe(params);})();</script><div style="font-size:10px; text-align:center; width:275px;"></div><!-- end feedwind code -->
</td>
</tr>
</form>

View File

@ -201,7 +201,7 @@ if ($showversion > "0") {
</div>
<div id="test-popup2" class="white-popup mfp-hide">
<div style="text-align: center;">
<?php echo "<a href=\"$kknowledge\" target=\"_blank\"><img src=\"$myurl/Pic/KKnowledge.png\" style=\"width: 200px; height: 40px;\"/></a>"; ?>
<?php echo "<a href=\"$http$kknowledge\" target=\"_blank\"><img src=\"$myurl/Pic/KKnowledge.png\" style=\"width: 200px; height: 40px;\"/></a>"; ?>
<?php echo "</p>"; ?>
<?php echo "<a href=\"$knews\" target=\"_blank\"><img src=\"$myurl/Pic/KNews.png\" style=\"width: 200px; height: 40px;\"/></a>"; ?>
<?php echo "</p>"; ?>