tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge remote-tracking branch 'upstream/develop' into 1601-network-performance

Browse source
This commit is contained in:
Michael Vogel 2016-01-18 00:53:18 +01:00
commit 6c7cf2a766
11 changed files with 1323 additions and 1206 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
include/features.php
View file

@ -1,24 +1,26 @@
<?php <?php
/** /**
* @file include/features.php * * @file include/features.php
* @brief Features management * @brief Features management
*/ */
/** /**
* @brief check if feature is enabled * @brief check if feature is enabled
* *
* return boolean * @return boolean
*/ */
function feature_enabled($uid,$feature) { function feature_enabled($uid,$feature) {
//return true;
$x = get_config('feature_lock',$feature);
if($x === false) {
$x = get_pconfig($uid,'feature',$feature); $x = get_pconfig($uid,'feature',$feature);
if($x === false) { if($x === false) {
$x = get_config('feature',$feature); $x = get_config('feature',$feature);
if($x === false) if($x === false)
$x = get_feature_default($feature); $x = get_feature_default($feature);
} }
}
$arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x); $arr = array('uid' => $uid, 'feature' => $feature, 'enabled' => $x);
call_hooks('feature_enabled',$arr); call_hooks('feature_enabled',$arr);
return($arr['enabled']); return($arr['enabled']);
@ -42,14 +44,17 @@ function get_feature_default($feature) {
} }
/** /**
* @ brief get a list of all available features * @brief Get a list of all available features
*
* The array includes the setting group, the setting name, * The array includes the setting group, the setting name,
* explainations for the setting and if it's enabled or disabled * explainations for the setting and if it's enabled or disabled
* by default * by default
* *
* @param bool $filtered True removes any locked features
*
* @return array * @return array
*/ */
function get_features() { function get_features($filtered = true) {
$arr = array( $arr = array(
@ -57,56 +62,78 @@ function get_features() {
'general' => array( 'general' => array(
t('General Features'), t('General Features'),
//array('expire', t('Content Expiration'), t('Remove old posts/comments after a period of time')), //array('expire', t('Content Expiration'), t('Remove old posts/comments after a period of time')),
array('multi_profiles', t('Multiple Profiles'), t('Ability to create multiple profiles'),false), array('multi_profiles', t('Multiple Profiles'), t('Ability to create multiple profiles'), false, get_config('feature_lock','multi_profiles')),
array('photo_location', t('Photo Location'), t('Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map.'),false), array('photo_location', t('Photo Location'), t('Photo metadata is normally stripped. This extracts the location (if present) prior to stripping metadata and links it to a map.'), false, get_config('feature_lock','photo_location')),
), ),
// Post composition // Post composition
'composition' => array( 'composition' => array(
t('Post Composition Features'), t('Post Composition Features'),
array('richtext', t('Richtext Editor'), t('Enable richtext editor'),false), array('richtext', t('Richtext Editor'), t('Enable richtext editor'), false, get_config('feature_lock','richtext')),
array('preview', t('Post Preview'), t('Allow previewing posts and comments before publishing them'),false), array('preview', t('Post Preview'), t('Allow previewing posts and comments before publishing them'), false, get_config('feature_lock','preview')),
array('aclautomention', t('Auto-mention Forums'), t('Add/remove mention when a fourm page is selected/deselected in ACL window.'),false), array('aclautomention', t('Auto-mention Forums'), t('Add/remove mention when a fourm page is selected/deselected in ACL window.'), false, get_config('feature_lock','aclautomention')),
), ),
// Network sidebar widgets // Network sidebar widgets
'widgets' => array( 'widgets' => array(
t('Network Sidebar Widgets'), t('Network Sidebar Widgets'),
array('archives', t('Search by Date'), t('Ability to select posts by date ranges'),false), array('archives', t('Search by Date'), t('Ability to select posts by date ranges'), false, get_config('feature_lock','archives')),
array('forumlist_widget', t('List Forums'), t('Enable widget to display the forums your are connected with'),true), array('forumlist_widget', t('List Forums'), t('Enable widget to display the forums your are connected with'), true, get_config('feature_lock','forumlist_widget')),
array('groups', t('Group Filter'), t('Enable widget to display Network posts only from selected group'),false), array('groups', t('Group Filter'), t('Enable widget to display Network posts only from selected group'), false, get_config('feature_lock','groups')),
array('networks', t('Network Filter'), t('Enable widget to display Network posts only from selected network'),false), array('networks', t('Network Filter'), t('Enable widget to display Network posts only from selected network'), false, get_config('feature_lock','networks')),
array('savedsearch', t('Saved Searches'), t('Save search terms for re-use'),false), array('savedsearch', t('Saved Searches'), t('Save search terms for re-use'), false, get_config('feature_lock','savedsearch')),
), ),
// Network tabs // Network tabs
'net_tabs' => array( 'net_tabs' => array(
t('Network Tabs'), t('Network Tabs'),
array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on'),false), array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on'), false, get_config('feature_lock','personal_tab')),
array('new_tab', t('Network New Tab'), t('Enable tab to display only new Network posts (from the last 12 hours)'),false), array('new_tab', t('Network New Tab'), t('Enable tab to display only new Network posts (from the last 12 hours)'), false, get_config('feature_lock','new_tab')),
array('link_tab', t('Network Shared Links Tab'), t('Enable tab to display only Network posts with links in them'),false), array('link_tab', t('Network Shared Links Tab'), t('Enable tab to display only Network posts with links in them'), false, get_config('feature_lock','link_tab')),
), ),
// Item tools // Item tools
'tools' => array( 'tools' => array(
t('Post/Comment Tools'), t('Post/Comment Tools'),
array('multi_delete', t('Multiple Deletion'), t('Select and delete multiple posts/comments at once'),false), array('multi_delete', t('Multiple Deletion'), t('Select and delete multiple posts/comments at once'), false, get_config('feature_lock','multi_delete')),
array('edit_posts', t('Edit Sent Posts'), t('Edit and correct posts and comments after sending'),false), array('edit_posts', t('Edit Sent Posts'), t('Edit and correct posts and comments after sending'), false, get_config('feature_lock','edit_posts')),
array('commtag', t('Tagging'), t('Ability to tag existing posts'),false), array('commtag', t('Tagging'), t('Ability to tag existing posts'), false, get_config('feature_lock','commtag')),
array('categories', t('Post Categories'), t('Add categories to your posts'),false), array('categories', t('Post Categories'), t('Add categories to your posts'), false, get_config('feature_lock','categories')),
array('filing', t('Saved Folders'), t('Ability to file posts under folders'),false), array('filing', t('Saved Folders'), t('Ability to file posts under folders'), false, get_config('feature_lock','filing')),
array('dislike', t('Dislike Posts'), t('Ability to dislike posts/comments')), array('dislike', t('Dislike Posts'), t('Ability to dislike posts/comments'), false, get_config('feature_lock','dislike')),
array('star_posts', t('Star Posts'), t('Ability to mark special posts with a star indicator'),false), array('star_posts', t('Star Posts'), t('Ability to mark special posts with a star indicator'), false, get_config('feature_lock','star_posts')),
array('ignore_posts', t('Mute Post Notifications'), t('Ability to mute notifications for a thread'),false), array('ignore_posts', t('Mute Post Notifications'), t('Ability to mute notifications for a thread'), false, get_config('feature_lock','ignore_posts')),
), ),
// Advanced Profile Settings // Advanced Profile Settings
'advanced_profile' => array( 'advanced_profile' => array(
t('Advanced Profile Settings'), t('Advanced Profile Settings'),
array('forumlist_profile', t('List Forums'), t('Show visitors public community forums at the Advanced Profile Page'),false), array('forumlist_profile', t('List Forums'), t('Show visitors public community forums at the Advanced Profile Page'), false, get_config('feature_lock','forumlist_profile')),
), ),
); );
// removed any locked features and remove the entire category if this makes it empty
if($filtered) {
foreach($arr as $k => $x) {
$has_items = false;
$kquantity = count($arr[$k]);
for($y = 0; $y < $kquantity; $y ++) {
if(is_array($arr[$k][$y])) {
if($arr[$k][$y][4] === false) {
$has_items = true;
}
else {
unset($arr[$k][$y]);
}
}
}
if(! $has_items) {
unset($arr[$k]);
}
}
}
call_hooks('get_features',$arr); call_hooks('get_features',$arr);
return $arr; return $arr;
} }

238
mod/admin.php
View file

@ -1,13 +1,17 @@
<?php <?php
/** /**
* Friendica admin * @file mod/admin.php
*
* @brief Friendica admin
*/ */
require_once("include/enotify.php"); require_once("include/enotify.php");
require_once("include/text.php"); require_once("include/text.php");
/** /**
* @brief process send data from the admin panels subpages * @brief Process send data from the admin panels subpages
* *
* This function acts as relais for processing the data send from the subpages * This function acts as relais for processing the data send from the subpages
* of the admin panel. Depending on the 1st parameter of the url (argv[1]) * of the admin panel. Depending on the 1st parameter of the url (argv[1])
@ -91,6 +95,9 @@ function admin_post(&$a){
goaway($a->get_baseurl(true) . '/admin/themes/' . $theme ); goaway($a->get_baseurl(true) . '/admin/themes/' . $theme );
return; return;
break; break;
case 'features':
admin_page_features_post($a);
break;
case 'logs': case 'logs':
admin_page_logs_post($a); admin_page_logs_post($a);
break; break;
@ -105,7 +112,7 @@ function admin_post(&$a){
} }
/** /**
* @brief generates content of the admin panel pages * @brief Generates content of the admin panel pages
* *
* This function generates the content for the admin panel. * This function generates the content for the admin panel.
* *
@ -127,37 +134,41 @@ function admin_content(&$a) {
// apc_delete($toDelete); // apc_delete($toDelete);
//} //}
/** // Header stuff
$a->page['htmlhead'] .= replace_macros(get_markup_template('admin_settings_head.tpl'), array());
/*
* Side bar links * Side bar links
*/ */
$aside_tools = Array(); $aside_tools = array();
// array( url, name, extra css classes ) // array( url, name, extra css classes )
// not part of $aside to make the template more adjustable // not part of $aside to make the template more adjustable
$aside_sub = Array( $aside_sub = array(
'site' => Array($a->get_baseurl(true)."/admin/site/", t("Site") , "site"), 'site' => array($a->get_baseurl(true)."/admin/site/", t("Site") , "site"),
'users' => Array($a->get_baseurl(true)."/admin/users/", t("Users") , "users"), 'users' => array($a->get_baseurl(true)."/admin/users/", t("Users") , "users"),
'plugins'=> Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"), 'plugins'=> array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"),
'themes' => Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"), 'themes' => array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"),
'dbsync' => Array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync"), 'features' => array($a->get_baseurl(true)."/admin/features/", t("Additional features") , "features"),
'queue' => Array($a->get_baseurl(true)."/admin/queue/", t('Inspect Queue'), "queue"), 'dbsync' => array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync"),
'federation' => Array($a->get_baseurl(true)."/admin/federation/", t('Federation Statistics'), "federation"), 'queue' => array($a->get_baseurl(true)."/admin/queue/", t('Inspect Queue'), "queue"),
'federation' => array($a->get_baseurl(true)."/admin/federation/", t('Federation Statistics'), "federation"),
); );
/* get plugins admin page */ /* get plugins admin page */
$r = q("SELECT `name` FROM `addon` WHERE `plugin_admin`=1 ORDER BY `name`"); $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){ foreach ($r as $h){
$plugin =$h['name']; $plugin =$h['name'];
$aside['plugins_admin'][] = Array($a->get_baseurl(true)."/admin/plugins/".$plugin, $plugin, "plugin"); $aside['plugins_admin'][] = array($a->get_baseurl(true)."/admin/plugins/".$plugin, $plugin, "plugin");
// temp plugins with admin // temp plugins with admin
$a->plugins_admin[] = $plugin; $a->plugins_admin[] = $plugin;
} }
$aside_tools['logs'] = Array($a->get_baseurl(true)."/admin/logs/", t("Logs"), "logs"); $aside_tools['logs'] = array($a->get_baseurl(true)."/admin/logs/", t("Logs"), "logs");
$aside_tools['viewlogs'] = Array($a->get_baseurl(true)."/admin/viewlogs/", t("View Logs"), 'viewlogs'); $aside_tools['viewlogs'] = array($a->get_baseurl(true)."/admin/viewlogs/", t("View Logs"), 'viewlogs');
$aside_tools['diagnostics_probe'] = Array($a->get_baseurl(true).'/probe/', t('probe address'), 'probe'); $aside_tools['diagnostics_probe'] = array($a->get_baseurl(true).'/probe/', t('probe address'), 'probe');
$aside_tools['diagnostics_webfinger'] = Array($a->get_baseurl(true).'/webfinger/', t('check webfinger'), 'webfinger'); $aside_tools['diagnostics_webfinger'] = array($a->get_baseurl(true).'/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( $a->page['aside'] .= replace_macros( $t, array(
@ -173,7 +184,7 @@ function admin_content(&$a) {
/** /*
* Page content * Page content
*/ */
$o = ''; $o = '';
@ -192,6 +203,9 @@ function admin_content(&$a) {
case 'themes': case 'themes':
$o = admin_page_themes($a); $o = admin_page_themes($a);
break; break;
case 'features':
$o = admin_page_features($a);
break;
case 'logs': case 'logs':
$o = admin_page_logs($a); $o = admin_page_logs($a);
break; break;
@ -224,7 +238,7 @@ function admin_content(&$a) {
} }
/** /**
* @brief subpage with some stats about "the federation" network * @brief Subpage with some stats about "the federation" network
* *
* This function generates the "Federation Statistics" subpage for the admin * This function generates the "Federation Statistics" subpage for the admin
* panel. The page lists some numbers to the part of "The Federation" known to * panel. The page lists some numbers to the part of "The Federation" known to
@ -248,18 +262,21 @@ function admin_page_federation(&$a) {
// displayed on the stats page. // displayed on the stats page.
$platforms = array('Friendica', 'Diaspora', '%%red%%', 'Hubzilla', 'GNU Social', 'StatusNet'); $platforms = array('Friendica', 'Diaspora', '%%red%%', 'Hubzilla', 'GNU Social', 'StatusNet');
$counts = array(); $counts = array();
foreach ($platforms as $p) { foreach ($platforms as $p) {
// get a total count for the platform, the name and version of the // get a total count for the platform, the name and version of the
// highest version and the protocol tpe // highest version and the protocol tpe
$c = q('SELECT count(*) AS total, platform, network, version FROM gserver $c = q('SELECT count(*) AS total, platform, network, version FROM gserver
WHERE platform LIKE "%s" AND last_contact > last_failure WHERE platform LIKE "%s" AND last_contact > last_failure
ORDER BY version ASC;', $p); ORDER BY version ASC;', $p);
// what versions for that platform do we know at all? // what versions for that platform do we know at all?
// again only the active nodes // again only the active nodes
$v = q('SELECT count(*) AS total, version FROM gserver $v = q('SELECT count(*) AS total, version FROM gserver
WHERE last_contact > last_failure AND platform LIKE "%s" WHERE last_contact > last_failure AND platform LIKE "%s"
GROUP BY version GROUP BY version
ORDER BY version;', $p); ORDER BY version;', $p);
// //
// clean up version numbers // clean up version numbers
// //
@ -276,17 +293,16 @@ function admin_page_federation(&$a) {
if($posDash) if($posDash)
$newVV = substr($newVV, 0, $posDash); $newVV = substr($newVV, 0, $posDash);
if(isset($newV[$newVV])) if(isset($newV[$newVV]))
{
$newV[$newVV] += $newVC; $newV[$newVV] += $newVC;
} else { else
$newV[$newVV] = $newVC; $newV[$newVV] = $newVC;
} }
}
foreach ($newV as $key => $value) { foreach ($newV as $key => $value) {
array_push($newVv, array('total'=>$value, 'version'=>$key)); array_push($newVv, array('total'=>$value, 'version'=>$key));
} }
$v = $newVv; $v = $newVv;
} }
// early friendica versions have the format x.x.xxxx where xxxx is the // early friendica versions have the format x.x.xxxx where xxxx is the
// DB version stamp; those should be operated out and versions be // DB version stamp; those should be operated out and versions be
// conbined // conbined
@ -301,24 +317,25 @@ function admin_page_federation(&$a) {
if(($lastDot == $len-4) && (!strrpos($newVV,'-rc')==$len-3)) if(($lastDot == $len-4) && (!strrpos($newVV,'-rc')==$len-3))
$newVV = substr($newVV, 0, $lastDot); $newVV = substr($newVV, 0, $lastDot);
if(isset($newV[$newVV])) if(isset($newV[$newVV]))
{
$newV[$newVV] += $newVC; $newV[$newVV] += $newVC;
} else { else
$newV[$newVV] = $newVC; $newV[$newVV] = $newVC;
} }
}
foreach ($newV as $key => $value) { foreach ($newV as $key => $value) {
array_push($newVv, array('total'=>$value, 'version'=>$key)); array_push($newVv, array('total'=>$value, 'version'=>$key));
} }
$v = $newVv; $v = $newVv;
} }
// the 3rd array item is needed for the JavaScript graphs as JS does // the 3rd array item is needed for the JavaScript graphs as JS does
// not like some characters in the names of variables... // not like some characters in the names of variables...
$counts[$p]=array($c[0], $v, str_replace(array(' ','%'),'',$p)); $counts[$p]=array($c[0], $v, str_replace(array(' ','%'),'',$p));
} }
// some helpful text // some helpful text
$intro = t('This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of.'); $intro = t('This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of.');
$hint = t('The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here.'); $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 // 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( return replace_macros($t, array(
@ -333,6 +350,7 @@ function admin_page_federation(&$a) {
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
)); ));
} }
/** /**
* @brief Admin Inspect Queue Page * @brief Admin Inspect Queue Page
* *
@ -365,6 +383,7 @@ function admin_page_queue(&$a) {
'$entries' => $r, '$entries' => $r,
)); ));
} }
/** /**
* @brief Admin Summary Page * @brief Admin Summary Page
* *
@ -378,13 +397,13 @@ function admin_page_queue(&$a) {
*/ */
function admin_page_summary(&$a) { function admin_page_summary(&$a) {
$r = q("SELECT `page-flags`, COUNT(uid) as `count` FROM `user` GROUP BY `page-flags`"); $r = q("SELECT `page-flags`, COUNT(uid) as `count` FROM `user` GROUP BY `page-flags`");
$accounts = Array( $accounts = array(
Array( t('Normal Account'), 0), array( t('Normal Account'), 0),
Array( t('Soapbox Account'), 0), array( t('Soapbox Account'), 0),
Array( t('Community/Celebrity Account'), 0), array( t('Community/Celebrity Account'), 0),
Array( t('Automatic Friend Account'), 0), array( t('Automatic Friend Account'), 0),
Array( t('Blog Account'), 0), array( t('Blog Account'), 0),
Array( t('Private Forum'), 0) array( t('Private Forum'), 0)
); );
$users=0; $users=0;
@ -411,21 +430,21 @@ function admin_page_summary(&$a) {
'$title' => t('Administration'), '$title' => t('Administration'),
'$page' => t('Summary'), '$page' => t('Summary'),
'$queues' => $queues, '$queues' => $queues,
'$users' => Array( t('Registered users'), $users), '$users' => array( t('Registered users'), $users),
'$accounts' => $accounts, '$accounts' => $accounts,
'$pending' => Array( t('Pending registrations'), $pending), '$pending' => array( t('Pending registrations'), $pending),
'$version' => Array( t('Version'), FRIENDICA_VERSION), '$version' => array( t('Version'), FRIENDICA_VERSION),
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),
'$platform' => FRIENDICA_PLATFORM, '$platform' => FRIENDICA_PLATFORM,
'$codename' => FRIENDICA_CODENAME, '$codename' => FRIENDICA_CODENAME,
'$build' => get_config('system','build'), '$build' => get_config('system','build'),
'$plugins' => Array( t('Active plugins'), $a->plugins ) '$plugins' => array( t('Active plugins'), $a->plugins )
)); ));
} }
/** /**
* @brief process send data from Admin Site Page * @brief Process send data from Admin Site Page
*
* @param App $a * @param App $a
*/ */
function admin_page_site_post(&$a) { function admin_page_site_post(&$a) {
@ -656,6 +675,7 @@ function admin_page_site_post(&$a){
} else { } else {
set_config('system','banner', $banner); set_config('system','banner', $banner);
} }
if($info=="") { if($info=="") {
del_config('config','info'); del_config('config','info');
} else { } else {
@ -663,6 +683,7 @@ function admin_page_site_post(&$a){
} }
set_config('system','language', $language); set_config('system','language', $language);
set_config('system','theme', $theme); set_config('system','theme', $theme);
if( $theme_mobile === '---' ) { if( $theme_mobile === '---' ) {
del_config('system','mobile-theme'); del_config('system','mobile-theme');
} else { } else {
@ -740,7 +761,7 @@ function admin_page_site_post(&$a){
} }
/** /**
* @brief generate Admin Site subpage * @brief Generate Admin Site subpage
* *
* This function generates the main configuration page of the admin panel. * This function generates the main configuration page of the admin panel.
* *
@ -762,7 +783,7 @@ function admin_page_site(&$a) {
$theme_choices = array(); $theme_choices = array();
$theme_choices_mobile = array(); $theme_choices_mobile = array();
$theme_choices_mobile["---"] = t("No special theme for mobile devices"); $theme_choices_mobile["---"] = t("No special theme for mobile devices");
$files = glob('view/theme/*'); /**/ $files = glob('view/theme/*');
if($files) { if($files) {
foreach($files as $file) { foreach($files as $file) {
if(intval(file_exists($file . '/unsupported'))) if(intval(file_exists($file . '/unsupported')))
@ -833,7 +854,7 @@ function admin_page_site(&$a) {
//echo "<pre>"; var_dump($lang_choices); die("</pre>"); //echo "<pre>"; var_dump($lang_choices); die("</pre>");
/* Register policy */ /* Register policy */
$register_choices = Array( $register_choices = array(
REGISTER_CLOSED => t("Closed"), REGISTER_CLOSED => t("Closed"),
REGISTER_APPROVE => t("Requires approval"), REGISTER_APPROVE => t("Requires approval"),
REGISTER_OPEN => t("Open") REGISTER_OPEN => t("Open")
@ -955,7 +976,7 @@ function admin_page_site(&$a) {
} }
/** /**
* @brief generates admin panel subpage for DB syncronization * @brief Generates admin panel subpage for DB syncronization
* *
* This page checks if the database of friendica is in sync with the specs. * This page checks if the database of friendica is in sync with the specs.
* Should this not be the case, it attemps to sync the structure and notifies * Should this not be the case, it attemps to sync the structure and notifies
@ -1045,12 +1066,13 @@ function admin_page_dbsync(&$a) {
} }
/** /**
* @brief process data send by Users admin page * @brief Process data send by Users admin page
*
* @param App $a * @param App $a
*/ */
function admin_page_users_post(&$a){ function admin_page_users_post(&$a){
$pending = ( x($_POST, 'pending') ? $_POST['pending'] : Array() ); $pending = ( x($_POST, 'pending') ? $_POST['pending'] : array() );
$users = ( x($_POST, 'user') ? $_POST['user'] : Array() ); $users = ( x($_POST, 'user') ? $_POST['user'] : array() );
$nu_name = ( x($_POST, 'new_user_name') ? $_POST['new_user_name'] : ''); $nu_name = ( x($_POST, 'new_user_name') ? $_POST['new_user_name'] : '');
$nu_nickname = ( x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); $nu_nickname = ( x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : '');
$nu_email = ( x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); $nu_email = ( x($_POST, 'new_user_email') ? $_POST['new_user_email'] : '');
@ -1140,7 +1162,7 @@ function admin_page_users_post(&$a){
} }
/** /**
* @brief admin panel subpage for User management * @brief Admin panel subpage for User management
* *
* This function generates the admin panel page for user management of the * This function generates the admin panel page for user management of the
* node. It offers functionality to add/block/delete users and offers some * node. It offers functionality to add/block/delete users and offers some
@ -1191,14 +1213,12 @@ function admin_page_users(&$a){
/* get users */ /* get users */
$total = q("SELECT count(*) as total FROM `user` where 1"); $total = q("SELECT count(*) as total FROM `user` where 1");
if(count($total)) { if(count($total)) {
$a->set_pager_total($total[0]['total']); $a->set_pager_total($total[0]['total']);
$a->set_pager_itemspage(100); $a->set_pager_itemspage(100);
} }
$users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`, `user`.`account_expired` $users = q("SELECT `user` . * , `contact`.`name` , `contact`.`url` , `contact`.`micro`, `lastitem`.`lastitem_date`, `user`.`account_expired`
FROM FROM
(SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid` (SELECT MAX(`item`.`changed`) as `lastitem_date`, `item`.`uid`
@ -1219,7 +1239,7 @@ function admin_page_users(&$a){
$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email'])); $adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
$_setup_users = function ($e) use ($adminlist){ $_setup_users = function ($e) use ($adminlist){
$accounts = Array( $accounts = array(
t('Normal Account'), t('Normal Account'),
t('Soapbox Account'), t('Soapbox Account'),
t('Community/Celebrity Account'), t('Community/Celebrity Account'),
@ -1241,11 +1261,11 @@ function admin_page_users(&$a){
// Get rid of dashes in key names, Smarty3 can't handle them // Get rid of dashes in key names, Smarty3 can't handle them
// and extracting deleted users // and extracting deleted users
$tmp_users = Array(); $tmp_users = array();
$deleted = Array(); $deleted = array();
while(count($users)) { while(count($users)) {
$new_user = Array(); $new_user = array();
foreach( array_pop($users) as $k => $v) { foreach( array_pop($users) as $k => $v) {
$k = str_replace('-','_',$k); $k = str_replace('-','_',$k);
$new_user[$k] = $v; $new_user[$k] = $v;
@ -1325,7 +1345,7 @@ function admin_page_users(&$a){
*/ */
function admin_page_plugins(&$a){ function admin_page_plugins(&$a){
/** /*
* Single plugin * Single plugin
*/ */
if($a->argc == 3) { if($a->argc == 3) {
@ -1353,6 +1373,7 @@ function admin_page_plugins(&$a){
goaway($a->get_baseurl(true) . '/admin/plugins' ); goaway($a->get_baseurl(true) . '/admin/plugins' );
return ''; // NOTREACHED return ''; // NOTREACHED
} }
// display plugin details // display plugin details
require_once('library/markdown.php'); require_once('library/markdown.php');
@ -1404,7 +1425,7 @@ function admin_page_plugins(&$a){
/** /*
* List plugins * List plugins
*/ */
@ -1416,7 +1437,7 @@ function admin_page_plugins(&$a){
} }
$plugins = array(); $plugins = array();
$files = glob("addon/*/"); /* */ $files = glob("addon/*/");
if($files) { if($files) {
foreach($files as $file) { foreach($files as $file) {
if(is_dir($file)) { if(is_dir($file)) {
@ -1539,7 +1560,7 @@ function admin_page_themes(&$a){
$allowed_themes[] = trim($x); $allowed_themes[] = trim($x);
$themes = array(); $themes = array();
$files = glob('view/theme/*'); /* */ $files = glob('view/theme/*');
if($files) { if($files) {
foreach($files as $file) { foreach($files as $file) {
$f = basename($file); $f = basename($file);
@ -1557,7 +1578,7 @@ function admin_page_themes(&$a){
return ''; return '';
} }
/** /*
* Single theme * Single theme
*/ */
@ -1674,7 +1695,7 @@ function admin_page_themes(&$a){
goaway($a->get_baseurl().'/admin/themes'); goaway($a->get_baseurl().'/admin/themes');
} }
/** /*
* List themes * List themes
*/ */
@ -1705,10 +1726,10 @@ function admin_page_themes(&$a){
/** /**
* @brief prosesses data send by Logs admin page * @brief Prosesses data send by Logs admin page
*
* @param App $a * @param App $a
*/ */
function admin_page_logs_post(&$a) { function admin_page_logs_post(&$a) {
if(x($_POST,"page_logs")) { if(x($_POST,"page_logs")) {
check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs'); check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs');
@ -1728,7 +1749,7 @@ function admin_page_logs_post(&$a) {
} }
/** /**
* @brief generates admin panel subpage for configuration of the logs * @brief Generates admin panel subpage for configuration of the logs
* *
* This function take the view/templates/admin_logs.tpl file and generates a * This function take the view/templates/admin_logs.tpl file and generates a
* page where admin can configure the logging of friendica. * page where admin can configure the logging of friendica.
@ -1745,7 +1766,7 @@ function admin_page_logs_post(&$a) {
*/ */
function admin_page_logs(&$a){ function admin_page_logs(&$a){
$log_choices = Array( $log_choices = array(
LOGGER_NORMAL => 'Normal', LOGGER_NORMAL => 'Normal',
LOGGER_TRACE => 'Trace', LOGGER_TRACE => 'Trace',
LOGGER_DEBUG => 'Debug', LOGGER_DEBUG => 'Debug',
@ -1776,7 +1797,7 @@ function admin_page_logs(&$a){
} }
/** /**
* @brief generates admin panel subpage to view the Friendica log * @brief Generates admin panel subpage to view the Friendica log
* *
* This function loads the template view/templates/admin_viewlogs.tpl to * This function loads the template view/templates/admin_viewlogs.tpl to
* display the systemlog content. The filename for the systemlog of friendica * display the systemlog content. The filename for the systemlog of friendica
@ -1809,8 +1830,7 @@ function admin_page_viewlogs(&$a){
else { else {
$fstat = fstat($fp); $fstat = fstat($fp);
$size = $fstat['size']; $size = $fstat['size'];
if($size != 0) if($size != 0) {
{
if($size > 5000000 || $size < 0) if($size > 5000000 || $size < 0)
$size = 5000000; $size = 5000000;
$seek = fseek($fp,0-$size,SEEK_END); $seek = fseek($fp,0-$size,SEEK_END);
@ -1830,3 +1850,87 @@ function admin_page_viewlogs(&$a){
'$logname' => get_config('system','logfile') '$logname' => get_config('system','logfile')
)); ));
} }
/**
* @brief Prosesses data send by the features admin page
*
* @param App $a
*/
function admin_page_features_post(&$a) {
check_form_security_token_redirectOnErr('/admin/features', 'admin_manage_features');
logger('postvars: ' . print_r($_POST,true),LOGGER_DATA);
$arr = array();
$features = get_features(false);
foreach($features as $fname => $fdata) {
foreach(array_slice($fdata,1) as $f) {
$feature = $f[0];
$feature_state = 'feature_' . $feature;
$featurelock = 'featurelock_' . $feature;
if(x($_POST[$feature_state]))
$val = intval($_POST['feature_' . $feature]);
else
$val = 0;
set_config('feature',$feature,$val);
if(x($_POST[$featurelock]))
set_config('feature_lock',$feature,$val);
else
del_config('feature_lock',$feature);
}
}
goaway($a->get_baseurl(true) . '/admin/features' );
return; // NOTREACHED
}
/**
* @brief Subpage for global additional feature management
*
* This functin generates the subpage 'Manage Additional Features'
* for the admin panel. At this page the admin can set preferences
* for the user settings of the 'additional features'. If needed this
* preferences can be locked through the admin.
*
* The returned string contains the HTML code of the subpage 'Manage
* Additional Features'
*
* @param App $a
* @return string
*/
function admin_page_features(&$a) {
if((argc() > 1) && (argv(1) === 'features')) {
$arr = array();
$features = get_features(false);
foreach($features as $fname => $fdata) {
$arr[$fname] = array();
$arr[$fname][0] = $fdata[0];
foreach(array_slice($fdata,1) as $f) {
$set = get_config('feature',$f[0]);
if($set === false)
$set = $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')))
);
}
}
$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'),
'$features' => $arr,
'$submit' => t('Save Settings'),
));
return $o;
}
}

11
mod/friendica.php
View file

@ -29,10 +29,21 @@ function friendica_init(&$a) {
$visible_plugins[] = $rr['name']; $visible_plugins[] = $rr['name'];
} }
load_config('feature_lock');
$locked_features = array();
if(is_array($a->config['feature_lock']) && count($a->config['feature_lock'])) {
foreach($a->config['feature_lock'] as $k => $v) {
if($k === 'config_loaded')
continue;
$locked_features[$k] = intval($v);
}
}
$data = Array( $data = Array(
'version' => FRIENDICA_VERSION, 'version' => FRIENDICA_VERSION,
'url' => z_root(), 'url' => z_root(),
'plugins' => $visible_plugins, 'plugins' => $visible_plugins,
'locked_features' => $locked_features,
'register_policy' => $register_policy[$a->config['register_policy']], 'register_policy' => $register_policy[$a->config['register_policy']],
'admin' => $admin, 'admin' => $admin,
'site_name' => $a->config['sitename'], 'site_name' => $a->config['sitename'],

47
mod/settings.php
View file

@ -43,57 +43,67 @@ function settings_init(&$a) {
'selected' => (($a->argc == 1) && ($a->argv[0] === 'settings')?'active':''), 'selected' => (($a->argc == 1) && ($a->argv[0] === 'settings')?'active':''),
'accesskey' => 'o', 'accesskey' => 'o',
), ),
array( );
if(get_features()) {
$tabs[] = array(
'label' => t('Additional features'), 'label' => t('Additional features'),
'url' => $a->get_baseurl(true).'/settings/features', 'url' => $a->get_baseurl(true).'/settings/features',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''), 'selected' => (($a->argc > 1) && ($a->argv[1] === 'features') ? 'active' : ''),
'accesskey' => 't', 'accesskey' => 't',
), );
array( }
$tabs[] = array(
'label' => t('Display'), 'label' => t('Display'),
'url' => $a->get_baseurl(true).'/settings/display', 'url' => $a->get_baseurl(true).'/settings/display',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''), 'selected' => (($a->argc > 1) && ($a->argv[1] === 'display')?'active':''),
'accesskey' => 'i', 'accesskey' => 'i',
), );
array( $tabs[] = array(
'label' => t('Social Networks'), 'label' => t('Social Networks'),
'url' => $a->get_baseurl(true).'/settings/connectors', 'url' => $a->get_baseurl(true).'/settings/connectors',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''), 'selected' => (($a->argc > 1) && ($a->argv[1] === 'connectors')?'active':''),
'accesskey' => 'w', 'accesskey' => 'w',
), );
array(
$tabs[] = array(
'label' => t('Plugins'), 'label' => t('Plugins'),
'url' => $a->get_baseurl(true).'/settings/addon', 'url' => $a->get_baseurl(true).'/settings/addon',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''), 'selected' => (($a->argc > 1) && ($a->argv[1] === 'addon')?'active':''),
'accesskey' => 'l', 'accesskey' => 'l',
), );
array(
$tabs[] = array(
'label' => t('Delegations'), 'label' => t('Delegations'),
'url' => $a->get_baseurl(true).'/delegate', 'url' => $a->get_baseurl(true).'/delegate',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'delegate')?'active':''), 'selected' => (($a->argc == 1) && ($a->argv[0] === 'delegate')?'active':''),
'accesskey' => 'd', 'accesskey' => 'd',
), );
array(
$tabs[] = array(
'label' => t('Connected apps'), 'label' => t('Connected apps'),
'url' => $a->get_baseurl(true) . '/settings/oauth', 'url' => $a->get_baseurl(true) . '/settings/oauth',
'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''), 'selected' => (($a->argc > 1) && ($a->argv[1] === 'oauth')?'active':''),
'accesskey' => 'b', 'accesskey' => 'b',
), );
array(
$tabs[] = array(
'label' => t('Export personal data'), 'label' => t('Export personal data'),
'url' => $a->get_baseurl(true) . '/uexport', 'url' => $a->get_baseurl(true) . '/uexport',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport')?'active':''), 'selected' => (($a->argc == 1) && ($a->argv[0] === 'uexport')?'active':''),
'accesskey' => 'e', 'accesskey' => 'e',
), );
array(
$tabs[] = array(
'label' => t('Remove account'), 'label' => t('Remove account'),
'url' => $a->get_baseurl(true) . '/removeme', 'url' => $a->get_baseurl(true) . '/removeme',
'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''), 'selected' => (($a->argc == 1) && ($a->argv[0] === 'removeme')?'active':''),
'accesskey' => 'r', 'accesskey' => 'r',
)
); );
$tabtpl = get_markup_template("generic_links_widget.tpl"); $tabtpl = get_markup_template("generic_links_widget.tpl");
$a->page['aside'] = replace_macros($tabtpl, array( $a->page['aside'] = replace_macros($tabtpl, array(
'$title' => t('Settings'), '$title' => t('Settings'),
@ -622,7 +632,6 @@ function settings_post(&$a) {
} }
if(! function_exists('settings_content')) {
function settings_content(&$a) { function settings_content(&$a) {
$o = ''; $o = '';
@ -747,7 +756,7 @@ function settings_content(&$a) {
$arr[$fname] = array(); $arr[$fname] = array();
$arr[$fname][0] = $fdata[0]; $arr[$fname][0] = $fdata[0];
foreach(array_slice($fdata,1) as $f) { foreach(array_slice($fdata,1) as $f) {
$arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(get_pconfig(local_user(),'feature',$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On'))); $arr[$fname][1][] = array('feature_' .$f[0],$f[1],((intval(feature_enabled(local_user(),$f[0]))) ? "1" : ''),$f[2],array(t('Off'),t('On')));
} }
} }
@ -1287,5 +1296,5 @@ function settings_content(&$a) {
return $o; return $o;
}} }

1604
view/de/messages.po
View file

File diff suppressed because it is too large Load diff

55
view/de/strings.php
View file

@ -142,9 +142,6 @@ $a->strings["Edit your <strong>default</strong> profile to your liking. Review t
$a->strings["Profile Keywords"] = "Profil Schlüsselbegriffe"; $a->strings["Profile Keywords"] = "Profil Schlüsselbegriffe";
$a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Trage ein paar öffentliche Stichwörter in Dein Standardprofil ein, die Deine Interessen beschreiben. Eventuell sind wir in der Lage Leute zu finden, die Deine Interessen teilen und können Dir dann Kontakte vorschlagen."; $a->strings["Set some public keywords for your default profile which describe your interests. We may be able to find other people with similar interests and suggest friendships."] = "Trage ein paar öffentliche Stichwörter in Dein Standardprofil ein, die Deine Interessen beschreiben. Eventuell sind wir in der Lage Leute zu finden, die Deine Interessen teilen und können Dir dann Kontakte vorschlagen.";
$a->strings["Connecting"] = "Verbindungen knüpfen"; $a->strings["Connecting"] = "Verbindungen knüpfen";
$a->strings["Facebook"] = "Facebook";
$a->strings["Authorise the Facebook Connector if you currently have a Facebook account and we will (optionally) import all your Facebook friends and conversations."] = "Richte die Verbindung zu Facebook ein, wenn Du im Augenblick ein Facebook-Konto hast und (optional) Deine Facebook-Freunde und -Unterhaltungen importieren willst.";
$a->strings["<em>If</em> this is your own personal server, installing the Facebook addon may ease your transition to the free social web."] = "<em>Wenn</em> dies Dein privater Server ist, könnte die Installation des Facebook Connectors Deinen Umzug ins freie soziale Netz angenehmer gestalten.";
$a->strings["Importing Emails"] = "Emails Importieren"; $a->strings["Importing Emails"] = "Emails Importieren";
$a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Gib Deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls Du E-Mails aus Deinem Posteingang importieren und mit Freunden und Mailinglisten interagieren willst."; $a->strings["Enter your email access information on your Connector Settings page if you wish to import and interact with friends or mailing lists from your email INBOX"] = "Gib Deine E-Mail-Zugangsinformationen auf der Connector-Einstellungsseite ein, falls Du E-Mails aus Deinem Posteingang importieren und mit Freunden und Mailinglisten interagieren willst.";
$a->strings["Go to Your Contacts Page"] = "Gehe zu deiner Kontakt-Seite"; $a->strings["Go to Your Contacts Page"] = "Gehe zu deiner Kontakt-Seite";
@ -290,12 +287,6 @@ $a->strings["Forgot your Password?"] = "Hast Du Dein Passwort vergessen?";
$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden Dir dann weitere Informationen per Mail zugesendet."; $a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = "Gib Deine E-Mail-Adresse an und fordere ein neues Passwort an. Es werden Dir dann weitere Informationen per Mail zugesendet.";
$a->strings["Nickname or Email: "] = "Spitzname oder E-Mail:"; $a->strings["Nickname or Email: "] = "Spitzname oder E-Mail:";
$a->strings["Reset"] = "Zurücksetzen"; $a->strings["Reset"] = "Zurücksetzen";
$a->strings["event"] = "Event";
$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s";
$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht";
$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil.";
$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil.";
$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil.";
$a->strings["{0} wants to be your friend"] = "{0} möchte mit Dir in Kontakt treten"; $a->strings["{0} wants to be your friend"] = "{0} möchte mit Dir in Kontakt treten";
$a->strings["{0} sent you a message"] = "{0} schickte Dir eine Nachricht"; $a->strings["{0} sent you a message"] = "{0} schickte Dir eine Nachricht";
$a->strings["{0} requested registration"] = "{0} möchte sich registrieren"; $a->strings["{0} requested registration"] = "{0} möchte sich registrieren";
@ -427,14 +418,19 @@ $a->strings["Plugins"] = "Plugins";
$a->strings["Themes"] = "Themen"; $a->strings["Themes"] = "Themen";
$a->strings["DB updates"] = "DB Updates"; $a->strings["DB updates"] = "DB Updates";
$a->strings["Inspect Queue"] = "Warteschlange Inspizieren"; $a->strings["Inspect Queue"] = "Warteschlange Inspizieren";
$a->strings["Federation Statistics"] = "Federation Statistik";
$a->strings["Logs"] = "Protokolle"; $a->strings["Logs"] = "Protokolle";
$a->strings["View Logs"] = "Protokolle anzeigen";
$a->strings["probe address"] = "Adresse untersuchen"; $a->strings["probe address"] = "Adresse untersuchen";
$a->strings["check webfinger"] = "Webfinger überprüfen"; $a->strings["check webfinger"] = "Webfinger überprüfen";
$a->strings["Admin"] = "Administration"; $a->strings["Admin"] = "Administration";
$a->strings["Plugin Features"] = "Plugin Features"; $a->strings["Plugin Features"] = "Plugin Features";
$a->strings["diagnostics"] = "Diagnose"; $a->strings["diagnostics"] = "Diagnose";
$a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen die auf Bestätigung warten"; $a->strings["User registrations waiting for confirmation"] = "Nutzeranmeldungen die auf Bestätigung warten";
$a->strings["This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of."] = "Diese Seite präsentiert einige Zahlen zu dem bekannten Teil des föderalen sozialen Netzwerks, von dem deine Friendica Installation ein Teil ist. Diese Zahlen sind nicht absolut und reflektieren nur den Teil des Netzwerks, den dein Knoten kennt.";
$a->strings["The <em>Auto Discovered Contact Directory</em> feature is not enabled, it will improve the data displayed here."] = "Die Funktion um <em>Automatisch ein Kontaktverzeichnis erstellen</em> ist nicht aktiv. Es wird die hier angezeigten Daten verbessern.";
$a->strings["Administration"] = "Administration"; $a->strings["Administration"] = "Administration";
$a->strings["Currently this node is aware of nodes from the following platforms:"] = "Momentan kennt dieser Knoten andere Knoten der folgenden Plattformen:";
$a->strings["ID"] = "ID"; $a->strings["ID"] = "ID";
$a->strings["Recipient Name"] = "Empfänger Name"; $a->strings["Recipient Name"] = "Empfänger Name";
$a->strings["Recipient Profile"] = "Empfänger Profil"; $a->strings["Recipient Profile"] = "Empfänger Profil";
@ -686,9 +682,11 @@ $a->strings["Toggle"] = "Umschalten";
$a->strings["Author: "] = "Autor:"; $a->strings["Author: "] = "Autor:";
$a->strings["Maintainer: "] = "Betreuer:"; $a->strings["Maintainer: "] = "Betreuer:";
$a->strings["Reload active plugins"] = "Aktive Plugins neu laden"; $a->strings["Reload active plugins"] = "Aktive Plugins neu laden";
$a->strings["There are currently no plugins available on your node. You can find the official plugin repository at %1\$s and might find other interesting plugins in the open plugin registry at %2\$s"] = "Es sind derzeit keine Plugins auf diesem Knoten verfügbar. Du findest das offizielle Plugin-Repository unter %1\$s und weitere eventuell interessante Plugins im offenen Plugins-Verzeichnis auf %2\$s.";
$a->strings["No themes found."] = "Keine Themen gefunden."; $a->strings["No themes found."] = "Keine Themen gefunden.";
$a->strings["Screenshot"] = "Bildschirmfoto"; $a->strings["Screenshot"] = "Bildschirmfoto";
$a->strings["Reload active themes"] = "Aktives Theme neu laden"; $a->strings["Reload active themes"] = "Aktives Theme neu laden";
$a->strings["No themes found on the system. They should be paced in %1\$s"] = "Es wurden keine Themes auf dem System gefunden. Diese sollten in %1\$s patziert werden.";
$a->strings["[Experimental]"] = "[Experimentell]"; $a->strings["[Experimental]"] = "[Experimentell]";
$a->strings["[Unsupported]"] = "[Nicht unterstützt]"; $a->strings["[Unsupported]"] = "[Nicht unterstützt]";
$a->strings["Log settings updated."] = "Protokolleinstellungen aktualisiert."; $a->strings["Log settings updated."] = "Protokolleinstellungen aktualisiert.";
@ -697,11 +695,8 @@ $a->strings["Enable Debugging"] = "Protokoll führen";
$a->strings["Log file"] = "Protokolldatei"; $a->strings["Log file"] = "Protokolldatei";
$a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis."; $a->strings["Must be writable by web server. Relative to your Friendica top-level directory."] = "Webserver muss Schreibrechte besitzen. Abhängig vom Friendica-Installationsverzeichnis.";
$a->strings["Log level"] = "Protokoll-Level"; $a->strings["Log level"] = "Protokoll-Level";
$a->strings["Close"] = "Schließen"; $a->strings["PHP logging"] = "PHP Protokollieren";
$a->strings["FTP Host"] = "FTP Host"; $a->strings["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."] = "Um PHP Warnungen und Fehler zu protokollieren, kannst du die folgenden Zeilen zur .htconfig.php Datei deiner Installation hinzufügen. Den Dateinamen der Log-Datei legst du in der Zeile mit dem 'error_log' fest, Er ist relativ zum Friendica-Stammverzeichnis und muss schreibbar durch den Webserver sein. Eine \"1\" als Option für die Punkte 'log_errors' und 'display_errors' aktiviert die Funktionen zum Protokollieren bzw. Anzeigen der Fehler, eine \"0\" deaktiviert sie.";
$a->strings["FTP Path"] = "FTP Pfad";
$a->strings["FTP User"] = "FTP Nutzername";
$a->strings["FTP Password"] = "FTP Passwort";
$a->strings["Search Results For: %s"] = "Suchergebnisse für: %s"; $a->strings["Search Results For: %s"] = "Suchergebnisse für: %s";
$a->strings["Remove term"] = "Begriff entfernen"; $a->strings["Remove term"] = "Begriff entfernen";
$a->strings["Saved Searches"] = "Gespeicherte Suchen"; $a->strings["Saved Searches"] = "Gespeicherte Suchen";
@ -1108,12 +1103,12 @@ $a->strings["Friends are advised to please try again in 24 hours."] = "Freunde s
$a->strings["Invalid locator"] = "Ungültiger Locator"; $a->strings["Invalid locator"] = "Ungültiger Locator";
$a->strings["Invalid email address."] = "Ungültige E-Mail-Adresse."; $a->strings["Invalid email address."] = "Ungültige E-Mail-Adresse.";
$a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen."; $a->strings["This account has not been configured for email. Request failed."] = "Dieses Konto ist nicht für E-Mail konfiguriert. Anfrage fehlgeschlagen.";
$a->strings["Unable to resolve your name at the provided location."] = "Konnte Deinen Namen an der angegebenen Stelle nicht finden.";
$a->strings["You have already introduced yourself here."] = "Du hast Dich hier bereits vorgestellt."; $a->strings["You have already introduced yourself here."] = "Du hast Dich hier bereits vorgestellt.";
$a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob Du bereits mit %s befreundet bist."; $a->strings["Apparently you are already friends with %s."] = "Es scheint so, als ob Du bereits mit %s befreundet bist.";
$a->strings["Invalid profile URL."] = "Ungültige Profil-URL."; $a->strings["Invalid profile URL."] = "Ungültige Profil-URL.";
$a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL."; $a->strings["Disallowed profile URL."] = "Nicht erlaubte Profil-URL.";
$a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet."; $a->strings["Your introduction has been sent."] = "Deine Kontaktanfrage wurde gesendet.";
$a->strings["Remote subscription can't be done for your network. Please subscribe directly on your system."] = "Entferntes abon­nie­ren kann für dein Netzwerk nicht durchgeführt werden. Bitte nutze direkt die Abonnieren-Funktion deines Systems. ";
$a->strings["Please login to confirm introduction."] = "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen."; $a->strings["Please login to confirm introduction."] = "Bitte melde Dich an, um die Kontaktanfrage zu bestätigen.";
$a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist Du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an."; $a->strings["Incorrect identity currently logged in. Please login to <strong>this</strong> profile."] = "Momentan bist Du mit einer anderen Identität angemeldet. Bitte melde Dich mit <strong>diesem</strong> Profil an.";
$a->strings["Confirm"] = "Bestätigen"; $a->strings["Confirm"] = "Bestätigen";
@ -1565,11 +1560,18 @@ $a->strings["Forums:"] = "Foren:";
$a->strings["Videos"] = "Videos"; $a->strings["Videos"] = "Videos";
$a->strings["Events and Calendar"] = "Ereignisse und Kalender"; $a->strings["Events and Calendar"] = "Ereignisse und Kalender";
$a->strings["Only You Can See This"] = "Nur Du kannst das sehen"; $a->strings["Only You Can See This"] = "Nur Du kannst das sehen";
$a->strings["event"] = "Event";
$a->strings["%1\$s likes %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s";
$a->strings["%1\$s doesn't like %2\$s's %3\$s"] = "%1\$s mag %2\$ss %3\$s nicht";
$a->strings["%1\$s is attending %2\$s's %3\$s"] = "%1\$s nimmt an %2\$ss %3\$s teil.";
$a->strings["%1\$s is not attending %2\$s's %3\$s"] = "%1\$s nimmt nicht an %2\$ss %3\$s teil.";
$a->strings["%1\$s may attend %2\$s's %3\$s"] = "%1\$s nimmt eventuell an %2\$ss %3\$s teil.";
$a->strings["Post to Email"] = "An E-Mail senden"; $a->strings["Post to Email"] = "An E-Mail senden";
$a->strings["Connectors disabled, since \"%s\" is enabled."] = "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist."; $a->strings["Connectors disabled, since \"%s\" is enabled."] = "Konnektoren sind nicht verfügbar, da \"%s\" aktiv ist.";
$a->strings["Visible to everybody"] = "Für jeden sichtbar"; $a->strings["Visible to everybody"] = "Für jeden sichtbar";
$a->strings["show"] = "zeigen"; $a->strings["show"] = "zeigen";
$a->strings["don't show"] = "nicht zeigen"; $a->strings["don't show"] = "nicht zeigen";
$a->strings["Close"] = "Schließen";
$a->strings["[no subject]"] = "[kein Betreff]"; $a->strings["[no subject]"] = "[kein Betreff]";
$a->strings["stopped following"] = "wird nicht mehr gefolgt"; $a->strings["stopped following"] = "wird nicht mehr gefolgt";
$a->strings["View Status"] = "Pinnwand anschauen"; $a->strings["View Status"] = "Pinnwand anschauen";
@ -1699,8 +1701,6 @@ $a->strings["<a href=\"%1\$s\" target=\"_blank\">%2\$s</a> %3\$s"] = "<a href=\"
$a->strings["<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href=\"%s\" target=\"_blank\">post</a>"] = "<span><a href=\"%s\" target=\"_blank\">%s</a> schrieb den folgenden <a href=\"%s\" target=\"_blank\">Beitrag</a>"; $a->strings["<span><a href=\"%s\" target=\"_blank\">%s</a> wrote the following <a href=\"%s\" target=\"_blank\">post</a>"] = "<span><a href=\"%s\" target=\"_blank\">%s</a> schrieb den folgenden <a href=\"%s\" target=\"_blank\">Beitrag</a>";
$a->strings["$1 wrote:"] = "$1 hat geschrieben:"; $a->strings["$1 wrote:"] = "$1 hat geschrieben:";
$a->strings["Encrypted content"] = "Verschlüsselter Inhalt"; $a->strings["Encrypted content"] = "Verschlüsselter Inhalt";
$a->strings["(no subject)"] = "(kein Betreff)";
$a->strings["noreply"] = "noreply";
$a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln."; $a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbankserver '%s' nicht ermitteln.";
$a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert"; $a->strings["Unknown | Not categorised"] = "Unbekannt | Nicht kategorisiert";
$a->strings["Block immediately"] = "Sofort blockieren"; $a->strings["Block immediately"] = "Sofort blockieren";
@ -1712,6 +1712,7 @@ $a->strings["Weekly"] = "Wöchentlich";
$a->strings["Monthly"] = "Monatlich"; $a->strings["Monthly"] = "Monatlich";
$a->strings["OStatus"] = "OStatus"; $a->strings["OStatus"] = "OStatus";
$a->strings["RSS/Atom"] = "RSS/Atom"; $a->strings["RSS/Atom"] = "RSS/Atom";
$a->strings["Facebook"] = "Facebook";
$a->strings["Zot!"] = "Zott"; $a->strings["Zot!"] = "Zott";
$a->strings["LinkedIn"] = "LinkedIn"; $a->strings["LinkedIn"] = "LinkedIn";
$a->strings["XMPP/IM"] = "XMPP/Chat"; $a->strings["XMPP/IM"] = "XMPP/Chat";
@ -1767,15 +1768,9 @@ $a->strings["Manage/edit friends and contacts"] = "Freunde und Kontakte verwalte
$a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration"; $a->strings["Site setup and configuration"] = "Einstellungen der Seite und Konfiguration";
$a->strings["Navigation"] = "Navigation"; $a->strings["Navigation"] = "Navigation";
$a->strings["Site map"] = "Sitemap"; $a->strings["Site map"] = "Sitemap";
$a->strings["User not found."] = "Nutzer nicht gefunden.";
$a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Das tägliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."; $a->strings["Daily posting limit of %d posts reached. The post was rejected."] = "Das tägliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen.";
$a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."; $a->strings["Weekly posting limit of %d posts reached. The post was rejected."] = "Das wöchentliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen.";
$a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen."; $a->strings["Monthly posting limit of %d posts reached. The post was rejected."] = "Das monatliche Nachrichtenlimit von %d Nachrichten wurde erreicht. Die Nachtricht wurde verworfen.";
$a->strings["There is no status with this id."] = "Es gibt keinen Status mit dieser ID.";
$a->strings["There is no conversation with this id."] = "Es existiert keine Unterhaltung mit dieser ID.";
$a->strings["Invalid item."] = "Ungültiges Objekt";
$a->strings["Invalid action. "] = "Ungültige Aktion";
$a->strings["DB error"] = "DB Error";
$a->strings["An invitation is required."] = "Du benötigst eine Einladung."; $a->strings["An invitation is required."] = "Du benötigst eine Einladung.";
$a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden."; $a->strings["Invitation could not be verified."] = "Die Einladung konnte nicht überprüft werden.";
$a->strings["Invalid OpenID url"] = "Ungültige OpenID URL"; $a->strings["Invalid OpenID url"] = "Ungültige OpenID URL";
@ -1798,6 +1793,8 @@ $a->strings["\n\t\tDear %1\$s,\n\t\t\tThank you for registering at %2\$s. Your a
$a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s."; $a->strings["\n\t\tThe login details are as follows:\n\t\t\tSite Location:\t%3\$s\n\t\t\tLogin Name:\t%1\$s\n\t\t\tPassword:\t%5\$s\n\n\t\tYou may change your password from your account \"Settings\" page after logging\n\t\tin.\n\n\t\tPlease take a few moments to review the other account settings on that page.\n\n\t\tYou may also wish to add some basic information to your default profile\n\t\t(on the \"Profiles\" page) so that other people can easily find you.\n\n\t\tWe recommend setting your full name, adding a profile photo,\n\t\tadding some profile \"keywords\" (very useful in making new friends) - and\n\t\tperhaps what country you live in; if you do not wish to be more specific\n\t\tthan that.\n\n\t\tWe fully respect your right to privacy, and none of these items are necessary.\n\t\tIf you are new and do not know anybody here, they may help\n\t\tyou to make some new and interesting friends.\n\n\n\t\tThank you and welcome to %2\$s."] = "\nDie Anmelde-Details sind die folgenden:\n\tAdresse der Seite:\t%3\$s\n\tBenutzernamename:\t%1\$s\n\tPasswort:\t%5\$s\n\nDu kannst Dein Passwort unter \"Einstellungen\" ändern, sobald Du Dich\nangemeldet hast.\n\nBitte nimm Dir ein paar Minuten um die anderen Einstellungen auf dieser\nSeite zu kontrollieren.\n\nEventuell magst Du ja auch einige Informationen über Dich in Deinem\nProfil veröffentlichen, damit andere Leute Dich einfacher finden können.\nBearbeite hierfür einfach Dein Standard-Profil (über die Profil-Seite).\n\nWir empfehlen Dir, Deinen kompletten Namen anzugeben und ein zu Dir\npassendes Profilbild zu wählen, damit Dich alte Bekannte wieder finden.\nAußerdem ist es nützlich, wenn Du auf Deinem Profil Schlüsselwörter\nangibst. Das erleichtert es, Leute zu finden, die Deine Interessen teilen.\n\nWir respektieren Deine Privatsphäre - keine dieser Angaben ist nötig.\nWenn Du neu im Netzwerk bist und noch niemanden kennst, dann können sie\nallerdings dabei helfen, neue und interessante Kontakte zu knüpfen.\n\nDanke für Deine Aufmerksamkeit und willkommen auf %2\$s.";
$a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora"; $a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
$a->strings["Attachments:"] = "Anhänge:"; $a->strings["Attachments:"] = "Anhänge:";
$a->strings["(no subject)"] = "(kein Betreff)";
$a->strings["noreply"] = "noreply";
$a->strings["Do you really want to delete this item?"] = "Möchtest Du wirklich dieses Item löschen?"; $a->strings["Do you really want to delete this item?"] = "Möchtest Du wirklich dieses Item löschen?";
$a->strings["Archives"] = "Archiv"; $a->strings["Archives"] = "Archiv";
$a->strings["Male"] = "Männlich"; $a->strings["Male"] = "Männlich";
@ -1958,18 +1955,6 @@ $a->strings["Your personal photos"] = "Deine privaten Fotos";
$a->strings["Local Directory"] = "Lokales Verzeichnis"; $a->strings["Local Directory"] = "Lokales Verzeichnis";
$a->strings["Set zoomfactor for Earth Layers"] = "Zoomfaktor der Earth Layer"; $a->strings["Set zoomfactor for Earth Layers"] = "Zoomfaktor der Earth Layer";
$a->strings["Show/hide boxes at right-hand column:"] = "Rahmen auf der rechten Seite anzeigen/verbergen"; $a->strings["Show/hide boxes at right-hand column:"] = "Rahmen auf der rechten Seite anzeigen/verbergen";
$a->strings["Midnight"] = "Mitternacht";
$a->strings["Zenburn"] = "Zenburn";
$a->strings["Bootstrap"] = "Bootstrap";
$a->strings["Shades of Pink"] = "Shades of Pink";
$a->strings["Lime and Orange"] = "Lime and Orange";
$a->strings["GeoCities Retro"] = "GeoCities Retro";
$a->strings["Background Image"] = "Hintergrundbild";
$a->strings["The URL to a picture (e.g. from your photo album) that should be used as background image."] = "Die URL eines Bildes (z.B. aus deinem Fotoalbum), das als Hintergrundbild verwendet werden soll.";
$a->strings["Background Color"] = "Hintergrundfarbe";
$a->strings["HEX value for the background color. Don't include the #"] = "HEX Wert der Hintergrundfarbe. Gib die # nicht mit an.";
$a->strings["font size"] = "Schriftgröße";
$a->strings["base font size for your interface"] = "Basis-Schriftgröße für dein Interface.";
$a->strings["Comma separated list of helper forums"] = "Komma-Separierte Liste der Helfer-Foren"; $a->strings["Comma separated list of helper forums"] = "Komma-Separierte Liste der Helfer-Foren";
$a->strings["Set style"] = "Stil auswählen"; $a->strings["Set style"] = "Stil auswählen";
$a->strings["Quick Start"] = "Schnell-Start"; $a->strings["Quick Start"] = "Schnell-Start";

21
view/templates/admin_settings_features.tpl Normal file
View file

@ -0,0 +1,21 @@
<h1>{{$title}}</h1>
<form action="admin/features" method="post" autocomplete="off">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{foreach $features as $g => $f}}
<h3 class="settings-heading"><a href="javascript:;">{{$f.0}}</a></h3>
<div class="settings-content-block">
{{foreach $f.1 as $fcat}}
{{include file="field_yesno.tpl" field=$fcat.0}}
{{include file="field_yesno.tpl" field=$fcat.1}}
{{/foreach}}
<div class="settings-submit-wrapper" >
<input type="submit" name="submit" class="settings-features-submit" value="{{$submit|escape:'html'}}" />
</div>
</div>
{{/foreach}}
</form>

9
view/templates/admin_settings_head.tpl Normal file
View file

@ -0,0 +1,9 @@
<script>
$(document).ready(function() {
$('.settings-content-block').hide();
$('.settings-heading').click(function(){
$('.settings-content-block').hide();
$(this).next('.settings-content-block').toggle();
});
});
</script>

2
view/templates/events.tpl
View file

@ -1,6 +1,6 @@
{{$tabs}} {{$tabs}}
<h2>{{$title}}</h2> {{include file="section_title.tpl"}}
<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div> <div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>

2
view/templates/profile_advanced.tpl
View file

@ -1,5 +1,5 @@
<h2>{{$title}}</h2> {{include file="section_title.tpl"}}
<dl id="aprofile-fullname" class="aprofile"> <dl id="aprofile-fullname" class="aprofile">
<dt>{{$profile.fullname.0}}</dt> <dt>{{$profile.fullname.0}}</dt>

11
view/theme/vier/templates/profile_advanced.tpl
View file

@ -4,7 +4,7 @@
</div> </div>
{{/if}} {{/if}}
<h2>{{$title}}</h2> {{include file="section_title.tpl"}}
<dl id="aprofile-fullname" class="aprofile"> <dl id="aprofile-fullname" class="aprofile">
<dt>{{$profile.fullname.0}}</dt> <dt>{{$profile.fullname.0}}</dt>
@ -171,6 +171,9 @@
</dl> </dl>
{{/if}} {{/if}}
{{if $profile.forumlist}}
<dl id="aprofile-forumlist" class="aprofile">
<dt>{{$profile.forumlist.0}}</dt>
<dd>{{$profile.forumlist.1}}</dd>
</dl>
{{/if}}