From b5241c610fe3eeaebedebc94e43edb802565123a Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 15 Sep 2014 00:06:51 +0100 Subject: Deprecate site channel. The sys channel should be doing this. Will fix shortly. --- mod/admin.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mod/admin.php') diff --git a/mod/admin.php b/mod/admin.php index 5bb97d158..836b12281 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -239,7 +239,7 @@ function admin_page_site_post(&$a){ $theme = ((x($_POST,'theme')) ? notags(trim($_POST['theme'])) : ''); $theme_mobile = ((x($_POST,'theme_mobile')) ? notags(trim($_POST['theme_mobile'])) : ''); $theme_accessibility = ((x($_POST,'theme_accessibility')) ? notags(trim($_POST['theme_accessibility'])) : ''); - $site_channel = ((x($_POST,'site_channel')) ? notags(trim($_POST['site_channel'])) : ''); +// $site_channel = ((x($_POST,'site_channel')) ? notags(trim($_POST['site_channel'])) : ''); $maximagesize = ((x($_POST,'maximagesize')) ? intval(trim($_POST['maximagesize'])) : 0); @@ -304,7 +304,7 @@ function admin_page_site_post(&$a){ set_config('system','accessibility_theme', $theme_accessibility); } - set_config('system','site_channel', $site_channel); +// set_config('system','site_channel', $site_channel); set_config('system','maximagesize', $maximagesize); set_config('system','register_policy', $register_policy); @@ -426,7 +426,7 @@ function admin_page_site(&$a) { '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices), '$theme_mobile' => array('theme_mobile', t("Mobile system theme"), get_config('system','mobile_theme'), t("Theme for mobile devices"), $theme_choices_mobile), '$theme_accessibility' => array('theme_accessibility', t("Accessibility system theme"), get_config('system','accessibility_theme'), t("Accessibility theme"), $theme_choices_accessibility), - '$site_channel' => array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")), +// '$site_channel' => array('site_channel', t("Channel to use for this website's static pages"), get_config('system','site_channel'), t("Site Channel")), '$diaspora_enabled' => array('diaspora_enabled',t('Enable Diaspora Protocol'), get_config('system','diaspora_enabled'), t('Communicate with Diaspora and Friendica - experimental')), '$feed_contacts' => array('feed_contacts', t('Allow Feeds as Connections'),get_config('system','feed_contacts'),t('(Heavy system resource usage)')), '$maximagesize' => array('maximagesize', t("Maximum image size"), intval(get_config('system','maximagesize')), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")), -- cgit v1.2.3 From 4d91b6e6d243eacb12faffb4d4ce2a3eec85f820 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 15 Sep 2014 22:53:33 -0700 Subject: fat finger - must have been here a while --- mod/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/admin.php') diff --git a/mod/admin.php b/mod/admin.php index 836b12281..9a35a8de8 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -768,7 +768,7 @@ function admin_page_channels_post(&$a){ ); proc_run('php','include/directory.php',$uid,'nopush'); } - notice( sprintf( tt("%s channel censored/uncensored", "%s channelss censored/uncensored", count($channels)), count($channels)) ); + notice( sprintf( tt("%s channel censored/uncensored", "%s channels censored/uncensored", count($channels)), count($channels)) ); } if (x($_POST,'page_channels_delete')){ require_once("include/Contact.php"); -- cgit v1.2.3 From b2f2424b5272f7c58343fe810f303b55f1b7bf5e Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 15 Sep 2014 23:11:08 -0700 Subject: push individual block to directory --- mod/admin.php | 1 + 1 file changed, 1 insertion(+) (limited to 'mod/admin.php') diff --git a/mod/admin.php b/mod/admin.php index 9a35a8de8..68ce6fe85 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -814,6 +814,7 @@ function admin_page_channels(&$a){ intval(PAGE_CENSORED), 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); }; break; -- cgit v1.2.3 From 89fec0e085c5e2a902af301af2eb8fd3154a81e6 Mon Sep 17 00:00:00 2001 From: Christian Vogeley Date: Sat, 20 Sep 2014 23:28:42 +0200 Subject: Allow ordering by created --- mod/admin.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'mod/admin.php') diff --git a/mod/admin.php b/mod/admin.php index 68ce6fe85..06f44c89b 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -687,7 +687,9 @@ function admin_page_users(&$a){ $order = " order by account_email asc "; if($_REQUEST['order'] === 'expires') $order = " order by account_expires desc "; - + if($_REQUEST['order'] === 'created') + $order = " order by account_created desc "; + $users =q("SELECT `account_id` , `account_email`, `account_lastlog`, `account_created`, `account_expires`, " . "`account_service_class`, ( account_flags & %d ) > 0 as `blocked`, " . "(SELECT GROUP_CONCAT( ch.channel_address SEPARATOR ' ') FROM channel as ch " . "WHERE ch.channel_account_id = ac.account_id and not (ch.channel_pageflags & %d )) as `channels` " . -- cgit v1.2.3