Skip to content

Commit

Permalink
#961 Add Private Messaging to zFeatures, update labels
Browse files Browse the repository at this point in the history
  • Loading branch information
Yannick committed Nov 6, 2014
1 parent a03ce49 commit 66c12e1
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 8 deletions.
2 changes: 1 addition & 1 deletion backstage/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,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_notifications'] == '1' || $luna_config['o_forum_new_style'] == '1' || $luna_config['o_user_menu_sidebar'] == '1' || $luna_config['o_backstage_dark'] == '1' || $luna_config['o_reading_list'] == '1')) {
if (file_exists('../z.txt') && ($luna_config['o_notifications'] == '1' || $luna_config['o_forum_new_style'] == '1' || $luna_config['o_user_menu_sidebar'] == '1' || $luna_config['o_backstage_dark'] == '1' || $luna_config['o_reading_list'] == '1' || $luna_config['o_private_message'] == '1')) {
?>
<div class="alert alert-danger">
<h4>zSettings enabled!</h4>
Expand Down
26 changes: 19 additions & 7 deletions backstage/zsettings.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
'notifications' => isset($_POST['form']['notifications']) ? '1' : '0',
'forum_new_style' => isset($_POST['form']['forum_new_style']) ? '1' : '0',
'user_menu_sidebar' => isset($_POST['form']['user_menu_sidebar']) ? '1' : '0',
'reading_list' => isset($_POST['form']['reading_list']) ? '1' : '0'
'reading_list' => isset($_POST['form']['reading_list']) ? '1' : '0',
'private_message' => isset($_POST['form']['private_message']) ? '1' : '0'
);

foreach ($form as $key => $input) {
Expand Down Expand Up @@ -75,7 +76,7 @@
<input type="hidden" name="form_sent" value="1" />
<fieldset>
<div class="form-group">
<label class="col-sm-3 control-label">zBackstageDark<span class="help-block"><span class="label label-success">low</span></span></label>
<label class="col-sm-3 control-label">zBackstageDark<span class="help-block"><span class="label label-info">low</span></span></label>
<div class="col-sm-9">
<div class="checkbox">
<label>
Expand All @@ -86,7 +87,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">zForumNewStyle<span class="help-block"><span class="label label-warning">normal</span></span></label>
<label class="col-sm-3 control-label">zForumNewStyle<span class="help-block"><span class="label label-warning">high</span></span></label>
<div class="col-sm-9">
<div class="checkbox">
<label>
Expand All @@ -97,7 +98,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">zHooks<span class="help-block"><span class="label label-default">disabled</span> <span class="label label-danger">high</span></span></label>
<label class="col-sm-3 control-label">zHooks<span class="help-block"><span class="label label-default">disabled</span> <span class="label label-danger">very high</span></span></label>
<div class="col-sm-9">
<div class="checkbox">
<label>
Expand All @@ -108,7 +109,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">zNotifications<span class="help-block"><span class="label label-danger">high</span></span></label>
<label class="col-sm-3 control-label">zNotifications<span class="help-block"><span class="label label-warning">high</span></span></label>
<div class="col-sm-9">
<div class="checkbox">
<label>
Expand All @@ -119,7 +120,18 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">zReadingList<span class="help-block"><span class="label label-danger">high</span></span></label>
<label class="col-sm-3 control-label">zPrivateMessaging<span class="help-block"><span class="label label-danger">very high</span></span></label>
<div class="col-sm-9">
<div class="checkbox">
<label>
<input type="checkbox" name="form[private_message]" value="1" <?php if ($luna_config['o_private_message'] == '1') echo ' checked="checked"' ?> />
enable private messaging system
</label>
</div>
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">zReadingList<span class="help-block"><span class="label label-success">normal</span></span></label>
<div class="col-sm-9">
<div class="checkbox">
<label>
Expand All @@ -130,7 +142,7 @@
</div>
</div>
<div class="form-group">
<label class="col-sm-3 control-label">zUserMenu<span class="help-block"><span class="label label-default">disabled</span> <span class="label label-success">low</span</span></label>
<label class="col-sm-3 control-label">zUserMenu<span class="help-block"><span class="label label-default">disabled</span> <span class="label label-success">normal</span></span></label>
<div class="col-sm-9">
<div class="checkbox">
<label>
Expand Down

0 comments on commit 66c12e1

Please sign in to comment.