Skip to content

Commit

Permalink
Remove zSettings
Browse files Browse the repository at this point in the history
  • Loading branch information
Yannick committed Dec 27, 2014
1 parent 122f9df commit 7e0cfb3
Show file tree
Hide file tree
Showing 9 changed files with 13 additions and 127 deletions.
8 changes: 5 additions & 3 deletions backstage/about.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,11 +189,11 @@
<b>Font Awesome</b> has been updated from version 4.1.0 to 4.2.0.<br />
<b>jQuery</b> has been updated from version 2.1.1 to 2.1.3.<br />
<b>PrismJS</b> has been added.<br />
<b>Core</b> has been updated from version 0.0.35.2491 to 0.2.3478.</p>
<b>Core</b> has been updated from version 0.0.36.2563 to 0.2.3478.</p>
</div>
<div class="col-sm-6">
<h4>Bugfixes</h4>
<p>28 bugs have been fixed.</p>
<p>40 bugs have been fixed.</p>
<h4>Security fixes</h4>
<p>3 security issue has been fixed.</p>
</div>
Expand Down Expand Up @@ -337,7 +337,8 @@
<span class="label label-success">35xx</span> You can now disable the "Back to top" link<br />
<span class="label label-success">35xx</span> Emoji's are now part of the Editor interface<br />
<span class="label label-success">35xx</span> Mainstage First Run has new actions<br />
<span class="label label-success">35xx</span> Responsive footer has been improved
<span class="label label-success">35xx</span> Responsive footer has been improved<br />
<span class="label label-success">35xx</span> zSettings has been dropped
</p>
</div>
<div class="col-sm-6">
Expand All @@ -349,6 +350,7 @@
<span class="label label-success">35xx</span> New interface for profile, settings and notifications<br />
<span class="label label-success">35xx</span> Inbox now has it's own icon in the menubar<br />
<span class="label label-success">35xx</span> Improved visual appearance of editor<br />
<span class="label label-success">35xx</span> Backstage's First Run can be disabled<br />
<span class="label label-success">35xx</span> Multiple bugfixes
</p>
</div>
Expand Down
8 changes: 1 addition & 7 deletions backstage/index.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,7 @@
if (isset($_GET['saved']))
echo '<div class="alert alert-success"><h4>'.$lang['Settings saved'].'</h4></div>';

if (file_exists('../z.txt') && ($luna_config['o_reading_list'] == '1')) {
?>
<div class="alert alert-danger">
<h4>zSettings enabled!</h4>
We've found out that some zSettings have been enabled. These settings control feature that are still in major development, might not work at all and/or can possibly corrupt your forum. We strongly recommend you to use these features only when necessary (for example, when you're developing Luna). Otherwise, you can disable them in <span class="fa fa-cog"></span> Settings > <span class="fa fa-cogs"></span> zSettings.
</div>
<?php } if ($luna_config['o_first_run_backstage'] == 0) { ?>
if ($luna_config['o_first_run_backstage'] == 0) { ?>
<div class="panel panel-primary hidden-xs">
<div class="panel-heading">
<h3 class="panel-title">Welcome to Luna
Expand Down
101 changes: 0 additions & 101 deletions backstage/zsettings.php
View file

This file was deleted.

8 changes: 4 additions & 4 deletions db_update.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,10 +399,6 @@ function stripslashes_array($array) {
$db->create_table('reading_list', $schema) or error('Unable to create reading list table', __FILE__, __LINE__, $db->error());
}

// Since 0.0.3226: Add o_reading_list/experimental feature
if (!array_key_exists('o_reading_list', $luna_config))
$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES (\'o_reading_list\', \'0\')') or error('Unable to insert config value \'o_reading_list\'', __FILE__, __LINE__, $db->error());

// Since 0.0.3247: Remove obsolete o_quickpost permission from config table
if (array_key_exists('o_quickpost', $luna_config))
$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name = \'o_quickpost\'') or error('Unable to remove config value \'o_quickpost\'', __FILE__, __LINE__, $db->error());
Expand Down Expand Up @@ -696,6 +692,10 @@ function stripslashes_array($array) {
if (!array_key_exists('o_custom_copyright', $luna_config))
$db->query('INSERT INTO '.$db->prefix.'config (conf_name, conf_value) VALUES (\'o_custom_copyright\', NULL)') or error('Unable to insert config value \'o_custom_copyright\'', __FILE__, __LINE__, $db->error());

// Since 0.2.3558: Remove obsolete o_reading_list permission from config table
if (array_key_exists('o_reading_list', $luna_config))
$db->query('DELETE FROM '.$db->prefix.'config WHERE conf_name = \'o_reading_list\'') or error('Unable to remove config value \'o_reading_list\'', __FILE__, __LINE__, $db->error());


break;

Expand Down
5 changes: 0 additions & 5 deletions include/backstage_functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ function load_admin_nav($section, $page) {
$page_title = '<span class="fa fa-fw fa-paint-brush"></span> Theme';
else if ($page == 'maintenance')
$page_title = '<span class="fa fa-fw fa-coffee"></span> Maintenance';
else if ($page == 'zsettings')
$page_title = '<span class="fa fa-fw fa-cogs"></span> zSettings';

else if ($page == 'database')
$page_title = 'Database management';
Expand Down Expand Up @@ -166,9 +164,6 @@ function load_admin_nav($section, $page) {
<li<?php if($page == 'menu') echo ' class="active"' ?>><a href="menu.php"><span class="fa fa-fw fa-bars"></span><span class="hidden-xs"> Menu</span></a></li>
<li<?php if($page == 'theme') echo ' class="active"' ?>><a href="theme.php"><span class="fa fa-fw fa-paint-brush"></span><span class="hidden-xs"> Theme</span></a></li>
<li<?php if($page == 'maintenance') echo ' class="active"' ?>><a href="maintenance.php"><span class="fa fa-fw fa-coffee"></span><span class="hidden-xs"> Maintenance</span></a></li>
<?php if (file_exists('../z.txt')) { ?>
<li<?php if($page == 'zsettings') echo ' class="active"' ?>><a href="zsettings.php"><span class="fa fa-fw fa-cogs"></span><span class="hidden-xs"> zSettings</span></a></li>
<?php } ?>
</ul>
<?php } ?>
</div>
Expand Down
3 changes: 0 additions & 3 deletions include/common.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@
if (!defined('FORUM_ROOT'))
exit('The constant FORUM_ROOT must be defined and point to a valid Luna installation root directory.');

if (file_exists('z.txt'))
$zset = '1';

// Load the version class
require FORUM_ROOT.'include/version.php';

Expand Down
2 changes: 1 addition & 1 deletion include/draw_functions.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ function draw_index_topics_list($section_id) {
}

function draw_topic_list() {
global $lang, $result, $db, $luna_config, $zset, $post_ids, $is_admmod, $start_from, $post_count, $admin_ids, $luna_user;
global $lang, $result, $db, $luna_config, $post_ids, $is_admmod, $start_from, $post_count, $admin_ids, $luna_user;

// Retrieve the posts (and their respective poster/online status)
$result = $db->query('SELECT u.email, u.title, u.url, u.location, u.signature, u.email_setting, u.num_posts, u.registered, u.admin_note, p.id, p.poster AS username, p.poster_id, p.poster_ip, p.poster_email, p.message, p.hide_smilies, p.posted, p.edited, p.edited_by, p.marked, g.g_id, g.g_user_title, o.user_id AS is_online FROM '.$db->prefix.'posts AS p INNER JOIN '.$db->prefix.'users AS u ON u.id=p.poster_id INNER JOIN '.$db->prefix.'groups AS g ON g.g_id=u.group_id LEFT JOIN '.$db->prefix.'online AS o ON (o.user_id=u.id AND o.user_id!=1 AND o.idle=0) WHERE p.id IN ('.implode(',', $post_ids).') ORDER BY p.id', true) or error('Unable to fetch post info', __FILE__, __LINE__, $db->error());
Expand Down
1 change: 0 additions & 1 deletion include/install.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1531,7 +1531,6 @@ public static function create_database($db_type, $db_host, $db_name, $db_usernam
'o_moderated_by' => 1,
'o_post_responsive' => 0,
'o_admin_notes' => "Add some notes...",
'o_reading_list' => 0, // Experimental
'o_pms_enabled' => 1,
'o_pms_mess_per_page' => 10,
'o_pms_max_receiver' => 5,
Expand Down
4 changes: 2 additions & 2 deletions include/version.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ class Version {
const FORUM_VERSION = '0.2-dev.2015';

// The Luna Core version
const FORUM_CORE_VERSION = '0.2.3555';
const FORUM_CORE_VERSION = '0.2.3558';

// The database version number, every change in the database requires this number to go one up
const FORUM_DB_VERSION = '87.10';
const FORUM_DB_VERSION = '87.11';

// The parser version number, every change to the parser requires this number to go one up
const FORUM_PARSER_VERSION = '11.1.1';
Expand Down

0 comments on commit 7e0cfb3

Please sign in to comment.