Skip to content

Commit bed9680

Browse files
GodModGodMod
committed
Merge branch 'sundown'
2 parents 17487be + bd39a96 commit bed9680

9 files changed

Lines changed: 78 additions & 69 deletions

File tree

‎admin/admin_index.class.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -334,8 +334,8 @@ public function display(){
334334
if($req_count > 0){
335335
$this->jquery->Tab_Select('admininfos_tabs', 2);
336336
}
337-
$this->jquery->rssFeeder('notifications', "index.php".$this->SID."&rssajax=notification", '3', '999');
338-
$this->jquery->rssFeeder('twitterfeed', "index.php".$this->SID."&rssajax=twitter");
337+
#$this->jquery->rssFeeder('notifications', "index.php".$this->SID."&rssajax=notification", '3', '999');
338+
#$this->jquery->rssFeeder('twitterfeed', "index.php".$this->SID."&rssajax=twitter");
339339

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

‎core/admin_functions.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ public function adminmenu($blnShowBadges = true, $coreUpdates="", $extensionUpda
311311
'icon' => 'fa-cog fa-lg fa-fw',
312312
'name' => $this->user->lang('menu_maintenance').(($blnShowBadges) ? $coreUpdates : ''),
313313
1 => array('link' => 'maintenance/'.$this->SID, 'text' => $this->user->lang('maintenance'), 'check' => 'a_maintenance', 'icon' => 'fa-cog fa-lg fa-fw'),
314-
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'),
314+
#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'),
315315
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'),
316316
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'),
317317
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'),

‎core/constants.php‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,16 @@
7474

7575
//URLs
7676
//-------------------------------------------------------------------------
77-
define('EQDKP_PROJECT_URL', "https://eqdkp-plus.eu");
78-
define('EQDKP_ABOUT_URL', "https://eqdkp-plus.eu/about");
79-
define('EQDKP_DOWNLOADS_URL', "https://download.eqdkp-plus.eu/");
80-
define('EQDKP_REPO_URL', "https://repo.eqdkp-plus.eu/");
77+
define('EQDKP_PROJECT_URL', "https://eqdkpplus.github.io/");
78+
define('EQDKP_ABOUT_URL', "https://eqdkpplus.github.io/");
79+
define('EQDKP_DOWNLOADS_URL', "https://eqdkpplus.github.io/");
80+
define('EQDKP_REPO_URL', "https://eqdkpplus.github.io/");
8181
define('EQDKP_NOTIFICATIONS_URL', "https://eqdkp-plus.eu/rss/notifications.xml");
8282
define('EQDKP_TWITTER_SCREENNAME', "EQdkpPlus");
83-
define('EQDKP_BOARD_URL', "https://forum.eqdkp-plus.eu");
83+
define('EQDKP_BOARD_URL', "https://eqdkpplus.github.io/");
8484
define('EQDKP_CRL_URL', "https://raw.githubusercontent.com/EQdkpPlus/misc-crl/master/crl.txt");
85-
define('EQDKP_WIKI_URL', "https://wiki.eqdkp-plus.eu/wiki/");
86-
define('EQDKP_BUGTRACKER_URL', "https://forum.eqdkp-plus.eu/bugtracker/");
85+
define('EQDKP_WIKI_URL', "https://eqdkpplus.github.io/");
86+
define('EQDKP_BUGTRACKER_URL', "https://eqdkpplus.github.io/");
8787
define('EQDKP_CONNECTION_CHECK_URL', 'https://raw.githubusercontent.com/EQdkpPlus/misc-connectioncheck/master/status.txt');
8888

8989
//Tag Blacklist for filtering article content

‎core/repository.class.php‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,8 @@ public function ResetExtensionList(){
170170

171171
// fetch the extension list and save to database
172172
private function fetchExtensionList(){
173+
return true;
174+
173175
$response = $this->puf->fetch($this->RepoEndpoint.'extension_list'.$this->getChannelURL()."&core=".$this->plusversion, "", 10);
174176
if ($response){
175177
$this->ResetExtensionList();
@@ -340,6 +342,8 @@ private function parseIntermediateCerts($strCerts){
340342

341343
//Download the Intermediate Cert from our server
342344
private function loadIntermediateCert(){
345+
return true;
346+
343347
$response = $this->puf->fetch($this->RepoEndpoint.'interm_cert', "", 5);
344348
$arrJson = json_decode($response);
345349

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

359363
//Download Revoke List from our server
360364
private function loadRevokeList(){
361-
365+
return true;
366+
362367
$response = $this->puf->fetch(EQDKP_CRL_URL, "", 5);
363368

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

455-
// check if there are updates available
456460
// check if there are updates available
457461
public function UpdatesAvailable($pcore=false){
458462
if($pcore){

‎install/install.class.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ private function end() {
351351
}
352352

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

‎language/english/lang_install.php‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -218,14 +218,7 @@
218218
"install_end_text" => 'The installation can now be completed successfully.',
219219
'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.',
220220
'install_support_h1' => 'Support EQdkp Plus',
221-
'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:
222-
<ul>
223-
<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>
224-
<li><i class="fa fa-comments"></i> <a href="http://eqdkp-plus.eu/forum/">Support us at our board</a></li>
225-
<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>
226-
<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>
227-
</ul>
228-
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>',
221+
'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>',
229222
'additional_keys' => 'Additional Features',
230223
//Step: additional_keys
231224
'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>',

‎language/german/lang_install.php‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -256,14 +256,6 @@
256256
//Step: end
257257
'install_end_text' => 'Die Installation kann nun erfolgreich abgeschlossen werden.',
258258
'install_support_h1' => 'Unterstütze EQdkp Plus',
259-
'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:
260-
<ul>
261-
<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>
262-
<li><i class="fa fa-comments"></i> <a href="http://eqdkp-plus.eu/forum/">Unterstütze uns in unserem Forum</a></li>
263-
<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>
264-
<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>
265-
</ul>
266-
267-
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>',
259+
'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>',
268260
'module_externalconnection' => 'Externe Verbindungen',
269261
);

‎maintenance/includes/tasks/update_23390/update_23390.class.php‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?php
2+
/* Project: EQdkp-Plus
3+
* Package: EQdkp-plus
4+
* Link: http://eqdkp-plus.eu
5+
*
6+
* Copyright (C) 2006-2015 EQdkp-Plus Developer Team
7+
*
8+
* This program is free software: you can redistribute it and/or modify
9+
* it under the terms of the GNU Affero General Public License as published
10+
* by the Free Software Foundation, either version 3 of the License, or
11+
* (at your option) any later version.
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU Affero General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU Affero General Public License
19+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
20+
*/
21+
22+
if ( !defined('EQDKP_INC') ){
23+
header('HTTP/1.0 404 Not Found');exit;
24+
}
25+
26+
include_once(registry::get_const('root_path').'maintenance/includes/sql_update_task.class.php');
27+
28+
class update_23390 extends sql_update_task {
29+
public $author = 'GodMod';
30+
public $version = '2.3.39.0'; //new plus-version
31+
public $ext_version = '2.3.39'; //new plus-version
32+
public $name = '2.3.39 Update';
33+
34+
public function __construct(){
35+
parent::__construct();
36+
37+
$this->langs = array(
38+
'english' => array(
39+
'update_23330' => 'EQdkp Plus 2.3.33 Update',
40+
'update_function' => 'Clear Repository Table',
41+
),
42+
'german' => array(
43+
'update_23330' => 'EQdkp Plus 2.3.33 Update',
44+
'update_function' => 'Leere Repository Tabelle'
45+
),
46+
);
47+
}
48+
49+
public function update_function(){
50+
$this->pdh->put('repository', 'reset');
51+
$this->pdh->process_hook_queue();
52+
53+
return true;
54+
}
55+
56+
}
57+
58+
?>

‎templates/base_template/admin/admin_index.html‎

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -19,31 +19,12 @@
1919

2020
<div id='admininfos_tabs'>
2121
<ul>
22-
<li><a href='#fragment-1'><i class="fa fa-book fa-lg"></i> <span>{L_adminc_news}</span></a></li>
2322
<li><a href='#fragment-2'><i class="fa fa-desktop fa-lg"></i> <span>{L_adminc_system}</span></a></li>
2423
<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>
2524
<li><a href='#fragment-3'><i class="fa fa-line-chart fa-lg"></i> <span>{L_adminc_statistics}</span></a></li>
2625
<li><a href='#fragment-4'><i class="fa fa-question fa-lg"></i> <span>{L_adminc_support}</span></a></li>
2726
</ul>
2827

29-
<div id="fragment-1">
30-
<div class="grid">
31-
<div class="onerow">
32-
<div class="col6">
33-
<h2>{L_rssadmin_head1}</h2>
34-
<div id="notifications"></div>
35-
</div>
36-
<div class="col6 last">
37-
<h2>{L_rssadmin_head2} <a href="https://twitter.com/EQdkpPlus" target="new" ><i class="fa fa-twitter-square fa-lg"></i></a>
38-
<a href="https://facebook.com/EQdkpPlus" target="new" ><i class="fa fa-facebook-square fa-lg"></i></a>
39-
</h2>
40-
<div id="twitterfeed"></div>
41-
</div>
42-
43-
</div>
44-
</div>
45-
</div>
46-
4728
<div id="fragment-5">
4829
<table class="table fullwidth">
4930
<tr>
@@ -239,30 +220,11 @@ <h3>{L_adjustments}</h3>
239220
<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>
240221
<td>{L_adminc_support_tour}</td>
241222
</tr>
242-
<tr>
243-
<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>
244-
<td>{L_adminc_magic}</td>
245-
</tr>
223+
246224
<tr>
247225
<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>
248226
<td>{L_adminc_support_wiki}</td>
249227
</tr>
250-
<tr>
251-
<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>
252-
<td>{L_adminc_support_bugtracker}</td>
253-
</tr>
254-
<tr>
255-
<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>
256-
<td>{L_adminc_support_forums}</td>
257-
</tr>
258-
<tr>
259-
<td id="support"><i class="fa fa-heart fa-5x" style="color:red;vertical-align:middle;"></i>
260-
<span class="fa-stack fa-lg" style="margin-left: -30px; margin-bottom: -10px; margin-right: 10px;">
261-
<i class="fa fa-circle fa-stack-2x"></i>
262-
<i class="fa fa-usd fa-stack-1x fa-inverse"></i>
263-
</span></td>
264-
<td>{L_support_eqdkplus}</td>
265-
</tr>
266228
</table>
267229
</div>
268230
</div>

0 commit comments

Comments
 (0)