'
. sprintf( tt('%d invitation available', '%d invitations available', $x), $x)
@@ -74,11 +75,11 @@ function unavailable_networks() {
$networks[] = NETWORK_TWITTER;
}
- if (get_config("system", "ostatus_disabled")) {
+ if (Config::get("system", "ostatus_disabled")) {
$networks[] = NETWORK_OSTATUS;
}
- if (!get_config("system", "diaspora_enabled")) {
+ if (!Config::get("system", "diaspora_enabled")) {
$networks[] = NETWORK_DIASPORA;
}
@@ -148,7 +149,7 @@ function fileas_widget($baseurl, $selected = '') {
return '';
}
- $saved = get_pconfig(local_user(), 'system', 'filetags');
+ $saved = PConfig::get(local_user(), 'system', 'filetags');
if (! strlen($saved)) {
return;
}
@@ -182,7 +183,7 @@ function categories_widget($baseurl, $selected = '') {
return '';
}
- $saved = get_pconfig($a->profile['profile_uid'], 'system', 'filetags');
+ $saved = PConfig::get($a->profile['profile_uid'], 'system', 'filetags');
if (! strlen($saved)) {
return;
}
diff --git a/include/conversation.php b/include/conversation.php
index bc227d977..d4fc2a40e 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1,6 +1,8 @@
theme_thread_allow) {
+ if (Config::get('system', 'thread_allow') && $a->theme_thread_allow) {
// Fallback to parent-uri if thr-parent is not set
$thr_parent = $item['thr-parent'];
if ($thr_parent == '') {
diff --git a/include/cron.php b/include/cron.php
index d4d19d8c8..4b5aac831 100644
--- a/include/cron.php
+++ b/include/cron.php
@@ -14,9 +14,9 @@ function cron_run(&$argv, &$argc){
return;
}
- $last = get_config('system', 'last_cron');
+ $last = Config::get('system', 'last_cron');
- $poll_interval = intval(get_config('system', 'cron_interval'));
+ $poll_interval = intval(Config::get('system', 'cron_interval'));
if (! $poll_interval) {
$poll_interval = 10;
}
@@ -59,7 +59,7 @@ function cron_run(&$argv, &$argc){
Worker::add(PRIORITY_LOW, "cronjobs", "repair_database");
// once daily run birthday_updates and then expire in background
- $d1 = get_config('system', 'last_expire_day');
+ $d1 = Config::get('system', 'last_expire_day');
$d2 = intval(datetime_convert('UTC', 'UTC', 'now', 'd'));
if ($d2 != intval($d1)) {
@@ -70,7 +70,7 @@ function cron_run(&$argv, &$argc){
Worker::add(PRIORITY_LOW, "discover_poco", "suggestions");
- set_config('system', 'last_expire_day', $d2);
+ Config::set('system', 'last_expire_day', $d2);
Worker::add(PRIORITY_LOW, 'expire');
@@ -90,7 +90,7 @@ function cron_run(&$argv, &$argc){
logger('cron: end');
- set_config('system', 'last_cron', time());
+ Config::set('system', 'last_cron', time());
return;
}
@@ -135,7 +135,7 @@ function cron_poll_contacts($argc, $argv) {
// and which have a polling address and ignore Diaspora since
// we are unable to match those posts with a Diaspora GUID and prevent duplicates.
- $abandon_days = intval(get_config('system', 'account_abandon_days'));
+ $abandon_days = intval(Config::get('system', 'account_abandon_days'));
if ($abandon_days < 1) {
$abandon_days = 0;
}
@@ -194,7 +194,7 @@ function cron_poll_contacts($argc, $argv) {
* This also lets us update our subscription to the hub, and add or replace hubs in case it
* changed. We will only update hubs once a day, regardless of 'pushpoll_frequency'.
*/
- $poll_interval = get_config('system', 'pushpoll_frequency');
+ $poll_interval = Config::get('system', 'pushpoll_frequency');
$contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
}
diff --git a/include/cronhooks.php b/include/cronhooks.php
index aa5d41afd..5f15c9379 100644
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -18,9 +18,9 @@ function cronhooks_run(&$argv, &$argc) {
return;
}
- $last = get_config('system', 'last_cronhook');
+ $last = Config::get('system', 'last_cronhook');
- $poll_interval = intval(get_config('system', 'cronhook_interval'));
+ $poll_interval = intval(Config::get('system', 'cronhook_interval'));
if (! $poll_interval) {
$poll_interval = 9;
}
@@ -33,7 +33,7 @@ function cronhooks_run(&$argv, &$argc) {
}
}
- $a->set_baseurl(get_config('system', 'url'));
+ $a->set_baseurl(Config::get('system', 'url'));
logger('cronhooks: start');
@@ -48,7 +48,7 @@ function cronhooks_run(&$argv, &$argc) {
logger('cronhooks: end');
- set_config('system', 'last_cronhook', time());
+ Config::set('system', 'last_cronhook', time());
return;
}
diff --git a/include/cronjobs.php b/include/cronjobs.php
index 437fedd53..e4eb48e77 100644
--- a/include/cronjobs.php
+++ b/include/cronjobs.php
@@ -112,7 +112,7 @@ function cron_expire_and_remove_users() {
*/
function cron_clear_cache(App $a) {
- $last = get_config('system','cache_last_cleared');
+ $last = Config::get('system','cache_last_cleared');
if ($last) {
$next = $last + (3600); // Once per hour
@@ -138,10 +138,10 @@ function cron_clear_cache(App $a) {
clear_cache($a->get_basepath()."/view/smarty3/compiled", $a->get_basepath()."/view/smarty3/compiled");
// clear cache for image proxy
- if (!get_config("system", "proxy_disabled")) {
+ if (!Config::get("system", "proxy_disabled")) {
clear_cache($a->get_basepath(), $a->get_basepath()."/proxy");
- $cachetime = get_config('system','proxy_cache_time');
+ $cachetime = Config::get('system','proxy_cache_time');
if (!$cachetime) {
$cachetime = PROXY_DEFAULT_TIME;
}
@@ -155,13 +155,13 @@ function cron_clear_cache(App $a) {
q("DELETE FROM `parsed_url` WHERE `created` < NOW() - INTERVAL 3 MONTH");
// Maximum table size in megabyte
- $max_tablesize = intval(get_config('system','optimize_max_tablesize')) * 1000000;
+ $max_tablesize = intval(Config::get('system','optimize_max_tablesize')) * 1000000;
if ($max_tablesize == 0) {
$max_tablesize = 100 * 1000000; // Default are 100 MB
}
if ($max_tablesize > 0) {
// Minimum fragmentation level in percent
- $fragmentation_level = intval(get_config('system','optimize_fragmentation')) / 100;
+ $fragmentation_level = intval(Config::get('system','optimize_fragmentation')) / 100;
if ($fragmentation_level == 0) {
$fragmentation_level = 0.3; // Default value is 30%
}
@@ -196,7 +196,7 @@ function cron_clear_cache(App $a) {
}
}
- set_config('system','cache_last_cleared', time());
+ Config::set('system','cache_last_cleared', time());
}
/**
diff --git a/include/crypto.php b/include/crypto.php
index 4600e7291..703439baa 100644
--- a/include/crypto.php
+++ b/include/crypto.php
@@ -1,5 +1,7 @@
false
);
- $conf = get_config('system', 'openssl_conf_file');
+ $conf = Config::get('system', 'openssl_conf_file');
if ($conf) {
$openssl_options['config'] = $conf;
}
diff --git a/include/datetime.php b/include/datetime.php
index 357869824..f525f1234 100644
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -5,6 +5,7 @@
*/
use Friendica\Core\Config;
+use Friendica\Core\PConfig;
/**
* @brief Two-level sort for timezones.
@@ -178,7 +179,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
function dob($dob) {
list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d');
- $f = get_config('system', 'birthday_input_format');
+ $f = Config::get('system', 'birthday_input_format');
if (! $f) {
$f = 'ymd';
}
@@ -279,7 +280,7 @@ function timesel($format, $h, $m, $id = 'timepicker') {
function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '', $required = false) {
// First day of the week (0 = Sunday)
- $firstDay = get_pconfig(local_user(), 'system', 'first_day_of_week');
+ $firstDay = PConfig::get(local_user(), 'system', 'first_day_of_week');
if ($firstDay === false) {
$firstDay=0;
}
diff --git a/include/dbstructure.php b/include/dbstructure.php
index 0b15805b4..6a881cdf7 100644
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -1781,9 +1781,9 @@ function dbstructure_run(&$argv, &$argc) {
case "update":
update_structure(true, true);
- $build = get_config('system','build');
+ $build = Config::get('system','build');
if (!x($build)) {
- set_config('system', 'build', DB_UPDATE_VERSION);
+ Config::set('system', 'build', DB_UPDATE_VERSION);
$build = DB_UPDATE_VERSION;
}
@@ -1798,7 +1798,7 @@ function dbstructure_run(&$argv, &$argc) {
}
}
- set_config('system','build',DB_UPDATE_VERSION);
+ Config::set('system','build',DB_UPDATE_VERSION);
return;
case "dumpsql":
print_structure(db_definition());
diff --git a/include/delivery.php b/include/delivery.php
index cddc9cb00..059f62767 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -335,7 +335,7 @@ function delivery_run(&$argv, &$argc){
$x[0]['writable'] = 1;
}
- $ssl_policy = get_config('system','ssl_policy');
+ $ssl_policy = Config::get('system','ssl_policy');
fix_contact_ssl_policy($x[0],$ssl_policy);
// If we are setup as a soapbox we aren't accepting top level posts from this person
@@ -375,7 +375,7 @@ function delivery_run(&$argv, &$argc){
if ($owner['prvnets']) {
break;
}
- if (get_config('system','ostatus_disabled') || get_config('system','dfrn_only')) {
+ if (Config::get('system','ostatus_disabled') || Config::get('system','dfrn_only')) {
break;
}
@@ -386,7 +386,7 @@ function delivery_run(&$argv, &$argc){
case NETWORK_MAIL:
case NETWORK_MAIL2:
- if (get_config('system','dfrn_only')) {
+ if (Config::get('system','dfrn_only')) {
break;
}
// WARNING: does not currently convert to RFC2047 header encodings, etc.
@@ -489,7 +489,7 @@ function delivery_run(&$argv, &$argc){
logger('delivery: diaspora batch deliver: '.$loc);
- if (get_config('system','dfrn_only') || (!get_config('system','diaspora_enabled')))
+ if (Config::get('system','dfrn_only') || (!Config::get('system','diaspora_enabled')))
break;
if ($mail) {
diff --git a/include/dfrn.php b/include/dfrn.php
index ea072652f..b4a29615d 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -8,6 +8,7 @@
*/
use Friendica\App;
+use Friendica\Core\Config;
use Friendica\Core\System;
use Friendica\Core\Worker;
@@ -442,11 +443,11 @@ class dfrn {
public static function relocate($owner, $uid) {
/* get site pubkey. this could be a new installation with no site keys*/
- $pubkey = get_config('system','site_pubkey');
+ $pubkey = Config::get('system','site_pubkey');
if (! $pubkey) {
$res = new_keypair(1024);
- set_config('system','site_prvkey', $res['prvkey']);
- set_config('system','site_pubkey', $res['pubkey']);
+ Config::set('system','site_prvkey', $res['prvkey']);
+ Config::set('system','site_pubkey', $res['pubkey']);
}
$rp = q("SELECT `resource-id` , `scale`, type FROM `photo`
@@ -478,7 +479,7 @@ class dfrn {
xml::add_element($doc, $relocate, "dfrn:confirm", $owner['confirm']);
xml::add_element($doc, $relocate, "dfrn:notify", $owner['notify']);
xml::add_element($doc, $relocate, "dfrn:poll", $owner['poll']);
- xml::add_element($doc, $relocate, "dfrn:sitepubkey", get_config('system','site_pubkey'));
+ xml::add_element($doc, $relocate, "dfrn:sitepubkey", Config::get('system','site_pubkey'));
$root->appendChild($relocate);
@@ -1103,12 +1104,12 @@ class dfrn {
$idtosend = '1:' . $orig_id;
}
- $rino = get_config('system', 'rino_encrypt');
+ $rino = Config::get('system', 'rino_encrypt');
$rino = intval($rino);
logger("Local rino version: ". $rino, LOGGER_DEBUG);
- $ssl_val = intval(get_config('system','ssl_policy'));
+ $ssl_val = intval(Config::get('system','ssl_policy'));
$ssl_policy = '';
switch ($ssl_val) {
diff --git a/include/diaspora.php b/include/diaspora.php
index 173e68578..846a89ba9 100644
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -42,7 +42,7 @@ class Diaspora {
*/
public static function relay_list() {
- $serverdata = get_config("system", "relay_server");
+ $serverdata = Config::get("system", "relay_server");
if ($serverdata == "")
return array();
@@ -411,7 +411,7 @@ class Diaspora {
*/
public static function dispatch_public($msg) {
- $enabled = intval(get_config("system", "diaspora_enabled"));
+ $enabled = intval(Config::get("system", "diaspora_enabled"));
if (!$enabled) {
logger("diaspora is disabled");
return false;
@@ -740,7 +740,7 @@ class Diaspora {
if (!$person || $update) {
logger("create or refresh", LOGGER_DEBUG);
- $r = probe_url($handle, PROBE_DIASPORA);
+ $r = Probe::uri($handle, NETWORK_DIASPORA);
// Note that Friendica contacts will return a "Diaspora person"
// if Diaspora connectivity is enabled on their server
@@ -2151,7 +2151,7 @@ class Diaspora {
intval($importer["uid"])
);
- if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(get_pconfig($importer["uid"], "system", "post_newfriend"))) {
+ if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(PConfig::get($importer["uid"], "system", "post_newfriend"))) {
$self = q("SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1",
intval($importer["uid"])
@@ -2942,7 +2942,7 @@ class Diaspora {
$a = get_app();
- $enabled = intval(get_config("system", "diaspora_enabled"));
+ $enabled = intval(Config::get("system", "diaspora_enabled"));
if (!$enabled)
return 200;
@@ -2958,7 +2958,7 @@ class Diaspora {
if (!$queue_run && was_recently_delayed($contact["id"])) {
$return_code = 0;
} else {
- if (!intval(get_config("system", "diaspora_test"))) {
+ if (!intval(Config::get("system", "diaspora_test"))) {
$content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
post_url($dest_url."/", $envelope, array("Content-Type: ".$content_type));
diff --git a/include/discover_poco.php b/include/discover_poco.php
index 7361721cf..1eefd1b81 100644
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -2,6 +2,7 @@
use Friendica\Core\Config;
use Friendica\Core\Worker;
+use Friendica\Network\Probe;
require_once 'include/probe.php';
require_once 'include/socgraph.php';
@@ -81,17 +82,17 @@ function discover_poco_run(&$argv, &$argc) {
logger($result, LOGGER_DEBUG);
} elseif ($mode == 3) {
update_suggestions();
- } elseif (($mode == 2) && get_config('system','poco_completion')) {
+ } elseif (($mode == 2) && Config::get('system','poco_completion')) {
discover_users();
- } elseif (($mode == 1) && ($search != "") && get_config('system','poco_local_search')) {
+ } elseif (($mode == 1) && ($search != "") && Config::get('system','poco_local_search')) {
discover_directory($search);
gs_search_user($search);
- } elseif (($mode == 0) && ($search == "") && (get_config('system','poco_discovery') > 0)) {
+ } elseif (($mode == 0) && ($search == "") && (Config::get('system','poco_discovery') > 0)) {
// Query Friendica and Hubzilla servers for their users
poco_discover();
// Query GNU Social servers for their users ("statistics" addon has to be enabled on the GS server)
- if (!get_config('system','ostatus_disabled'))
+ if (!Config::get('system','ostatus_disabled'))
gs_discover();
}
@@ -234,7 +235,7 @@ function discover_directory($search) {
logger("Friendica server ".$server_url." seems to be okay.", LOGGER_DEBUG);
}
- $data = probe_url($jj->url);
+ $data = Probe::uri($jj->url);
if ($data["network"] == NETWORK_DFRN) {
logger("Profile ".$jj->url." is reachable (".$search.")", LOGGER_DEBUG);
logger("Add profile ".$jj->url." to local directory (".$search.")", LOGGER_DEBUG);
@@ -283,7 +284,7 @@ function gs_search_user($search) {
/// @TODO AS is considered as a notation for constants (as they usually being written all upper-case)
/// @TODO find all those and convert to all lower-case which is a keyword then
foreach ($contacts->data AS $user) {
- $contact = probe_url($user->site_address."/".$user->name);
+ $contact = Probe::uri($user->site_address."/".$user->name);
if ($contact["network"] != NETWORK_PHANTOM) {
$contact["about"] = $user->description;
update_gcontact($contact);
diff --git a/include/enotify.php b/include/enotify.php
index 10723fb41..d823a1ae8 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -1,6 +1,7 @@
array(
t('General Features'),
//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, 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, get_config('feature_lock','photo_location')),
- array('export_calendar', t('Export Public Calendar'), t('Ability for visitors to download the public calendar'), false, get_config('feature_lock','export_calendar')),
+ array('multi_profiles', t('Multiple Profiles'), t('Ability to create multiple profiles'), false, Config::get('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, Config::get('feature_lock','photo_location')),
+ array('export_calendar', t('Export Public Calendar'), t('Ability for visitors to download the public calendar'), false, Config::get('feature_lock','export_calendar')),
),
// Post composition
'composition' => array(
t('Post Composition Features'),
- 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 forum page is selected/deselected in ACL window.'), false, get_config('feature_lock','aclautomention')),
+ array('preview', t('Post Preview'), t('Allow previewing posts and comments before publishing them'), false, Config::get('feature_lock','preview')),
+ array('aclautomention', t('Auto-mention Forums'), t('Add/remove mention when a forum page is selected/deselected in ACL window.'), false, Config::get('feature_lock','aclautomention')),
),
// Network sidebar widgets
'widgets' => array(
t('Network Sidebar Widgets'),
- 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, get_config('feature_lock','forumlist_widget')),
- 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, get_config('feature_lock','networks')),
- array('savedsearch', t('Saved Searches'), t('Save search terms for re-use'), false, get_config('feature_lock','savedsearch')),
+ array('archives', t('Search by Date'), t('Ability to select posts by date ranges'), false, Config::get('feature_lock','archives')),
+ array('forumlist_widget', t('List Forums'), t('Enable widget to display the forums your are connected with'), true, Config::get('feature_lock','forumlist_widget')),
+ array('groups', t('Group Filter'), t('Enable widget to display Network posts only from selected group'), false, Config::get('feature_lock','groups')),
+ array('networks', t('Network Filter'), t('Enable widget to display Network posts only from selected network'), false, Config::get('feature_lock','networks')),
+ array('savedsearch', t('Saved Searches'), t('Save search terms for re-use'), false, Config::get('feature_lock','savedsearch')),
),
// Network tabs
'net_tabs' => array(
t('Network Tabs'),
- 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, 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, get_config('feature_lock','link_tab')),
+ array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on'), false, Config::get('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, Config::get('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, Config::get('feature_lock','link_tab')),
),
// Item tools
'tools' => array(
t('Post/Comment Tools'),
- 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, get_config('feature_lock','edit_posts')),
- 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, get_config('feature_lock','categories')),
- 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'), false, get_config('feature_lock','dislike')),
- 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, get_config('feature_lock','ignore_posts')),
+ array('multi_delete', t('Multiple Deletion'), t('Select and delete multiple posts/comments at once'), false, Config::get('feature_lock','multi_delete')),
+ array('edit_posts', t('Edit Sent Posts'), t('Edit and correct posts and comments after sending'), false, Config::get('feature_lock','edit_posts')),
+ array('commtag', t('Tagging'), t('Ability to tag existing posts'), false, Config::get('feature_lock','commtag')),
+ array('categories', t('Post Categories'), t('Add categories to your posts'), false, Config::get('feature_lock','categories')),
+ array('filing', t('Saved Folders'), t('Ability to file posts under folders'), false, Config::get('feature_lock','filing')),
+ array('dislike', t('Dislike Posts'), t('Ability to dislike posts/comments'), false, Config::get('feature_lock','dislike')),
+ array('star_posts', t('Star Posts'), t('Ability to mark special posts with a star indicator'), false, Config::get('feature_lock','star_posts')),
+ array('ignore_posts', t('Mute Post Notifications'), t('Ability to mute notifications for a thread'), false, Config::get('feature_lock','ignore_posts')),
),
// Advanced Profile Settings
'advanced_profile' => array(
t('Advanced Profile Settings'),
- array('forumlist_profile', t('List Forums'), t('Show visitors public community forums at the Advanced Profile Page'), false, get_config('feature_lock','forumlist_profile')),
+ array('forumlist_profile', t('List Forums'), t('Show visitors public community forums at the Advanced Profile Page'), false, Config::get('feature_lock','forumlist_profile')),
),
);
diff --git a/include/follow.php b/include/follow.php
index 83806ade7..55ea86f8c 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -1,6 +1,7 @@
profile = $pdata;
$a->profile_uid = $pdata['profile_uid'];
- $a->profile['mobile-theme'] = get_pconfig($a->profile['profile_uid'], 'system', 'mobile_theme');
+ $a->profile['mobile-theme'] = PConfig::get($a->profile['profile_uid'], 'system', 'mobile_theme');
$a->profile['network'] = NETWORK_DFRN;
$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename'];
- if (!$profiledata && !get_pconfig(local_user(),'system','always_my_theme'))
+ if (!$profiledata && !PConfig::get(local_user(),'system','always_my_theme'))
$_SESSION['theme'] = $a->profile['theme'];
$_SESSION['mobile-theme'] = $a->profile['mobile-theme'];
@@ -102,7 +104,7 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
));
}
- $block = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
+ $block = (((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
/**
* @todo
@@ -929,7 +931,7 @@ function zrl($s, $force = false) {
*/
function get_theme_uid() {
$uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0);
- if ((local_user()) && ((get_pconfig(local_user(), 'system', 'always_my_theme')) || (! $uid))) {
+ if ((local_user()) && ((PConfig::get(local_user(), 'system', 'always_my_theme')) || (! $uid))) {
return local_user();
}
diff --git a/include/items.php b/include/items.php
index 4b7d277f0..96340fc12 100644
--- a/include/items.php
+++ b/include/items.php
@@ -9,6 +9,7 @@ use Friendica\Core\System;
use Friendica\ParseUrl;
use Friendica\Util\Lock;
use Friendica\Core\Config;
+use Friendica\Core\PConfig;
use Friendica\Core\Worker;
require_once 'include/bbcode.php';
@@ -1062,7 +1063,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
// update the commented timestamp on the parent
// Only update "commented" if it is really a comment
- if (($arr['verb'] == ACTIVITY_POST) || !get_config("system", "like_no_comment")) {
+ if (($arr['verb'] == ACTIVITY_POST) || !Config::get("system", "like_no_comment")) {
dba::update('item', array('commented' => datetime_convert(), 'changed' => datetime_convert()), array('id' => $parent_id));
} else {
dba::update('item', array('changed' => datetime_convert()), array('id' => $parent_id));
@@ -1783,7 +1784,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
return;
}
- $push_url = get_config('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id'];
+ $push_url = Config::get('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id'];
// Use a single verify token, even if multiple hubs
$verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : random_string());
@@ -1806,7 +1807,7 @@ function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
function fix_private_photos($s, $uid, $item = null, $cid = 0) {
- if (get_config('system','disable_embedded')) {
+ if (Config::get('system','disable_embedded')) {
return $s;
}
@@ -1991,7 +1992,7 @@ function item_expire($uid, $days, $network = "", $force = false) {
* $expire_network_only = save your own wall posts
* and just expire conversations started by others
*/
- $expire_network_only = get_pconfig($uid,'expire', 'network_only');
+ $expire_network_only = PConfig::get($uid,'expire', 'network_only');
$sql_extra = ((intval($expire_network_only)) ? " AND wall = 0 " : "");
if ($network != "") {
@@ -2020,7 +2021,7 @@ function item_expire($uid, $days, $network = "", $force = false) {
return;
}
- $expire_items = get_pconfig($uid, 'expire', 'items');
+ $expire_items = PConfig::get($uid, 'expire', 'items');
$expire_items = (($expire_items === false) ? 1 : intval($expire_items)); // default if not set: 1
// Forcing expiring of items - but not notes and marked items
@@ -2028,13 +2029,13 @@ function item_expire($uid, $days, $network = "", $force = false) {
$expire_items = true;
}
- $expire_notes = get_pconfig($uid, 'expire', 'notes');
+ $expire_notes = PConfig::get($uid, 'expire', 'notes');
$expire_notes = (($expire_notes === false) ? 1 : intval($expire_notes)); // default if not set: 1
- $expire_starred = get_pconfig($uid, 'expire', 'starred');
+ $expire_starred = PConfig::get($uid, 'expire', 'starred');
$expire_starred = (($expire_starred === false) ? 1 : intval($expire_starred)); // default if not set: 1
- $expire_photos = get_pconfig($uid, 'expire', 'photos');
+ $expire_photos = PConfig::get($uid, 'expire', 'photos');
$expire_photos = (($expire_photos === false) ? 0 : intval($expire_photos)); // default if not set: 0
logger('User '.$uid.': expire: # items=' . count($r). "; expire items: $expire_items, expire notes: $expire_notes, expire starred: $expire_starred, expire photos: $expire_photos");
@@ -2385,11 +2386,11 @@ function posted_date_widget($url, $uid, $wall) {
// For former Facebook folks that left because of "timeline"
/*
* @TODO old-lost code?
- if ($wall && intval(get_pconfig($uid, 'system', 'no_wall_archive_widget')))
+ if ($wall && intval(PConfig::get($uid, 'system', 'no_wall_archive_widget')))
return $o;
*/
- $visible_years = get_pconfig($uid,'system','archive_visible_years');
+ $visible_years = PConfig::get($uid,'system','archive_visible_years');
if (! $visible_years) {
$visible_years = 5;
}
diff --git a/include/message.php b/include/message.php
index 731a56c4c..c2678d2f1 100644
--- a/include/message.php
+++ b/include/message.php
@@ -170,7 +170,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
require_once 'include/probe.php';
- $me = probe_url($replyto);
+ $me = Probe::uri($replyto);
if (! $me['name']) {
return -2;
diff --git a/include/nav.php b/include/nav.php
index d7a6e397c..478213b4e 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -1,6 +1,7 @@
Friendica';
}
diff --git a/include/network.php b/include/network.php
index 2a996cd93..90aea6e76 100644
--- a/include/network.php
+++ b/include/network.php
@@ -124,26 +124,26 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
if (x($opts, 'timeout')) {
@curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
} else {
- $curl_time = intval(get_config('system', 'curl_timeout'));
+ $curl_time = intval(Config::get('system', 'curl_timeout'));
@curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
}
// by default we will allow self-signed certs
// but you can override this
- $check_cert = get_config('system', 'verifyssl');
+ $check_cert = Config::get('system', 'verifyssl');
@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
if ($check_cert) {
@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
}
- $proxy = get_config('system', 'proxy');
+ $proxy = Config::get('system', 'proxy');
if (strlen($proxy)) {
@curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
@curl_setopt($ch, CURLOPT_PROXY, $proxy);
- $proxyuser = @get_config('system', 'proxyuser');
+ $proxyuser = @Config::get('system', 'proxyuser');
if (strlen($proxyuser)) {
@curl_setopt($ch, CURLOPT_PROXYUSERPWD, $proxyuser);
@@ -299,7 +299,7 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
if (intval($timeout)) {
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
} else {
- $curl_time = intval(get_config('system', 'curl_timeout'));
+ $curl_time = intval(Config::get('system', 'curl_timeout'));
curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
}
@@ -317,19 +317,19 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
}
- $check_cert = get_config('system', 'verifyssl');
+ $check_cert = Config::get('system', 'verifyssl');
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
if ($check_cert) {
@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
}
- $proxy = get_config('system', 'proxy');
+ $proxy = Config::get('system', 'proxy');
if (strlen($proxy)) {
curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
curl_setopt($ch, CURLOPT_PROXY, $proxy);
- $proxyuser = get_config('system', 'proxyuser');
+ $proxyuser = Config::get('system', 'proxyuser');
if (strlen($proxyuser)) {
curl_setopt($ch, CURLOPT_PROXYUSERPWD, $proxyuser);
}
@@ -465,7 +465,7 @@ function http_status_exit($val, $description = array()) {
* @return boolean True if it's a valid URL, fals if something wrong with it
*/
function validate_url(&$url) {
- if (get_config('system','disable_url_validation'))
+ if (Config::get('system','disable_url_validation'))
return true;
// no naked subdomains (allow localhost for tests)
@@ -493,7 +493,7 @@ function validate_url(&$url) {
*/
function validate_email($addr) {
- if (get_config('system','disable_email_validation'))
+ if (Config::get('system','disable_email_validation'))
return true;
if (! strpos($addr,'@'))
@@ -598,7 +598,7 @@ function allowed_email($email) {
return false;
}
- $str_allowed = get_config('system','allowed_email');
+ $str_allowed = Config::get('system','allowed_email');
if (! $str_allowed) {
return true;
}
@@ -658,7 +658,7 @@ function parse_xml_string($s, $strict = true) {
function scale_external_images($srctext, $include_link = true, $scale_replace = false) {
// Suppress "view full size"
- if (intval(get_config('system','no_view_full_size'))) {
+ if (intval(Config::get('system','no_view_full_size'))) {
$include_link = false;
}
@@ -915,11 +915,11 @@ function original_url($url, $depth = 1, $fetchbody = false) {
function short_link($url) {
require_once('library/slinky.php');
$slinky = new Slinky($url);
- $yourls_url = get_config('yourls','url1');
+ $yourls_url = Config::get('yourls','url1');
if ($yourls_url) {
- $yourls_username = get_config('yourls','username1');
- $yourls_password = get_config('yourls', 'password1');
- $yourls_ssl = get_config('yourls', 'ssl1');
+ $yourls_username = Config::get('yourls','username1');
+ $yourls_password = Config::get('yourls', 'password1');
+ $yourls_ssl = Config::get('yourls', 'ssl1');
$yourls = new Slinky_YourLS();
$yourls->set('username', $yourls_username);
$yourls->set('password', $yourls_password);
diff --git a/include/notifier.php b/include/notifier.php
index 4c693f70e..84c959f80 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -3,6 +3,7 @@
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\Worker;
+use Friendica\Network\Probe;
require_once 'include/queue_fn.php';
require_once 'include/html2plain.php';
@@ -426,7 +427,7 @@ function notifier_run(&$argv, &$argc){
if (dbm::is_result($r)) {
$probed_contact = $r[0];
} else {
- $probed_contact = probe_url($thr_parent[0]['author-link']);
+ $probed_contact = Probe::uri($thr_parent[0]['author-link']);
}
if ($probed_contact["notify"] != "") {
@@ -441,7 +442,7 @@ function notifier_run(&$argv, &$argc){
if (dbm::is_result($r)) {
$probed_contact = $r[0];
} else {
- $probed_contact = probe_url($thr_parent[0]['owner-link']);
+ $probed_contact = Probe::uri($thr_parent[0]['owner-link']);
}
if ($probed_contact["notify"] != "") {
@@ -455,7 +456,7 @@ function notifier_run(&$argv, &$argc){
//logger('Checking tag '.$x, LOGGER_DEBUG);
$matches = null;
if (preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
- $probed_contact = probe_url($matches[1]);
+ $probed_contact = Probe::uri($matches[1]);
if ($probed_contact["notify"] != "") {
logger('Notify mentioned user '.$probed_contact["url"].': '.$probed_contact["notify"]);
$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
@@ -474,7 +475,7 @@ function notifier_run(&$argv, &$argc){
// If this is a public message and pubmail is set on the parent, include all your email contacts
- $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+ $mail_disabled = ((function_exists('imap_open') && (!Config::get('system','imap_disabled'))) ? 0 : 1);
if (! $mail_disabled) {
if ((! strlen($target_item['allow_cid'])) && (! strlen($target_item['allow_gid']))
@@ -524,7 +525,7 @@ function notifier_run(&$argv, &$argc){
// They are especially used for notifications to OStatus users that don't follow us.
if ($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
- if (!get_config('system','dfrn_only')) {
+ if (!Config::get('system','dfrn_only')) {
foreach ($url_recipients as $url) {
if ($url) {
logger('notifier: urldelivery: ' . $url);
diff --git a/include/oauth.php b/include/oauth.php
index ce22086d1..f89aedf6b 100644
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -6,6 +6,8 @@
*/
use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
use Friendica\Core\System;
define('REQUEST_TOKEN_DURATION', 300);
@@ -92,7 +94,7 @@ class FKOAuthDataStore extends OAuthDataStore {
$ret=Null;
// get user for this verifier
- $uverifier = get_config("oauth", $verifier);
+ $uverifier = Config::get("oauth", $verifier);
logger(__function__.":".$verifier.",".$uverifier);
if (is_null($verifier) || ($uverifier!==false)){
@@ -114,11 +116,11 @@ class FKOAuthDataStore extends OAuthDataStore {
if (!is_null($ret) && $uverifier!==false){
- del_config("oauth", $verifier);
- /* $apps = get_pconfig($uverifier, "oauth", "apps");
+ Config::delete("oauth", $verifier);
+ /* $apps = PConfig::get($uverifier, "oauth", "apps");
if ($apps===false) $apps=array();
$apps[] = $consumer->key;
- set_pconfig($uverifier, "oauth", "apps", $apps);*/
+ PConfig::set($uverifier, "oauth", "apps", $apps);*/
}
return $ret;
@@ -148,7 +150,7 @@ class FKOAuth1 extends OAuthServer {
}
$_SESSION['uid'] = $record['uid'];
$_SESSION['theme'] = $record['theme'];
- $_SESSION['mobile-theme'] = get_pconfig($record['uid'], 'system', 'mobile_theme');
+ $_SESSION['mobile-theme'] = PConfig::get($record['uid'], 'system', 'mobile_theme');
$_SESSION['authenticated'] = 1;
$_SESSION['page_flags'] = $record['page-flags'];
$_SESSION['my_url'] = System::baseUrl() . '/profile/' . $record['nickname'];
diff --git a/include/ostatus.php b/include/ostatus.php
index 78916173e..74941f6ef 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -1513,7 +1513,7 @@ class ostatus {
$contact = owner;
if (!isset($contact["poll"])) {
- $data = probe_url($url);
+ $data = Probe::uri($url);
$contact["poll"] = $data["poll"];
if (!$contact["alias"])
diff --git a/include/pgettext.php b/include/pgettext.php
index da47b8b6c..2e902a6ab 100644
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -3,7 +3,7 @@
/**
* @brief translation support
*
- * Get the language setting directly from system variables, bypassing get_config()
+ * Get the language setting directly from system variables, bypassing Config::get()
* as database may not yet be configured.
*
* If possible, we use the value from the browser.
diff --git a/include/plaintext.php b/include/plaintext.php
index 53015c961..8fa291744 100644
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -6,6 +6,7 @@
use Friendica\App;
use Friendica\ParseUrl;
+use Friendica\Core\PConfig;
require_once("include/Photo.php");
require_once("include/bbcode.php");
@@ -449,7 +450,7 @@ function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2
// Which purpose has this line? It is now uncommented, but left as a reminder
//} elseif (strpos($b["body"], "[share") !== false) {
// $post["url"] = $b["plink"];
- } elseif (get_pconfig($b["uid"], "system", "no_intelligent_shortening")) {
+ } elseif (PConfig::get($b["uid"], "system", "no_intelligent_shortening")) {
$post["url"] = $b["plink"];
}
$msg = shortenmsg($msg, $limit);
diff --git a/include/plugin.php b/include/plugin.php
index 4c07f6d3f..c4daa6c02 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -6,6 +6,7 @@
*/
use Friendica\App;
+use Friendica\Core\Config;
use Friendica\Core\System;
/**
@@ -72,7 +73,7 @@ function install_plugin($plugin) {
if (! function_exists('reload_plugins')) {
function reload_plugins() {
- $plugins = get_config('system','addon');
+ $plugins = Config::get('system','addon');
if (strlen($plugins)) {
$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
diff --git a/include/post_update.php b/include/post_update.php
index 8dcf07052..210ab79fe 100644
--- a/include/post_update.php
+++ b/include/post_update.php
@@ -3,6 +3,8 @@
* @file include/post_update.php
*/
+use Friendica\Core\Config;
+
/**
* @brief Calls the post update functions
*/
@@ -33,7 +35,7 @@ function post_update() {
function post_update_1192() {
// Was the script completed?
- if (get_config("system", "post_update_version") >= 1192)
+ if (Config::get("system", "post_update_version") >= 1192)
return true;
// Check if the first step is done (Setting "gcontact-id" in the item table)
@@ -46,7 +48,7 @@ function post_update_1192() {
(`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
if ($r && ($r[0]["total"] == 0)) {
- set_config("system", "post_update_version", 1192);
+ Config::set("system", "post_update_version", 1192);
return true;
}
@@ -85,23 +87,23 @@ function post_update_1192() {
function post_update_1194() {
// Was the script completed?
- if (get_config("system", "post_update_version") >= 1194)
+ if (Config::get("system", "post_update_version") >= 1194)
return true;
logger("Start", LOGGER_DEBUG);
- $end_id = get_config("system", "post_update_1194_end");
+ $end_id = Config::get("system", "post_update_1194_end");
if (!$end_id) {
$r = q("SELECT `id` FROM `item` WHERE `uid` != 0 ORDER BY `id` DESC LIMIT 1");
if ($r) {
- set_config("system", "post_update_1194_end", $r[0]["id"]);
- $end_id = get_config("system", "post_update_1194_end");
+ Config::set("system", "post_update_1194_end", $r[0]["id"]);
+ $end_id = Config::get("system", "post_update_1194_end");
}
}
logger("End ID: ".$end_id, LOGGER_DEBUG);
- $start_id = get_config("system", "post_update_1194_start");
+ $start_id = Config::get("system", "post_update_1194_start");
$query1 = "SELECT `item`.`id` FROM `item` ";
@@ -119,12 +121,12 @@ function post_update_1194() {
intval($start_id), intval($end_id),
dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
if (!$r) {
- set_config("system", "post_update_version", 1194);
+ Config::set("system", "post_update_version", 1194);
logger("Update is done", LOGGER_DEBUG);
return true;
} else {
- set_config("system", "post_update_1194_start", $r[0]["id"]);
- $start_id = get_config("system", "post_update_1194_start");
+ Config::set("system", "post_update_1194_start", $r[0]["id"]);
+ $start_id = Config::get("system", "post_update_1194_start");
}
logger("Start ID: ".$start_id, LOGGER_DEBUG);
@@ -157,7 +159,7 @@ function post_update_1194() {
function post_update_1198() {
// Was the script completed?
- if (get_config("system", "post_update_version") >= 1198)
+ if (Config::get("system", "post_update_version") >= 1198)
return true;
logger("Start", LOGGER_DEBUG);
@@ -172,7 +174,7 @@ function post_update_1198() {
(`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
if ($r && ($r[0]["total"] == 0)) {
- set_config("system", "post_update_version", 1198);
+ Config::set("system", "post_update_version", 1198);
logger("Done", LOGGER_DEBUG);
return true;
}
@@ -186,7 +188,7 @@ function post_update_1198() {
logger("Updated threads", LOGGER_DEBUG);
if (dbm::is_result($r)) {
- set_config("system", "post_update_version", 1198);
+ Config::set("system", "post_update_version", 1198);
logger("Done", LOGGER_DEBUG);
return true;
}
@@ -234,7 +236,7 @@ function post_update_1198() {
*/
function post_update_1206() {
// Was the script completed?
- if (get_config("system", "post_update_version") >= 1206)
+ if (Config::get("system", "post_update_version") >= 1206)
return true;
logger("Start", LOGGER_DEBUG);
@@ -254,7 +256,7 @@ function post_update_1206() {
}
}
- set_config("system", "post_update_version", 1206);
+ Config::set("system", "post_update_version", 1206);
logger("Done", LOGGER_DEBUG);
return true;
}
diff --git a/include/queue_fn.php b/include/queue_fn.php
index 884066811..475ac1eb0 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -1,5 +1,7 @@
1) {
+ if (Config::get('system','poco_discovery') > 1) {
- $timeframe = get_config('system','poco_discovery_since');
+ $timeframe = Config::get('system','poco_discovery_since');
if ($timeframe == 0) {
$timeframe = 30;
}
@@ -1803,7 +1803,7 @@ function poco_discover_single_server($id) {
$success = poco_discover_server(json_decode($retdata["body"]));
}
- if (!$success && (get_config('system','poco_discovery') > 2)) {
+ if (!$success && (Config::get('system','poco_discovery') > 2)) {
logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG);
poco_discover_server_users($data, $server);
}
@@ -1830,7 +1830,7 @@ function poco_discover($complete = false) {
$no_of_queries = 5;
- $requery_days = intval(get_config("system", "poco_requery_days"));
+ $requery_days = intval(Config::get("system", "poco_requery_days"));
if ($requery_days == 0) {
$requery_days = 7;
@@ -2036,7 +2036,7 @@ function clean_contact_url($url) {
*/
function fix_alternate_contact_address(&$contact) {
if (($contact["network"] == NETWORK_OSTATUS) && poco_alternate_ostatus_url($contact["url"])) {
- $data = probe_url($contact["url"]);
+ $data = Probe::uri($contact["url"]);
if ($contact["network"] == NETWORK_OSTATUS) {
logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
$contact["url"] = $data["url"];
@@ -2294,7 +2294,7 @@ function update_gcontact($contact) {
* @param str $url profile link
*/
function update_gcontact_from_probe($url) {
- $data = probe_url($url);
+ $data = Probe::uri($url);
if (in_array($data["network"], array(NETWORK_PHANTOM))) {
logger("Invalid network for contact url ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
@@ -2410,7 +2410,7 @@ function gs_fetch_users($server) {
*/
function gs_discover() {
- $requery_days = intval(get_config("system", "poco_requery_days"));
+ $requery_days = intval(Config::get("system", "poco_requery_days"));
$last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
diff --git a/include/text.php b/include/text.php
index 8f0ff6e73..90d569c62 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1,6 +1,8 @@
profile['uid'],'system','display_friend_count');
+ $shown = PConfig::get($a->profile['uid'],'system','display_friend_count');
if ($shown === false) {
$shown = 24;
}
@@ -1096,7 +1098,7 @@ function search($s, $id = 'search-box', $url = 'search', $save = false, $aside =
t("Tags"),
t("Contacts"));
- if (get_config('system','poco_local_search')) {
+ if (Config::get('system','poco_local_search')) {
$values['$searchoption'][] = t("Forums");
}
}
@@ -1114,7 +1116,7 @@ if (! function_exists('valid_email')) {
function valid_email($x){
/// @TODO Removed because Fabio told me so.
- //if (get_config('system','disable_email_validation'))
+ //if (Config::get('system','disable_email_validation'))
// return true;
return preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/', $x);
}}
@@ -1282,7 +1284,7 @@ function redir_private_images($a, &$item)
function put_item_in_cache(&$item, $update = false) {
if (($item["rendered-hash"] != hash("md5", $item["body"])) || ($item["rendered-hash"] == "") ||
- ($item["rendered-html"] == "") || get_config("system", "ignore_cache")) {
+ ($item["rendered-html"] == "") || Config::get("system", "ignore_cache")) {
// The function "redir_private_images" changes the body.
// I'm not sure if we should store it permanently, so we save the old value.
@@ -1331,7 +1333,7 @@ function prepare_body(&$item, $attach = false, $preview = false) {
return $ev;
}
- if (!get_config('system','suppress_tags')) {
+ if (!Config::get('system','suppress_tags')) {
$taglist = dba::p("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = ? AND `oid` = ? AND `type` IN (?, ?) ORDER BY `tid`",
intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
@@ -1979,7 +1981,7 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
if ($file_old == $file_new)
return true;
- $saved = get_pconfig($uid,'system','filetags');
+ $saved = PConfig::get($uid,'system','filetags');
if (strlen($saved)) {
if ($type == 'file') {
$lbracket = '[';
@@ -2030,13 +2032,13 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
}
if ($saved != $filetags_updated) {
- set_pconfig($uid, 'system', 'filetags', $filetags_updated);
+ PConfig::set($uid, 'system', 'filetags', $filetags_updated);
}
return true;
}
else
if (strlen($file_new)) {
- set_pconfig($uid, 'system', 'filetags', $file_new);
+ PConfig::set($uid, 'system', 'filetags', $file_new);
}
return true;
}
@@ -2062,9 +2064,9 @@ function file_tag_save_file($uid, $item, $file) {
create_files_from_item($item);
- $saved = get_pconfig($uid,'system','filetags');
+ $saved = PConfig::get($uid,'system','filetags');
if ((! strlen($saved)) || (! stristr($saved, '[' . file_tag_encode($file) . ']'))) {
- set_pconfig($uid, 'system', 'filetags', $saved . '[' . file_tag_encode($file) . ']');
+ PConfig::set($uid, 'system', 'filetags', $saved . '[' . file_tag_encode($file) . ']');
}
info( t('Item filed') );
}
@@ -2110,8 +2112,8 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false) {
intval($uid));
if (! dbm::is_result($r)) {
- $saved = get_pconfig($uid,'system','filetags');
- set_pconfig($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
+ $saved = PConfig::get($uid,'system','filetags');
+ PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
}
return true;
diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index 97c825352..654cb1fba 100644
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -1,6 +1,7 @@
false, 'user' => null, 'password' => '', 'message' => '');
- $using_invites = get_config('system','invitation_only');
- $num_invites = get_config('system','number_invites');
+ $using_invites = Config::get('system','invitation_only');
+ $num_invites = Config::get('system','number_invites');
$invite_id = ((x($arr,'invite_id')) ? notags(trim($arr['invite_id'])) : '');
@@ -35,7 +36,7 @@ function create_user($arr) {
$verified = ((x($arr,'verified')) ? intval($arr['verified']) : 0);
$publish = ((x($arr,'profile_publish_reg') && intval($arr['profile_publish_reg'])) ? 1 : 0);
- $netpublish = ((strlen(get_config('system','directory'))) ? $publish : 0);
+ $netpublish = ((strlen(Config::get('system','directory'))) ? $publish : 0);
if ($password1 != $confirm) {
$result['message'] .= t('Passwords do not match. Password unchanged.') . EOL;
@@ -101,7 +102,7 @@ function create_user($arr) {
// So now we are just looking for a space in the full name.
- $loose_reg = get_config('system','no_regfullname');
+ $loose_reg = Config::get('system','no_regfullname');
if(! $loose_reg) {
$username = mb_convert_case($username,MB_CASE_TITLE,'UTF-8');
if(! strpos($username,' '))
@@ -268,7 +269,7 @@ function create_user($arr) {
);
}
- if(get_config('system', 'newuser_private') && $def_gid) {
+ if(Config::get('system', 'newuser_private') && $def_gid) {
q("UPDATE `user` SET `allow_gid` = '%s' WHERE `uid` = %d",
dbesc("<" . $def_gid . ">"),
intval($newuid)
diff --git a/index.php b/index.php
index fe871ba96..93b170ea8 100644
--- a/index.php
+++ b/index.php
@@ -51,6 +51,8 @@ if (!$install) {
*
*/
+use Friendica\Core\Config;
+
require_once "include/dba.php";
if (!$install) {
@@ -70,8 +72,8 @@ if (!$install) {
die("System is currently unavailable. Please try again later");
}
- if (get_config('system', 'force_ssl') && ($a->get_scheme() == "http") &&
- (intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) &&
+ if (Config::get('system', 'force_ssl') && ($a->get_scheme() == "http") &&
+ (intval(Config::get('system', 'ssl_policy')) == SSL_POLICY_FULL) &&
(substr(System::baseUrl(), 0, 8) == "https://")) {
header("HTTP/1.1 302 Moved Temporarily");
header("Location: " . System::baseUrl() . "/" . $a->query_string);
@@ -82,7 +84,7 @@ if (!$install) {
load_hooks();
call_hooks('init_1');
- $maintenance = get_config('system', 'maintenance');
+ $maintenance = Config::get('system', 'maintenance');
}
$lang = get_browser_language();
@@ -204,7 +206,7 @@ if ($install && $a->module!="view") {
nav_set_selected('nothing');
//Don't populate apps_menu if apps are private
-$privateapps = get_config('config','private_addons');
+$privateapps = Config::get('config','private_addons');
if ((local_user()) || (! $privateapps === "1")) {
$arr = array('app_menu' => $a->apps);
@@ -251,7 +253,7 @@ if (strlen($a->module)) {
$a->module = "login";
}
- $privateapps = get_config('config','private_addons');
+ $privateapps = Config::get('config','private_addons');
if (is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
//Check if module is an app and if public access to apps is allowed or not
diff --git a/mod/acctlink.php b/mod/acctlink.php
index 5e98ed32b..54e46e532 100644
--- a/mod/acctlink.php
+++ b/mod/acctlink.php
@@ -1,14 +1,13 @@
notags(trim($_POST['newentry_domain'])),
'reason' => notags(trim($_POST['newentry_reason']))
@@ -551,7 +551,7 @@ function admin_page_federation(App $a) {
'$page' => t('Federation Statistics'),
'$intro' => $intro,
'$hint' => $hint,
- '$autoactive' => get_config('system', 'poco_completion'),
+ '$autoactive' => Config::get('system', 'poco_completion'),
'$counts' => $counts,
'$version' => FRIENDICA_VERSION,
'$legendtext' => sprintf(t('Currently this node is aware of %d nodes from the following platforms:'), $total),
@@ -688,7 +688,7 @@ function admin_page_summary(App $a) {
'$baseurl' => System::baseUrl(),
'$platform' => FRIENDICA_PLATFORM,
'$codename' => FRIENDICA_CODENAME,
- '$build' => get_config('system','build'),
+ '$build' => Config::get('system','build'),
'$plugins' => array(t('Active plugins'), $a->plugins),
'$showwarning' => $showwarning,
'$warningtext' => $warningtext
@@ -771,7 +771,7 @@ function admin_page_site_post(App $a) {
// update config
$a->set_baseurl($new_url);
- set_config('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");
@@ -875,7 +875,7 @@ function admin_page_site_post(App $a) {
if (!$thread_allow) {
$ostatus_disabled = true;
}
- if ($ssl_policy != intval(get_config('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:'),
@@ -914,24 +914,24 @@ function admin_page_site_post(App $a) {
);
}
}
- set_config('system','ssl_policy',$ssl_policy);
- set_config('system','maxloadavg',$maxloadavg);
- set_config('system','maxloadavg_frontend',$maxloadavg_frontend);
- set_config('system','min_memory',$min_memory);
- set_config('system','optimize_max_tablesize',$optimize_max_tablesize);
- set_config('system','optimize_fragmentation',$optimize_fragmentation);
- set_config('system','poco_completion',$poco_completion);
- set_config('system','poco_requery_days',$poco_requery_days);
- set_config('system','poco_discovery',$poco_discovery);
- set_config('system','poco_discovery_since',$poco_discovery_since);
- set_config('system','poco_local_search',$poco_local_search);
- set_config('system','nodeinfo',$nodeinfo);
- set_config('config','sitename',$sitename);
- set_config('config','hostname',$hostname);
- set_config('config','sender_email', $sender_email);
- set_config('system','suppress_tags',$suppress_tags);
- set_config('system','shortcut_icon',$shortcut_icon);
- set_config('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...
@@ -940,91 +940,91 @@ function admin_page_site_post(App $a) {
dbesc("banner")
);
} else {
- set_config('system','banner', $banner);
+ Config::set('system','banner', $banner);
}
if ($info == "") {
- del_config('config','info');
+ Config::delete('config','info');
} else {
- set_config('config','info',$info);
+ Config::set('config','info',$info);
}
- set_config('system','language', $language);
- set_config('system','theme', $theme);
+ Config::set('system','language', $language);
+ Config::set('system','theme', $theme);
if ($theme_mobile == '---') {
- del_config('system','mobile-theme');
+ Config::delete('system','mobile-theme');
} else {
- set_config('system','mobile-theme', $theme_mobile);
+ Config::set('system','mobile-theme', $theme_mobile);
}
if ($singleuser == '---') {
- del_config('system','singleuser');
+ Config::delete('system','singleuser');
} else {
- set_config('system','singleuser', $singleuser);
+ Config::set('system','singleuser', $singleuser);
}
- set_config('system', 'maximagesize', $maximagesize);
- set_config('system', 'max_image_length', $maximagelength);
- set_config('system', 'jpeg_quality', $jpegimagequality);
+ Config::set('system', 'maximagesize', $maximagesize);
+ Config::set('system', 'max_image_length', $maximagelength);
+ Config::set('system', 'jpeg_quality', $jpegimagequality);
- set_config('config', 'register_policy', $register_policy);
- set_config('system', 'max_daily_registrations', $daily_registrations);
- set_config('system', 'account_abandon_days', $abandon_days);
- set_config('config', 'register_text', $register_text);
- set_config('system', 'allowed_sites', $allowed_sites);
- set_config('system', 'allowed_email', $allowed_email);
- set_config('system', 'block_public', $block_public);
- set_config('system', 'publish_all', $force_publish);
- set_config('system', 'thread_allow', $thread_allow);
- set_config('system', 'newuser_private', $newuser_private);
- set_config('system', 'enotify_no_content', $enotify_no_content);
- set_config('system', 'disable_embedded', $disable_embedded);
- set_config('system', 'allow_users_remote_self', $allow_users_remote_self);
- set_config('system', 'check_new_version_url', $check_new_version_url);
+ Config::set('config', 'register_policy', $register_policy);
+ Config::set('system', 'max_daily_registrations', $daily_registrations);
+ Config::set('system', 'account_abandon_days', $abandon_days);
+ Config::set('config', 'register_text', $register_text);
+ Config::set('system', 'allowed_sites', $allowed_sites);
+ 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', 'allow_users_remote_self', $allow_users_remote_self);
+ Config::set('system', 'check_new_version_url', $check_new_version_url);
- set_config('system', 'block_extended_register', $no_multi_reg);
- set_config('system', 'no_openid', $no_openid);
- set_config('system', 'no_regfullname', $no_regfullname);
- set_config('system', 'community_page_style', $community_page_style);
- set_config('system', 'max_author_posts_community_page', $max_author_posts_community_page);
- set_config('system', 'verifyssl', $verifyssl);
- set_config('system', 'proxyuser', $proxyuser);
- set_config('system', 'proxy', $proxy);
- set_config('system', 'curl_timeout', $timeout);
- set_config('system', 'dfrn_only', $dfrn_only);
- set_config('system', 'ostatus_disabled', $ostatus_disabled);
- set_config('system', 'ostatus_full_threads', $ostatus_full_threads);
- set_config('system', 'diaspora_enabled', $diaspora_enabled);
+ Config::set('system', 'block_extended_register', $no_multi_reg);
+ Config::set('system', 'no_openid', $no_openid);
+ Config::set('system', 'no_regfullname', $no_regfullname);
+ Config::set('system', 'community_page_style', $community_page_style);
+ Config::set('system', 'max_author_posts_community_page', $max_author_posts_community_page);
+ Config::set('system', 'verifyssl', $verifyssl);
+ Config::set('system', 'proxyuser', $proxyuser);
+ Config::set('system', 'proxy', $proxy);
+ Config::set('system', 'curl_timeout', $timeout);
+ Config::set('system', 'dfrn_only', $dfrn_only);
+ Config::set('system', 'ostatus_disabled', $ostatus_disabled);
+ Config::set('system', 'ostatus_full_threads', $ostatus_full_threads);
+ Config::set('system', 'diaspora_enabled', $diaspora_enabled);
- set_config('config', 'private_addons', $private_addons);
+ Config::set('config', 'private_addons', $private_addons);
- set_config('system', 'force_ssl', $force_ssl);
- set_config('system', 'hide_help', $hide_help);
+ Config::set('system', 'force_ssl', $force_ssl);
+ Config::set('system', 'hide_help', $hide_help);
if ($itemcache != '') {
$itemcache = App::realpath($itemcache);
}
- set_config('system', 'itemcache', $itemcache);
- set_config('system', 'itemcache_duration', $itemcache_duration);
- set_config('system', 'max_comments', $max_comments);
+ Config::set('system', 'itemcache', $itemcache);
+ Config::set('system', 'itemcache_duration', $itemcache_duration);
+ Config::set('system', 'max_comments', $max_comments);
if ($temppath != '') {
$temppath = App::realpath($temppath);
}
- set_config('system', 'temppath', $temppath);
+ Config::set('system', 'temppath', $temppath);
if ($basepath != '') {
$basepath = App::realpath($basepath);
}
- set_config('system', 'basepath', $basepath);
- set_config('system', 'proxy_disabled', $proxy_disabled);
- set_config('system', 'only_tag_search', $only_tag_search);
- set_config('system', 'worker_queues', $worker_queues);
- set_config('system', 'worker_dont_fork', $worker_dont_fork);
- set_config('system', 'worker_fastlane', $worker_fastlane);
- set_config('system', 'frontend_worker', $worker_frontend);
- set_config('system', 'rino_encrypt', $rino);
+ Config::set('system', 'basepath', $basepath);
+ Config::set('system', 'proxy_disabled', $proxy_disabled);
+ Config::set('system', 'only_tag_search', $only_tag_search);
+ Config::set('system', 'worker_queues', $worker_queues);
+ Config::set('system', 'worker_dont_fork', $worker_dont_fork);
+ Config::set('system', 'worker_fastlane', $worker_fastlane);
+ Config::set('system', 'frontend_worker', $worker_frontend);
+ Config::set('system', 'rino_encrypt', $rino);
info(t('Site settings updated.').EOL);
goaway('admin/site');
@@ -1045,10 +1045,10 @@ function admin_page_site(App $a) {
/* Installed langs */
$lang_choices = get_available_languages();
- if (strlen(get_config('system','directory_submit_url')) &&
- !strlen(get_config('system','directory'))) {
- set_config('system','directory', dirname(get_config('system','directory_submit_url')));
- del_config('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 */
@@ -1121,12 +1121,12 @@ function admin_page_site(App $a) {
}
/* Banner */
- $banner = get_config('system','banner');
+ $banner = Config::get('system','banner');
if ($banner == false) {
$banner = 'Friendica';
}
$banner = htmlspecialchars($banner);
- $info = get_config('config','info');
+ $info = Config::get('config','info');
$info = htmlspecialchars($info);
// Automatically create temporary paths
@@ -1189,83 +1189,83 @@ function admin_page_site(App $a) {
'$hostname' => array('hostname', t("Host name"), $a->config['hostname'], ""),
'$sender_email' => array('sender_email', t("Sender Email"), $a->config['sender_email'], t("The email address your server shall use to send notification emails from."), "", "", "email"),
'$banner' => array('banner', t("Banner/Logo"), $banner, ""),
- '$shortcut_icon' => array('shortcut_icon', t("Shortcut icon"), get_config('system','shortcut_icon'), t("Link to an icon that will be used for browsers.")),
- '$touch_icon' => array('touch_icon', t("Touch icon"), get_config('system','touch_icon'), t("Link to an icon that will be used for tablets and mobiles.")),
+ '$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())),
- '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices),
- '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices),
+ '$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 - change theme settings"), $theme_choices),
'$theme_mobile' => array('theme_mobile', t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), t("Theme for mobile devices"), $theme_choices_mobile),
- '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
- '$force_ssl' => array('force_ssl', t("Force SSL"), get_config('system','force_ssl'), t("Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.")),
- '$hide_help' => array('hide_help', t("Hide help entry from navigation menu"), get_config('system','hide_help'), t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")),
+ '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(Config::get('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
+ '$force_ssl' => array('force_ssl', t("Force SSL"), Config::get('system','force_ssl'), t("Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.")),
+ '$hide_help' => array('hide_help', t("Hide help entry from navigation menu"), Config::get('system','hide_help'), t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")),
'$singleuser' => array('singleuser', t("Single user instance"), Config::get('system', 'singleuser', '---'), t("Make this instance multi-user or single-user for the named user"), $user_names),
- '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
- '$maximagelength' => array('maximagelength', t("Maximum image length"), get_config('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")),
- '$jpegimagequality' => array('jpegimagequality', t("JPEG image quality"), get_config('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")),
+ '$maximagesize' => array('maximagesize', t("Maximum image size"), Config::get('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
+ '$maximagelength' => array('maximagelength', t("Maximum image length"), Config::get('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")),
+ '$jpegimagequality' => array('jpegimagequality', t("JPEG image quality"), Config::get('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")),
'$register_policy' => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices),
- '$daily_registrations' => array('max_daily_registrations', t("Maximum Daily Registrations"), get_config('system', 'max_daily_registrations'), t("If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect.")),
+ '$daily_registrations' => array('max_daily_registrations', t("Maximum Daily Registrations"), Config::get('system', 'max_daily_registrations'), t("If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect.")),
'$register_text' => array('register_text', t("Register text"), $a->config['register_text'], t("Will be displayed prominently on the registration page.")),
- '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
- '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),
- '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
- '$block_public' => array('block_public', t("Block public"), get_config('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"), get_config('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"), get_config('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"), get_config('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"), get_config('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"), get_config('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."), get_config('config','private_addons'), t("Checking this box will restrict addons listed in the apps menu to members only.")),
- '$disable_embedded' => array('disable_embedded', t("Don't embed private images in posts"), get_config('system','disable_embedded'), t("Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.")),
- '$allow_users_remote_self' => array('allow_users_remote_self', t('Allow Users to set remote_self'), get_config('system','allow_users_remote_self'), t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')),
- '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
- '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
- '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
- '$community_page_style' => array('community_page_style', t("Community Page Style"), get_config('system','community_page_style'), t("Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."), $community_page_style_choices),
- '$max_author_posts_community_page' => array('max_author_posts_community_page', t("Posts per user on community page"), get_config('system','max_author_posts_community_page'), t("The maximum number of posts per user on the community page. (Not valid for 'Global Community')")),
- '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),
- '$ostatus_full_threads' => array('ostatus_full_threads', t("Only import OStatus threads from our contacts"), get_config('system','ostatus_full_threads'), t("Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system.")),
+ '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), Config::get('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
+ '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), Config::get('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),
+ '$allowed_email' => array('allowed_email', t("Allowed email domains"), Config::get('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
+ '$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.")),
+ '$disable_embedded' => array('disable_embedded', t("Don't embed private images in posts"), Config::get('system','disable_embedded'), t("Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.")),
+ '$allow_users_remote_self' => array('allow_users_remote_self', t('Allow Users to set remote_self'), Config::get('system','allow_users_remote_self'), t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')),
+ '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), Config::get('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
+ '$no_openid' => array('no_openid', t("OpenID support"), !Config::get('system','no_openid'), t("OpenID support for registration and logins.")),
+ '$no_regfullname' => array('no_regfullname', t("Fullname check"), !Config::get('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
+ '$community_page_style' => array('community_page_style', t("Community Page Style"), Config::get('system','community_page_style'), t("Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."), $community_page_style_choices),
+ '$max_author_posts_community_page' => array('max_author_posts_community_page', t("Posts per user on community page"), Config::get('system','max_author_posts_community_page'), t("The maximum number of posts per user on the community page. (Not valid for 'Global Community')")),
+ '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !Config::get('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),
+ '$ostatus_full_threads' => array('ostatus_full_threads', t("Only import OStatus threads from our contacts"), Config::get('system','ostatus_full_threads'), t("Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system.")),
'$ostatus_not_able' => t("OStatus support can only be enabled if threading is enabled."),
'$diaspora_able' => $diaspora_able,
'$diaspora_not_able' => t("Diaspora support can't be enabled because Friendica was installed into a sub directory."),
- '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")),
- '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")),
- '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")),
- '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""),
- '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""),
- '$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")),
- '$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('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(get_config('system','maxloadavg_frontend')) > 0)?get_config('system','maxloadavg_frontend'):50), t("Maximum system load before the frontend quits service - default 50.")),
- '$min_memory' => array('min_memory', t("Minimal Memory"), ((intval(get_config('system','min_memory')) > 0)?get_config('system','min_memory'):0), t("Minimal free memory in MB for the poller. Needs access to /proc/meminfo - default 0 (deactivated).")),
+ '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), Config::get('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")),
+ '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), Config::get('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")),
+ '$verifyssl' => array('verifyssl', t("Verify SSL"), Config::get('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")),
+ '$proxyuser' => array('proxyuser', t("Proxy user"), Config::get('system','proxyuser'), ""),
+ '$proxy' => array('proxy', t("Proxy URL"), Config::get('system','proxy'), ""),
+ '$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).")),
'$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(get_config('system','optimize_fragmentation')) > 0)?get_config('system','optimize_fragmentation'):30), t("Minimum fragmenation level to start the automatic optimization - default value is 30%.")),
+ '$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%.")),
- '$poco_completion' => array('poco_completion', t("Periodical check of global contacts"), get_config('system','poco_completion'), t("If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers.")),
- '$poco_requery_days' => array('poco_requery_days', t("Days between requery"), get_config('system','poco_requery_days'), t("Number of days after which a server is requeried for his contacts.")),
- '$poco_discovery' => array('poco_discovery', t("Discover contacts from other servers"), (string) intval(get_config('system','poco_discovery')), t("Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."), $poco_discovery_choices),
- '$poco_discovery_since' => array('poco_discovery_since', t("Timeframe for fetching global contacts"), (string) intval(get_config('system','poco_discovery_since')), t("When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."), $poco_discovery_since_choices),
- '$poco_local_search' => array('poco_local_search', t("Search the local directory"), get_config('system','poco_local_search'), t("Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated.")),
+ '$poco_completion' => array('poco_completion', t("Periodical check of global contacts"), Config::get('system','poco_completion'), t("If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers.")),
+ '$poco_requery_days' => array('poco_requery_days', t("Days between requery"), Config::get('system','poco_requery_days'), t("Number of days after which a server is requeried for his contacts.")),
+ '$poco_discovery' => array('poco_discovery', t("Discover contacts from other servers"), (string) intval(Config::get('system','poco_discovery')), t("Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."), $poco_discovery_choices),
+ '$poco_discovery_since' => array('poco_discovery_since', t("Timeframe for fetching global contacts"), (string) intval(Config::get('system','poco_discovery_since')), t("When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."), $poco_discovery_since_choices),
+ '$poco_local_search' => array('poco_local_search', t("Search the local directory"), Config::get('system','poco_local_search'), t("Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated.")),
- '$nodeinfo' => array('nodeinfo', t("Publish server information"), get_config('system','nodeinfo'), t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details.")),
+ '$nodeinfo' => array('nodeinfo', t("Publish server information"), Config::get('system','nodeinfo'), t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details.")),
- '$check_new_version_url' => array('check_new_version_url', t("Check upstream version"), get_config('system', 'check_new_version_url'), t("Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."), $check_git_version_choices),
- '$suppress_tags' => array('suppress_tags', t("Suppress Tags"), get_config('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")),
- '$itemcache' => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), t("The item caches buffers generated bbcode and external images.")),
- '$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")),
- '$max_comments' => array('max_comments', t("Maximum numbers of comments per post"), get_config('system','max_comments'), t("How much comments should be shown for each post? Default value is 100.")),
- '$temppath' => array('temppath', t("Temp path"), get_config('system','temppath'), t("If you have a restricted system where the webserver can't access the system temp path, enter another path here.")),
- '$basepath' => array('basepath', t("Base path to installation"), get_config('system','basepath'), t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.")),
- '$proxy_disabled' => array('proxy_disabled', t("Disable picture proxy"), get_config('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")),
- '$only_tag_search' => array('only_tag_search', t("Only search in tags"), get_config('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")),
+ '$check_new_version_url' => array('check_new_version_url', t("Check upstream version"), Config::get('system', 'check_new_version_url'), t("Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."), $check_git_version_choices),
+ '$suppress_tags' => array('suppress_tags', t("Suppress Tags"), Config::get('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")),
+ '$itemcache' => array('itemcache', t("Path to item cache"), Config::get('system','itemcache'), t("The item caches buffers generated bbcode and external images.")),
+ '$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), Config::get('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")),
+ '$max_comments' => array('max_comments', t("Maximum numbers of comments per post"), Config::get('system','max_comments'), t("How much comments should be shown for each post? Default value is 100.")),
+ '$temppath' => array('temppath', t("Temp path"), Config::get('system','temppath'), t("If you have a restricted system where the webserver can't access the system temp path, enter another path here.")),
+ '$basepath' => array('basepath', t("Base path to installation"), Config::get('system','basepath'), t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.")),
+ '$proxy_disabled' => array('proxy_disabled', t("Disable picture proxy"), Config::get('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")),
+ '$only_tag_search' => array('only_tag_search', t("Only search in tags"), Config::get('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")),
'$relocate_url' => array('relocate_url', t("New base url"), System::baseUrl(), t("Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.")),
- '$rino' => array('rino', t("RINO Encryption"), intval(get_config('system','rino_encrypt')), t("Encryption layer between nodes."), array("Disabled", "RINO1 (deprecated)", "RINO2")),
+ '$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"), get_config('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"), get_config('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_fastlane' => array('worker_fastlane', t("Enable fastlane"), get_config('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'), get_config('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())),
+ '$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_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")
@@ -1290,10 +1290,10 @@ function admin_page_dbsync(App $a) {
$o = '';
if ($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') {
- set_config('database', 'update_'.intval($a->argv[3]), 'success');
- $curr = get_config('system','build');
+ Config::set('database', 'update_'.intval($a->argv[3]), 'success');
+ $curr = Config::get('system','build');
if (intval($curr) == intval($a->argv[3])) {
- set_config('system','build',intval($curr) + 1);
+ Config::set('system','build',intval($curr) + 1);
}
info(t('Update has been marked successful').EOL);
goaway('admin/dbsync');
@@ -1304,7 +1304,7 @@ function admin_page_dbsync(App $a) {
$retval = update_structure(false, true);
if (!$retval) {
$o .= sprintf(t("Database structure update %s was successfully applied."), DB_UPDATE_VERSION)."
"; - set_config('database', 'dbupdate_'.DB_UPDATE_VERSION, 'success'); + 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)."
"; @@ -1324,13 +1324,13 @@ function admin_page_dbsync(App $a) { } elseif ($retval === UPDATE_SUCCESS) { $o .= sprintf(t('Update %s was successfully applied.', $func)); - set_config('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)."
"; - set_config('database',$func, 'success'); + Config::set('database',$func, 'success'); } return $o; } @@ -1378,7 +1378,7 @@ function admin_page_users_post(App $a) { $nu_name = (x($_POST, 'new_user_name') ? $_POST['new_user_name'] : ''); $nu_nickname = (x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); $nu_email = (x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); - $nu_language = get_config('system', 'language'); + $nu_language = Config::get('system', 'language'); check_form_security_token_redirectOnErr('/admin/users', 'admin_users'); @@ -1702,7 +1702,7 @@ function admin_page_plugins(App $a) { install_plugin($plugin); info(sprintf(t("Plugin %s enabled."), $plugin)); } - set_config("system","addon", implode(", ",$a->plugins)); + Config::set("system","addon", implode(", ",$a->plugins)); goaway('admin/plugins'); return ''; // NOTREACHED } @@ -1784,7 +1784,7 @@ function admin_page_plugins(App $a) { } // Override the above szenario, when the admin really wants to see outdated stuff - if (get_config("system", "show_unsupported_addons")) { + if (Config::get("system", "show_unsupported_addons")) { $show_plugin = true; } @@ -1888,7 +1888,7 @@ function rebuild_theme_table($themes) { */ function admin_page_themes(App $a) { - $allowed_themes_str = get_config('system','allowed_themes'); + $allowed_themes_str = Config::get('system','allowed_themes'); $allowed_themes_raw = explode(',',$allowed_themes_str); $allowed_themes = array(); if (count($allowed_themes_raw)) { @@ -1917,7 +1917,7 @@ function admin_page_themes(App $a) { $is_supported = 1-(intval(file_exists($file.'/unsupported'))); $is_allowed = intval(in_array($f,$allowed_themes)); - if ($is_allowed || $is_supported || get_config("system", "show_unsupported_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); } } @@ -1954,7 +1954,7 @@ function admin_page_themes(App $a) { info(sprintf('Theme %s disabled.',$theme)); } - set_config('system','allowed_themes',$s); + Config::set('system','allowed_themes',$s); goaway('admin/themes'); return ''; // NOTREACHED } @@ -2089,9 +2089,9 @@ function admin_page_logs_post(App $a) { $debugging = ((x($_POST,'debugging')) ? true : false); $loglevel = ((x($_POST,'loglevel')) ? intval(trim($_POST['loglevel'])) : 0); - set_config('system','logfile', $logfile); - set_config('system','debugging', $debugging); - set_config('system','loglevel', $loglevel); + Config::set('system','logfile', $logfile); + Config::set('system','debugging', $debugging); + Config::set('system','loglevel', $loglevel); } info(t("Log settings updated.")); @@ -2139,12 +2139,12 @@ function admin_page_logs(App $a) { '$submit' => t('Save Settings'), '$clear' => t('Clear'), '$baseurl' => System::baseUrl(true), - '$logname' => get_config('system','logfile'), + '$logname' => Config::get('system','logfile'), // name, label, value, help string, extra data... - '$debugging' => array('debugging', t("Enable Debugging"),get_config('system','debugging'), ""), - '$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")), - '$loglevel' => array('loglevel', t("Log level"), get_config('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"), @@ -2174,7 +2174,7 @@ function admin_page_logs(App $a) { */ function admin_page_viewlogs(App $a) { $t = get_markup_template("admin_viewlogs.tpl"); - $f = get_config('system','logfile'); + $f = Config::get('system','logfile'); $data = ''; if (!file_exists($f)) { @@ -2205,7 +2205,7 @@ function admin_page_viewlogs(App $a) { '$title' => t('Administration'), '$page' => t('View Logs'), '$data' => $data, - '$logname' => get_config('system','logfile') + '$logname' => Config::get('system','logfile') )); } @@ -2234,12 +2234,12 @@ function admin_page_features_post(App $a) { } else { $val = 0; } - set_config('feature',$feature,$val); + Config::set('feature',$feature,$val); if (x($_POST, $featurelock)) { - set_config('feature_lock', $feature, $val); + Config::set('feature_lock', $feature, $val); } else { - del_config('feature_lock', $feature); + Config::delete('feature_lock', $feature); } } } @@ -2273,7 +2273,7 @@ function admin_page_features(App $a) { $arr[$fname][0] = $fdata[0]; foreach (array_slice($fdata,1) as $f) { - $set = get_config('feature',$f[0]); + $set = Config::get('feature',$f[0]); if ($set === false) { $set = $f[3]; } diff --git a/mod/api.php b/mod/api.php index cd5d5241f..beb7d71c4 100644 --- a/mod/api.php +++ b/mod/api.php @@ -1,6 +1,7 @@ callback_url!=null) { diff --git a/mod/apps.php b/mod/apps.php index 0c0df7654..b8800c7d7 100644 --- a/mod/apps.php +++ b/mod/apps.php @@ -1,9 +1,10 @@ argc > 1) auto_redir($a, $a->argv[1]); - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) { return; } @@ -71,7 +73,7 @@ function cal_content(App $a) { nav_set_selected('events'); // First day of the week (0 = Sunday) - $firstDay = get_pconfig(local_user(),'system','first_day_of_week'); + $firstDay = PConfig::get(local_user(),'system','first_day_of_week'); if ($firstDay === false) $firstDay=0; // get the translation strings for the callendar @@ -250,7 +252,7 @@ function cal_content(App $a) { if (x($_GET,'id')){ $tpl = get_markup_template("event.tpl"); } else { -// if (get_config('experimentals','new_calendar')==1){ +// if (Config::get('experimentals','new_calendar')==1){ $tpl = get_markup_template("events_js.tpl"); // } else { // $tpl = get_markup_template("events.tpl"); diff --git a/mod/crepair.php b/mod/crepair.php index 59ac620a3..cc930a2f3 100644 --- a/mod/crepair.php +++ b/mod/crepair.php @@ -1,6 +1,7 @@ $r[0]['issued-id'], 'intro_id' => $intro[0]['id'], 'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0), - 'activity' => intval(get_pconfig($r[0]['uid'],'system','post_newfriend')) + 'activity' => intval(PConfig::get($r[0]['uid'],'system','post_newfriend')) ); dfrn_confirm_post($a,$handsfree); } @@ -800,8 +802,8 @@ function dfrn_request_content(App $a) { * Normal web request. Display our user's introduction form. */ - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { - if(! get_config('system','local_block')) { + if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) { + if(! Config::get('system','local_block')) { notice( t('Public access denied.') . EOL); return; } @@ -850,9 +852,9 @@ function dfrn_request_content(App $a) { // see if we are allowed to have NETWORK_MAIL2 contacts - $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); + $mail_disabled = ((function_exists('imap_open') && (! Config::get('system','imap_disabled'))) ? 0 : 1); - if (get_config('system','dfrn_only')) { + if (Config::get('system','dfrn_only')) { $mail_disabled = 1; } diff --git a/mod/directory.php b/mod/directory.php index c83b7b411..98afad77c 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -1,6 +1,7 @@ set_pager_itemspage(60); @@ -26,8 +27,8 @@ function directory_post(App $a) { function directory_content(App $a) { require_once("mod/proxy.php"); - if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) || - (get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) { + if((Config::get('system','block_public')) && (! local_user()) && (! remote_user()) || + (Config::get('system','block_local_dir')) && (! local_user()) && (! remote_user())) { notice( t('Public access denied.') . EOL); return; } @@ -41,7 +42,7 @@ function directory_content(App $a) { $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); $gdirpath = ''; - $dirurl = get_config('system','directory'); + $dirurl = Config::get('system','directory'); if(strlen($dirurl)) { $gdirpath = zrl($dirurl,true); } @@ -66,7 +67,7 @@ function directory_content(App $a) { (`profile`.`prv_keywords` LIKE '%$search%'))"; } - $publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " ); + $publish = ((Config::get('system','publish_all')) ? '' : " AND `publish` = 1 " ); $r = q("SELECT COUNT(*) AS `total` FROM `profile` diff --git a/mod/dirfind.php b/mod/dirfind.php index a1253b144..da2f1396e 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -1,11 +1,12 @@ pager['page']) * $perpage) - $perpage; - if (get_config('system','diaspora_enabled')) { + if (Config::get('system','diaspora_enabled')) { $diaspora = NETWORK_DIASPORA; } else { $diaspora = NETWORK_DFRN; } - if (!get_config('system','ostatus_disabled')) { + if (!Config::get('system','ostatus_disabled')) { $ostatus = NETWORK_OSTATUS; } else { $ostatus = NETWORK_DFRN; @@ -170,7 +171,7 @@ function dirfind_content(App $a, $prefix = "") { $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : ''); - if(strlen(get_config('system','directory'))) + if(strlen(Config::get('system','directory'))) $x = fetch_url(get_server().'/lsearch?f=' . $p . '&search=' . urlencode($search)); $j = json_decode($x); diff --git a/mod/display.php b/mod/display.php index edf372df5..d2ee12c57 100644 --- a/mod/display.php +++ b/mod/display.php @@ -1,13 +1,14 @@ argc > 1) { $which = $a->argv[1]; diff --git a/mod/home.php b/mod/home.php index 3490c4fae..985c408b5 100644 --- a/mod/home.php +++ b/mod/home.php @@ -1,6 +1,7 @@ get_hostname(),System::baseUrl(),System::baseUrl(),System::baseUrl() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);*/ + '$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),System::baseUrl(),System::baseUrl(),System::baseUrl() . '/post', salmon_key(Config::get('system','site_pubkey'))),$tpl);*/ $tpl = get_markup_template('xrd_host.tpl'); echo replace_macros($tpl, array( '$zhost' => $a->get_hostname(), '$zroot' => System::baseUrl(), '$domain' => System::baseUrl(), '$zot_post' => System::baseUrl() . '/post', - '$bigkey' => salmon_key(get_config('system','site_pubkey')), + '$bigkey' => salmon_key(Config::get('system','site_pubkey')), )); exit(); diff --git a/mod/hovercard.php b/mod/hovercard.php index 26c606251..064ccab1b 100644 --- a/mod/hovercard.php +++ b/mod/hovercard.php @@ -9,6 +9,7 @@ */ use Friendica\App; +use Friendica\Core\Config; require_once("include/socgraph.php"); require_once("include/Contact.php"); @@ -23,7 +24,7 @@ function hovercard_content() { $datatype = (x($_REQUEST,'datatype') ?$_REQUEST['datatype'] : "json"); // Get out if the system doesn't have public access allowed - if(intval(get_config('system','block_public'))) + if(intval(Config::get('system','block_public'))) http_status_exit(401); // Return the raw content of the template. We use this to make templates usable for js functions. diff --git a/mod/invite.php b/mod/invite.php index 81b588002..4f7abf36a 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -8,6 +8,8 @@ */ use Friendica\App; +use Friendica\Core\Config; +use Friendica\Core\PConfig; use Friendica\Core\System; require_once('include/email.php'); @@ -21,12 +23,12 @@ function invite_post(App $a) { check_form_security_token_redirectOnErr('/', 'send_invite'); - $max_invites = intval(get_config('system','max_invites')); + $max_invites = intval(Config::get('system','max_invites')); if (! $max_invites) { $max_invites = 50; } - $current_invites = intval(get_pconfig(local_user(),'system','sent_invites')); + $current_invites = intval(PConfig::get(local_user(),'system','sent_invites')); if ($current_invites > $max_invites) { notice( t('Total invitation limit exceeded.') . EOL); return; @@ -38,9 +40,9 @@ function invite_post(App $a) { $total = 0; - if (get_config('system','invitation_only')) { + if (Config::get('system','invitation_only')) { $invonly = true; - $x = get_pconfig(local_user(),'system','invites_remaining'); + $x = PConfig::get(local_user(),'system','invites_remaining'); if ((! $x) && (! is_site_admin())) { return; } @@ -67,7 +69,7 @@ function invite_post(App $a) { if (! is_site_admin()) { $x --; if ($x >= 0) { - set_pconfig(local_user(),'system','invites_remaining',$x); + PConfig::set(local_user(),'system','invites_remaining',$x); } else { return; } @@ -85,7 +87,7 @@ function invite_post(App $a) { if ($res) { $total ++; $current_invites ++; - set_pconfig(local_user(),'system','sent_invites',$current_invites); + PConfig::set(local_user(),'system','sent_invites',$current_invites); if($current_invites > $max_invites) { notice( t('Invitation limit exceeded. Please contact your site administrator.') . EOL); return; @@ -110,16 +112,16 @@ function invite_content(App $a) { $tpl = get_markup_template('invite.tpl'); $invonly = false; - if (get_config('system','invitation_only')) { + if (Config::get('system','invitation_only')) { $invonly = true; - $x = get_pconfig(local_user(),'system','invites_remaining'); + $x = PConfig::get(local_user(),'system','invites_remaining'); if ((! $x) && (! is_site_admin())) { notice( t('You have no more invitations available') . EOL); return ''; } } - $dirloc = get_config('system','directory'); + $dirloc = Config::get('system','directory'); if (strlen($dirloc)) { if ($a->config['register_policy'] == REGISTER_CLOSED) { $linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), $dirloc . '/servers'); diff --git a/mod/item.php b/mod/item.php index 0d09b1903..51488fa72 100644 --- a/mod/item.php +++ b/mod/item.php @@ -16,8 +16,10 @@ */ use Friendica\App; +use Friendica\Core\Config; use Friendica\Core\System; use Friendica\Core\Worker; +use Friendica\Network\Probe; require_once 'include/crypto.php'; require_once 'include/enotify.php'; @@ -27,7 +29,6 @@ require_once 'include/files.php'; require_once 'include/threads.php'; require_once 'include/text.php'; require_once 'include/items.php'; -require_once 'include/probe.php'; require_once 'include/diaspora.php'; require_once 'include/Contact.php'; @@ -146,7 +147,7 @@ function item_post(App $a) { $parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]); if (!isset($parent_contact["nick"])) { - $probed_contact = probe_url($thrparent[0]["author-link"]); + $probed_contact = Probe::uri($thrparent[0]["author-link"]); if ($probed_contact["network"] != NETWORK_FEED) { $parent_contact = $probed_contact; $parent_contact["nurl"] = normalise_link($probed_contact["url"]); @@ -328,7 +329,7 @@ function item_post(App $a) { // if using the API, we won't see pubmail_enable - figure out if it should be set if ($api_source && $profile_uid && $profile_uid == local_user() && (! $private)) { - $mail_disabled = ((function_exists('imap_open') && (! get_config('system', 'imap_disabled'))) ? 0 : 1); + $mail_disabled = ((function_exists('imap_open') && (! Config::get('system', 'imap_disabled'))) ? 0 : 1); if (! $mail_disabled) { /// @TODO Check if only pubmail is loaded, * loads all columns $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", @@ -1163,7 +1164,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n if (dbm::is_result($r)) { $data = $r[0]; } else { - $data = probe_url($matches[1]); + $data = Probe::uri($matches[1]); } if ($data["alias"] != "") { @@ -1235,7 +1236,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n } if (!dbm::is_result($r)) { - $probed = probe_url($name); + $probed = Probe::uri($name); if ($result['network'] != NETWORK_PHANTOM) { update_gcontact($probed); $r = q("SELECT `url`, `name`, `nick`, `network`, `alias`, `notify` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", diff --git a/mod/match.php b/mod/match.php index 829ca3987..f268fbc8a 100644 --- a/mod/match.php +++ b/mod/match.php @@ -1,6 +1,7 @@ pager['page'] != 1) $params['p'] = $a->pager['page']; - if(strlen(get_config('system','directory'))) + if(strlen(Config::get('system','directory'))) $x = post_url(get_server().'/msearch', $params); else $x = post_url(System::baseUrl() . '/msearch', $params); diff --git a/mod/newmember.php b/mod/newmember.php index f470327cd..0dcdb8bd8 100644 --- a/mod/newmember.php +++ b/mod/newmember.php @@ -1,6 +1,7 @@ ' . t('Connecting') . ''; $o .= '
Friendica';
}
diff --git a/include/network.php b/include/network.php
index 2a996cd93..90aea6e76 100644
--- a/include/network.php
+++ b/include/network.php
@@ -124,26 +124,26 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
if (x($opts, 'timeout')) {
@curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
} else {
- $curl_time = intval(get_config('system', 'curl_timeout'));
+ $curl_time = intval(Config::get('system', 'curl_timeout'));
@curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
}
// by default we will allow self-signed certs
// but you can override this
- $check_cert = get_config('system', 'verifyssl');
+ $check_cert = Config::get('system', 'verifyssl');
@curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
if ($check_cert) {
@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
}
- $proxy = get_config('system', 'proxy');
+ $proxy = Config::get('system', 'proxy');
if (strlen($proxy)) {
@curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
@curl_setopt($ch, CURLOPT_PROXY, $proxy);
- $proxyuser = @get_config('system', 'proxyuser');
+ $proxyuser = @Config::get('system', 'proxyuser');
if (strlen($proxyuser)) {
@curl_setopt($ch, CURLOPT_PROXYUSERPWD, $proxyuser);
@@ -299,7 +299,7 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
if (intval($timeout)) {
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
} else {
- $curl_time = intval(get_config('system', 'curl_timeout'));
+ $curl_time = intval(Config::get('system', 'curl_timeout'));
curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
}
@@ -317,19 +317,19 @@ function post_url($url, $params, $headers = null, &$redirects = 0, $timeout = 0)
curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
}
- $check_cert = get_config('system', 'verifyssl');
+ $check_cert = Config::get('system', 'verifyssl');
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
if ($check_cert) {
@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
}
- $proxy = get_config('system', 'proxy');
+ $proxy = Config::get('system', 'proxy');
if (strlen($proxy)) {
curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
curl_setopt($ch, CURLOPT_PROXY, $proxy);
- $proxyuser = get_config('system', 'proxyuser');
+ $proxyuser = Config::get('system', 'proxyuser');
if (strlen($proxyuser)) {
curl_setopt($ch, CURLOPT_PROXYUSERPWD, $proxyuser);
}
@@ -465,7 +465,7 @@ function http_status_exit($val, $description = array()) {
* @return boolean True if it's a valid URL, fals if something wrong with it
*/
function validate_url(&$url) {
- if (get_config('system','disable_url_validation'))
+ if (Config::get('system','disable_url_validation'))
return true;
// no naked subdomains (allow localhost for tests)
@@ -493,7 +493,7 @@ function validate_url(&$url) {
*/
function validate_email($addr) {
- if (get_config('system','disable_email_validation'))
+ if (Config::get('system','disable_email_validation'))
return true;
if (! strpos($addr,'@'))
@@ -598,7 +598,7 @@ function allowed_email($email) {
return false;
}
- $str_allowed = get_config('system','allowed_email');
+ $str_allowed = Config::get('system','allowed_email');
if (! $str_allowed) {
return true;
}
@@ -658,7 +658,7 @@ function parse_xml_string($s, $strict = true) {
function scale_external_images($srctext, $include_link = true, $scale_replace = false) {
// Suppress "view full size"
- if (intval(get_config('system','no_view_full_size'))) {
+ if (intval(Config::get('system','no_view_full_size'))) {
$include_link = false;
}
@@ -915,11 +915,11 @@ function original_url($url, $depth = 1, $fetchbody = false) {
function short_link($url) {
require_once('library/slinky.php');
$slinky = new Slinky($url);
- $yourls_url = get_config('yourls','url1');
+ $yourls_url = Config::get('yourls','url1');
if ($yourls_url) {
- $yourls_username = get_config('yourls','username1');
- $yourls_password = get_config('yourls', 'password1');
- $yourls_ssl = get_config('yourls', 'ssl1');
+ $yourls_username = Config::get('yourls','username1');
+ $yourls_password = Config::get('yourls', 'password1');
+ $yourls_ssl = Config::get('yourls', 'ssl1');
$yourls = new Slinky_YourLS();
$yourls->set('username', $yourls_username);
$yourls->set('password', $yourls_password);
diff --git a/include/notifier.php b/include/notifier.php
index 4c693f70e..84c959f80 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -3,6 +3,7 @@
use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\Worker;
+use Friendica\Network\Probe;
require_once 'include/queue_fn.php';
require_once 'include/html2plain.php';
@@ -426,7 +427,7 @@ function notifier_run(&$argv, &$argc){
if (dbm::is_result($r)) {
$probed_contact = $r[0];
} else {
- $probed_contact = probe_url($thr_parent[0]['author-link']);
+ $probed_contact = Probe::uri($thr_parent[0]['author-link']);
}
if ($probed_contact["notify"] != "") {
@@ -441,7 +442,7 @@ function notifier_run(&$argv, &$argc){
if (dbm::is_result($r)) {
$probed_contact = $r[0];
} else {
- $probed_contact = probe_url($thr_parent[0]['owner-link']);
+ $probed_contact = Probe::uri($thr_parent[0]['owner-link']);
}
if ($probed_contact["notify"] != "") {
@@ -455,7 +456,7 @@ function notifier_run(&$argv, &$argc){
//logger('Checking tag '.$x, LOGGER_DEBUG);
$matches = null;
if (preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
- $probed_contact = probe_url($matches[1]);
+ $probed_contact = Probe::uri($matches[1]);
if ($probed_contact["notify"] != "") {
logger('Notify mentioned user '.$probed_contact["url"].': '.$probed_contact["notify"]);
$url_recipients[$probed_contact["notify"]] = $probed_contact["notify"];
@@ -474,7 +475,7 @@ function notifier_run(&$argv, &$argc){
// If this is a public message and pubmail is set on the parent, include all your email contacts
- $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1);
+ $mail_disabled = ((function_exists('imap_open') && (!Config::get('system','imap_disabled'))) ? 0 : 1);
if (! $mail_disabled) {
if ((! strlen($target_item['allow_cid'])) && (! strlen($target_item['allow_gid']))
@@ -524,7 +525,7 @@ function notifier_run(&$argv, &$argc){
// They are especially used for notifications to OStatus users that don't follow us.
if ($slap && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
- if (!get_config('system','dfrn_only')) {
+ if (!Config::get('system','dfrn_only')) {
foreach ($url_recipients as $url) {
if ($url) {
logger('notifier: urldelivery: ' . $url);
diff --git a/include/oauth.php b/include/oauth.php
index ce22086d1..f89aedf6b 100644
--- a/include/oauth.php
+++ b/include/oauth.php
@@ -6,6 +6,8 @@
*/
use Friendica\App;
+use Friendica\Core\Config;
+use Friendica\Core\PConfig;
use Friendica\Core\System;
define('REQUEST_TOKEN_DURATION', 300);
@@ -92,7 +94,7 @@ class FKOAuthDataStore extends OAuthDataStore {
$ret=Null;
// get user for this verifier
- $uverifier = get_config("oauth", $verifier);
+ $uverifier = Config::get("oauth", $verifier);
logger(__function__.":".$verifier.",".$uverifier);
if (is_null($verifier) || ($uverifier!==false)){
@@ -114,11 +116,11 @@ class FKOAuthDataStore extends OAuthDataStore {
if (!is_null($ret) && $uverifier!==false){
- del_config("oauth", $verifier);
- /* $apps = get_pconfig($uverifier, "oauth", "apps");
+ Config::delete("oauth", $verifier);
+ /* $apps = PConfig::get($uverifier, "oauth", "apps");
if ($apps===false) $apps=array();
$apps[] = $consumer->key;
- set_pconfig($uverifier, "oauth", "apps", $apps);*/
+ PConfig::set($uverifier, "oauth", "apps", $apps);*/
}
return $ret;
@@ -148,7 +150,7 @@ class FKOAuth1 extends OAuthServer {
}
$_SESSION['uid'] = $record['uid'];
$_SESSION['theme'] = $record['theme'];
- $_SESSION['mobile-theme'] = get_pconfig($record['uid'], 'system', 'mobile_theme');
+ $_SESSION['mobile-theme'] = PConfig::get($record['uid'], 'system', 'mobile_theme');
$_SESSION['authenticated'] = 1;
$_SESSION['page_flags'] = $record['page-flags'];
$_SESSION['my_url'] = System::baseUrl() . '/profile/' . $record['nickname'];
diff --git a/include/ostatus.php b/include/ostatus.php
index 78916173e..74941f6ef 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -1513,7 +1513,7 @@ class ostatus {
$contact = owner;
if (!isset($contact["poll"])) {
- $data = probe_url($url);
+ $data = Probe::uri($url);
$contact["poll"] = $data["poll"];
if (!$contact["alias"])
diff --git a/include/pgettext.php b/include/pgettext.php
index da47b8b6c..2e902a6ab 100644
--- a/include/pgettext.php
+++ b/include/pgettext.php
@@ -3,7 +3,7 @@
/**
* @brief translation support
*
- * Get the language setting directly from system variables, bypassing get_config()
+ * Get the language setting directly from system variables, bypassing Config::get()
* as database may not yet be configured.
*
* If possible, we use the value from the browser.
diff --git a/include/plaintext.php b/include/plaintext.php
index 53015c961..8fa291744 100644
--- a/include/plaintext.php
+++ b/include/plaintext.php
@@ -6,6 +6,7 @@
use Friendica\App;
use Friendica\ParseUrl;
+use Friendica\Core\PConfig;
require_once("include/Photo.php");
require_once("include/bbcode.php");
@@ -449,7 +450,7 @@ function plaintext(App $a, $b, $limit = 0, $includedlinks = false, $htmlmode = 2
// Which purpose has this line? It is now uncommented, but left as a reminder
//} elseif (strpos($b["body"], "[share") !== false) {
// $post["url"] = $b["plink"];
- } elseif (get_pconfig($b["uid"], "system", "no_intelligent_shortening")) {
+ } elseif (PConfig::get($b["uid"], "system", "no_intelligent_shortening")) {
$post["url"] = $b["plink"];
}
$msg = shortenmsg($msg, $limit);
diff --git a/include/plugin.php b/include/plugin.php
index 4c07f6d3f..c4daa6c02 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -6,6 +6,7 @@
*/
use Friendica\App;
+use Friendica\Core\Config;
use Friendica\Core\System;
/**
@@ -72,7 +73,7 @@ function install_plugin($plugin) {
if (! function_exists('reload_plugins')) {
function reload_plugins() {
- $plugins = get_config('system','addon');
+ $plugins = Config::get('system','addon');
if (strlen($plugins)) {
$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
diff --git a/include/post_update.php b/include/post_update.php
index 8dcf07052..210ab79fe 100644
--- a/include/post_update.php
+++ b/include/post_update.php
@@ -3,6 +3,8 @@
* @file include/post_update.php
*/
+use Friendica\Core\Config;
+
/**
* @brief Calls the post update functions
*/
@@ -33,7 +35,7 @@ function post_update() {
function post_update_1192() {
// Was the script completed?
- if (get_config("system", "post_update_version") >= 1192)
+ if (Config::get("system", "post_update_version") >= 1192)
return true;
// Check if the first step is done (Setting "gcontact-id" in the item table)
@@ -46,7 +48,7 @@ function post_update_1192() {
(`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
if ($r && ($r[0]["total"] == 0)) {
- set_config("system", "post_update_version", 1192);
+ Config::set("system", "post_update_version", 1192);
return true;
}
@@ -85,23 +87,23 @@ function post_update_1192() {
function post_update_1194() {
// Was the script completed?
- if (get_config("system", "post_update_version") >= 1194)
+ if (Config::get("system", "post_update_version") >= 1194)
return true;
logger("Start", LOGGER_DEBUG);
- $end_id = get_config("system", "post_update_1194_end");
+ $end_id = Config::get("system", "post_update_1194_end");
if (!$end_id) {
$r = q("SELECT `id` FROM `item` WHERE `uid` != 0 ORDER BY `id` DESC LIMIT 1");
if ($r) {
- set_config("system", "post_update_1194_end", $r[0]["id"]);
- $end_id = get_config("system", "post_update_1194_end");
+ Config::set("system", "post_update_1194_end", $r[0]["id"]);
+ $end_id = Config::get("system", "post_update_1194_end");
}
}
logger("End ID: ".$end_id, LOGGER_DEBUG);
- $start_id = get_config("system", "post_update_1194_start");
+ $start_id = Config::get("system", "post_update_1194_start");
$query1 = "SELECT `item`.`id` FROM `item` ";
@@ -119,12 +121,12 @@ function post_update_1194() {
intval($start_id), intval($end_id),
dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
if (!$r) {
- set_config("system", "post_update_version", 1194);
+ Config::set("system", "post_update_version", 1194);
logger("Update is done", LOGGER_DEBUG);
return true;
} else {
- set_config("system", "post_update_1194_start", $r[0]["id"]);
- $start_id = get_config("system", "post_update_1194_start");
+ Config::set("system", "post_update_1194_start", $r[0]["id"]);
+ $start_id = Config::get("system", "post_update_1194_start");
}
logger("Start ID: ".$start_id, LOGGER_DEBUG);
@@ -157,7 +159,7 @@ function post_update_1194() {
function post_update_1198() {
// Was the script completed?
- if (get_config("system", "post_update_version") >= 1198)
+ if (Config::get("system", "post_update_version") >= 1198)
return true;
logger("Start", LOGGER_DEBUG);
@@ -172,7 +174,7 @@ function post_update_1198() {
(`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
if ($r && ($r[0]["total"] == 0)) {
- set_config("system", "post_update_version", 1198);
+ Config::set("system", "post_update_version", 1198);
logger("Done", LOGGER_DEBUG);
return true;
}
@@ -186,7 +188,7 @@ function post_update_1198() {
logger("Updated threads", LOGGER_DEBUG);
if (dbm::is_result($r)) {
- set_config("system", "post_update_version", 1198);
+ Config::set("system", "post_update_version", 1198);
logger("Done", LOGGER_DEBUG);
return true;
}
@@ -234,7 +236,7 @@ function post_update_1198() {
*/
function post_update_1206() {
// Was the script completed?
- if (get_config("system", "post_update_version") >= 1206)
+ if (Config::get("system", "post_update_version") >= 1206)
return true;
logger("Start", LOGGER_DEBUG);
@@ -254,7 +256,7 @@ function post_update_1206() {
}
}
- set_config("system", "post_update_version", 1206);
+ Config::set("system", "post_update_version", 1206);
logger("Done", LOGGER_DEBUG);
return true;
}
diff --git a/include/queue_fn.php b/include/queue_fn.php
index 884066811..475ac1eb0 100644
--- a/include/queue_fn.php
+++ b/include/queue_fn.php
@@ -1,5 +1,7 @@
1) {
+ if (Config::get('system','poco_discovery') > 1) {
- $timeframe = get_config('system','poco_discovery_since');
+ $timeframe = Config::get('system','poco_discovery_since');
if ($timeframe == 0) {
$timeframe = 30;
}
@@ -1803,7 +1803,7 @@ function poco_discover_single_server($id) {
$success = poco_discover_server(json_decode($retdata["body"]));
}
- if (!$success && (get_config('system','poco_discovery') > 2)) {
+ if (!$success && (Config::get('system','poco_discovery') > 2)) {
logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG);
poco_discover_server_users($data, $server);
}
@@ -1830,7 +1830,7 @@ function poco_discover($complete = false) {
$no_of_queries = 5;
- $requery_days = intval(get_config("system", "poco_requery_days"));
+ $requery_days = intval(Config::get("system", "poco_requery_days"));
if ($requery_days == 0) {
$requery_days = 7;
@@ -2036,7 +2036,7 @@ function clean_contact_url($url) {
*/
function fix_alternate_contact_address(&$contact) {
if (($contact["network"] == NETWORK_OSTATUS) && poco_alternate_ostatus_url($contact["url"])) {
- $data = probe_url($contact["url"]);
+ $data = Probe::uri($contact["url"]);
if ($contact["network"] == NETWORK_OSTATUS) {
logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
$contact["url"] = $data["url"];
@@ -2294,7 +2294,7 @@ function update_gcontact($contact) {
* @param str $url profile link
*/
function update_gcontact_from_probe($url) {
- $data = probe_url($url);
+ $data = Probe::uri($url);
if (in_array($data["network"], array(NETWORK_PHANTOM))) {
logger("Invalid network for contact url ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
@@ -2410,7 +2410,7 @@ function gs_fetch_users($server) {
*/
function gs_discover() {
- $requery_days = intval(get_config("system", "poco_requery_days"));
+ $requery_days = intval(Config::get("system", "poco_requery_days"));
$last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
diff --git a/include/text.php b/include/text.php
index 8f0ff6e73..90d569c62 100644
--- a/include/text.php
+++ b/include/text.php
@@ -1,6 +1,8 @@
profile['uid'],'system','display_friend_count');
+ $shown = PConfig::get($a->profile['uid'],'system','display_friend_count');
if ($shown === false) {
$shown = 24;
}
@@ -1096,7 +1098,7 @@ function search($s, $id = 'search-box', $url = 'search', $save = false, $aside =
t("Tags"),
t("Contacts"));
- if (get_config('system','poco_local_search')) {
+ if (Config::get('system','poco_local_search')) {
$values['$searchoption'][] = t("Forums");
}
}
@@ -1114,7 +1116,7 @@ if (! function_exists('valid_email')) {
function valid_email($x){
/// @TODO Removed because Fabio told me so.
- //if (get_config('system','disable_email_validation'))
+ //if (Config::get('system','disable_email_validation'))
// return true;
return preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/', $x);
}}
@@ -1282,7 +1284,7 @@ function redir_private_images($a, &$item)
function put_item_in_cache(&$item, $update = false) {
if (($item["rendered-hash"] != hash("md5", $item["body"])) || ($item["rendered-hash"] == "") ||
- ($item["rendered-html"] == "") || get_config("system", "ignore_cache")) {
+ ($item["rendered-html"] == "") || Config::get("system", "ignore_cache")) {
// The function "redir_private_images" changes the body.
// I'm not sure if we should store it permanently, so we save the old value.
@@ -1331,7 +1333,7 @@ function prepare_body(&$item, $attach = false, $preview = false) {
return $ev;
}
- if (!get_config('system','suppress_tags')) {
+ if (!Config::get('system','suppress_tags')) {
$taglist = dba::p("SELECT `type`, `term`, `url` FROM `term` WHERE `otype` = ? AND `oid` = ? AND `type` IN (?, ?) ORDER BY `tid`",
intval(TERM_OBJ_POST), intval($item['id']), intval(TERM_HASHTAG), intval(TERM_MENTION));
@@ -1979,7 +1981,7 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
if ($file_old == $file_new)
return true;
- $saved = get_pconfig($uid,'system','filetags');
+ $saved = PConfig::get($uid,'system','filetags');
if (strlen($saved)) {
if ($type == 'file') {
$lbracket = '[';
@@ -2030,13 +2032,13 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
}
if ($saved != $filetags_updated) {
- set_pconfig($uid, 'system', 'filetags', $filetags_updated);
+ PConfig::set($uid, 'system', 'filetags', $filetags_updated);
}
return true;
}
else
if (strlen($file_new)) {
- set_pconfig($uid, 'system', 'filetags', $file_new);
+ PConfig::set($uid, 'system', 'filetags', $file_new);
}
return true;
}
@@ -2062,9 +2064,9 @@ function file_tag_save_file($uid, $item, $file) {
create_files_from_item($item);
- $saved = get_pconfig($uid,'system','filetags');
+ $saved = PConfig::get($uid,'system','filetags');
if ((! strlen($saved)) || (! stristr($saved, '[' . file_tag_encode($file) . ']'))) {
- set_pconfig($uid, 'system', 'filetags', $saved . '[' . file_tag_encode($file) . ']');
+ PConfig::set($uid, 'system', 'filetags', $saved . '[' . file_tag_encode($file) . ']');
}
info( t('Item filed') );
}
@@ -2110,8 +2112,8 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false) {
intval($uid));
if (! dbm::is_result($r)) {
- $saved = get_pconfig($uid,'system','filetags');
- set_pconfig($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
+ $saved = PConfig::get($uid,'system','filetags');
+ PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
}
return true;
diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index 97c825352..654cb1fba 100644
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -1,6 +1,7 @@
false, 'user' => null, 'password' => '', 'message' => '');
- $using_invites = get_config('system','invitation_only');
- $num_invites = get_config('system','number_invites');
+ $using_invites = Config::get('system','invitation_only');
+ $num_invites = Config::get('system','number_invites');
$invite_id = ((x($arr,'invite_id')) ? notags(trim($arr['invite_id'])) : '');
@@ -35,7 +36,7 @@ function create_user($arr) {
$verified = ((x($arr,'verified')) ? intval($arr['verified']) : 0);
$publish = ((x($arr,'profile_publish_reg') && intval($arr['profile_publish_reg'])) ? 1 : 0);
- $netpublish = ((strlen(get_config('system','directory'))) ? $publish : 0);
+ $netpublish = ((strlen(Config::get('system','directory'))) ? $publish : 0);
if ($password1 != $confirm) {
$result['message'] .= t('Passwords do not match. Password unchanged.') . EOL;
@@ -101,7 +102,7 @@ function create_user($arr) {
// So now we are just looking for a space in the full name.
- $loose_reg = get_config('system','no_regfullname');
+ $loose_reg = Config::get('system','no_regfullname');
if(! $loose_reg) {
$username = mb_convert_case($username,MB_CASE_TITLE,'UTF-8');
if(! strpos($username,' '))
@@ -268,7 +269,7 @@ function create_user($arr) {
);
}
- if(get_config('system', 'newuser_private') && $def_gid) {
+ if(Config::get('system', 'newuser_private') && $def_gid) {
q("UPDATE `user` SET `allow_gid` = '%s' WHERE `uid` = %d",
dbesc("<" . $def_gid . ">"),
intval($newuid)
diff --git a/index.php b/index.php
index fe871ba96..93b170ea8 100644
--- a/index.php
+++ b/index.php
@@ -51,6 +51,8 @@ if (!$install) {
*
*/
+use Friendica\Core\Config;
+
require_once "include/dba.php";
if (!$install) {
@@ -70,8 +72,8 @@ if (!$install) {
die("System is currently unavailable. Please try again later");
}
- if (get_config('system', 'force_ssl') && ($a->get_scheme() == "http") &&
- (intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) &&
+ if (Config::get('system', 'force_ssl') && ($a->get_scheme() == "http") &&
+ (intval(Config::get('system', 'ssl_policy')) == SSL_POLICY_FULL) &&
(substr(System::baseUrl(), 0, 8) == "https://")) {
header("HTTP/1.1 302 Moved Temporarily");
header("Location: " . System::baseUrl() . "/" . $a->query_string);
@@ -82,7 +84,7 @@ if (!$install) {
load_hooks();
call_hooks('init_1');
- $maintenance = get_config('system', 'maintenance');
+ $maintenance = Config::get('system', 'maintenance');
}
$lang = get_browser_language();
@@ -204,7 +206,7 @@ if ($install && $a->module!="view") {
nav_set_selected('nothing');
//Don't populate apps_menu if apps are private
-$privateapps = get_config('config','private_addons');
+$privateapps = Config::get('config','private_addons');
if ((local_user()) || (! $privateapps === "1")) {
$arr = array('app_menu' => $a->apps);
@@ -251,7 +253,7 @@ if (strlen($a->module)) {
$a->module = "login";
}
- $privateapps = get_config('config','private_addons');
+ $privateapps = Config::get('config','private_addons');
if (is_array($a->plugins) && in_array($a->module,$a->plugins) && file_exists("addon/{$a->module}/{$a->module}.php")) {
//Check if module is an app and if public access to apps is allowed or not
diff --git a/mod/acctlink.php b/mod/acctlink.php
index 5e98ed32b..54e46e532 100644
--- a/mod/acctlink.php
+++ b/mod/acctlink.php
@@ -1,14 +1,13 @@
notags(trim($_POST['newentry_domain'])),
'reason' => notags(trim($_POST['newentry_reason']))
@@ -551,7 +551,7 @@ function admin_page_federation(App $a) {
'$page' => t('Federation Statistics'),
'$intro' => $intro,
'$hint' => $hint,
- '$autoactive' => get_config('system', 'poco_completion'),
+ '$autoactive' => Config::get('system', 'poco_completion'),
'$counts' => $counts,
'$version' => FRIENDICA_VERSION,
'$legendtext' => sprintf(t('Currently this node is aware of %d nodes from the following platforms:'), $total),
@@ -688,7 +688,7 @@ function admin_page_summary(App $a) {
'$baseurl' => System::baseUrl(),
'$platform' => FRIENDICA_PLATFORM,
'$codename' => FRIENDICA_CODENAME,
- '$build' => get_config('system','build'),
+ '$build' => Config::get('system','build'),
'$plugins' => array(t('Active plugins'), $a->plugins),
'$showwarning' => $showwarning,
'$warningtext' => $warningtext
@@ -771,7 +771,7 @@ function admin_page_site_post(App $a) {
// update config
$a->set_baseurl($new_url);
- set_config('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");
@@ -875,7 +875,7 @@ function admin_page_site_post(App $a) {
if (!$thread_allow) {
$ostatus_disabled = true;
}
- if ($ssl_policy != intval(get_config('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:'),
@@ -914,24 +914,24 @@ function admin_page_site_post(App $a) {
);
}
}
- set_config('system','ssl_policy',$ssl_policy);
- set_config('system','maxloadavg',$maxloadavg);
- set_config('system','maxloadavg_frontend',$maxloadavg_frontend);
- set_config('system','min_memory',$min_memory);
- set_config('system','optimize_max_tablesize',$optimize_max_tablesize);
- set_config('system','optimize_fragmentation',$optimize_fragmentation);
- set_config('system','poco_completion',$poco_completion);
- set_config('system','poco_requery_days',$poco_requery_days);
- set_config('system','poco_discovery',$poco_discovery);
- set_config('system','poco_discovery_since',$poco_discovery_since);
- set_config('system','poco_local_search',$poco_local_search);
- set_config('system','nodeinfo',$nodeinfo);
- set_config('config','sitename',$sitename);
- set_config('config','hostname',$hostname);
- set_config('config','sender_email', $sender_email);
- set_config('system','suppress_tags',$suppress_tags);
- set_config('system','shortcut_icon',$shortcut_icon);
- set_config('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...
@@ -940,91 +940,91 @@ function admin_page_site_post(App $a) {
dbesc("banner")
);
} else {
- set_config('system','banner', $banner);
+ Config::set('system','banner', $banner);
}
if ($info == "") {
- del_config('config','info');
+ Config::delete('config','info');
} else {
- set_config('config','info',$info);
+ Config::set('config','info',$info);
}
- set_config('system','language', $language);
- set_config('system','theme', $theme);
+ Config::set('system','language', $language);
+ Config::set('system','theme', $theme);
if ($theme_mobile == '---') {
- del_config('system','mobile-theme');
+ Config::delete('system','mobile-theme');
} else {
- set_config('system','mobile-theme', $theme_mobile);
+ Config::set('system','mobile-theme', $theme_mobile);
}
if ($singleuser == '---') {
- del_config('system','singleuser');
+ Config::delete('system','singleuser');
} else {
- set_config('system','singleuser', $singleuser);
+ Config::set('system','singleuser', $singleuser);
}
- set_config('system', 'maximagesize', $maximagesize);
- set_config('system', 'max_image_length', $maximagelength);
- set_config('system', 'jpeg_quality', $jpegimagequality);
+ Config::set('system', 'maximagesize', $maximagesize);
+ Config::set('system', 'max_image_length', $maximagelength);
+ Config::set('system', 'jpeg_quality', $jpegimagequality);
- set_config('config', 'register_policy', $register_policy);
- set_config('system', 'max_daily_registrations', $daily_registrations);
- set_config('system', 'account_abandon_days', $abandon_days);
- set_config('config', 'register_text', $register_text);
- set_config('system', 'allowed_sites', $allowed_sites);
- set_config('system', 'allowed_email', $allowed_email);
- set_config('system', 'block_public', $block_public);
- set_config('system', 'publish_all', $force_publish);
- set_config('system', 'thread_allow', $thread_allow);
- set_config('system', 'newuser_private', $newuser_private);
- set_config('system', 'enotify_no_content', $enotify_no_content);
- set_config('system', 'disable_embedded', $disable_embedded);
- set_config('system', 'allow_users_remote_self', $allow_users_remote_self);
- set_config('system', 'check_new_version_url', $check_new_version_url);
+ Config::set('config', 'register_policy', $register_policy);
+ Config::set('system', 'max_daily_registrations', $daily_registrations);
+ Config::set('system', 'account_abandon_days', $abandon_days);
+ Config::set('config', 'register_text', $register_text);
+ Config::set('system', 'allowed_sites', $allowed_sites);
+ 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', 'allow_users_remote_self', $allow_users_remote_self);
+ Config::set('system', 'check_new_version_url', $check_new_version_url);
- set_config('system', 'block_extended_register', $no_multi_reg);
- set_config('system', 'no_openid', $no_openid);
- set_config('system', 'no_regfullname', $no_regfullname);
- set_config('system', 'community_page_style', $community_page_style);
- set_config('system', 'max_author_posts_community_page', $max_author_posts_community_page);
- set_config('system', 'verifyssl', $verifyssl);
- set_config('system', 'proxyuser', $proxyuser);
- set_config('system', 'proxy', $proxy);
- set_config('system', 'curl_timeout', $timeout);
- set_config('system', 'dfrn_only', $dfrn_only);
- set_config('system', 'ostatus_disabled', $ostatus_disabled);
- set_config('system', 'ostatus_full_threads', $ostatus_full_threads);
- set_config('system', 'diaspora_enabled', $diaspora_enabled);
+ Config::set('system', 'block_extended_register', $no_multi_reg);
+ Config::set('system', 'no_openid', $no_openid);
+ Config::set('system', 'no_regfullname', $no_regfullname);
+ Config::set('system', 'community_page_style', $community_page_style);
+ Config::set('system', 'max_author_posts_community_page', $max_author_posts_community_page);
+ Config::set('system', 'verifyssl', $verifyssl);
+ Config::set('system', 'proxyuser', $proxyuser);
+ Config::set('system', 'proxy', $proxy);
+ Config::set('system', 'curl_timeout', $timeout);
+ Config::set('system', 'dfrn_only', $dfrn_only);
+ Config::set('system', 'ostatus_disabled', $ostatus_disabled);
+ Config::set('system', 'ostatus_full_threads', $ostatus_full_threads);
+ Config::set('system', 'diaspora_enabled', $diaspora_enabled);
- set_config('config', 'private_addons', $private_addons);
+ Config::set('config', 'private_addons', $private_addons);
- set_config('system', 'force_ssl', $force_ssl);
- set_config('system', 'hide_help', $hide_help);
+ Config::set('system', 'force_ssl', $force_ssl);
+ Config::set('system', 'hide_help', $hide_help);
if ($itemcache != '') {
$itemcache = App::realpath($itemcache);
}
- set_config('system', 'itemcache', $itemcache);
- set_config('system', 'itemcache_duration', $itemcache_duration);
- set_config('system', 'max_comments', $max_comments);
+ Config::set('system', 'itemcache', $itemcache);
+ Config::set('system', 'itemcache_duration', $itemcache_duration);
+ Config::set('system', 'max_comments', $max_comments);
if ($temppath != '') {
$temppath = App::realpath($temppath);
}
- set_config('system', 'temppath', $temppath);
+ Config::set('system', 'temppath', $temppath);
if ($basepath != '') {
$basepath = App::realpath($basepath);
}
- set_config('system', 'basepath', $basepath);
- set_config('system', 'proxy_disabled', $proxy_disabled);
- set_config('system', 'only_tag_search', $only_tag_search);
- set_config('system', 'worker_queues', $worker_queues);
- set_config('system', 'worker_dont_fork', $worker_dont_fork);
- set_config('system', 'worker_fastlane', $worker_fastlane);
- set_config('system', 'frontend_worker', $worker_frontend);
- set_config('system', 'rino_encrypt', $rino);
+ Config::set('system', 'basepath', $basepath);
+ Config::set('system', 'proxy_disabled', $proxy_disabled);
+ Config::set('system', 'only_tag_search', $only_tag_search);
+ Config::set('system', 'worker_queues', $worker_queues);
+ Config::set('system', 'worker_dont_fork', $worker_dont_fork);
+ Config::set('system', 'worker_fastlane', $worker_fastlane);
+ Config::set('system', 'frontend_worker', $worker_frontend);
+ Config::set('system', 'rino_encrypt', $rino);
info(t('Site settings updated.').EOL);
goaway('admin/site');
@@ -1045,10 +1045,10 @@ function admin_page_site(App $a) {
/* Installed langs */
$lang_choices = get_available_languages();
- if (strlen(get_config('system','directory_submit_url')) &&
- !strlen(get_config('system','directory'))) {
- set_config('system','directory', dirname(get_config('system','directory_submit_url')));
- del_config('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 */
@@ -1121,12 +1121,12 @@ function admin_page_site(App $a) {
}
/* Banner */
- $banner = get_config('system','banner');
+ $banner = Config::get('system','banner');
if ($banner == false) {
$banner = 'Friendica';
}
$banner = htmlspecialchars($banner);
- $info = get_config('config','info');
+ $info = Config::get('config','info');
$info = htmlspecialchars($info);
// Automatically create temporary paths
@@ -1189,83 +1189,83 @@ function admin_page_site(App $a) {
'$hostname' => array('hostname', t("Host name"), $a->config['hostname'], ""),
'$sender_email' => array('sender_email', t("Sender Email"), $a->config['sender_email'], t("The email address your server shall use to send notification emails from."), "", "", "email"),
'$banner' => array('banner', t("Banner/Logo"), $banner, ""),
- '$shortcut_icon' => array('shortcut_icon', t("Shortcut icon"), get_config('system','shortcut_icon'), t("Link to an icon that will be used for browsers.")),
- '$touch_icon' => array('touch_icon', t("Touch icon"), get_config('system','touch_icon'), t("Link to an icon that will be used for tablets and mobiles.")),
+ '$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())),
- '$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices),
- '$theme' => array('theme', t("System theme"), get_config('system','theme'), t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices),
+ '$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 - change theme settings"), $theme_choices),
'$theme_mobile' => array('theme_mobile', t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), t("Theme for mobile devices"), $theme_choices_mobile),
- '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(get_config('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
- '$force_ssl' => array('force_ssl', t("Force SSL"), get_config('system','force_ssl'), t("Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.")),
- '$hide_help' => array('hide_help', t("Hide help entry from navigation menu"), get_config('system','hide_help'), t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")),
+ '$ssl_policy' => array('ssl_policy', t("SSL link policy"), (string) intval(Config::get('system','ssl_policy')), t("Determines whether generated links should be forced to use SSL"), $ssl_choices),
+ '$force_ssl' => array('force_ssl', t("Force SSL"), Config::get('system','force_ssl'), t("Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.")),
+ '$hide_help' => array('hide_help', t("Hide help entry from navigation menu"), Config::get('system','hide_help'), t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")),
'$singleuser' => array('singleuser', t("Single user instance"), Config::get('system', 'singleuser', '---'), t("Make this instance multi-user or single-user for the named user"), $user_names),
- '$maximagesize' => array('maximagesize', t("Maximum image size"), get_config('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
- '$maximagelength' => array('maximagelength', t("Maximum image length"), get_config('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")),
- '$jpegimagequality' => array('jpegimagequality', t("JPEG image quality"), get_config('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")),
+ '$maximagesize' => array('maximagesize', t("Maximum image size"), Config::get('system','maximagesize'), t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")),
+ '$maximagelength' => array('maximagelength', t("Maximum image length"), Config::get('system','max_image_length'), t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")),
+ '$jpegimagequality' => array('jpegimagequality', t("JPEG image quality"), Config::get('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")),
'$register_policy' => array('register_policy', t("Register policy"), $a->config['register_policy'], "", $register_choices),
- '$daily_registrations' => array('max_daily_registrations', t("Maximum Daily Registrations"), get_config('system', 'max_daily_registrations'), t("If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect.")),
+ '$daily_registrations' => array('max_daily_registrations', t("Maximum Daily Registrations"), Config::get('system', 'max_daily_registrations'), t("If registration is permitted above, this sets the maximum number of new user registrations to accept per day. If register is set to closed, this setting has no effect.")),
'$register_text' => array('register_text', t("Register text"), $a->config['register_text'], t("Will be displayed prominently on the registration page.")),
- '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), get_config('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
- '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), get_config('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),
- '$allowed_email' => array('allowed_email', t("Allowed email domains"), get_config('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
- '$block_public' => array('block_public', t("Block public"), get_config('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"), get_config('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"), get_config('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"), get_config('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"), get_config('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"), get_config('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."), get_config('config','private_addons'), t("Checking this box will restrict addons listed in the apps menu to members only.")),
- '$disable_embedded' => array('disable_embedded', t("Don't embed private images in posts"), get_config('system','disable_embedded'), t("Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.")),
- '$allow_users_remote_self' => array('allow_users_remote_self', t('Allow Users to set remote_self'), get_config('system','allow_users_remote_self'), t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')),
- '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
- '$no_openid' => array('no_openid', t("OpenID support"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")),
- '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
- '$community_page_style' => array('community_page_style', t("Community Page Style"), get_config('system','community_page_style'), t("Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."), $community_page_style_choices),
- '$max_author_posts_community_page' => array('max_author_posts_community_page', t("Posts per user on community page"), get_config('system','max_author_posts_community_page'), t("The maximum number of posts per user on the community page. (Not valid for 'Global Community')")),
- '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),
- '$ostatus_full_threads' => array('ostatus_full_threads', t("Only import OStatus threads from our contacts"), get_config('system','ostatus_full_threads'), t("Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system.")),
+ '$abandon_days' => array('abandon_days', t('Accounts abandoned after x days'), Config::get('system','account_abandon_days'), t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')),
+ '$allowed_sites' => array('allowed_sites', t("Allowed friend domains"), Config::get('system','allowed_sites'), t("Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains")),
+ '$allowed_email' => array('allowed_email', t("Allowed email domains"), Config::get('system','allowed_email'), t("Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains")),
+ '$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.")),
+ '$disable_embedded' => array('disable_embedded', t("Don't embed private images in posts"), Config::get('system','disable_embedded'), t("Don't replace locally-hosted private photos in posts with an embedded copy of the image. This means that contacts who receive posts containing private photos will have to authenticate and load each image, which may take a while.")),
+ '$allow_users_remote_self' => array('allow_users_remote_self', t('Allow Users to set remote_self'), Config::get('system','allow_users_remote_self'), t('With checking this, every user is allowed to mark every contact as a remote_self in the repair contact dialog. Setting this flag on a contact causes mirroring every posting of that contact in the users stream.')),
+ '$no_multi_reg' => array('no_multi_reg', t("Block multiple registrations"), Config::get('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")),
+ '$no_openid' => array('no_openid', t("OpenID support"), !Config::get('system','no_openid'), t("OpenID support for registration and logins.")),
+ '$no_regfullname' => array('no_regfullname', t("Fullname check"), !Config::get('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")),
+ '$community_page_style' => array('community_page_style', t("Community Page Style"), Config::get('system','community_page_style'), t("Type of community page to show. 'Global community' shows every public posting from an open distributed network that arrived on this server."), $community_page_style_choices),
+ '$max_author_posts_community_page' => array('max_author_posts_community_page', t("Posts per user on community page"), Config::get('system','max_author_posts_community_page'), t("The maximum number of posts per user on the community page. (Not valid for 'Global Community')")),
+ '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !Config::get('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")),
+ '$ostatus_full_threads' => array('ostatus_full_threads', t("Only import OStatus threads from our contacts"), Config::get('system','ostatus_full_threads'), t("Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system.")),
'$ostatus_not_able' => t("OStatus support can only be enabled if threading is enabled."),
'$diaspora_able' => $diaspora_able,
'$diaspora_not_able' => t("Diaspora support can't be enabled because Friendica was installed into a sub directory."),
- '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")),
- '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")),
- '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")),
- '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""),
- '$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""),
- '$timeout' => array('timeout', t("Network timeout"), (x(get_config('system','curl_timeout'))?get_config('system','curl_timeout'):60), t("Value is in seconds. Set to 0 for unlimited (not recommended).")),
- '$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('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(get_config('system','maxloadavg_frontend')) > 0)?get_config('system','maxloadavg_frontend'):50), t("Maximum system load before the frontend quits service - default 50.")),
- '$min_memory' => array('min_memory', t("Minimal Memory"), ((intval(get_config('system','min_memory')) > 0)?get_config('system','min_memory'):0), t("Minimal free memory in MB for the poller. Needs access to /proc/meminfo - default 0 (deactivated).")),
+ '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), Config::get('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")),
+ '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), Config::get('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")),
+ '$verifyssl' => array('verifyssl', t("Verify SSL"), Config::get('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")),
+ '$proxyuser' => array('proxyuser', t("Proxy user"), Config::get('system','proxyuser'), ""),
+ '$proxy' => array('proxy', t("Proxy URL"), Config::get('system','proxy'), ""),
+ '$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).")),
'$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(get_config('system','optimize_fragmentation')) > 0)?get_config('system','optimize_fragmentation'):30), t("Minimum fragmenation level to start the automatic optimization - default value is 30%.")),
+ '$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%.")),
- '$poco_completion' => array('poco_completion', t("Periodical check of global contacts"), get_config('system','poco_completion'), t("If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers.")),
- '$poco_requery_days' => array('poco_requery_days', t("Days between requery"), get_config('system','poco_requery_days'), t("Number of days after which a server is requeried for his contacts.")),
- '$poco_discovery' => array('poco_discovery', t("Discover contacts from other servers"), (string) intval(get_config('system','poco_discovery')), t("Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."), $poco_discovery_choices),
- '$poco_discovery_since' => array('poco_discovery_since', t("Timeframe for fetching global contacts"), (string) intval(get_config('system','poco_discovery_since')), t("When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."), $poco_discovery_since_choices),
- '$poco_local_search' => array('poco_local_search', t("Search the local directory"), get_config('system','poco_local_search'), t("Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated.")),
+ '$poco_completion' => array('poco_completion', t("Periodical check of global contacts"), Config::get('system','poco_completion'), t("If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers.")),
+ '$poco_requery_days' => array('poco_requery_days', t("Days between requery"), Config::get('system','poco_requery_days'), t("Number of days after which a server is requeried for his contacts.")),
+ '$poco_discovery' => array('poco_discovery', t("Discover contacts from other servers"), (string) intval(Config::get('system','poco_discovery')), t("Periodically query other servers for contacts. You can choose between 'users': the users on the remote system, 'Global Contacts': active contacts that are known on the system. The fallback is meant for Redmatrix servers and older friendica servers, where global contacts weren't available. The fallback increases the server load, so the recommened setting is 'Users, Global Contacts'."), $poco_discovery_choices),
+ '$poco_discovery_since' => array('poco_discovery_since', t("Timeframe for fetching global contacts"), (string) intval(Config::get('system','poco_discovery_since')), t("When the discovery is activated, this value defines the timeframe for the activity of the global contacts that are fetched from other servers."), $poco_discovery_since_choices),
+ '$poco_local_search' => array('poco_local_search', t("Search the local directory"), Config::get('system','poco_local_search'), t("Search the local directory instead of the global directory. When searching locally, every search will be executed on the global directory in the background. This improves the search results when the search is repeated.")),
- '$nodeinfo' => array('nodeinfo', t("Publish server information"), get_config('system','nodeinfo'), t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details.")),
+ '$nodeinfo' => array('nodeinfo', t("Publish server information"), Config::get('system','nodeinfo'), t("If enabled, general server and usage data will be published. The data contains the name and version of the server, number of users with public profiles, number of posts and the activated protocols and connectors. See the-federation.info for details.")),
- '$check_new_version_url' => array('check_new_version_url', t("Check upstream version"), get_config('system', 'check_new_version_url'), t("Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."), $check_git_version_choices),
- '$suppress_tags' => array('suppress_tags', t("Suppress Tags"), get_config('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")),
- '$itemcache' => array('itemcache', t("Path to item cache"), get_config('system','itemcache'), t("The item caches buffers generated bbcode and external images.")),
- '$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")),
- '$max_comments' => array('max_comments', t("Maximum numbers of comments per post"), get_config('system','max_comments'), t("How much comments should be shown for each post? Default value is 100.")),
- '$temppath' => array('temppath', t("Temp path"), get_config('system','temppath'), t("If you have a restricted system where the webserver can't access the system temp path, enter another path here.")),
- '$basepath' => array('basepath', t("Base path to installation"), get_config('system','basepath'), t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.")),
- '$proxy_disabled' => array('proxy_disabled', t("Disable picture proxy"), get_config('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")),
- '$only_tag_search' => array('only_tag_search', t("Only search in tags"), get_config('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")),
+ '$check_new_version_url' => array('check_new_version_url', t("Check upstream version"), Config::get('system', 'check_new_version_url'), t("Enables checking for new Friendica versions at github. If there is a new version, you will be informed in the admin panel overview."), $check_git_version_choices),
+ '$suppress_tags' => array('suppress_tags', t("Suppress Tags"), Config::get('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")),
+ '$itemcache' => array('itemcache', t("Path to item cache"), Config::get('system','itemcache'), t("The item caches buffers generated bbcode and external images.")),
+ '$itemcache_duration' => array('itemcache_duration', t("Cache duration in seconds"), Config::get('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day). To disable the item cache, set the value to -1.")),
+ '$max_comments' => array('max_comments', t("Maximum numbers of comments per post"), Config::get('system','max_comments'), t("How much comments should be shown for each post? Default value is 100.")),
+ '$temppath' => array('temppath', t("Temp path"), Config::get('system','temppath'), t("If you have a restricted system where the webserver can't access the system temp path, enter another path here.")),
+ '$basepath' => array('basepath', t("Base path to installation"), Config::get('system','basepath'), t("If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot.")),
+ '$proxy_disabled' => array('proxy_disabled', t("Disable picture proxy"), Config::get('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")),
+ '$only_tag_search' => array('only_tag_search', t("Only search in tags"), Config::get('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")),
'$relocate_url' => array('relocate_url', t("New base url"), System::baseUrl(), t("Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.")),
- '$rino' => array('rino', t("RINO Encryption"), intval(get_config('system','rino_encrypt')), t("Encryption layer between nodes."), array("Disabled", "RINO1 (deprecated)", "RINO2")),
+ '$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"), get_config('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"), get_config('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_fastlane' => array('worker_fastlane', t("Enable fastlane"), get_config('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'), get_config('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())),
+ '$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_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")
@@ -1290,10 +1290,10 @@ function admin_page_dbsync(App $a) {
$o = '';
if ($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') {
- set_config('database', 'update_'.intval($a->argv[3]), 'success');
- $curr = get_config('system','build');
+ Config::set('database', 'update_'.intval($a->argv[3]), 'success');
+ $curr = Config::get('system','build');
if (intval($curr) == intval($a->argv[3])) {
- set_config('system','build',intval($curr) + 1);
+ Config::set('system','build',intval($curr) + 1);
}
info(t('Update has been marked successful').EOL);
goaway('admin/dbsync');
@@ -1304,7 +1304,7 @@ function admin_page_dbsync(App $a) {
$retval = update_structure(false, true);
if (!$retval) {
$o .= sprintf(t("Database structure update %s was successfully applied."), DB_UPDATE_VERSION).""; - set_config('database', 'dbupdate_'.DB_UPDATE_VERSION, 'success'); + 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)."
"; @@ -1324,13 +1324,13 @@ function admin_page_dbsync(App $a) { } elseif ($retval === UPDATE_SUCCESS) { $o .= sprintf(t('Update %s was successfully applied.', $func)); - set_config('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)."
"; - set_config('database',$func, 'success'); + Config::set('database',$func, 'success'); } return $o; } @@ -1378,7 +1378,7 @@ function admin_page_users_post(App $a) { $nu_name = (x($_POST, 'new_user_name') ? $_POST['new_user_name'] : ''); $nu_nickname = (x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); $nu_email = (x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); - $nu_language = get_config('system', 'language'); + $nu_language = Config::get('system', 'language'); check_form_security_token_redirectOnErr('/admin/users', 'admin_users'); @@ -1702,7 +1702,7 @@ function admin_page_plugins(App $a) { install_plugin($plugin); info(sprintf(t("Plugin %s enabled."), $plugin)); } - set_config("system","addon", implode(", ",$a->plugins)); + Config::set("system","addon", implode(", ",$a->plugins)); goaway('admin/plugins'); return ''; // NOTREACHED } @@ -1784,7 +1784,7 @@ function admin_page_plugins(App $a) { } // Override the above szenario, when the admin really wants to see outdated stuff - if (get_config("system", "show_unsupported_addons")) { + if (Config::get("system", "show_unsupported_addons")) { $show_plugin = true; } @@ -1888,7 +1888,7 @@ function rebuild_theme_table($themes) { */ function admin_page_themes(App $a) { - $allowed_themes_str = get_config('system','allowed_themes'); + $allowed_themes_str = Config::get('system','allowed_themes'); $allowed_themes_raw = explode(',',$allowed_themes_str); $allowed_themes = array(); if (count($allowed_themes_raw)) { @@ -1917,7 +1917,7 @@ function admin_page_themes(App $a) { $is_supported = 1-(intval(file_exists($file.'/unsupported'))); $is_allowed = intval(in_array($f,$allowed_themes)); - if ($is_allowed || $is_supported || get_config("system", "show_unsupported_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); } } @@ -1954,7 +1954,7 @@ function admin_page_themes(App $a) { info(sprintf('Theme %s disabled.',$theme)); } - set_config('system','allowed_themes',$s); + Config::set('system','allowed_themes',$s); goaway('admin/themes'); return ''; // NOTREACHED } @@ -2089,9 +2089,9 @@ function admin_page_logs_post(App $a) { $debugging = ((x($_POST,'debugging')) ? true : false); $loglevel = ((x($_POST,'loglevel')) ? intval(trim($_POST['loglevel'])) : 0); - set_config('system','logfile', $logfile); - set_config('system','debugging', $debugging); - set_config('system','loglevel', $loglevel); + Config::set('system','logfile', $logfile); + Config::set('system','debugging', $debugging); + Config::set('system','loglevel', $loglevel); } info(t("Log settings updated.")); @@ -2139,12 +2139,12 @@ function admin_page_logs(App $a) { '$submit' => t('Save Settings'), '$clear' => t('Clear'), '$baseurl' => System::baseUrl(true), - '$logname' => get_config('system','logfile'), + '$logname' => Config::get('system','logfile'), // name, label, value, help string, extra data... - '$debugging' => array('debugging', t("Enable Debugging"),get_config('system','debugging'), ""), - '$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")), - '$loglevel' => array('loglevel', t("Log level"), get_config('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"), @@ -2174,7 +2174,7 @@ function admin_page_logs(App $a) { */ function admin_page_viewlogs(App $a) { $t = get_markup_template("admin_viewlogs.tpl"); - $f = get_config('system','logfile'); + $f = Config::get('system','logfile'); $data = ''; if (!file_exists($f)) { @@ -2205,7 +2205,7 @@ function admin_page_viewlogs(App $a) { '$title' => t('Administration'), '$page' => t('View Logs'), '$data' => $data, - '$logname' => get_config('system','logfile') + '$logname' => Config::get('system','logfile') )); } @@ -2234,12 +2234,12 @@ function admin_page_features_post(App $a) { } else { $val = 0; } - set_config('feature',$feature,$val); + Config::set('feature',$feature,$val); if (x($_POST, $featurelock)) { - set_config('feature_lock', $feature, $val); + Config::set('feature_lock', $feature, $val); } else { - del_config('feature_lock', $feature); + Config::delete('feature_lock', $feature); } } } @@ -2273,7 +2273,7 @@ function admin_page_features(App $a) { $arr[$fname][0] = $fdata[0]; foreach (array_slice($fdata,1) as $f) { - $set = get_config('feature',$f[0]); + $set = Config::get('feature',$f[0]); if ($set === false) { $set = $f[3]; } diff --git a/mod/api.php b/mod/api.php index cd5d5241f..beb7d71c4 100644 --- a/mod/api.php +++ b/mod/api.php @@ -1,6 +1,7 @@ callback_url!=null) { diff --git a/mod/apps.php b/mod/apps.php index 0c0df7654..b8800c7d7 100644 --- a/mod/apps.php +++ b/mod/apps.php @@ -1,9 +1,10 @@ argc > 1) auto_redir($a, $a->argv[1]); - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { + if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) { return; } @@ -71,7 +73,7 @@ function cal_content(App $a) { nav_set_selected('events'); // First day of the week (0 = Sunday) - $firstDay = get_pconfig(local_user(),'system','first_day_of_week'); + $firstDay = PConfig::get(local_user(),'system','first_day_of_week'); if ($firstDay === false) $firstDay=0; // get the translation strings for the callendar @@ -250,7 +252,7 @@ function cal_content(App $a) { if (x($_GET,'id')){ $tpl = get_markup_template("event.tpl"); } else { -// if (get_config('experimentals','new_calendar')==1){ +// if (Config::get('experimentals','new_calendar')==1){ $tpl = get_markup_template("events_js.tpl"); // } else { // $tpl = get_markup_template("events.tpl"); diff --git a/mod/crepair.php b/mod/crepair.php index 59ac620a3..cc930a2f3 100644 --- a/mod/crepair.php +++ b/mod/crepair.php @@ -1,6 +1,7 @@ $r[0]['issued-id'], 'intro_id' => $intro[0]['id'], 'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0), - 'activity' => intval(get_pconfig($r[0]['uid'],'system','post_newfriend')) + 'activity' => intval(PConfig::get($r[0]['uid'],'system','post_newfriend')) ); dfrn_confirm_post($a,$handsfree); } @@ -800,8 +802,8 @@ function dfrn_request_content(App $a) { * Normal web request. Display our user's introduction form. */ - if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { - if(! get_config('system','local_block')) { + if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) { + if(! Config::get('system','local_block')) { notice( t('Public access denied.') . EOL); return; } @@ -850,9 +852,9 @@ function dfrn_request_content(App $a) { // see if we are allowed to have NETWORK_MAIL2 contacts - $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); + $mail_disabled = ((function_exists('imap_open') && (! Config::get('system','imap_disabled'))) ? 0 : 1); - if (get_config('system','dfrn_only')) { + if (Config::get('system','dfrn_only')) { $mail_disabled = 1; } diff --git a/mod/directory.php b/mod/directory.php index c83b7b411..98afad77c 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -1,6 +1,7 @@ set_pager_itemspage(60); @@ -26,8 +27,8 @@ function directory_post(App $a) { function directory_content(App $a) { require_once("mod/proxy.php"); - if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) || - (get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) { + if((Config::get('system','block_public')) && (! local_user()) && (! remote_user()) || + (Config::get('system','block_local_dir')) && (! local_user()) && (! remote_user())) { notice( t('Public access denied.') . EOL); return; } @@ -41,7 +42,7 @@ function directory_content(App $a) { $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); $gdirpath = ''; - $dirurl = get_config('system','directory'); + $dirurl = Config::get('system','directory'); if(strlen($dirurl)) { $gdirpath = zrl($dirurl,true); } @@ -66,7 +67,7 @@ function directory_content(App $a) { (`profile`.`prv_keywords` LIKE '%$search%'))"; } - $publish = ((get_config('system','publish_all')) ? '' : " AND `publish` = 1 " ); + $publish = ((Config::get('system','publish_all')) ? '' : " AND `publish` = 1 " ); $r = q("SELECT COUNT(*) AS `total` FROM `profile` diff --git a/mod/dirfind.php b/mod/dirfind.php index a1253b144..da2f1396e 100644 --- a/mod/dirfind.php +++ b/mod/dirfind.php @@ -1,11 +1,12 @@ pager['page']) * $perpage) - $perpage; - if (get_config('system','diaspora_enabled')) { + if (Config::get('system','diaspora_enabled')) { $diaspora = NETWORK_DIASPORA; } else { $diaspora = NETWORK_DFRN; } - if (!get_config('system','ostatus_disabled')) { + if (!Config::get('system','ostatus_disabled')) { $ostatus = NETWORK_OSTATUS; } else { $ostatus = NETWORK_DFRN; @@ -170,7 +171,7 @@ function dirfind_content(App $a, $prefix = "") { $p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : ''); - if(strlen(get_config('system','directory'))) + if(strlen(Config::get('system','directory'))) $x = fetch_url(get_server().'/lsearch?f=' . $p . '&search=' . urlencode($search)); $j = json_decode($x); diff --git a/mod/display.php b/mod/display.php index edf372df5..d2ee12c57 100644 --- a/mod/display.php +++ b/mod/display.php @@ -1,13 +1,14 @@ argc > 1) { $which = $a->argv[1]; diff --git a/mod/home.php b/mod/home.php index 3490c4fae..985c408b5 100644 --- a/mod/home.php +++ b/mod/home.php @@ -1,6 +1,7 @@ get_hostname(),System::baseUrl(),System::baseUrl(),System::baseUrl() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);*/ + '$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),System::baseUrl(),System::baseUrl(),System::baseUrl() . '/post', salmon_key(Config::get('system','site_pubkey'))),$tpl);*/ $tpl = get_markup_template('xrd_host.tpl'); echo replace_macros($tpl, array( '$zhost' => $a->get_hostname(), '$zroot' => System::baseUrl(), '$domain' => System::baseUrl(), '$zot_post' => System::baseUrl() . '/post', - '$bigkey' => salmon_key(get_config('system','site_pubkey')), + '$bigkey' => salmon_key(Config::get('system','site_pubkey')), )); exit(); diff --git a/mod/hovercard.php b/mod/hovercard.php index 26c606251..064ccab1b 100644 --- a/mod/hovercard.php +++ b/mod/hovercard.php @@ -9,6 +9,7 @@ */ use Friendica\App; +use Friendica\Core\Config; require_once("include/socgraph.php"); require_once("include/Contact.php"); @@ -23,7 +24,7 @@ function hovercard_content() { $datatype = (x($_REQUEST,'datatype') ?$_REQUEST['datatype'] : "json"); // Get out if the system doesn't have public access allowed - if(intval(get_config('system','block_public'))) + if(intval(Config::get('system','block_public'))) http_status_exit(401); // Return the raw content of the template. We use this to make templates usable for js functions. diff --git a/mod/invite.php b/mod/invite.php index 81b588002..4f7abf36a 100644 --- a/mod/invite.php +++ b/mod/invite.php @@ -8,6 +8,8 @@ */ use Friendica\App; +use Friendica\Core\Config; +use Friendica\Core\PConfig; use Friendica\Core\System; require_once('include/email.php'); @@ -21,12 +23,12 @@ function invite_post(App $a) { check_form_security_token_redirectOnErr('/', 'send_invite'); - $max_invites = intval(get_config('system','max_invites')); + $max_invites = intval(Config::get('system','max_invites')); if (! $max_invites) { $max_invites = 50; } - $current_invites = intval(get_pconfig(local_user(),'system','sent_invites')); + $current_invites = intval(PConfig::get(local_user(),'system','sent_invites')); if ($current_invites > $max_invites) { notice( t('Total invitation limit exceeded.') . EOL); return; @@ -38,9 +40,9 @@ function invite_post(App $a) { $total = 0; - if (get_config('system','invitation_only')) { + if (Config::get('system','invitation_only')) { $invonly = true; - $x = get_pconfig(local_user(),'system','invites_remaining'); + $x = PConfig::get(local_user(),'system','invites_remaining'); if ((! $x) && (! is_site_admin())) { return; } @@ -67,7 +69,7 @@ function invite_post(App $a) { if (! is_site_admin()) { $x --; if ($x >= 0) { - set_pconfig(local_user(),'system','invites_remaining',$x); + PConfig::set(local_user(),'system','invites_remaining',$x); } else { return; } @@ -85,7 +87,7 @@ function invite_post(App $a) { if ($res) { $total ++; $current_invites ++; - set_pconfig(local_user(),'system','sent_invites',$current_invites); + PConfig::set(local_user(),'system','sent_invites',$current_invites); if($current_invites > $max_invites) { notice( t('Invitation limit exceeded. Please contact your site administrator.') . EOL); return; @@ -110,16 +112,16 @@ function invite_content(App $a) { $tpl = get_markup_template('invite.tpl'); $invonly = false; - if (get_config('system','invitation_only')) { + if (Config::get('system','invitation_only')) { $invonly = true; - $x = get_pconfig(local_user(),'system','invites_remaining'); + $x = PConfig::get(local_user(),'system','invites_remaining'); if ((! $x) && (! is_site_admin())) { notice( t('You have no more invitations available') . EOL); return ''; } } - $dirloc = get_config('system','directory'); + $dirloc = Config::get('system','directory'); if (strlen($dirloc)) { if ($a->config['register_policy'] == REGISTER_CLOSED) { $linktxt = sprintf( t('Visit %s for a list of public sites that you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), $dirloc . '/servers'); diff --git a/mod/item.php b/mod/item.php index 0d09b1903..51488fa72 100644 --- a/mod/item.php +++ b/mod/item.php @@ -16,8 +16,10 @@ */ use Friendica\App; +use Friendica\Core\Config; use Friendica\Core\System; use Friendica\Core\Worker; +use Friendica\Network\Probe; require_once 'include/crypto.php'; require_once 'include/enotify.php'; @@ -27,7 +29,6 @@ require_once 'include/files.php'; require_once 'include/threads.php'; require_once 'include/text.php'; require_once 'include/items.php'; -require_once 'include/probe.php'; require_once 'include/diaspora.php'; require_once 'include/Contact.php'; @@ -146,7 +147,7 @@ function item_post(App $a) { $parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]); if (!isset($parent_contact["nick"])) { - $probed_contact = probe_url($thrparent[0]["author-link"]); + $probed_contact = Probe::uri($thrparent[0]["author-link"]); if ($probed_contact["network"] != NETWORK_FEED) { $parent_contact = $probed_contact; $parent_contact["nurl"] = normalise_link($probed_contact["url"]); @@ -328,7 +329,7 @@ function item_post(App $a) { // if using the API, we won't see pubmail_enable - figure out if it should be set if ($api_source && $profile_uid && $profile_uid == local_user() && (! $private)) { - $mail_disabled = ((function_exists('imap_open') && (! get_config('system', 'imap_disabled'))) ? 0 : 1); + $mail_disabled = ((function_exists('imap_open') && (! Config::get('system', 'imap_disabled'))) ? 0 : 1); if (! $mail_disabled) { /// @TODO Check if only pubmail is loaded, * loads all columns $r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", @@ -1163,7 +1164,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n if (dbm::is_result($r)) { $data = $r[0]; } else { - $data = probe_url($matches[1]); + $data = Probe::uri($matches[1]); } if ($data["alias"] != "") { @@ -1235,7 +1236,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n } if (!dbm::is_result($r)) { - $probed = probe_url($name); + $probed = Probe::uri($name); if ($result['network'] != NETWORK_PHANTOM) { update_gcontact($probed); $r = q("SELECT `url`, `name`, `nick`, `network`, `alias`, `notify` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", diff --git a/mod/match.php b/mod/match.php index 829ca3987..f268fbc8a 100644 --- a/mod/match.php +++ b/mod/match.php @@ -1,6 +1,7 @@ pager['page'] != 1) $params['p'] = $a->pager['page']; - if(strlen(get_config('system','directory'))) + if(strlen(Config::get('system','directory'))) $x = post_url(get_server().'/msearch', $params); else $x = post_url(System::baseUrl() . '/msearch', $params); diff --git a/mod/newmember.php b/mod/newmember.php index f470327cd..0dcdb8bd8 100644 --- a/mod/newmember.php +++ b/mod/newmember.php @@ -1,6 +1,7 @@ ' . t('Connecting') . ''; $o .= '
- ';
- $mail_disabled = ((function_exists('imap_open') && (!get_config('system', 'imap_disabled'))) ? 0 : 1);
+ $mail_disabled = ((function_exists('imap_open') && (!Config::get('system', 'imap_disabled'))) ? 0 : 1);
if (!$mail_disabled) {
$o .= '
- ' . '' . t('Importing Emails') . '
' . t('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') . ' ' . EOL;
@@ -40,7 +41,7 @@ function newmember_content(App $a) {
$o .= ' - ' . '' . t('Group Your Contacts') . '
' . t('Once you have made some friends, organize them into private conversation groups from the sidebar of your Contacts page and then you can interact with each group privately on your Network page.') . ' ' . EOL;
- if (get_config('system', 'newuser_private')) {
+ if (Config::get('system', 'newuser_private')) {
$o .= ' - ' . '' . t("Why Aren't My Posts Public?") . '
' . t("Friendica respects your privacy. By default, your posts will only show up to people you've added as friends. For more information, see the help section from the link above.") . ' ' . EOL;
}
diff --git a/mod/openid.php b/mod/openid.php
index 1dac83d2d..62a7e98e8 100644
--- a/mod/openid.php
+++ b/mod/openid.php
@@ -1,13 +1,14 @@
= $total) {
$a->page['htmlhead'] = '';
- del_pconfig($uid, "ostatus", "legacy_friends");
- del_pconfig($uid, "ostatus", "legacy_contact");
+ PConfig::delete($uid, "ostatus", "legacy_friends");
+ PConfig::delete($uid, "ostatus", "legacy_contact");
$o .= t("Done");
return $o;
}
@@ -64,7 +65,7 @@ function ostatus_subscribe_content(App $a) {
$o .= "
- ';
$o .= '
".$counter."/".$total.": ".$url;
- $data = probe_url($url);
+ $data = Probe::uri($url);
if ($data["network"] == NETWORK_OSTATUS) {
$result = new_contact($uid, $url, true, NETWORK_OSTATUS);
if ($result["success"]) {
diff --git a/mod/photos.php b/mod/photos.php
index e626ef400..4110e8057 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -22,7 +22,7 @@ function photos_init(App $a) {
auto_redir($a, $a->argv[1]);
}
- if ((get_config('system', 'block_public')) && (! local_user()) && (! remote_user())) {
+ if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
return;
}
@@ -811,7 +811,7 @@ function photos_post(App $a) {
logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG);
- $maximagesize = get_config('system','maximagesize');
+ $maximagesize = Config::get('system','maximagesize');
if (($maximagesize) && ($filesize > $maximagesize)) {
notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
@@ -847,7 +847,7 @@ function photos_post(App $a) {
$exif = $ph->orient($src);
@unlink($src);
- $max_length = get_config('system', 'max_image_length');
+ $max_length = Config::get('system', 'max_image_length');
if (! $max_length) {
$max_length = MAX_IMAGE_LENGTH;
}
@@ -961,7 +961,7 @@ function photos_content(App $a) {
// photos/name/image/xxxxx/edit
- if ((get_config('system', 'block_public')) && (! local_user()) && (! remote_user())) {
+ if ((Config::get('system', 'block_public')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL);
return;
}
diff --git a/mod/profile.php b/mod/profile.php
index c2b4fe248..be95fd250 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -1,6 +1,8 @@
profile['hidewall'] && (! local_user()) && (! remote_user())) ? true : false);
if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) {
@@ -95,7 +97,7 @@ function profile_content(App $a, $update = 0) {
$category = ((x($_GET,'category')) ? $_GET['category'] : '');
}
- if (get_config('system','block_public') && (! local_user()) && (! remote_user())) {
+ if (Config::get('system','block_public') && (! local_user()) && (! remote_user())) {
return login();
}
@@ -272,10 +274,10 @@ function profile_content(App $a, $update = 0) {
// check if we serve a mobile device and get the user settings
// accordingly
if ($a->is_mobile) {
- $itemspage_network = get_pconfig(local_user(),'system','itemspage_mobile_network');
+ $itemspage_network = PConfig::get(local_user(),'system','itemspage_mobile_network');
$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 10);
} else {
- $itemspage_network = get_pconfig(local_user(),'system','itemspage_network');
+ $itemspage_network = PConfig::get(local_user(),'system','itemspage_network');
$itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
}
// now that we have the user settings, see if the theme forces
@@ -328,7 +330,7 @@ function profile_content(App $a, $update = 0) {
$items = array();
}
- if($is_owner && (! $update) && (! get_config('theme','hide_eventlist'))) {
+ if($is_owner && (! $update) && (! Config::get('theme','hide_eventlist'))) {
$o .= get_birthdays();
$o .= get_events();
}
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index bc9314453..c68655b75 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -1,6 +1,7 @@
user['nickname'];
- if ($url && strlen(get_config('system','directory'))) {
+ if ($url && strlen(Config::get('system','directory'))) {
Worker::add(PRIORITY_LOW, "directory", $url);
}
@@ -151,7 +152,7 @@ function profile_photo_post(App $a) {
$filetype = guess_image_type($filename);
}
- $maximagesize = get_config('system','maximagesize');
+ $maximagesize = Config::get('system','maximagesize');
if (($maximagesize) && ($filesize > $maximagesize)) {
notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
@@ -229,7 +230,7 @@ function profile_photo_content(App $a) {
// Update global directory in background
$url = $_SESSION['my_url'];
- if ($url && strlen(get_config('system','directory'))) {
+ if ($url && strlen(Config::get('system','directory'))) {
Worker::add(PRIORITY_LOW, "directory", $url);
}
@@ -286,7 +287,7 @@ function profile_photo_content(App $a) {
if(! function_exists('profile_photo_crop_ui_head')) {
function profile_photo_crop_ui_head(App $a, $ph) {
- $max_length = get_config('system','max_image_length');
+ $max_length = Config::get('system','max_image_length');
if (! $max_length) {
$max_length = MAX_IMAGE_LENGTH;
}
diff --git a/mod/profiles.php b/mod/profiles.php
index 90296322a..b787bc154 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -1,6 +1,8 @@
user['hidewall'] || get_config('system', 'block_public')) {
+ if ($a->user['hidewall'] || Config::get('system', 'block_public')) {
return;
}
- if (! get_pconfig(local_user(), 'system', 'post_profilechange')) {
+ if (! PConfig::get(local_user(), 'system', 'post_profilechange')) {
return;
}
@@ -648,9 +650,9 @@ function profiles_content(App $a) {
$personal_account = !(in_array($a->user["page-flags"],
array(PAGE_COMMUNITY, PAGE_PRVGROUP)));
- $detailled_profile = (get_pconfig(local_user(), 'system', 'detailled_profile') AND $personal_account);
+ $detailled_profile = (PConfig::get(local_user(), 'system', 'detailled_profile') AND $personal_account);
- $f = get_config('system', 'birthday_input_format');
+ $f = Config::get('system', 'birthday_input_format');
if (! $f) {
$f = 'ymd';
}
diff --git a/mod/profperm.php b/mod/profperm.php
index c67a0202e..2b3c07526 100644
--- a/mod/profperm.php
+++ b/mod/profperm.php
@@ -1,6 +1,8 @@
use Friendica\App;
+use Friendica\Core\Config;
use Friendica\Core\System;
define('PROXY_DEFAULT_TIME', 86400); // 1 Day
@@ -258,7 +259,7 @@ function proxy_url($url, $writemode = false, $size = '') {
return $url;
}
- if (get_config('system', 'proxy_disabled')) {
+ if (Config::get('system', 'proxy_disabled')) {
return $url;
}
diff --git a/mod/pubsubhubbub.php b/mod/pubsubhubbub.php
index 477d1e296..77f27dff5 100644
--- a/mod/pubsubhubbub.php
+++ b/mod/pubsubhubbub.php
@@ -1,6 +1,7 @@
$_POST);
call_hooks('register_post', $arr);
- $max_dailies = intval(get_config('system','max_daily_registrations'));
+ $max_dailies = intval(Config::get('system','max_daily_registrations'));
if($max_dailies) {
$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
if($r && $r[0]['total'] >= $max_dailies) {
@@ -73,8 +75,8 @@ function register_post(App $a) {
Worker::add(PRIORITY_LOW, "directory", $url);
}
- $using_invites = get_config('system','invitation_only');
- $num_invites = get_config('system','number_invites');
+ $using_invites = Config::get('system','invitation_only');
+ $num_invites = Config::get('system','number_invites');
$invite_id = ((x($_POST,'invite_id')) ? notags(trim($_POST['invite_id'])) : '');
@@ -82,7 +84,7 @@ function register_post(App $a) {
if($using_invites && $invite_id) {
q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
- set_pconfig($user['uid'],'system','invites_remaining',$num_invites);
+ PConfig::set($user['uid'],'system','invites_remaining',$num_invites);
}
// Only send a password mail when the password wasn't manually provided
@@ -130,7 +132,7 @@ function register_post(App $a) {
// invite system
if($using_invites && $invite_id) {
q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
- set_pconfig($user['uid'],'system','invites_remaining',$num_invites);
+ PConfig::set($user['uid'],'system','invites_remaining',$num_invites);
}
// send email to admins
@@ -183,7 +185,7 @@ function register_content(App $a) {
// even with closed registrations, unless specifically prohibited by site policy.
// 'block_extended_register' blocks all registrations, period.
- $block = get_config('system','block_extended_register');
+ $block = Config::get('system','block_extended_register');
if(local_user() && ($block)) {
notice("Permission denied." . EOL);
@@ -195,7 +197,7 @@ function register_content(App $a) {
return;
}
- $max_dailies = intval(get_config('system','max_daily_registrations'));
+ $max_dailies = intval(Config::get('system','max_daily_registrations'));
if($max_dailies) {
$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
if($r && $r[0]['total'] >= $max_dailies) {
@@ -218,7 +220,7 @@ function register_content(App $a) {
$photo = ((x($_POST,'photo')) ? $_POST['photo'] : ((x($_GET,'photo')) ? hex2bin($_GET['photo']) : ''));
$invite_id = ((x($_POST,'invite_id')) ? $_POST['invite_id'] : ((x($_GET,'invite_id')) ? $_GET['invite_id'] : ''));
- $noid = get_config('system','no_openid');
+ $noid = Config::get('system','no_openid');
if($noid) {
$oidhtml = '';
@@ -237,7 +239,7 @@ function register_content(App $a) {
$realpeople = ''; // t('Members of this network prefer to communicate with real people who use their real names.');
- if(get_config('system','publish_all')) {
+ if(Config::get('system','publish_all')) {
$profile_publish_reg = '';
}
else {
@@ -267,7 +269,7 @@ function register_content(App $a) {
$o = replace_macros($o, array(
'$oidhtml' => $oidhtml,
- '$invitations' => get_config('system','invitation_only'),
+ '$invitations' => Config::get('system','invitation_only'),
'$permonly' => $a->config['register_policy'] == REGISTER_APPROVE,
'$permonlybox' => array('permonlybox', t('Note for the admin'), '', t('Leave a message for the admin, why you want to join this node')),
'$invite_desc' => t('Membership on this site is by invitation only.'),
diff --git a/mod/regmod.php b/mod/regmod.php
index be57c8d65..03cb7fa8f 100644
--- a/mod/regmod.php
+++ b/mod/regmod.php
@@ -1,6 +1,7 @@
t("Public access denied."),
"description" => t("Only logged in users are permitted to perform a search.")));
@@ -99,15 +100,15 @@ function search_content(App $a) {
//return;
}
- if (get_config('system','permit_crawling') && !local_user() && !remote_user()) {
+ if (Config::get('system','permit_crawling') && !local_user() && !remote_user()) {
// Default values:
// 10 requests are "free", after the 11th only a call per minute is allowed
- $free_crawls = intval(get_config('system','free_crawls'));
+ $free_crawls = intval(Config::get('system','free_crawls'));
if ($free_crawls == 0)
$free_crawls = 10;
- $crawl_permit_period = intval(get_config('system','crawl_permit_period'));
+ $crawl_permit_period = intval(Config::get('system','crawl_permit_period'));
if ($crawl_permit_period == 0)
$crawl_permit_period = 10;
@@ -176,7 +177,7 @@ function search_content(App $a) {
if (! $search)
return $o;
- if (get_config('system','only_tag_search'))
+ if (Config::get('system','only_tag_search'))
$tag = true;
// Here is the way permissions work in the search module...
diff --git a/mod/statistics_json.php b/mod/statistics_json.php
index 3b9e9c496..9b2263da7 100644
--- a/mod/statistics_json.php
+++ b/mod/statistics_json.php
@@ -5,12 +5,13 @@
*/
use Friendica\App;
+use Friendica\Core\Config;
require_once("include/plugin.php");
function statistics_json_init(App $a) {
- if (!get_config("system", "nodeinfo")) {
+ if (!Config::get("system", "nodeinfo")) {
http_status_exit(404);
killme();
}
@@ -20,10 +21,10 @@ function statistics_json_init(App $a) {
"network" => FRIENDICA_PLATFORM,
"version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION,
"registrations_open" => ($a->config['register_policy'] != 0),
- "total_users" => get_config('nodeinfo', 'total_users'),
- "active_users_halfyear" => get_config('nodeinfo', 'active_users_halfyear'),
- "active_users_monthly" => get_config('nodeinfo', 'active_users_monthly'),
- "local_posts" => get_config('nodeinfo', 'local_posts')
+ "total_users" => Config::get('nodeinfo', 'total_users'),
+ "active_users_halfyear" => Config::get('nodeinfo', 'active_users_halfyear'),
+ "active_users_monthly" => Config::get('nodeinfo', 'active_users_monthly'),
+ "local_posts" => Config::get('nodeinfo', 'local_posts')
);
$statistics["services"] = array();
diff --git a/mod/uimport.php b/mod/uimport.php
index b9bde2388..cbfe9a729 100644
--- a/mod/uimport.php
+++ b/mod/uimport.php
@@ -5,6 +5,7 @@
*/
use Friendica\App;
+use Friendica\Core\Config;
require_once("include/uimport.php");
@@ -45,7 +46,7 @@ function uimport_content(App $a) {
return;
}
- $max_dailies = intval(get_config('system', 'max_daily_registrations'));
+ $max_dailies = intval(Config::get('system', 'max_daily_registrations'));
if ($max_dailies) {
$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
if ($r && $r[0]['total'] >= $max_dailies) {
diff --git a/mod/update_community.php b/mod/update_community.php
index f0e96af48..c0e4c3323 100644
--- a/mod/update_community.php
+++ b/mod/update_community.php
@@ -3,6 +3,7 @@
// See update_profile.php for documentation
use Friendica\App;
+use Friendica\Core\PConfig;
require_once("mod/community.php");
@@ -17,7 +18,7 @@ function update_community_content(App $a) {
$replace = "