Skip to content

Commit

Permalink
Merge branch 'sundown'
Browse files Browse the repository at this point in the history
  • Loading branch information
GodMod committed May 4, 2021
2 parents 17487be + bd39a96 commit bed9680
Show file tree
Hide file tree
Showing 9 changed files with 78 additions and 69 deletions.
4 changes: 2 additions & 2 deletions admin/admin_index.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -334,8 +334,8 @@ public function display(){
if($req_count > 0){
$this->jquery->Tab_Select('admininfos_tabs', 2);
}
$this->jquery->rssFeeder('notifications', "index.php".$this->SID."&rssajax=notification", '3', '999');
$this->jquery->rssFeeder('twitterfeed', "index.php".$this->SID."&rssajax=twitter");
#$this->jquery->rssFeeder('notifications', "index.php".$this->SID."&rssajax=notification", '3', '999');
#$this->jquery->rssFeeder('twitterfeed', "index.php".$this->SID."&rssajax=twitter");

$this->tpl->js_file($this->root_path.'libraries/jquery/js/circles/circles.min.js');

Expand Down
2 changes: 1 addition & 1 deletion core/admin_functions.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ public function adminmenu($blnShowBadges = true, $coreUpdates="", $extensionUpda
'icon' => 'fa-cog fa-lg fa-fw',
'name' => $this->user->lang('menu_maintenance').(($blnShowBadges) ? $coreUpdates : ''),
1 => array('link' => 'maintenance/'.$this->SID, 'text' => $this->user->lang('maintenance'), 'check' => 'a_maintenance', 'icon' => 'fa-cog fa-lg fa-fw'),
2 => array('link' => 'admin/manage_live_update.php'.$this->SID, 'text' => $this->user->lang('liveupdate'), 'check' => 'a_maintenance', 'icon' => 'fa fa-refresh fa-lg fa-fw'),
#2 => array('link' => 'admin/manage_live_update.php'.$this->SID, 'text' => $this->user->lang('liveupdate'), 'check' => 'a_maintenance', 'icon' => 'fa fa-refresh fa-lg fa-fw'),
3 => array('link' => 'admin/manage_backup.php'.$this->SID, 'text' => $this->user->lang('backup'), 'check' => 'a_backup', 'icon' => 'fa-floppy-o fa-lg fa-fw'),
4 => array('link' => 'admin/manage_reset.php'.$this->SID, 'text' => $this->user->lang('consolidate_reset'), 'check' => 'a_reset', 'icon' => 'fa-retweet fa-lg fa-fw'),
5 => array('link' => 'admin/manage_cache.php'.$this->SID, 'text' => $this->user->lang('pdc_manager'), 'check' => 'a_cache_man', 'icon' => 'fa-briefcase fa-lg fa-fw'),
Expand Down
14 changes: 7 additions & 7 deletions core/constants.php
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,16 @@

//URLs
//-------------------------------------------------------------------------
define('EQDKP_PROJECT_URL', "https://eqdkp-plus.eu");
define('EQDKP_ABOUT_URL', "https://eqdkp-plus.eu/about");
define('EQDKP_DOWNLOADS_URL', "https://download.eqdkp-plus.eu/");
define('EQDKP_REPO_URL', "https://repo.eqdkp-plus.eu/");
define('EQDKP_PROJECT_URL', "https://eqdkpplus.github.io/");
define('EQDKP_ABOUT_URL', "https://eqdkpplus.github.io/");
define('EQDKP_DOWNLOADS_URL', "https://eqdkpplus.github.io/");
define('EQDKP_REPO_URL', "https://eqdkpplus.github.io/");
define('EQDKP_NOTIFICATIONS_URL', "https://eqdkp-plus.eu/rss/notifications.xml");
define('EQDKP_TWITTER_SCREENNAME', "EQdkpPlus");
define('EQDKP_BOARD_URL', "https://forum.eqdkp-plus.eu");
define('EQDKP_BOARD_URL', "https://eqdkpplus.github.io/");
define('EQDKP_CRL_URL', "https://raw.githubusercontent.com/EQdkpPlus/misc-crl/master/crl.txt");
define('EQDKP_WIKI_URL', "https://wiki.eqdkp-plus.eu/wiki/");
define('EQDKP_BUGTRACKER_URL', "https://forum.eqdkp-plus.eu/bugtracker/");
define('EQDKP_WIKI_URL', "https://eqdkpplus.github.io/");
define('EQDKP_BUGTRACKER_URL', "https://eqdkpplus.github.io/");
define('EQDKP_CONNECTION_CHECK_URL', 'https://raw.githubusercontent.com/EQdkpPlus/misc-connectioncheck/master/status.txt');

//Tag Blacklist for filtering article content
Expand Down
8 changes: 6 additions & 2 deletions core/repository.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ public function ResetExtensionList(){

// fetch the extension list and save to database
private function fetchExtensionList(){
return true;

$response = $this->puf->fetch($this->RepoEndpoint.'extension_list'.$this->getChannelURL()."&core=".$this->plusversion, "", 10);
if ($response){
$this->ResetExtensionList();
Expand Down Expand Up @@ -340,6 +342,8 @@ private function parseIntermediateCerts($strCerts){

//Download the Intermediate Cert from our server
private function loadIntermediateCert(){
return true;

$response = $this->puf->fetch($this->RepoEndpoint.'interm_cert', "", 5);
$arrJson = json_decode($response);

Expand All @@ -358,7 +362,8 @@ private function loadIntermediateCert(){

//Download Revoke List from our server
private function loadRevokeList(){

return true;

$response = $this->puf->fetch(EQDKP_CRL_URL, "", 5);

if ($response){
Expand Down Expand Up @@ -452,7 +457,6 @@ public function UpdateCount(){
return (isset($this->updates['pluskernel'])) ? ($this->update_count-1) : $this->update_count;
}

// check if there are updates available
// check if there are updates available
public function UpdatesAvailable($pcore=false){
if($pcore){
Expand Down
2 changes: 1 addition & 1 deletion install/install.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ private function end() {
}

private function parse_end() {
header('Location: '.$this->root_path.'admin/quickstart.php?splash=true');
header('Location: '.$this->root_path.'admin/index.php');
exit;
}

Expand Down
9 changes: 1 addition & 8 deletions language/english/lang_install.php
Original file line number Diff line number Diff line change
Expand Up @@ -218,14 +218,7 @@
"install_end_text" => 'The installation can now be completed successfully.',
'windows_apache_hint' => 'It seems like you are using Apache under Windows as Webserver. EQdkp Plus will only work if you increase the ThreadStackSize to 8388608 at the Apache configuration file.',
'install_support_h1' => 'Support EQdkp Plus',
'install_support_text' => 'A project like EQdkp Plus can only exist, if we can get back some of the effort, time and love we invest in EQdkp Plus. You can give something back on the following ways:
<ul>
<li><i class="fa fa-puzzle-piece"></i> <a href="http://eqdkp-plus.eu/repository/">Publish a plugin or template, so every EQdkp Plus user can use it</a></li>
<li><i class="fa fa-comments"></i> <a href="http://eqdkp-plus.eu/forum/">Support us at our board</a></li>
<li><i class="fa fa-cogs"></i> <a href="https://eqdkp-plus.eu/en/development.html">Take part actively in the development of EQdkp Plus</a></li>
<li><i class="fa fa-usd"></i> <a href="https://eqdkp-plus.eu/en/donate.html">Support us financially so we can continue offering you our services like LiveUpdate</a></li>
</ul>
So if you love EQdkp Plus as much as we do, think about supporting us!<br /><a href="https://eqdkp-plus.eu/Donate.html?" style="background:orange;border-radius:5px;padding:7px;display:inline-block;color:black;"><i class="fa fa-paypal"></i> Donate now</a>',
'install_support_text' => '<a href="https://www.paypal.me/eqdkpplus" style="background:orange;border-radius:5px;padding:7px;display:inline-block;color:black;"><i class="fa fa-paypal"></i> Donate now</a>',
'additional_keys' => 'Additional Features',
//Step: additional_keys
'additional_keys_info' => 'We use features from other providers, like spam protection. In order to use this features, you need own Keys for this features. Therefore you can create your own keys at the following pages.<br /><b>Of course you can skip this step, and insert the keys at any time at the EQdkp Plus Settings.</b>',
Expand Down
10 changes: 1 addition & 9 deletions language/german/lang_install.php
Original file line number Diff line number Diff line change
Expand Up @@ -256,14 +256,6 @@
//Step: end
'install_end_text' => 'Die Installation kann nun erfolgreich abgeschlossen werden.',
'install_support_h1' => 'Unterstütze EQdkp Plus',
'install_support_text' => 'So ein Projekt wie EQdkp Plus kann natürlich nur existieren, wenn wir für die ganze Mühe, Zeit und Liebe, die wir in EQdkp Plus stecken, auch wieder etwas zurückbekommen. Dies ist auf vielfältige Weise möglich:
<ul>
<li><i class="fa fa-puzzle-piece"></i> <a href="http://eqdkp-plus.eu/repository/">Veröffentliche ein Plugin oder Template, damit alle EQdkp Plus Benutzer was davon haben</a></li>
<li><i class="fa fa-comments"></i> <a href="http://eqdkp-plus.eu/forum/">Unterstütze uns in unserem Forum</a></li>
<li><i class="fa fa-cogs"></i> <a href="http://eqdkp-plus.eu/de/entwicklung.html">Beteilige dich aktiv an der Weiterentwicklung von EQdkp Plus</a></li>
<li><i class="fa fa-usd"></i> <a href="http://eqdkp-plus.eu/de/spenden.html">Unterstützte uns finanziell, damit wir euch weiterhin unsere Services anbieten können</a></li>
</ul>
Also wenn ihr EQdkp Plus genauso liebt wie wir, denkt doch mal darüber nach, uns zu unterstützen!<br /><a href="https://eqdkp-plus.eu/Donate.html?" style="background:orange;border-radius:5px;padding:7px;display:inline-block;color:black;"><i class="fa fa-paypal"></i> Jetzt Spenden</a>',
'install_support_text' => '<a href="https://www.paypal.me/eqdkpplus" style="background:orange;border-radius:5px;padding:7px;display:inline-block;color:black;"><i class="fa fa-paypal"></i> Jetzt Spenden</a>',
'module_externalconnection' => 'Externe Verbindungen',
);
58 changes: 58 additions & 0 deletions maintenance/includes/tasks/update_23390/update_23390.class.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?php
/* Project: EQdkp-Plus
* Package: EQdkp-plus
* Link: http://eqdkp-plus.eu
*
* Copyright (C) 2006-2015 EQdkp-Plus Developer Team
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/

if ( !defined('EQDKP_INC') ){
header('HTTP/1.0 404 Not Found');exit;
}

include_once(registry::get_const('root_path').'maintenance/includes/sql_update_task.class.php');

class update_23390 extends sql_update_task {
public $author = 'GodMod';
public $version = '2.3.39.0'; //new plus-version
public $ext_version = '2.3.39'; //new plus-version
public $name = '2.3.39 Update';

public function __construct(){
parent::__construct();

$this->langs = array(
'english' => array(
'update_23330' => 'EQdkp Plus 2.3.33 Update',
'update_function' => 'Clear Repository Table',
),
'german' => array(
'update_23330' => 'EQdkp Plus 2.3.33 Update',
'update_function' => 'Leere Repository Tabelle'
),
);
}

public function update_function(){
$this->pdh->put('repository', 'reset');
$this->pdh->process_hook_queue();

return true;
}

}

?>
40 changes: 1 addition & 39 deletions templates/base_template/admin/admin_index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,31 +19,12 @@

<div id='admininfos_tabs'>
<ul>
<li><a href='#fragment-1'><i class="fa fa-book fa-lg"></i> <span>{L_adminc_news}</span></a></li>
<li><a href='#fragment-2'><i class="fa fa-desktop fa-lg"></i> <span>{L_adminc_system}</span></a></li>
<li><a href='#fragment-5'><i class="fa fa-check-square fa-lg"></i><!-- IF REQCOUNT > 0--> <span class="bubble-red">{REQCOUNT}</span><!-- ENDIF --> <span>{L_adminc_requirements}</span></a></li>
<li><a href='#fragment-3'><i class="fa fa-line-chart fa-lg"></i> <span>{L_adminc_statistics}</span></a></li>
<li><a href='#fragment-4'><i class="fa fa-question fa-lg"></i> <span>{L_adminc_support}</span></a></li>
</ul>

<div id="fragment-1">
<div class="grid">
<div class="onerow">
<div class="col6">
<h2>{L_rssadmin_head1}</h2>
<div id="notifications"></div>
</div>
<div class="col6 last">
<h2>{L_rssadmin_head2} <a href="https://twitter.com/EQdkpPlus" target="new" ><i class="fa fa-twitter-square fa-lg"></i></a>
<a href="https://facebook.com/EQdkpPlus" target="new" ><i class="fa fa-facebook-square fa-lg"></i></a>
</h2>
<div id="twitterfeed"></div>
</div>

</div>
</div>
</div>

<div id="fragment-5">
<table class="table fullwidth">
<tr>
Expand Down Expand Up @@ -239,30 +220,11 @@ <h3>{L_adjustments}</h3>
<td><span class="fa-stack fa-3x"><i class="fa fa-square fa-stack-2x"></i><i class="fa fa-question fa-stack-1x fa-inverse"></i></span></td>
<td>{L_adminc_support_tour}</td>
</tr>
<tr>
<td><span class="fa-stack fa-3x"><i class="fa fa-square fa-stack-2x"></i><i class="fa fa-magic fa-stack-1x fa-inverse"></i></span></td>
<td>{L_adminc_magic}</td>
</tr>

<tr>
<td><span class="fa-stack fa-3x"><i class="fa fa-square fa-stack-2x"></i><i class="fa fa-wikipedia-w fa-stack-1x fa-inverse"></i></span></td>
<td>{L_adminc_support_wiki}</td>
</tr>
<tr>
<td><span class="fa-stack fa-3x"><i class="fa fa-square fa-stack-2x"></i><i class="fa fa-bug fa-stack-1x fa-inverse"></i></span></td>
<td>{L_adminc_support_bugtracker}</td>
</tr>
<tr>
<td><span class="fa-stack fa-3x"><i class="fa fa-square fa-stack-2x"></i><i class="fa fa-users fa-stack-1x fa-inverse"></i></span></td>
<td>{L_adminc_support_forums}</td>
</tr>
<tr>
<td id="support"><i class="fa fa-heart fa-5x" style="color:red;vertical-align:middle;"></i>
<span class="fa-stack fa-lg" style="margin-left: -30px; margin-bottom: -10px; margin-right: 10px;">
<i class="fa fa-circle fa-stack-2x"></i>
<i class="fa fa-usd fa-stack-1x fa-inverse"></i>
</span></td>
<td>{L_support_eqdkplus}</td>
</tr>
</table>
</div>
</div>
Expand Down

0 comments on commit bed9680

Please sign in to comment.