<?php if(x($page,'title')) echo $page['title'] ?>

From d9b9faaa89150d83cb79556c493cb43865a25eb8 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 25 May 2015 21:27:33 +0200 Subject: add this to better support mobile devices out of the box in zen template --- view/php/zen.php | 1 + 1 file changed, 1 insertion(+) diff --git a/view/php/zen.php b/view/php/zen.php index 6fd11127c..5b89e9c32 100644 --- a/view/php/zen.php +++ b/view/php/zen.php @@ -2,6 +2,7 @@ <?php if(x($page,'title')) echo $page['title'] ?> + -- cgit v1.2.3 From 23abfb0a5b5933f32a5f94869abdab75f4f0ace8 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 25 May 2015 16:56:28 -0700 Subject: add toggle for ALLOWCODE to admin/channel and also fix the ability to toggle the censor flag from that page. --- mod/admin.php | 42 +++++++++++++++++++++++++++++++++++++----- version.inc | 2 +- view/tpl/admin_channels.tpl | 3 ++- 3 files changed, 40 insertions(+), 7 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 7b6a8b723..54ee04776 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -847,10 +847,12 @@ function admin_page_channels_post(&$a) { $channels = ( x($_POST, 'channel') ? $_POST['channel'] : Array() ); check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels'); + + $xor = db_getfunc('^'); if (x($_POST,'page_channels_block')){ foreach($channels as $uid){ - q("UPDATE channel SET channel_pageflags = ( channel_pageflags & ~%d ) where channel_id = %d", + q("UPDATE channel SET channel_pageflags = ( channel_pageflags $xor %d ) where channel_id = %d", intval(PAGE_CENSORED), intval( $uid ) ); @@ -858,6 +860,15 @@ function admin_page_channels_post(&$a) { } notice( sprintf( tt("%s channel censored/uncensored", "%s channels censored/uncensored", count($channels)), count($channels)) ); } + if (x($_POST,'page_channels_code')){ + foreach($channels as $uid){ + q("UPDATE channel SET channel_pageflags = ( channel_pageflags $xor %d ) where channel_id = %d", + intval(PAGE_ALLOWCODE), + intval( $uid ) + ); + } + notice( sprintf( tt("%s channel code allowed/disallowed", "%s channels code allowed/disallowed", count($channels)), count($channels)) ); + } if (x($_POST,'page_channels_delete')){ require_once("include/Contact.php"); foreach($channels as $uid){ @@ -899,14 +910,29 @@ function admin_page_channels(&$a){ case "block":{ check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't'); - q("UPDATE channel SET channel_pageflags = ( channel_pageflags & ~%d ) where channel_id = %d", - intval(PAGE_CENSORED), + $pflags = $channel[0]['channel_pageflags'] ^ PAGE_CENSORED; + q("UPDATE channel SET channel_pageflags = %d where channel_id = %d", + intval($pflags), intval( $uid ) ); proc_run('php','include/directory.php',$uid,'nopush'); - notice( sprintf( (($channel[0]['channel_pageflags'] & PAGE_CENSORED) ? t("Channel '%s' uncensored"): t("Channel '%s' censored")) , $channel[0]['channel_name'] . ' (' . $channel[0]['channel_address'] . ')' ) . EOL); + notice( sprintf( (($pflags & PAGE_CENSORED) ? t("Channel '%s' censored"): t("Channel '%s' uncensored")) , $channel[0]['channel_name'] . ' (' . $channel[0]['channel_address'] . ')' ) . EOL); + }; break; + + case "code":{ + check_form_security_token_redirectOnErr('/admin/channels', 'admin_channels', 't'); + $pflags = $channel[0]['channel_pageflags'] ^ PAGE_ALLOWCODE; + q("UPDATE channel SET channel_pageflags = %d where channel_id = %d", + intval($pflags), + intval( $uid ) + ); + + notice( sprintf( (($pflags & PAGE_ALLOWCODE) ? t("Channel '%s' code allowed"): t("Channel '%s' code disallowed")) , $channel[0]['channel_name'] . ' (' . $channel[0]['channel_address'] . ')' ) . EOL); }; break; + + default: + break; } goaway($a->get_baseurl(true) . '/admin/channels' ); } @@ -935,6 +961,11 @@ function admin_page_channels(&$a){ $channels[$x]['blocked'] = true; else $channels[$x]['blocked'] = false; + + if($channels[$x]['channel_pageflags'] & PAGE_ALLOWCODE) + $channels[$x]['allowcode'] = true; + else + $channels[$x]['allowcode'] = false; } } @@ -948,7 +979,8 @@ function admin_page_channels(&$a){ '$delete' => t('Delete'), '$block' => t('Censor'), '$unblock' => t('Uncensor'), - + '$code' => t('Allow Code'), + '$uncode' => t('Disallow Code'), '$h_channels' => t('Channel'), '$th_channels' => array( t('UID'), t('Name'), t('Address')), diff --git a/version.inc b/version.inc index 3f9529176..20fd10ffb 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-05-24.1042 +2015-05-25.1043 diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index a76878438..a3390b179 100755 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -35,6 +35,7 @@ + @@ -42,7 +43,7 @@

{{else}} NO CHANNELS?!? {{/if}} -- cgit v1.2.3