<?php
-
- /**
+/**
* @file mod/admin.php
*
* @brief Friendica admin
*/
-
use Friendica\App;
+use Friendica\Content\Feature;
use Friendica\Core\System;
use Friendica\Core\Config;
use Friendica\Core\Worker;
use Friendica\Database\DBM;
+use Friendica\Model\Contact;
+use Friendica\Model\User;
-require_once("include/enotify.php");
-require_once("include/text.php");
-require_once('include/items.php');
+require_once 'include/enotify.php';
+require_once 'include/text.php';
+require_once 'include/items.php';
/**
* @brief Process send data from the admin panels subpages
* @param App $a
*
*/
-function admin_post(App $a) {
-
-
+function admin_post(App $a)
+{
if (!is_site_admin()) {
return;
}
// do not allow a page manager to access the admin panel at all.
- if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
+ if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
return;
}
break;
case 'plugins':
if ($a->argc > 2 &&
- is_file("addon/".$a->argv[2]."/".$a->argv[2].".php")) {
- @include_once("addon/".$a->argv[2]."/".$a->argv[2].".php");
- if (function_exists($a->argv[2].'_plugin_admin_post')) {
- $func = $a->argv[2].'_plugin_admin_post';
- $func($a);
- }
+ is_file("addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php")) {
+ @include_once("addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php");
+ if (function_exists($a->argv[2] . '_plugin_admin_post')) {
+ $func = $a->argv[2] . '_plugin_admin_post';
+ $func($a);
+ }
}
- goaway('admin/plugins/'.$a->argv[2]);
+ goaway('admin/plugins/' . $a->argv[2]);
return; // NOTREACHED
break;
case 'themes':
$theme = $a->argv[2];
if (is_file("view/theme/$theme/config.php")) {
- function __call_theme_admin_post(App $a, $theme) {
+
+ function __call_theme_admin_post(App $a, $theme)
+ {
$orig_theme = $a->theme;
$orig_page = $a->page;
$orig_session_theme = $_SESSION['theme'];
$_SESSION['theme'] = $theme;
- $init = $theme."_init";
+ $init = $theme . "_init";
if (function_exists($init)) {
$init($a);
}
if (is_ajax()) {
return;
}
- goaway('admin/themes/'.$theme);
+ goaway('admin/themes/' . $theme);
return;
break;
case 'features':
case 'dbsync':
admin_page_dbsync_post($a);
break;
+ case 'contactblock':
+ admin_page_contactblock_post($a);
+ break;
case 'blocklist':
admin_page_blocklist_post($a);
break;
* @param App $a
* @return string
*/
-function admin_content(App $a) {
-
+function admin_content(App $a)
+{
if (!is_site_admin()) {
return login(false);
}
- if (x($_SESSION,'submanage') && intval($_SESSION['submanage'])) {
+ if (x($_SESSION, 'submanage') && intval($_SESSION['submanage'])) {
return "";
}
// $toDelete = new APCIterator('user', APC_ITER_VALUE);
// apc_delete($toDelete);
//}
-
// Header stuff
- $a->page['htmlhead'] .= replace_macros(get_markup_template('admin_settings_head.tpl'), array());
+ $a->page['htmlhead'] .= replace_macros(get_markup_template('admin/settings_head.tpl'), array());
/*
* Side bar links
// array(url, name, extra css classes)
// not part of $aside to make the template more adjustable
$aside_sub = array(
- 'site' => array("admin/site/", t("Site") , "site"),
- 'users' => array("admin/users/", t("Users") , "users"),
- 'plugins'=> array("admin/plugins/", t("Plugins") , "plugins"),
- 'themes' => array("admin/themes/", t("Themes") , "themes"),
- 'features' => array("admin/features/", t("Additional features") , "features"),
- 'dbsync' => array("admin/dbsync/", t('DB updates'), "dbsync"),
- 'queue' => array("admin/queue/", t('Inspect Queue'), "queue"),
- 'blocklist' => array("admin/blocklist/", t('Server Blocklist'), "blocklist"),
- 'federation' => array("admin/federation/", t('Federation Statistics'), "federation"),
- 'deleteitem' => array("admin/deleteitem/", t('Delete Item'), 'deleteitem'),
+ 'site' => array("admin/site/" , t("Site") , "site"),
+ 'users' => array("admin/users/" , t("Users") , "users"),
+ 'plugins' => array("admin/plugins/" , t("Plugins") , "plugins"),
+ 'themes' => array("admin/themes/" , t("Themes") , "themes"),
+ 'features' => array("admin/features/" , t("Additional features") , "features"),
+ 'dbsync' => array("admin/dbsync/" , t('DB updates') , "dbsync"),
+ 'queue' => array("admin/queue/" , t('Inspect Queue') , "queue"),
+ 'contactblock' => array("admin/contactblock/", t('Contact Blocklist') , "contactblock"),
+ 'blocklist' => array("admin/blocklist/" , t('Server Blocklist') , "blocklist"),
+ 'federation' => array("admin/federation/" , t('Federation Statistics'), "federation"),
+ 'deleteitem' => array("admin/deleteitem/" , t('Delete Item') , 'deleteitem'),
);
/* get plugins admin page */
$r = q("SELECT `name` FROM `addon` WHERE `plugin_admin` = 1 ORDER BY `name`");
- $aside_tools['plugins_admin']=array();
+ $aside_tools['plugins_admin'] = array();
foreach ($r as $h) {
- $plugin =$h['name'];
- $aside_tools['plugins_admin'][] = array("admin/plugins/".$plugin, $plugin, "plugin");
+ $plugin = $h['name'];
+ $aside_tools['plugins_admin'][] = array("admin/plugins/" . $plugin, $plugin, "plugin");
// temp plugins with admin
$a->plugins_admin[] = $plugin;
}
$aside_tools['diagnostics_probe'] = array('probe/', t('probe address'), 'probe');
$aside_tools['diagnostics_webfinger'] = array('webfinger/', t('check webfinger'), 'webfinger');
- $t = get_markup_template("admin_aside.tpl");
+ $t = get_markup_template('admin/aside.tpl');
$a->page['aside'] .= replace_macros($t, array(
'$admin' => $aside_tools,
'$subpages' => $aside_sub,
'$logtxt' => t('Logs'),
'$diagnosticstxt' => t('diagnostics'),
'$h_pending' => t('User registrations waiting for confirmation'),
- '$admurl'=> "admin/"
+ '$admurl' => "admin/"
));
-
-
- /*
- * Page content
- */
+ // Page content
$o = '';
// urls
if ($a->argc > 1) {
case 'federation':
$o = admin_page_federation($a);
break;
+ case 'contactblock':
+ $o = admin_page_contactblock($a);
+ break;
case 'blocklist':
$o = admin_page_blocklist($a);
break;
* @param App $a
* @return string
*/
-function admin_page_blocklist(App $a) {
+function admin_page_blocklist(App $a)
+{
$blocklist = Config::get('system', 'blocklist');
$blocklistform = array();
if (is_array($blocklist)) {
- foreach($blocklist as $id => $b) {
+ foreach ($blocklist as $id => $b) {
$blocklistform[] = array(
'domain' => array("domain[$id]", t('Blocked domain'), $b['domain'], '', t('The blocked domain'), 'required', '', ''),
- 'reason' => array("reason[$id]", t("Reason for the block"), $b['reason'], t('The reason why you blocked this domain.').'('.$b['domain'].')', 'required', '', ''),
- 'delete' => array("delete[$id]", t("Delete domain").' ('.$b['domain'].')', False , t("Check to delete this entry from the blocklist"))
+ 'reason' => array("reason[$id]", t("Reason for the block"), $b['reason'], t('The reason why you blocked this domain.') . '(' . $b['domain'] . ')', 'required', '', ''),
+ 'delete' => array("delete[$id]", t("Delete domain") . ' (' . $b['domain'] . ')', False, t("Check to delete this entry from the blocklist"))
);
}
}
- $t = get_markup_template("admin_blocklist.tpl");
+ $t = get_markup_template('admin/blocklist.tpl');
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Server Blocklist'),
'$entries' => $blocklistform,
'$baseurl' => System::baseUrl(true),
'$confirm_delete' => t('Delete entry from blocklist?'),
- '$form_security_token' => get_form_security_token("admin_blocklist")
+ '$form_security_token' => get_form_security_token("admin_blocklist")
));
}
*
* @param App $a
*/
-function admin_page_blocklist_post(App $a) {
- if (!x($_POST,"page_blocklist_save") && (!x($_POST['page_blocklist_edit']))) {
+function admin_page_blocklist_post(App $a)
+{
+ if (!x($_POST, "page_blocklist_save") && (!x($_POST['page_blocklist_edit']))) {
return;
}
'reason' => notags(trim($_POST['newentry_reason']))
);
Config::set('system', 'blocklist', $blocklist);
- info(t('Server added to blocklist.').EOL);
+ info(t('Server added to blocklist.') . EOL);
} else {
// Edit the entries from blocklist
$blocklist = array();
}
}
Config::set('system', 'blocklist', $blocklist);
- info(t('Site blocklist updated.').EOL);
+ info(t('Site blocklist updated.') . EOL);
}
goaway('admin/blocklist');
return; // NOTREACHED
}
+/**
+ * @brief Process data send by the contact block admin page
+ *
+ * @param App $a
+ */
+function admin_page_contactblock_post(App $a)
+{
+ $contact_url = x($_POST, 'contact_url') ? $_POST['contact_url'] : '';
+ $contacts = x($_POST, 'contacts') ? $_POST['contacts'] : [];
+
+ check_form_security_token_redirectOnErr('/admin/contactblock', 'admin_contactblock');
+
+ if (x($_POST, 'page_contactblock_block')) {
+ $contact_id = Contact::getIdForURL($contact_url, 0);
+ if ($contact_id) {
+ Contact::block($contact_id);
+ notice(t('The contact has been blocked from the node'));
+ } else {
+ notice(t('Could not find any contact entry for this URL (%s)', $contact_url));
+ }
+ }
+ if (x($_POST, 'page_contactblock_unblock')) {
+ foreach ($contacts as $uid) {
+ Contact::unblock($uid);
+ }
+ notice(tt("%s contact unblocked", "%s contacts unblocked", count($contacts)));
+ }
+ goaway('admin/contactblock');
+ return; // NOTREACHED
+}
+
+/**
+ * @brief Admin panel for server-wide contact block
+ *
+ * @param App $a
+ * @return string
+ */
+function admin_page_contactblock(App $a)
+{
+ $condition = ['uid' => 0, 'blocked' => true];
+
+ $total = dba::count('contact', $condition);
+
+ $a->set_pager_total($total);
+ $a->set_pager_itemspage(30);
+
+ $statement = dba::select('contact', [], $condition, ['limit' => [$a->pager['start'], $a->pager['itemspage']]]);
+
+ $contacts = dba::inArray($statement);
+
+ $t = get_markup_template('admin/contactblock.tpl');
+ $o = replace_macros($t, array(
+ // strings //
+ '$title' => t('Administration'),
+ '$page' => t('Remote Contact Blocklist'),
+ '$description' => t('This page allows you to prevent any message from a remote contact to reach your node.'),
+ '$submit' => t('Block Remote Contact'),
+ '$select_all' => t('select all'),
+ '$select_none' => t('select none'),
+ '$block' => t('Block'),
+ '$unblock' => t('Unblock'),
+ '$no_data' => t('No remote contact is blocked from this node.'),
+
+ '$h_contacts' => t('Blocked Remote Contacts'),
+ '$h_newblock' => t('Block New Remote Contact'),
+ '$th_contacts' => [t('Photo'), t('Name'), t('Address'), t('Profile URL')],
+
+ '$form_security_token' => get_form_security_token("admin_contactblock"),
+
+ // values //
+ '$baseurl' => System::baseUrl(true),
+
+ '$contacts' => $contacts,
+ '$total_contacts' => tt('%s total blocked contact', '%s total blocked contacts', $total),
+ '$paginate' => paginate($a),
+ '$contacturl' => ['contact_url', t("Profile URL"), '', t("URL of the remote contact to block.")],
+ ));
+ return $o;
+}
+
/**
* @brief Subpage where the admin can delete an item from their node given the GUID
*
* @param App $a
* @return string
*/
-function admin_page_deleteitem(App $a) {
- $t = get_markup_template("admin_deleteitem.tpl");
+function admin_page_deleteitem(App $a)
+{
+ $t = get_markup_template('admin/deleteitem.tpl');
return replace_macros($t, array(
'$title' => t('Administration'),
'$intro2' => t('You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456.'),
'$deleteitemguid' => array('deleteitemguid', t("GUID"), '', t("The GUID of the item you want to delete."), 'required', 'autofocus'),
'$baseurl' => System::baseUrl(),
- '$form_security_token' => get_form_security_token("admin_deleteitem")
+ '$form_security_token' => get_form_security_token("admin_deleteitem")
));
}
+
/**
* @brief Process send data from Admin Delete Item Page
*
*
* @param App $a
*/
-function admin_page_deleteitem_post(App $a) {
+function admin_page_deleteitem_post(App $a)
+{
if (!x($_POST['page_deleteitem_submit'])) {
return;
}
// The GUID should not include a "/", so if there is one, we got an URL
// and the last part of it is most likely the GUID.
if (strpos($guid, '/')) {
- $guid = substr($guid, strrpos($guid, '/')+1);
+ $guid = substr($guid, strrpos($guid, '/') + 1);
}
// Now that we have the GUID get all IDs of the associated entries in the
// item table of the DB and drop those items, which will also delete the
// associated threads.
- $r = dba::select('item', array('id'), array('guid'=>$guid));
+ $r = dba::select('item', array('id'), array('guid' => $guid));
while ($row = dba::fetch($r)) {
drop_item($row['id'], false);
}
dba::close($r);
}
- info(t('Item marked for deletion.').EOL);
+ info(t('Item marked for deletion.') . EOL);
goaway('admin/deleteitem');
return; // NOTREACHED
}
* @param App $a
* @return string
*/
-function admin_page_federation(App $a) {
+function admin_page_federation(App $a)
+{
// get counts on active friendica, diaspora, redmatrix, hubzilla, gnu
// social and statusnet nodes this node is knowing
//
// Add more platforms if you like, when one returns 0 known nodes it is not
// displayed on the stats page.
$platforms = array('Friendi%%a', 'Diaspora', '%%red%%', 'Hubzilla', 'BlaBlaNet', 'GNU Social', 'StatusNet', 'Mastodon', 'Pleroma');
- $colors = array('Friendi%%a' => '#ffc018', // orange from the logo
- 'Diaspora' => '#a1a1a1', // logo is black and white, makes a gray
- '%%red%%' => '#c50001', // fire red from the logo
- 'Hubzilla' => '#43488a', // blue from the logo
- 'BlaBlaNet' => '#3B5998', // blue from the navbar at blablanet-dot-com
- 'GNU Social'=> '#a22430', // dark red from the logo
- 'StatusNet' => '#789240', // the green from the logo (red and blue have already others
- 'Mastodon' => '#1a9df9', // blue from the Mastodon logo
- 'Pleroma' => '#E46F0F'); // Orange from the text that is used on Pleroma instances
+ $colors = array(
+ 'Friendi%%a' => '#ffc018', // orange from the logo
+ 'Diaspora' => '#a1a1a1', // logo is black and white, makes a gray
+ '%%red%%' => '#c50001', // fire red from the logo
+ 'Hubzilla' => '#43488a', // blue from the logo
+ 'BlaBlaNet' => '#3B5998', // blue from the navbar at blablanet-dot-com
+ 'GNU Social' => '#a22430', // dark red from the logo
+ 'StatusNet' => '#789240', // the green from the logo (red and blue have already others
+ 'Mastodon' => '#1a9df9', // blue from the Mastodon logo
+ 'Pleroma' => '#E46F0F' // Orange from the text that is used on Pleroma instances
+ );
$counts = array();
$total = 0;
// to the version string for the displayed list.
foreach ($v as $key => $value) {
if ($v[$key]['version'] == '') {
- $v[$key] = array('total'=>$v[$key]['total'], 'version'=>t('unknown'));
+ $v[$key] = array('total' => $v[$key]['total'], 'version' => t('unknown'));
}
}
// in the DB the Diaspora versions have the format x.x.x.x-xx the last
}
}
foreach ($newV as $key => $value) {
- array_push($newVv, array('total'=>$value, 'version'=>$key));
+ array_push($newVv, array('total' => $value, 'version' => $key));
}
$v = $newVv;
}
foreach ($v as $vv) {
$newVC = $vv['total'];
$newVV = $vv['version'];
- $lastDot = strrpos($newVV,'.');
- $len = strlen($newVV)-1;
- if (($lastDot == $len-4) && (!strrpos($newVV,'-rc') == $len-3)) {
+ $lastDot = strrpos($newVV, '.');
+ $len = strlen($newVV) - 1;
+ if (($lastDot == $len - 4) && (!strrpos($newVV, '-rc') == $len - 3)) {
$newVV = substr($newVV, 0, $lastDot);
}
if (isset($newV[$newVV])) {
}
}
foreach ($newV as $key => $value) {
- array_push($newVv, array('total'=>$value, 'version'=>$key));
+ array_push($newVv, array('total' => $value, 'version' => $key));
}
$v = $newVv;
}
// the 3rd array item is needed for the JavaScript graphs as JS does
// not like some characters in the names of variables...
- $counts[$p]=array($c[0], $v, str_replace(array(' ','%'),'',$p), $colors[$p]);
+ $counts[$p] = array($c[0], $v, str_replace(array(' ', '%'), '', $p), $colors[$p]);
}
// some helpful text
$hint = t('The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here.');
// load the template, replace the macros and return the page content
- $t = get_markup_template("admin_federation.tpl");
+ $t = get_markup_template('admin/federation.tpl');
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Federation Statistics'),
* @param App $a
* @return string
*/
-function admin_page_queue(App $a) {
+function admin_page_queue(App $a)
+{
// get content from the queue table
$r = q("SELECT `c`.`name`, `c`.`nurl`, `q`.`id`, `q`.`network`, `q`.`created`, `q`.`last`
FROM `queue` AS `q`, `contact` AS `c`
WHERE `c`.`id` = `q`.`cid`
ORDER BY `q`.`cid`, `q`.`created`;");
- $t = get_markup_template("admin_queue.tpl");
+ $t = get_markup_template('admin/queue.tpl');
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Inspect Queue'),
* @param App $a
* @return string
*/
-function admin_page_summary(App $a) {
+function admin_page_summary(App $a)
+{
// are there MyISAM tables in the DB? If so, trigger a warning message
- $r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1",
- dbesc(dba::database_name()));
+ $r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1", dbesc(dba::database_name()));
$showwarning = false;
$warningtext = array();
if (DBM::is_result($r)) {
}
// Check if github.com/friendica/master/VERSION is higher then
// the local version of Friendica. Check is opt-in, source may be master or devel branch
- if (Config::get('system', 'check_new_version_url', 'none') != 'none' ) {
- $gitversion = Config::get('system','git_friendica_version');
+ if (Config::get('system', 'check_new_version_url', 'none') != 'none') {
+ $gitversion = Config::get('system', 'git_friendica_version');
if (version_compare(FRIENDICA_VERSION, $gitversion) < 0) {
$warningtext[] = sprintf(t('There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s'), $FRIENDICA_VERSION, $gitversion);
$showwarning = true;
array(t('Private Forum Account'), 0)
);
- $users=0;
+ $users = 0;
foreach ($r as $u) {
$accounts[$u['page-flags']][1] = $u['count'];
$users+= $u['count'];
}
- logger('accounts: '.print_r($accounts,true),LOGGER_DATA);
+ logger('accounts: ' . print_r($accounts, true), LOGGER_DATA);
$r = q("SELECT COUNT(`id`) AS `count` FROM `register`");
$pending = $r[0]['count'];
$queues = array('label' => t('Message queues'), 'queue' => $queue, 'workerq' => $workerqueue);
- $t = get_markup_template("admin_summary.tpl");
+ $t = get_markup_template('admin/summary.tpl');
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Summary'),
'$baseurl' => System::baseUrl(),
'$platform' => FRIENDICA_PLATFORM,
'$codename' => FRIENDICA_CODENAME,
- '$build' => Config::get('system','build'),
+ '$build' => Config::get('system', 'build'),
'$plugins' => array(t('Active plugins'), $a->plugins),
'$showwarning' => $showwarning,
'$warningtext' => $warningtext
*
* @param App $a
*/
-function admin_page_site_post(App $a) {
+function admin_page_site_post(App $a)
+{
check_form_security_token_redirectOnErr('/admin/site', 'admin_site');
if (!empty($_POST['republish_directory'])) {
- Worker::add(PRIORITY_LOW, 'directory');
+ Worker::add(PRIORITY_LOW, 'Directory');
return;
}
- if (!x($_POST,"page_site")) {
+ if (!x($_POST, "page_site")) {
return;
}
// relocate
- if (x($_POST,'relocate') && x($_POST,'relocate_url') && $_POST['relocate_url'] != "") {
+ if (x($_POST, 'relocate') && x($_POST, 'relocate_url') && $_POST['relocate_url'] != "") {
$new_url = $_POST['relocate_url'];
- $new_url = rtrim($new_url,"/");
+ $new_url = rtrim($new_url, "/");
$parsed = @parse_url($new_url);
- if (!$parsed || (!x($parsed,'host') || !x($parsed,'scheme'))) {
+ if (!$parsed || (!x($parsed, 'host') || !x($parsed, 'scheme'))) {
notice(t("Can not parse base url. Must have at least <scheme>://<domain>"));
goaway('admin/site');
}
$new_host = str_replace("http://", "@", normalise_link($new_url));
$old_host = str_replace("http://", "@", normalise_link($old_url));
- function update_table($table_name, $fields, $old_url, $new_url) {
+ function update_table($table_name, $fields, $old_url, $new_url)
+ {
global $a;
$dbold = dbesc($old_url);
$q = sprintf("UPDATE %s SET %s;", $table_name, $upds);
$r = q($q);
if (!$r) {
- notice("Failed updating '$table_name': ".dba::errorMessage());
+ notice("Failed updating '$table_name': " . dba::errorMessage());
goaway('admin/site');
}
}
-
// update tables
// update profile links in the format "http://server.tld"
update_table("profile", array('photo', 'thumb'), $old_url, $new_url);
update_table("term", array('url'), $old_url, $new_url);
- update_table("contact", array('photo','thumb','micro','url','nurl','alias','request','notify','poll','confirm','poco', 'avatar'), $old_url, $new_url);
- update_table("gcontact", array('url','nurl','photo','server_url','notify','alias'), $old_url, $new_url);
- update_table("item", array('owner-link','owner-avatar','author-link','author-avatar','body','plink','tag'), $old_url, $new_url);
+ update_table("contact", array('photo', 'thumb', 'micro', 'url', 'nurl', 'alias', 'request', 'notify', 'poll', 'confirm', 'poco', 'avatar'), $old_url, $new_url);
+ update_table("gcontact", array('url', 'nurl', 'photo', 'server_url', 'notify', 'alias'), $old_url, $new_url);
+ update_table("item", array('owner-link', 'owner-avatar', 'author-link', 'author-avatar', 'body', 'plink', 'tag'), $old_url, $new_url);
// update profile addresses in the format "user@server.tld"
update_table("contact", array('addr'), $old_host, $new_host);
- update_table("gcontact", array('connect','addr'), $old_host, $new_host);
+ update_table("gcontact", array('connect', 'addr'), $old_host, $new_host);
// update config
$a->set_baseurl($new_url);
- Config::set('system','url',$new_url);
+ Config::set('system', 'url', $new_url);
// send relocate
$users = q("SELECT `uid` FROM `user` WHERE `account_removed` = 0 AND `account_expired` = 0");
foreach ($users as $user) {
- Worker::add(PRIORITY_HIGH, 'notifier', 'relocate', $user['uid']);
+ Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', $user['uid']);
}
info("Relocation started. Could take a while to complete.");
$block_public = ((x($_POST,'block_public')) ? True : False);
$force_publish = ((x($_POST,'publish_all')) ? True : False);
$global_directory = ((x($_POST,'directory')) ? notags(trim($_POST['directory'])) : '');
- $thread_allow = ((x($_POST,'thread_allow')) ? True : False);
$newuser_private = ((x($_POST,'newuser_private')) ? True : False);
$enotify_no_content = ((x($_POST,'enotify_no_content')) ? True : False);
$private_addons = ((x($_POST,'private_addons')) ? True : False);
// Has the directory url changed? If yes, then resubmit the existing profiles there
if ($global_directory != Config::get('system', 'directory') && ($global_directory != '')) {
Config::set('system', 'directory', $global_directory);
- Worker::add(PRIORITY_LOW, 'directory');
+ Worker::add(PRIORITY_LOW, 'Directory');
}
if ($a->get_path() != "") {
$diaspora_enabled = false;
}
- if (!$thread_allow) {
- $ostatus_disabled = true;
- }
- if ($ssl_policy != intval(Config::get('system','ssl_policy'))) {
+ if ($ssl_policy != intval(Config::get('system', 'ssl_policy'))) {
if ($ssl_policy == SSL_POLICY_FULL) {
q("UPDATE `contact` SET
`url` = REPLACE(`url` , 'http:' , 'https:'),
);
}
}
- Config::set('system','ssl_policy',$ssl_policy);
- Config::set('system','maxloadavg',$maxloadavg);
- Config::set('system','maxloadavg_frontend',$maxloadavg_frontend);
- Config::set('system','min_memory',$min_memory);
- Config::set('system','optimize_max_tablesize',$optimize_max_tablesize);
- Config::set('system','optimize_fragmentation',$optimize_fragmentation);
- Config::set('system','poco_completion',$poco_completion);
- Config::set('system','poco_requery_days',$poco_requery_days);
- Config::set('system','poco_discovery',$poco_discovery);
- Config::set('system','poco_discovery_since',$poco_discovery_since);
- Config::set('system','poco_local_search',$poco_local_search);
- Config::set('system','nodeinfo',$nodeinfo);
- Config::set('config','sitename',$sitename);
- Config::set('config','hostname',$hostname);
- Config::set('config','sender_email', $sender_email);
- Config::set('system','suppress_tags',$suppress_tags);
- Config::set('system','shortcut_icon',$shortcut_icon);
- Config::set('system','touch_icon',$touch_icon);
+ Config::set('system', 'ssl_policy', $ssl_policy);
+ Config::set('system', 'maxloadavg', $maxloadavg);
+ Config::set('system', 'maxloadavg_frontend', $maxloadavg_frontend);
+ Config::set('system', 'min_memory', $min_memory);
+ Config::set('system', 'optimize_max_tablesize', $optimize_max_tablesize);
+ Config::set('system', 'optimize_fragmentation', $optimize_fragmentation);
+ Config::set('system', 'poco_completion', $poco_completion);
+ Config::set('system', 'poco_requery_days', $poco_requery_days);
+ Config::set('system', 'poco_discovery', $poco_discovery);
+ Config::set('system', 'poco_discovery_since', $poco_discovery_since);
+ Config::set('system', 'poco_local_search', $poco_local_search);
+ Config::set('system', 'nodeinfo', $nodeinfo);
+ Config::set('config', 'sitename', $sitename);
+ Config::set('config', 'hostname', $hostname);
+ Config::set('config', 'sender_email', $sender_email);
+ Config::set('system', 'suppress_tags', $suppress_tags);
+ Config::set('system', 'shortcut_icon', $shortcut_icon);
+ Config::set('system', 'touch_icon', $touch_icon);
if ($banner == "") {
// don't know why, but del_config doesn't work...
- q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
- dbesc("system"),
- dbesc("banner")
+ q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", dbesc("system"), dbesc("banner")
);
} else {
- Config::set('system','banner', $banner);
+ Config::set('system', 'banner', $banner);
}
if ($info == "") {
- Config::delete('config','info');
+ Config::delete('config', 'info');
} else {
- Config::set('config','info',$info);
+ Config::set('config', 'info', $info);
}
- Config::set('system','language', $language);
- Config::set('system','theme', $theme);
+ Config::set('system', 'language', $language);
+ Config::set('system', 'theme', $theme);
if ($theme_mobile == '---') {
- Config::delete('system','mobile-theme');
+ Config::delete('system', 'mobile-theme');
} else {
- Config::set('system','mobile-theme', $theme_mobile);
+ Config::set('system', 'mobile-theme', $theme_mobile);
}
if ($singleuser == '---') {
- Config::delete('system','singleuser');
+ Config::delete('system', 'singleuser');
} else {
- Config::set('system','singleuser', $singleuser);
+ Config::set('system', 'singleuser', $singleuser);
}
Config::set('system', 'maximagesize', $maximagesize);
Config::set('system', 'max_image_length', $maximagelength);
Config::set('system', 'allowed_email', $allowed_email);
Config::set('system', 'block_public', $block_public);
Config::set('system', 'publish_all', $force_publish);
- Config::set('system', 'thread_allow', $thread_allow);
Config::set('system', 'newuser_private', $newuser_private);
Config::set('system', 'enotify_no_content', $enotify_no_content);
Config::set('system', 'disable_embedded', $disable_embedded);
Config::set('system', 'frontend_worker', $worker_frontend);
Config::set('system', 'rino_encrypt', $rino);
- info(t('Site settings updated.').EOL);
+ info(t('Site settings updated.') . EOL);
goaway('admin/site');
return; // NOTREACHED
-
}
/**
* @param App $a
* @return string
*/
-function admin_page_site(App $a) {
-
+function admin_page_site(App $a)
+{
/* Installed langs */
$lang_choices = get_available_languages();
- if (strlen(Config::get('system','directory_submit_url')) &&
- !strlen(Config::get('system','directory'))) {
- Config::set('system','directory', dirname(Config::get('system','directory_submit_url')));
- Config::delete('system','directory_submit_url');
+ if (strlen(Config::get('system', 'directory_submit_url')) &&
+ !strlen(Config::get('system', 'directory'))) {
+ Config::set('system', 'directory', dirname(Config::get('system', 'directory_submit_url')));
+ Config::delete('system', 'directory_submit_url');
}
/* Installed themes */
$allowed_theme_list = Config::get('system', 'allowed_themes');
foreach ($files as $file) {
- if (intval(file_exists($file.'/unsupported')))
+ if (intval(file_exists($file . '/unsupported'))) {
continue;
+ }
$f = basename($file);
continue;
}
- $theme_name = ((file_exists($file.'/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
+ $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f);
- if (file_exists($file.'/mobile')) {
+ if (file_exists($file . '/mobile')) {
$theme_choices_mobile[$f] = $theme_name;
} else {
$theme_choices[$f] = $theme_name;
CP_NO_COMMUNITY_PAGE => t("No community page"),
CP_USERS_ON_SERVER => t("Public postings from users of this site"),
CP_GLOBAL_COMMUNITY => t("Global community page")
- );
+ );
/* OStatus conversation poll choices */
$ostatus_poll_choices = array(
"60" => t("Hourly"),
"720" => t("Twice daily"),
"1440" => t("Daily")
- );
+ );
$poco_discovery_choices = array(
"0" => t("Disabled"),
"1" => t("Users"),
"2" => t("Users, Global Contacts"),
"3" => t("Users, Global Contacts/fallback"),
- );
+ );
$poco_discovery_since_choices = array(
"30" => t("One month"),
"91" => t("Three months"),
"182" => t("Half a year"),
"365" => t("One year"),
- );
+ );
/* get user names to make the install a personal install of X */
$user_names = array();
}
/* Banner */
- $banner = Config::get('system','banner');
+ $banner = Config::get('system', 'banner');
if ($banner == false) {
$banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
}
$banner = htmlspecialchars($banner);
- $info = Config::get('config','info');
+ $info = Config::get('config', 'info');
$info = htmlspecialchars($info);
// Automatically create temporary paths
}
$diaspora_able = ($a->get_path() == "");
- $optimize_max_tablesize = Config::get('system','optimize_max_tablesize', 100);
+ $optimize_max_tablesize = Config::get('system', 'optimize_max_tablesize', 100);
if ($optimize_max_tablesize < -1) {
$optimize_max_tablesize = -1;
$optimize_max_tablesize = 100;
}
- $t = get_markup_template("admin_site.tpl");
+ $t = get_markup_template('admin/site.tpl');
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Site'),
'$portable_contacts' => t('Auto Discovered Contact Directory'),
'$performance' => t('Performance'),
'$worker_title' => t('Worker'),
- '$relocate'=> t('Relocate - WARNING: advanced function. Could make this server unreachable.'),
+ '$relocate' => t('Relocate - WARNING: advanced function. Could make this server unreachable.'),
'$baseurl' => System::baseUrl(true),
// name, label, value, help string, extra data...
'$sitename' => array('sitename', t("Site name"), $a->config['sitename'],''),
'$banner' => array('banner', t("Banner/Logo"), $banner, ""),
'$shortcut_icon' => array('shortcut_icon', t("Shortcut icon"), Config::get('system','shortcut_icon'), t("Link to an icon that will be used for browsers.")),
'$touch_icon' => array('touch_icon', t("Touch icon"), Config::get('system','touch_icon'), t("Link to an icon that will be used for tablets and mobiles.")),
- '$info' => array('info', t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())),
+ '$info' => array('info', t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/servers.'), get_server())),
'$language' => array('language', t("System language"), Config::get('system','language'), "", $lang_choices),
'$theme' => array('theme', t("System theme"), Config::get('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
'$theme_mobile' => array('theme_mobile', t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), t("Theme for mobile devices"), $theme_choices_mobile),
'$block_public' => array('block_public', t("Block public"), Config::get('system','block_public'), t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")),
'$force_publish' => array('publish_all', t("Force publish"), Config::get('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")),
'$global_directory' => array('directory', t("Global directory URL"), Config::get('system','directory'), t("URL to the global directory. If this is not set, the global directory is completely unavailable to the application.")),
- '$thread_allow' => array('thread_allow', t("Allow threaded items"), Config::get('system','thread_allow'), t("Allow infinite level threading for items on this site.")),
'$newuser_private' => array('newuser_private', t("Private posts by default for new users"), Config::get('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")),
'$enotify_no_content' => array('enotify_no_content', t("Don't include post content in email notifications"), Config::get('system','enotify_no_content'), t("Don't include the content of a post/comment/private message/etc. in the email notifications that are sent out from this site, as a privacy measure.")),
'$private_addons' => array('private_addons', t("Disallow public access to addons listed in the apps menu."), Config::get('config','private_addons'), t("Checking this box will restrict addons listed in the apps menu to members only.")),
'$timeout' => array('timeout', t("Network timeout"), (x(Config::get('system','curl_timeout'))?Config::get('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")),
'$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(Config::get('system','maxloadavg')) > 0)?Config::get('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")),
'$maxloadavg_frontend' => array('maxloadavg_frontend', t("Maximum Load Average (Frontend)"), ((intval(Config::get('system','maxloadavg_frontend')) > 0)?Config::get('system','maxloadavg_frontend'):50), t("Maximum system load before the frontend quits service - default 50.")),
- '$min_memory' => array('min_memory', t("Minimal Memory"), ((intval(Config::get('system','min_memory')) > 0)?Config::get('system','min_memory'):0), t("Minimal free memory in MB for the poller. Needs access to /proc/meminfo - default 0 (deactivated).")),
+ '$min_memory' => array('min_memory', t("Minimal Memory"), ((intval(Config::get('system','min_memory')) > 0)?Config::get('system','min_memory'):0), t("Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated).")),
'$optimize_max_tablesize'=> array('optimize_max_tablesize', t("Maximum table size for optimization"), $optimize_max_tablesize, t("Maximum table size (in MB) for the automatic optimization - default 100 MB. Enter -1 to disable it.")),
'$optimize_fragmentation'=> array('optimize_fragmentation', t("Minimum level of fragmentation"), ((intval(Config::get('system','optimize_fragmentation')) > 0)?Config::get('system','optimize_fragmentation'):30), t("Minimum fragmenation level to start the automatic optimization - default value is 30%.")),
'$rino' => array('rino', t("RINO Encryption"), intval(Config::get('system','rino_encrypt')), t("Encryption layer between nodes."), array("Disabled", "RINO1 (deprecated)", "RINO2")),
'$worker_queues' => array('worker_queues', t("Maximum number of parallel workers"), Config::get('system','worker_queues'), t("On shared hosters set this to 2. On larger systems, values of 10 are great. Default value is 4.")),
- '$worker_dont_fork' => array('worker_dont_fork', t("Don't use 'proc_open' with the worker"), Config::get('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of poller calls in your crontab.")),
+ '$worker_dont_fork' => array('worker_dont_fork', t("Don't use 'proc_open' with the worker"), Config::get('system','worker_dont_fork'), t("Enable this if your system doesn't allow the use of 'proc_open'. This can happen on shared hosters. If this is enabled you should increase the frequency of worker calls in your crontab.")),
'$worker_fastlane' => array('worker_fastlane', t("Enable fastlane"), Config::get('system','worker_fastlane'), t("When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.")),
'$worker_frontend' => array('worker_frontend', t('Enable frontend worker'), Config::get('system','frontend_worker'), sprintf(t('When enabled the Worker process is triggered when backend access is performed (e.g. messages being delivered). On smaller sites you might want to call %s/worker on a regular basis via an external cron job. You should only enable this option if you cannot utilize cron/scheduled jobs on your server.'), System::baseUrl())),
'$form_security_token' => get_form_security_token("admin_site")
-
));
-
}
/**
*
* @param App $a
* @return string
- **/
-function admin_page_dbsync(App $a) {
-
+ * */
+function admin_page_dbsync(App $a)
+{
$o = '';
if ($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') {
- Config::set('database', 'update_'.intval($a->argv[3]), 'success');
- $curr = Config::get('system','build');
+ Config::set('database', 'update_' . intval($a->argv[3]), 'success');
+ $curr = Config::get('system', 'build');
if (intval($curr) == intval($a->argv[3])) {
- Config::set('system','build',intval($curr) + 1);
+ Config::set('system', 'build', intval($curr) + 1);
}
- info(t('Update has been marked successful').EOL);
+ info(t('Update has been marked successful') . EOL);
goaway('admin/dbsync');
}
require_once("include/dbstructure.php");
$retval = update_structure(false, true);
if (!$retval) {
- $o .= sprintf(t("Database structure update %s was successfully applied."), DB_UPDATE_VERSION)."<br />";
- Config::set('database', 'dbupdate_'.DB_UPDATE_VERSION, 'success');
+ $o .= sprintf(t("Database structure update %s was successfully applied."), DB_UPDATE_VERSION) . "<br />";
+ Config::set('database', 'dbupdate_' . DB_UPDATE_VERSION, 'success');
} else {
- $o .= sprintf(t("Executing of database structure update %s failed with error: %s"),
- DB_UPDATE_VERSION, $retval)."<br />";
+ $o .= sprintf(t("Executing of database structure update %s failed with error: %s"), DB_UPDATE_VERSION, $retval) . "<br />";
}
if ($a->argv[2] === 'check') {
return $o;
}
if ($a->argc > 2 && intval($a->argv[2])) {
- require_once('update.php');
- $func = 'update_'.intval($a->argv[2]);
+ require_once 'update.php';
+ $func = 'update_' . intval($a->argv[2]);
if (function_exists($func)) {
$retval = $func();
if ($retval === UPDATE_FAILED) {
$o .= sprintf(t("Executing %s failed with error: %s"), $func, $retval);
- }
- elseif ($retval === UPDATE_SUCCESS) {
+ } elseif ($retval === UPDATE_SUCCESS) {
$o .= sprintf(t('Update %s was successfully applied.', $func));
- Config::set('database',$func, 'success');
+ Config::set('database', $func, 'success');
} else {
$o .= sprintf(t('Update %s did not return a status. Unknown if it succeeded.'), $func);
}
} else {
- $o .= sprintf(t('There was no additional update function %s that needed to be called.'), $func)."<br />";
- Config::set('database',$func, 'success');
+ $o .= sprintf(t('There was no additional update function %s that needed to be called.'), $func) . "<br />";
+ Config::set('database', $func, 'success');
}
return $o;
}
$r = q("SELECT `k`, `v` FROM `config` WHERE `cat` = 'database' ");
if (DBM::is_result($r)) {
foreach ($r as $rr) {
- $upd = intval(substr($rr['k'],7));
+ $upd = intval(substr($rr['k'], 7));
if ($upd < 1139 || $rr['v'] === 'success') {
continue;
}
$failed[] = $upd;
}
}
- if (! count($failed)) {
- $o = replace_macros(get_markup_template('structure_check.tpl'),array(
- '$base' => System::baseUrl(true),
+ if (!count($failed)) {
+ $o = replace_macros(get_markup_template('structure_check.tpl'), array(
+ '$base' => System::baseUrl(true),
'$banner' => t('No failed updates.'),
- '$check' => t('Check database structure'),
+ '$check' => t('Check database structure'),
));
} else {
- $o = replace_macros(get_markup_template('failed_updates.tpl'),array(
- '$base' => System::baseUrl(true),
+ $o = replace_macros(get_markup_template('failed_updates.tpl'), array(
+ '$base' => System::baseUrl(true),
'$banner' => t('Failed Updates'),
- '$desc' => t('This does not include updates prior to 1139, which did not return a status.'),
- '$mark' => t('Mark success (if update was manually applied)'),
- '$apply' => t('Attempt to execute this update step automatically'),
+ '$desc' => t('This does not include updates prior to 1139, which did not return a status.'),
+ '$mark' => t('Mark success (if update was manually applied)'),
+ '$apply' => t('Attempt to execute this update step automatically'),
'$failed' => $failed
));
}
return $o;
-
}
/**
*
* @param App $a
*/
-function admin_page_users_post(App $a) {
+function admin_page_users_post(App $a)
+{
$pending = (x($_POST, 'pending') ? $_POST['pending'] : array());
$users = (x($_POST, 'user') ? $_POST['user'] : array());
$nu_name = (x($_POST, 'new_user_name') ? $_POST['new_user_name'] : '');
check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
if (!($nu_name === "") && !($nu_email === "") && !($nu_nickname === "")) {
- require_once('include/user.php');
-
- $result = create_user(array('username'=>$nu_name, 'email'=>$nu_email,
- 'nickname'=>$nu_nickname, 'verified'=>1, 'language'=>$nu_language));
- if (! $result['success']) {
+ $result = User::create(array('username' => $nu_name, 'email' => $nu_email,
+ 'nickname' => $nu_nickname, 'verified' => 1, 'language' => $nu_language));
+ if (!$result['success']) {
notice($result['message']);
return;
}
notification(array(
'type' => SYSTEM_EMAIL,
'to_email' => $nu['email'],
- 'subject'=> sprintf(t('Registration details for %s'), $a->config['sitename']),
- 'preamble'=> $preamble,
+ 'subject' => sprintf(t('Registration details for %s'), $a->config['sitename']),
+ 'preamble' => $preamble,
'body' => $body));
-
}
- if (x($_POST,'page_users_block')) {
+ if (x($_POST, 'page_users_block')) {
foreach ($users as $uid) {
- q("UPDATE `user` SET `blocked` = 1-`blocked` WHERE `uid` = %s",
- intval($uid)
+ q("UPDATE `user` SET `blocked` = 1-`blocked` WHERE `uid` = %s", intval($uid)
);
}
notice(sprintf(tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users)), count($users)));
}
- if (x($_POST,'page_users_delete')) {
- require_once("include/Contact.php");
+ if (x($_POST, 'page_users_delete')) {
foreach ($users as $uid) {
- user_remove($uid);
+ User::remove($uid);
}
notice(sprintf(tt("%s user deleted", "%s users deleted", count($users)), count($users)));
}
- if (x($_POST,'page_users_approve')) {
+ if (x($_POST, 'page_users_approve')) {
require_once("mod/regmod.php");
foreach ($pending as $hash) {
user_allow($hash);
}
}
- if (x($_POST,'page_users_deny')) {
+ if (x($_POST, 'page_users_deny')) {
require_once("mod/regmod.php");
foreach ($pending as $hash) {
user_deny($hash);
* @param App $a
* @return string
*/
-function admin_page_users(App $a) {
- if ($a->argc>2) {
+function admin_page_users(App $a)
+{
+ if ($a->argc > 2) {
$uid = $a->argv[3];
$user = q("SELECT `username`, `blocked` FROM `user` WHERE `uid` = %d", intval($uid));
if (count($user) == 0) {
- notice('User not found'.EOL);
+ notice('User not found' . EOL);
goaway('admin/users');
return ''; // NOTREACHED
}
- switch($a->argv[2]) {
+ switch ($a->argv[2]) {
case "delete":
check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
// delete user
- require_once("include/Contact.php");
- user_remove($uid);
+ User::remove($uid);
- notice(sprintf(t("User '%s' deleted"), $user[0]['username']).EOL);
+ notice(sprintf(t("User '%s' deleted"), $user[0]['username']) . EOL);
break;
case "block":
check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't');
- q("UPDATE `user` SET `blocked` = %d WHERE `uid` = %s",
- intval(1-$user[0]['blocked']),
- intval($uid)
+ q("UPDATE `user` SET `blocked` = %d WHERE `uid` = %s", intval(1 - $user[0]['blocked']), intval($uid)
);
- notice(sprintf(($user[0]['blocked']?t("User '%s' unblocked"):t("User '%s' blocked")) , $user[0]['username']).EOL);
+ notice(sprintf(($user[0]['blocked'] ? t("User '%s' unblocked") : t("User '%s' blocked")), $user[0]['username']) . EOL);
break;
}
goaway('admin/users');
return ''; // NOTREACHED
-
}
/* get pending */
$order = "contact.name";
$order_direction = "+";
- if (x($_GET,'o')) {
+ if (x($_GET, 'o')) {
$new_order = $_GET['o'];
if ($new_order[0] === "-") {
$order_direction = "-";
- $new_order = substr($new_order,1);
+ $new_order = substr($new_order, 1);
}
if (in_array($new_order, $valid_orders)) {
$order = $new_order;
}
- if (x($_GET,'d')) {
+ if (x($_GET, 'd')) {
$new_direction = $_GET['d'];
}
}
- $sql_order = "`".str_replace('.','`.`',$order)."`";
- $sql_order_direction = ($order_direction === "+")?"ASC":"DESC";
+ $sql_order = "`" . str_replace('.', '`.`', $order) . "`";
+ $sql_order_direction = ($order_direction === "+") ? "ASC" : "DESC";
$users = q("SELECT `user`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`account_expired`, `contact`.`last-item` AS `lastitem_date`
FROM `user`
INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
WHERE `user`.`verified`
- ORDER BY $sql_order $sql_order_direction LIMIT %d, %d",
- intval($a->pager['start']),
- intval($a->pager['itemspage'])
- );
+ ORDER BY $sql_order $sql_order_direction LIMIT %d, %d", intval($a->pager['start']), intval($a->pager['itemspage'])
+ );
//echo "<pre>$users"; killme();
t('Normal Account'),
t('Automatic Follower Account'),
t('Public Forum Account'),
- t('Automatic Friend Account')
+ t('Automatic Friend Account')
);
$e['page-flags'] = $accounts[$e['page-flags']];
$e['register_date'] = relative_date($e['register_date']);
//$e['is_admin'] = ($e['email'] === $a->config['admin_email']);
$e['is_admin'] = in_array($e['email'], $adminlist);
$e['is_deletable'] = (intval($e['uid']) != local_user());
- $e['deleted'] = ($e['account_removed']?relative_date($e['account_expires_on']):False);
+ $e['deleted'] = ($e['account_removed'] ? relative_date($e['account_expires_on']) : False);
return $e;
};
$users = array_map($_setup_users, $users);
while (count($users)) {
$new_user = array();
foreach (array_pop($users) as $k => $v) {
- $k = str_replace('-','_',$k);
+ $k = str_replace('-', '_', $k);
$new_user[$k] = $v;
}
if ($new_user['deleted']) {
array_push($users, array_pop($tmp_users));
}
- $th_users = array_map(null,
- array(t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account')),
- $valid_orders
+ $th_users = array_map(null, array(t('Name'), t('Email'), t('Register date'), t('Last login'), t('Last item'), t('Account')), $valid_orders
);
- $t = get_markup_template("admin_users.tpl");
+ $t = get_markup_template('admin/users.tpl');
$o = replace_macros($t, array(
// strings //
'$title' => t('Administration'),
'$h_pending' => t('User registrations waiting for confirm'),
'$h_deleted' => t('User waiting for permanent deletion'),
'$th_pending' => array(t('Request date'), t('Name'), t('Email')),
- '$no_pending' => t('No registrations.'),
+ '$no_pending' => t('No registrations.'),
'$pendingnotetext' => t('Note from the user'),
'$approve' => t('Approve'),
'$deny' => t('Deny'),
return $o;
}
-
/**
* @brief Plugins admin page
*
* @param App $a
* @return string
*/
-function admin_page_plugins(App $a) {
-
+function admin_page_plugins(App $a)
+{
/*
* Single plugin
*/
return '';
}
- if (x($_GET,"a") && $_GET['a']=="t") {
+ if (x($_GET, "a") && $_GET['a'] == "t") {
check_form_security_token_redirectOnErr('/admin/plugins', 'admin_themes', 't');
// Toggle plugin status
install_plugin($plugin);
info(sprintf(t("Plugin %s enabled."), $plugin));
}
- Config::set("system","addon", implode(", ",$a->plugins));
+ Config::set("system", "addon", implode(", ", $a->plugins));
goaway('admin/plugins');
return ''; // NOTREACHED
}
require_once('library/markdown.php');
if (in_array($plugin, $a->plugins)) {
- $status="on"; $action= t("Disable");
+ $status = "on";
+ $action = t("Disable");
} else {
- $status="off"; $action= t("Enable");
+ $status = "off";
+ $action = t("Enable");
}
- $readme=Null;
+ $readme = Null;
if (is_file("addon/$plugin/README.md")) {
$readme = file_get_contents("addon/$plugin/README.md");
$readme = Markdown($readme, false);
} elseif (is_file("addon/$plugin/README")) {
- $readme = "<pre>". file_get_contents("addon/$plugin/README") ."</pre>";
+ $readme = "<pre>" . file_get_contents("addon/$plugin/README") . "</pre>";
}
- $admin_form="";
+ $admin_form = "";
if (is_array($a->plugins_admin) && in_array($plugin, $a->plugins_admin)) {
@require_once("addon/$plugin/$plugin.php");
- $func = $plugin.'_plugin_admin';
+ $func = $plugin . '_plugin_admin';
$func($a, $admin_form);
}
- $t = get_markup_template("admin_plugins_details.tpl");
+ $t = get_markup_template('admin/plugins_details.tpl');
return replace_macros($t, array(
'$title' => t('Administration'),
));
}
-
-
/*
* List plugins
*/
-
- if (x($_GET,"a") && $_GET['a']=="r") {
- check_form_security_token_redirectOnErr(System::baseUrl().'/admin/plugins', 'admin_themes', 't');
+ if (x($_GET, "a") && $_GET['a'] == "r") {
+ check_form_security_token_redirectOnErr(System::baseUrl() . '/admin/plugins', 'admin_themes', 't');
reload_plugins();
info("Plugins reloaded");
- goaway(System::baseUrl().'/admin/plugins');
+ goaway(System::baseUrl() . '/admin/plugins');
}
$plugins = array();
if ($files) {
foreach ($files as $file) {
if (is_dir($file)) {
- list($tmp, $id)=array_map("trim", explode("/",$file));
+ list($tmp, $id) = array_map("trim", explode("/", $file));
$info = get_plugin_info($id);
$show_plugin = true;
// If the addon is unsupported, then only show it, when it is enabled
- if ((strtolower($info["status"]) == "unsupported") && !in_array($id, $a->plugins)) {
+ if ((strtolower($info["status"]) == "unsupported") && !in_array($id, $a->plugins)) {
$show_plugin = false;
}
}
if ($show_plugin) {
- $plugins[] = array($id, (in_array($id, $a->plugins)?"on":"off") , $info);
+ $plugins[] = array($id, (in_array($id, $a->plugins) ? "on" : "off"), $info);
}
}
}
}
- $t = get_markup_template("admin_plugins.tpl");
+ $t = get_markup_template('admin/plugins.tpl');
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Plugins'),
* @param string $th
* @param int $result
*/
-function toggle_theme(&$themes,$th,&$result) {
- for($x = 0; $x < count($themes); $x ++) {
+function toggle_theme(&$themes, $th, &$result)
+{
+ for ($x = 0; $x < count($themes); $x ++) {
if ($themes[$x]['name'] === $th) {
if ($themes[$x]['allowed']) {
$themes[$x]['allowed'] = 0;
$result = 0;
- }
- else {
+ } else {
$themes[$x]['allowed'] = 1;
$result = 1;
}
* @param string $th
* @return int
*/
-function theme_status($themes,$th) {
- for($x = 0; $x < count($themes); $x ++) {
+function theme_status($themes, $th)
+{
+ for ($x = 0; $x < count($themes); $x ++) {
if ($themes[$x]['name'] === $th) {
if ($themes[$x]['allowed']) {
return 1;
- }
- else {
+ } else {
return 0;
}
}
return 0;
}
-
/**
* @param array $themes
* @return string
*/
-function rebuild_theme_table($themes) {
+function rebuild_theme_table($themes)
+{
$o = '';
if (count($themes)) {
foreach ($themes as $th) {
return $o;
}
-
/**
* @brief Themes admin page
*
* @param App $a
* @return string
*/
-function admin_page_themes(App $a) {
-
- $allowed_themes_str = Config::get('system','allowed_themes');
- $allowed_themes_raw = explode(',',$allowed_themes_str);
+function admin_page_themes(App $a)
+{
+ $allowed_themes_str = Config::get('system', 'allowed_themes');
+ $allowed_themes_raw = explode(',', $allowed_themes_str);
$allowed_themes = array();
if (count($allowed_themes_raw)) {
foreach ($allowed_themes_raw as $x) {
$f = basename($file);
// Is there a style file?
- $theme_files = glob('view/theme/'.$f.'/style.*');
+ $theme_files = glob('view/theme/' . $f . '/style.*');
// If not then quit
if (count($theme_files) == 0) {
continue;
}
- $is_experimental = intval(file_exists($file.'/experimental'));
- $is_supported = 1-(intval(file_exists($file.'/unsupported')));
- $is_allowed = intval(in_array($f,$allowed_themes));
+ $is_experimental = intval(file_exists($file . '/experimental'));
+ $is_supported = 1 - (intval(file_exists($file . '/unsupported')));
+ $is_allowed = intval(in_array($f, $allowed_themes));
if ($is_allowed || $is_supported || Config::get("system", "show_unsupported_themes")) {
$themes[] = array('name' => $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed);
}
}
- if (! count($themes)) {
+ if (!count($themes)) {
notice(t('No themes found.'));
return '';
}
if ($a->argc == 3) {
$theme = $a->argv[2];
- if (! is_dir("view/theme/$theme")) {
+ if (!is_dir("view/theme/$theme")) {
notice(t("Item not found."));
return '';
}
- if (x($_GET,"a") && $_GET['a']=="t") {
+ if (x($_GET, "a") && $_GET['a'] == "t") {
check_form_security_token_redirectOnErr('/admin/themes', 'admin_themes', 't');
// Toggle theme status
- toggle_theme($themes,$theme,$result);
+ toggle_theme($themes, $theme, $result);
$s = rebuild_theme_table($themes);
if ($result) {
install_theme($theme);
- info(sprintf('Theme %s enabled.',$theme));
+ info(sprintf('Theme %s enabled.', $theme));
} else {
uninstall_theme($theme);
- info(sprintf('Theme %s disabled.',$theme));
+ info(sprintf('Theme %s disabled.', $theme));
}
- Config::set('system','allowed_themes',$s);
+ Config::set('system', 'allowed_themes', $s);
goaway('admin/themes');
return ''; // NOTREACHED
}
// display theme details
- require_once('library/markdown.php');
+ require_once 'library/markdown.php';
- if (theme_status($themes,$theme)) {
- $status="on"; $action= t("Disable");
+ if (theme_status($themes, $theme)) {
+ $status = "on";
+ $action = t("Disable");
} else {
- $status="off"; $action= t("Enable");
+ $status = "off";
+ $action = t("Enable");
}
$readme = Null;
$readme = file_get_contents("view/theme/$theme/README.md");
$readme = Markdown($readme, false);
} elseif (is_file("view/theme/$theme/README")) {
- $readme = "<pre>". file_get_contents("view/theme/$theme/README") ."</pre>";
+ $readme = "<pre>" . file_get_contents("view/theme/$theme/README") . "</pre>";
}
$admin_form = "";
if (is_file("view/theme/$theme/config.php")) {
- function __get_theme_admin_form(App $a, $theme) {
+
+ function __get_theme_admin_form(App $a, $theme)
+ {
$orig_theme = $a->theme;
$orig_page = $a->page;
$orig_session_theme = $_SESSION['theme'];
$_SESSION['theme'] = $theme;
- $init = $theme."_init";
+ $init = $theme . "_init";
if (function_exists($init)) {
$init($a);
}
}
$screenshot = array(get_theme_screenshot($theme), t('Screenshot'));
- if (! stristr($screenshot[0],$theme)) {
+ if (!stristr($screenshot[0], $theme)) {
$screenshot = null;
}
- $t = get_markup_template("admin_plugins_details.tpl");
+ $t = get_markup_template('admin/plugins_details.tpl');
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Themes'),
// reload active themes
- if (x($_GET,"a") && $_GET['a']=="r") {
- check_form_security_token_redirectOnErr(System::baseUrl().'/admin/themes', 'admin_themes', 't');
+ if (x($_GET, "a") && $_GET['a'] == "r") {
+ check_form_security_token_redirectOnErr(System::baseUrl() . '/admin/themes', 'admin_themes', 't');
if ($themes) {
foreach ($themes as $th) {
if ($th['allowed']) {
}
}
info("Themes reloaded");
- goaway(System::baseUrl().'/admin/themes');
+ goaway(System::baseUrl() . '/admin/themes');
}
/*
$xthemes = array();
if ($themes) {
foreach ($themes as $th) {
- $xthemes[] = array($th['name'],(($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
+ $xthemes[] = array($th['name'], (($th['allowed']) ? "on" : "off"), get_theme_info($th['name']));
}
}
-
- $t = get_markup_template("admin_plugins.tpl");
+ $t = get_markup_template('admin/plugins.tpl');
return replace_macros($t, array(
'$title' => t('Administration'),
'$page' => t('Themes'),
));
}
-
/**
* @brief Prosesses data send by Logs admin page
*
* @param App $a
*/
-function admin_page_logs_post(App $a) {
- if (x($_POST,"page_logs")) {
+function admin_page_logs_post(App $a)
+{
+ if (x($_POST, "page_logs")) {
check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs');
$logfile = ((x($_POST,'logfile')) ? notags(trim($_POST['logfile'])) : '');
$debugging = ((x($_POST,'debugging')) ? true : false);
$loglevel = ((x($_POST,'loglevel')) ? intval(trim($_POST['loglevel'])) : 0);
- Config::set('system','logfile', $logfile);
- Config::set('system','debugging', $debugging);
- Config::set('system','loglevel', $loglevel);
+ Config::set('system', 'logfile', $logfile);
+ Config::set('system', 'debugging', $debugging);
+ Config::set('system', 'loglevel', $loglevel);
}
info(t("Log settings updated."));
* @param App $a
* @return string
*/
-function admin_page_logs(App $a) {
-
+function admin_page_logs(App $a)
+{
$log_choices = array(
LOGGER_NORMAL => 'Normal',
LOGGER_TRACE => 'Trace',
$phplogenabled = t('PHP log currently disabled.');
}
- $t = get_markup_template("admin_logs.tpl");
+ $t = get_markup_template('admin/logs.tpl');
return replace_macros($t, array(
'$title' => t('Administration'),
'$submit' => t('Save Settings'),
'$clear' => t('Clear'),
'$baseurl' => System::baseUrl(true),
- '$logname' => Config::get('system','logfile'),
-
+ '$logname' => Config::get('system', 'logfile'),
// name, label, value, help string, extra data...
- '$debugging' => array('debugging', t("Enable Debugging"),Config::get('system','debugging'), ""),
- '$logfile' => array('logfile', t("Log file"), Config::get('system','logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")),
- '$loglevel' => array('loglevel', t("Log level"), Config::get('system','loglevel'), "", $log_choices),
-
+ '$debugging' => array('debugging', t("Enable Debugging"), Config::get('system', 'debugging'), ""),
+ '$logfile' => array('logfile', t("Log file"), Config::get('system', 'logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")),
+ '$loglevel' => array('loglevel', t("Log level"), Config::get('system', 'loglevel'), "", $log_choices),
'$form_security_token' => get_form_security_token("admin_logs"),
'$phpheader' => t("PHP logging"),
'$phphint' => t("To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."),
* @param App $a
* @return string
*/
-function admin_page_viewlogs(App $a) {
- $t = get_markup_template("admin_viewlogs.tpl");
- $f = Config::get('system','logfile');
+function admin_page_viewlogs(App $a)
+{
+ $t = get_markup_template('admin/viewlogs.tpl');
+ $f = Config::get('system', 'logfile');
$data = '';
if (!file_exists($f)) {
if ($size > 5000000 || $size < 0) {
$size = 5000000;
}
- $seek = fseek($fp,0-$size,SEEK_END);
+ $seek = fseek($fp, 0 - $size, SEEK_END);
if ($seek === 0) {
- $data = escape_tags(fread($fp,$size));
- while (! feof($fp)) {
- $data .= escape_tags(fread($fp,4096));
+ $data = escape_tags(fread($fp, $size));
+ while (!feof($fp)) {
+ $data .= escape_tags(fread($fp, 4096));
}
}
}
'$title' => t('Administration'),
'$page' => t('View Logs'),
'$data' => $data,
- '$logname' => Config::get('system','logfile')
+ '$logname' => Config::get('system', 'logfile')
));
}
*
* @param App $a
*/
-function admin_page_features_post(App $a) {
-
+function admin_page_features_post(App $a)
+{
check_form_security_token_redirectOnErr('/admin/features', 'admin_manage_features');
- logger('postvars: '.print_r($_POST,true),LOGGER_DATA);
+ logger('postvars: ' . print_r($_POST, true), LOGGER_DATA);
$arr = array();
- $features = get_features(false);
+ $features = Feature::get(false);
foreach ($features as $fname => $fdata) {
foreach (array_slice($fdata, 1) as $f) {
} else {
$val = 0;
}
- Config::set('feature',$feature,$val);
+ Config::set('feature', $feature, $val);
if (x($_POST, $featurelock)) {
Config::set('feature_lock', $feature, $val);
* @param App $a
* @return string
*/
-function admin_page_features(App $a) {
-
+function admin_page_features(App $a)
+{
if ((argc() > 1) && (argv(1) === 'features')) {
$arr = array();
- $features = get_features(false);
+ $features = Feature::get(false);
foreach ($features as $fname => $fdata) {
$arr[$fname] = array();
$arr[$fname][0] = $fdata[0];
- foreach (array_slice($fdata,1) as $f) {
-
- $set = Config::get('feature',$f[0]);
- if ($set === false) {
- $set = $f[3];
- }
+ foreach (array_slice($fdata, 1) as $f) {
+ $set = Config::get('feature', $f[0], $f[3]);
$arr[$fname][1][] = array(
- array('feature_' .$f[0],$f[1],$set,$f[2],array(t('Off'), t('On'))),
- array('featurelock_' .$f[0],sprintf(t('Lock feature %s'),$f[1]),(($f[4] !== false) ? "1" : ''),'',array(t('Off'), t('On')))
+ array('feature_' . $f[0], $f[1], $set, $f[2], array(t('Off'), t('On'))),
+ array('featurelock_' . $f[0], sprintf(t('Lock feature %s'), $f[1]), (($f[4] !== false) ? "1" : ''), '', array(t('Off'), t('On')))
);
}
}
- $tpl = get_markup_template("admin_settings_features.tpl");
+ $tpl = get_markup_template('admin/settings_features.tpl');
$o .= replace_macros($tpl, array(
'$form_security_token' => get_form_security_token("admin_manage_features"),
'$title' => t('Manage Additional Features'),
projects / friendica.git / blobdiff