Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-12-23 12:00:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Issue-#3873

Browse source 
Replace deprecated functions with new syntax.
This commit is contained in:
Adam Magness 2017-11-06 21:22:52 -05:00
parent c847a2f9cc
commit acb4630eed
124 changed files with 819 additions and 679 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
boot.php
View file

@ -23,6 +23,7 @@ require_once(__DIR__ . DIRECTORY_SEPARATOR . 'vendor' . DIRECTORY_SEPARATOR . 'a
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Util\Lock; use Friendica\Util\Lock;
require_once 'include/config.php'; require_once 'include/config.php';
@ -603,9 +604,9 @@ function is_ajax() {
*/ */
function check_db($via_worker) { function check_db($via_worker) {
$build = get_config('system', 'build'); $build = Config::get('system', 'build');
if (!x($build)) { if (!x($build)) {
set_config('system', 'build', DB_UPDATE_VERSION); Config::set('system', 'build', DB_UPDATE_VERSION);
$build = DB_UPDATE_VERSION; $build = DB_UPDATE_VERSION;
} }
if ($build != DB_UPDATE_VERSION) { if ($build != DB_UPDATE_VERSION) {
@ -622,7 +623,7 @@ function check_db($via_worker) {
*/ */
function check_url(App $a) { function check_url(App $a) {
$url = get_config('system', 'url'); $url = Config::get('system', 'url');
// if the url isn't set or the stored url is radically different // if the url isn't set or the stored url is radically different
// than the currently visited url, store the current value accordingly. // than the currently visited url, store the current value accordingly.
@ -631,10 +632,10 @@ function check_url(App $a) {
// We will only change the url to an ip address if there is no existing setting // We will only change the url to an ip address if there is no existing setting
if (!x($url)) { if (!x($url)) {
$url = set_config('system', 'url', System::baseUrl()); $url = Config::set('system', 'url', System::baseUrl());
} }
if ((!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname))) { if ((!link_compare($url, System::baseUrl())) && (!preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/", $a->get_hostname))) {
$url = set_config('system', 'url', System::baseUrl()); $url = Config::set('system', 'url', System::baseUrl());
} }
return; return;
@ -644,9 +645,9 @@ function check_url(App $a) {
* @brief Automatic database updates * @brief Automatic database updates
*/ */
function update_db(App $a) { function update_db(App $a) {
$build = get_config('system', 'build'); $build = Config::get('system', 'build');
if (!x($build)) { if (!x($build)) {
$build = set_config('system', 'build', DB_UPDATE_VERSION); $build = Config::set('system', 'build', DB_UPDATE_VERSION);
} }
if ($build != DB_UPDATE_VERSION) { if ($build != DB_UPDATE_VERSION) {
@ -664,12 +665,12 @@ function update_db(App $a) {
if (DB_UPDATE_VERSION == UPDATE_VERSION) { if (DB_UPDATE_VERSION == UPDATE_VERSION) {
// Compare the current structure with the defined structure // Compare the current structure with the defined structure
$t = get_config('database', 'dbupdate_' . DB_UPDATE_VERSION); $t = Config::get('database', 'dbupdate_' . DB_UPDATE_VERSION);
if ($t !== false) { if ($t !== false) {
return; return;
} }
set_config('database', 'dbupdate_' . DB_UPDATE_VERSION, time()); Config::set('database', 'dbupdate_' . DB_UPDATE_VERSION, time());
// run old update routine (wich could modify the schema and // run old update routine (wich could modify the schema and
// conflits with new routine) // conflits with new routine)
@ -693,7 +694,7 @@ function update_db(App $a) {
); );
return; return;
} else { } else {
set_config('database', 'dbupdate_' . DB_UPDATE_VERSION, 'success'); Config::set('database', 'dbupdate_' . DB_UPDATE_VERSION, 'success');
} }
// run any left update_nnnn functions in update.php // run any left update_nnnn functions in update.php
@ -720,11 +721,11 @@ function run_update_function($x) {
// If the update fails or times-out completely you may need to // If the update fails or times-out completely you may need to
// delete the config entry to try again. // delete the config entry to try again.
$t = get_config('database', 'update_' . $x); $t = Config::get('database', 'update_' . $x);
if ($t !== false) { if ($t !== false) {
return false; return false;
} }
set_config('database', 'update_' . $x, time()); Config::set('database', 'update_' . $x, time());
// call the specific update // call the specific update
@ -739,13 +740,13 @@ function run_update_function($x) {
); );
return false; return false;
} else { } else {
set_config('database', 'update_' . $x, 'success'); Config::set('database', 'update_' . $x, 'success');
set_config('system', 'build', $x + 1); Config::set('system', 'build', $x + 1);
return true; return true;
} }
} else { } else {
set_config('database', 'update_' . $x, 'success'); Config::set('database', 'update_' . $x, 'success');
set_config('system', 'build', $x + 1); Config::set('system', 'build', $x + 1);
return true; return true;
} }
return true; return true;
@ -774,7 +775,7 @@ function check_plugins(App $a) {
$installed = array(); $installed = array();
} }
$plugins = get_config('system', 'addon'); $plugins = Config::get('system', 'addon');
$plugins_arr = array(); $plugins_arr = array();
if ($plugins) { if ($plugins) {
@ -852,7 +853,7 @@ function login($register = false, $hiddens = false) {
); );
} }
$noid = get_config('system', 'no_openid'); $noid = Config::get('system', 'no_openid');
$dest_url = $a->query_string; $dest_url = $a->query_string;
@ -1007,7 +1008,7 @@ function notice($s) {
function info($s) { function info($s) {
$a = get_app(); $a = get_app();
if (local_user() && get_pconfig(local_user(), 'system', 'ignore_info')) { if (local_user() && PConfig::get(local_user(), 'system', 'ignore_info')) {
return; return;
} }
@ -1063,7 +1064,7 @@ function current_theme() {
// This works only if the user is on the same server // This works only if the user is on the same server
if ($page_theme && local_user() && (local_user() != $a->profile_uid)) { if ($page_theme && local_user() && (local_user() != $a->profile_uid)) {
if (get_pconfig(local_user(), 'system', 'always_my_theme')) { if (PConfig::get(local_user(), 'system', 'always_my_theme')) {
$page_theme = null; $page_theme = null;
} }
} }
@ -1304,7 +1305,7 @@ function random_digits($digits) {
} }
function get_server() { function get_server() {
$server = get_config("system", "directory"); $server = Config::get("system", "directory");
if ($server == "") { if ($server == "") {
$server = "http://dir.friendica.social"; $server = "http://dir.friendica.social";
@ -1316,7 +1317,7 @@ function get_server() {
function get_temppath() { function get_temppath() {
$a = get_app(); $a = get_app();
$temppath = get_config("system", "temppath"); $temppath = Config::get("system", "temppath");
if (($temppath != "") && App::directory_usable($temppath)) { if (($temppath != "") && App::directory_usable($temppath)) {
// We have a temp path and it is usable // We have a temp path and it is usable
@ -1340,7 +1341,7 @@ function get_temppath() {
if (App::directory_usable($new_temppath)) { if (App::directory_usable($new_temppath)) {
// The new path is usable, we are happy // The new path is usable, we are happy
set_config("system", "temppath", $new_temppath); Config::set("system", "temppath", $new_temppath);
return $new_temppath; return $new_temppath;
} else { } else {
// We can't create a subdirectory, strange. // We can't create a subdirectory, strange.
@ -1389,7 +1390,7 @@ function clear_cache($basepath = "", $path = "") {
return; return;
} }
$cachetime = (int) get_config('system', 'itemcache_duration'); $cachetime = (int) Config::get('system', 'itemcache_duration');
if ($cachetime == 0) { if ($cachetime == 0) {
$cachetime = 86400; $cachetime = 86400;
} }
@ -1412,12 +1413,12 @@ function clear_cache($basepath = "", $path = "") {
function get_itemcachepath() { function get_itemcachepath() {
// Checking, if the cache is deactivated // Checking, if the cache is deactivated
$cachetime = (int) get_config('system', 'itemcache_duration'); $cachetime = (int) Config::get('system', 'itemcache_duration');
if ($cachetime < 0) { if ($cachetime < 0) {
return ""; return "";
} }
$itemcache = get_config('system', 'itemcache'); $itemcache = Config::get('system', 'itemcache');
if (($itemcache != "") && App::directory_usable($itemcache)) { if (($itemcache != "") && App::directory_usable($itemcache)) {
return App::realpath($itemcache); return App::realpath($itemcache);
} }
@ -1431,7 +1432,7 @@ function get_itemcachepath() {
} }
if (App::directory_usable($itemcache)) { if (App::directory_usable($itemcache)) {
set_config("system", "itemcache", $itemcache); Config::set("system", "itemcache", $itemcache);
return $itemcache; return $itemcache;
} }
} }
@ -1444,7 +1445,7 @@ function get_itemcachepath() {
* @return string Spool path * @return string Spool path
*/ */
function get_spoolpath() { function get_spoolpath() {
$spoolpath = get_config('system', 'spoolpath'); $spoolpath = Config::get('system', 'spoolpath');
if (($spoolpath != "") && App::directory_usable($spoolpath)) { if (($spoolpath != "") && App::directory_usable($spoolpath)) {
// We have a spool path and it is usable // We have a spool path and it is usable
return $spoolpath; return $spoolpath;
@ -1462,7 +1463,7 @@ function get_spoolpath() {
if (App::directory_usable($spoolpath)) { if (App::directory_usable($spoolpath)) {
// The new path is usable, we are happy // The new path is usable, we are happy
set_config("system", "spoolpath", $spoolpath); Config::set("system", "spoolpath", $spoolpath);
return $spoolpath; return $spoolpath;
} else { } else {
// We can't create a subdirectory, strange. // We can't create a subdirectory, strange.
@ -1574,7 +1575,7 @@ function argv($x) {
*/ */
function infinite_scroll_data($module) { function infinite_scroll_data($module) {
if (get_pconfig(local_user(), 'system', 'infinite_scroll') if (PConfig::get(local_user(), 'system', 'infinite_scroll')
&& ($module == "network") && ($_GET["mode"] != "minimal")) { && ($module == "network") && ($_GET["mode"] != "minimal")) {
// get the page number // get the page number

6
doc/themes.md
View file

@ -130,7 +130,7 @@ The selected 1st part will be saved in the database by the theme_post function.
// if the one specific submit button was pressed then proceed // if the one specific submit button was pressed then proceed
if (isset($_POST['duepuntozero-settings-submit'])){ if (isset($_POST['duepuntozero-settings-submit'])){
// and save the selection key into the personal config of the user // and save the selection key into the personal config of the user
set_pconfig(local_user(), 'duepuntozero', 'colorset', $_POST['duepuntozero_colorset']); PConfig::set(local_user(), 'duepuntozero', 'colorset', $_POST['duepuntozero_colorset']);
} }
} }
@ -138,9 +138,9 @@ Now that this information is set in the database, what should friendica do with
For this, have a look at the theme.php file of the *duepunto zero*. For this, have a look at the theme.php file of the *duepunto zero*.
There you'll find somethink alike There you'll find somethink alike
$colorset = get_pconfig( local_user(), 'duepuntozero','colorset'); $colorset = PConfig::get( local_user(), 'duepuntozero','colorset');
if (!$colorset) if (!$colorset)
$colorset = get_config('duepuntozero', 'colorset'); $colorset = Config::get('duepuntozero', 'colorset');
if ($colorset) { if ($colorset) {
if ($colorset == 'greenzero') if ($colorset == 'greenzero')
$a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/greenzero.css" type="text/css" media="screen" />'."\n"; $a->page['htmlhead'] .= '<link rel="stylesheet" href="view/theme/duepuntozero/deriv/greenzero.css" type="text/css" media="screen" />'."\n";

4
friendica_test_data.sql
View file

File diff suppressed because one or more lines are too long

3
include/Contact.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Network\Probe; use Friendica\Network\Probe;
@ -50,7 +51,7 @@ function contact_remove($id) {
return; return;
} }
$archive = get_pconfig($r[0]['uid'], 'system','archive_removed_contacts'); $archive = PConfig::get($r[0]['uid'], 'system','archive_removed_contacts');
if ($archive) { if ($archive) {
q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d", q("update contact set `archive` = 1, `network` = 'none', `writable` = 0 where id = %d",
intval($id) intval($id)

5
include/DirSearch.php
View file

@ -5,6 +5,7 @@
* @brief This file includes the DirSearch class with directory related functions * @brief This file includes the DirSearch class with directory related functions
*/ */
use Friendica\Core\Config;
/** /**
* @brief This class handels directory related functions * @brief This class handels directory related functions
@ -22,12 +23,12 @@ class DirSearch {
if($search) { if($search) {
// check supported networks // check supported networks
if (get_config('system','diaspora_enabled')) if (Config::get('system','diaspora_enabled'))
$diaspora = NETWORK_DIASPORA; $diaspora = NETWORK_DIASPORA;
else else
$diaspora = NETWORK_DFRN; $diaspora = NETWORK_DFRN;
if (!get_config('system','ostatus_disabled')) if (!Config::get('system','ostatus_disabled'))
$ostatus = NETWORK_OSTATUS; $ostatus = NETWORK_OSTATUS;
else else
$ostatus = NETWORK_DFRN; $ostatus = NETWORK_DFRN;

4
include/Emailer.php
View file

@ -1,5 +1,7 @@
<?php <?php
use Friendica\Core\PConfig;
require_once('include/email.php'); require_once('include/email.php');
class Emailer { class Emailer {
@ -22,7 +24,7 @@ class Emailer {
$email_textonly = False; $email_textonly = False;
if (x($params,"uid")) { if (x($params,"uid")) {
$email_textonly = get_pconfig($params['uid'], "system", "email_textonly"); $email_textonly = PConfig::get($params['uid'], "system", "email_textonly");
} }
$fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8'); $fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8');

5
include/NotificationsManager.php
View file

@ -5,6 +5,7 @@
* or for formatting notifications * or for formatting notifications
*/ */
use Friendica\Core\Pconfig;
use Friendica\Core\System; use Friendica\Core\System;
require_once 'include/html2plain.php'; require_once 'include/html2plain.php';
@ -781,7 +782,7 @@ class NotificationsManager {
'name' => $it['fname'], 'name' => $it['fname'],
'url' => zrl($it['furl']), 'url' => zrl($it['furl']),
'hidden' => $it['hidden'] == 1, 'hidden' => $it['hidden'] == 1,
'post_newfriend' => (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), 'post_newfriend' => (intval(PConfig::get(local_user(),'system','post_newfriend')) ? '1' : 0),
'knowyou' => $knowyou, 'knowyou' => $knowyou,
'note' => $it['note'], 'note' => $it['note'],
@ -814,7 +815,7 @@ class NotificationsManager {
'keywords' => $it['gkeywords'], 'keywords' => $it['gkeywords'],
'gender' => $it['ggender'], 'gender' => $it['ggender'],
'hidden' => $it['hidden'] == 1, 'hidden' => $it['hidden'] == 1,
'post_newfriend' => (intval(get_pconfig(local_user(),'system','post_newfriend')) ? '1' : 0), 'post_newfriend' => (intval(PConfig::get(local_user(),'system','post_newfriend')) ? '1' : 0),
'url' => $it['url'], 'url' => $it['url'],
'zrl' => zrl($it['url']), 'zrl' => zrl($it['url']),
'addr' => $it['gaddr'], 'addr' => $it['gaddr'],

13
include/Photo.php
View file

@ -5,6 +5,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
require_once("include/photos.php"); require_once("include/photos.php");
@ -119,7 +120,7 @@ class Photo {
*/ */
switch($this->getType()){ switch($this->getType()){
case "image/png": case "image/png":
$quality = get_config('system', 'png_quality'); $quality = Config::get('system', 'png_quality');
if ((! $quality) || ($quality > 9)) { if ((! $quality) || ($quality > 9)) {
$quality = PNG_QUALITY; $quality = PNG_QUALITY;
} }
@ -135,7 +136,7 @@ class Photo {
$this->image->setCompressionQuality($quality); $this->image->setCompressionQuality($quality);
break; break;
case "image/jpeg": case "image/jpeg":
$quality = get_config('system', 'jpeg_quality'); $quality = Config::get('system', 'jpeg_quality');
if ((! $quality) || ($quality > 100)) { if ((! $quality) || ($quality > 100)) {
$quality = JPEG_QUALITY; $quality = JPEG_QUALITY;
} }
@ -605,14 +606,14 @@ class Photo {
switch($this->getType()){ switch($this->getType()){
case "image/png": case "image/png":
$quality = get_config('system', 'png_quality'); $quality = Config::get('system', 'png_quality');
if ((!$quality) || ($quality > 9)) { if ((!$quality) || ($quality > 9)) {
$quality = PNG_QUALITY; $quality = PNG_QUALITY;
} }
imagepng($this->image, null, $quality); imagepng($this->image, null, $quality);
break; break;
case "image/jpeg": case "image/jpeg":
$quality = get_config('system', 'jpeg_quality'); $quality = Config::get('system', 'jpeg_quality');
if ((!$quality) || ($quality > 100)) { if ((!$quality) || ($quality > 100)) {
$quality = JPEG_QUALITY; $quality = JPEG_QUALITY;
} }
@ -940,7 +941,7 @@ function store_photo(App $a, $uid, $imagedata = "", $url = "") {
$a->save_timestamp($stamp1, "file"); $a->save_timestamp($stamp1, "file");
} }
$maximagesize = get_config('system', 'maximagesize'); $maximagesize = Config::get('system', 'maximagesize');
if (($maximagesize) && (strlen($imagedata) > $maximagesize)) { if (($maximagesize) && (strlen($imagedata) > $maximagesize)) {
logger("Image exceeds size limit of ".$maximagesize, LOGGER_DEBUG); logger("Image exceeds size limit of ".$maximagesize, LOGGER_DEBUG);
@ -972,7 +973,7 @@ function store_photo(App $a, $uid, $imagedata = "", $url = "") {
$ph->orient($tempfile); $ph->orient($tempfile);
unlink($tempfile); unlink($tempfile);
$max_length = get_config('system', 'max_image_length'); $max_length = Config::get('system', 'max_image_length');
if (! $max_length) { if (! $max_length) {
$max_length = MAX_IMAGE_LENGTH; $max_length = MAX_IMAGE_LENGTH;
} }

6
include/Smilies.php
View file

@ -14,6 +14,8 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
/** /**
@ -156,8 +158,8 @@ class Smilies {
* @return string HML Output of the Smilie * @return string HML Output of the Smilie
*/ */
public static function replace($s, $sample = false, $no_images = false) { public static function replace($s, $sample = false, $no_images = false) {
if(intval(get_config('system','no_smilies')) if(intval(Config::get('system','no_smilies'))
|| (local_user() && intval(get_pconfig(local_user(),'system','no_smilies')))) || (local_user() && intval(PConfig::get(local_user(),'system','no_smilies'))))
return $s; return $s;
$s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','self::encode',$s); $s = preg_replace_callback('/<pre>(.*?)<\/pre>/ism','self::encode',$s);

7
include/acl_selectors.php
View file

@ -5,6 +5,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
require_once "include/contact_selectors.php"; require_once "include/contact_selectors.php";
require_once "include/contact_widgets.php"; require_once "include/contact_widgets.php";
@ -332,7 +333,7 @@ function populate_acl($user = null, $show_jotnets = false) {
$jotnets = ''; $jotnets = '';
if ($show_jotnets) { if ($show_jotnets) {
$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);
$mail_enabled = false; $mail_enabled = false;
$pubmail_enabled = false; $pubmail_enabled = false;
@ -757,12 +758,12 @@ function navbar_complete(App $a) {
// logger('navbar_complete'); // logger('navbar_complete');
if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
return; return;
} }
// check if searching in the local global contact table is enabled // check if searching in the local global contact table is enabled
$localsearch = get_config('system','poco_local_search'); $localsearch = Config::get('system','poco_local_search');
$search = $prefix.notags(trim($_REQUEST['search'])); $search = $prefix.notags(trim($_REQUEST['search']));
$mode = $_REQUEST['smode']; $mode = $_REQUEST['smode'];

20
include/api.php
View file

@ -297,7 +297,7 @@ $called_api = null;
$duration = (float) (microtime(true) - $stamp); $duration = (float) (microtime(true) - $stamp);
logger("API call duration: " . round($duration, 2) . "\t" . $a->query_string, LOGGER_DEBUG); logger("API call duration: " . round($duration, 2) . "\t" . $a->query_string, LOGGER_DEBUG);
if (get_config("system", "profiler")) { if (Config::get("system", "profiler")) {
$duration = microtime(true)-$a->performance["start"]; $duration = microtime(true)-$a->performance["start"];
/// @TODO round() really everywhere? /// @TODO round() really everywhere?
@ -312,7 +312,7 @@ $called_api = null;
LOGGER_DEBUG LOGGER_DEBUG
); );
if (get_config("rendertime", "callstack")) { if (Config::get("rendertime", "callstack")) {
$o = "Database Read:\n"; $o = "Database Read:\n";
foreach ($a->callstack["database"] AS $func => $time) { foreach ($a->callstack["database"] AS $func => $time) {
$time = round($time, 3); $time = round($time, 3);
@ -1084,7 +1084,7 @@ $called_api = null;
$_REQUEST['type'] = 'net-comment'; $_REQUEST['type'] = 'net-comment';
} else { } else {
// Check for throttling (maximum posts per day, week and month) // Check for throttling (maximum posts per day, week and month)
$throttle_day = get_config('system','throttle_limit_day'); $throttle_day = Config::get('system','throttle_limit_day');
if ($throttle_day > 0) { if ($throttle_day > 0) {
$datefrom = date("Y-m-d H:i:s", time() - 24*60*60); $datefrom = date("Y-m-d H:i:s", time() - 24*60*60);
@ -1105,7 +1105,7 @@ $called_api = null;
} }
} }
$throttle_week = get_config('system','throttle_limit_week'); $throttle_week = Config::get('system','throttle_limit_week');
if ($throttle_week > 0) { if ($throttle_week > 0) {
$datefrom = date("Y-m-d H:i:s", time() - 24*60*60*7); $datefrom = date("Y-m-d H:i:s", time() - 24*60*60*7);
@ -1126,7 +1126,7 @@ $called_api = null;
} }
} }
$throttle_month = get_config('system','throttle_limit_month'); $throttle_month = Config::get('system','throttle_limit_month');
if ($throttle_month > 0) { if ($throttle_month > 0) {
$datefrom = date("Y-m-d H:i:s", time() - 24*60*60*30); $datefrom = date("Y-m-d H:i:s", time() - 24*60*60*30);
@ -2464,7 +2464,7 @@ $called_api = null;
if ($image) { if ($image) {
// If image cache is activated, then use the following sizes: // If image cache is activated, then use the following sizes:
// thumb (150), small (340), medium (600) and large (1024) // thumb (150), small (340), medium (600) and large (1024)
if (!get_config("system", "proxy_disabled")) { if (!Config::get("system", "proxy_disabled")) {
$media_url = proxy_url($url); $media_url = proxy_url($url);
$sizes = array(); $sizes = array();
@ -3761,7 +3761,7 @@ $called_api = null;
// Update global directory in background // Update global directory in background
//$user = api_get_user(get_app()); //$user = api_get_user(get_app());
$url = System::baseUrl() . '/profile/' . get_app()->user['nickname']; $url = System::baseUrl() . '/profile/' . get_app()->user['nickname'];
if ($url && strlen(get_config('system', 'directory'))) { if ($url && strlen(Config::get('system', 'directory'))) {
Worker::add(PRIORITY_LOW, "directory", $url); Worker::add(PRIORITY_LOW, "directory", $url);
} }
@ -3854,7 +3854,7 @@ $called_api = null;
throw new InternalServerErrorException("image size exceeds PHP config settings, file was rejected by server"); throw new InternalServerErrorException("image size exceeds PHP config settings, file was rejected by server");
} }
// check against max upload size within Friendica instance // check against max upload size within Friendica instance
$maximagesize = get_config('system', 'maximagesize'); $maximagesize = Config::get('system', 'maximagesize');
if (($maximagesize) && ($filesize > $maximagesize)) { if (($maximagesize) && ($filesize > $maximagesize)) {
$formattedBytes = formatBytes($maximagesize); $formattedBytes = formatBytes($maximagesize);
throw new InternalServerErrorException("image size exceeds Friendica config setting (uploaded size: $formattedBytes)"); throw new InternalServerErrorException("image size exceeds Friendica config setting (uploaded size: $formattedBytes)");
@ -3872,7 +3872,7 @@ $called_api = null;
@unlink($src); @unlink($src);
// check max length of images on server // check max length of images on server
$max_length = get_config('system', 'max_image_length'); $max_length = Config::get('system', 'max_image_length');
if (! $max_length) { if (! $max_length) {
$max_length = MAX_IMAGE_LENGTH; $max_length = MAX_IMAGE_LENGTH;
} }
@ -4947,7 +4947,7 @@ $called_api = null;
// retrieve general information about profiles for user // retrieve general information about profiles for user
$multi_profiles = feature_enabled(api_user(),'multi_profiles'); $multi_profiles = feature_enabled(api_user(),'multi_profiles');
$directory = get_config('system', 'directory'); $directory = Config::get('system', 'directory');
// get data of the specified profile id or all profiles of the user if not specified // get data of the specified profile id or all profiles of the user if not specified
if ($profileid != 0) { if ($profileid != 0) {

6
include/auth.php
View file

@ -33,7 +33,7 @@ if (isset($_COOKIE["Friendica"])) {
if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) { if (!isset($_SESSION) || !isset($_SESSION['authenticated'])) {
authenticate_success($r[0]); authenticate_success($r[0]);
if (get_config('system','paranoia')) if (Config::get('system','paranoia'))
$_SESSION['addr'] = $data->ip; $_SESSION['addr'] = $data->ip;
} }
} }
@ -67,7 +67,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
// already logged in user returning // already logged in user returning
$check = get_config('system','paranoia'); $check = Config::get('system','paranoia');
// extra paranoia - if the IP changed, log them out // extra paranoia - if the IP changed, log them out
if ($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) { if ($check && ($_SESSION['addr'] != $_SERVER['REMOTE_ADDR'])) {
logger('Session address changed. Paranoid setting in effect, blocking session. '. logger('Session address changed. Paranoid setting in effect, blocking session. '.
@ -109,7 +109,7 @@ if (isset($_SESSION) && x($_SESSION,'authenticated') && (!x($_POST,'auth-params'
if ((x($_POST,'openid_url')) && strlen($_POST['openid_url']) || if ((x($_POST,'openid_url')) && strlen($_POST['openid_url']) ||
(x($_POST,'username')) && strlen($_POST['username'])) { (x($_POST,'username')) && strlen($_POST['username'])) {
$noid = get_config('system','no_openid'); $noid = Config::get('system','no_openid');
$openid_url = trim((strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username'])); $openid_url = trim((strlen($_POST['openid_url'])?$_POST['openid_url']:$_POST['username']));

2
include/bbcode.php
View file

@ -913,7 +913,7 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $simplehtml = fa
$Text = str_replace("\r\n", "\n", $Text); $Text = str_replace("\r\n", "\n", $Text);
// removing multiplicated newlines // removing multiplicated newlines
if (get_config("system", "remove_multiplicated_lines")) { if (Config::get("system", "remove_multiplicated_lines")) {
$search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]", "[/li]\n", "\n[li]", "\n[ul]", "[/ul]\n", "\n\n[share ", "[/attachment]\n", $search = array("\n\n\n", "\n ", " \n", "[/quote]\n\n", "\n[/quote]", "[/li]\n", "\n[li]", "\n[ul]", "[/ul]\n", "\n\n[share ", "[/attachment]\n",
"\n[h1]", "[/h1]\n", "\n[h2]", "[/h2]\n", "\n[h3]", "[/h3]\n", "\n[h4]", "[/h4]\n", "\n[h5]", "[/h5]\n", "\n[h6]", "[/h6]\n"); "\n[h1]", "[/h1]\n", "\n[h2]", "[/h2]\n", "\n[h3]", "[/h3]\n", "\n[h4]", "[/h4]\n", "\n[h5]", "[/h5]\n", "\n[h6]", "[/h6]\n");
$replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[ul]", "[/ul]", "\n[share ", "[/attachment]", $replace = array("\n\n", "\n", "\n", "[/quote]\n", "[/quote]", "[/li]", "[li]", "[ul]", "[/ul]", "\n[share ", "[/attachment]",

24
include/cache.php
View file

@ -154,7 +154,7 @@ class Cache {
public static function clear($max_level = CACHE_MONTH) { public static function clear($max_level = CACHE_MONTH) {
// Clear long lasting cache entries only once a day // Clear long lasting cache entries only once a day
if (get_config("system", "cache_cleared_day") < time() - self::duration(CACHE_DAY)) { if (Config::get("system", "cache_cleared_day") < time() - self::duration(CACHE_DAY)) {
if ($max_level == CACHE_MONTH) { if ($max_level == CACHE_MONTH) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d", q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 30 days")), intval(CACHE_MONTH)); dbesc(datetime_convert('UTC','UTC',"now - 30 days")), intval(CACHE_MONTH));
@ -169,42 +169,42 @@ class Cache {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d", q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 1 days")), intval(CACHE_DAY)); dbesc(datetime_convert('UTC','UTC',"now - 1 days")), intval(CACHE_DAY));
} }
set_config("system", "cache_cleared_day", time()); Config::set("system", "cache_cleared_day", time());
} }
if (($max_level <= CACHE_HOUR) && (get_config("system", "cache_cleared_hour")) < time() - self::duration(CACHE_HOUR)) { if (($max_level <= CACHE_HOUR) && (Config::get("system", "cache_cleared_hour")) < time() - self::duration(CACHE_HOUR)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d", q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 1 hours")), intval(CACHE_HOUR)); dbesc(datetime_convert('UTC','UTC',"now - 1 hours")), intval(CACHE_HOUR));
set_config("system", "cache_cleared_hour", time()); Config::set("system", "cache_cleared_hour", time());
} }
if (($max_level <= CACHE_HALF_HOUR) && (get_config("system", "cache_cleared_half_hour")) < time() - self::duration(CACHE_HALF_HOUR)) { if (($max_level <= CACHE_HALF_HOUR) && (Config::get("system", "cache_cleared_half_hour")) < time() - self::duration(CACHE_HALF_HOUR)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d", q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 30 minutes")), intval(CACHE_HALF_HOUR)); dbesc(datetime_convert('UTC','UTC',"now - 30 minutes")), intval(CACHE_HALF_HOUR));
set_config("system", "cache_cleared_half_hour", time()); Config::set("system", "cache_cleared_half_hour", time());
} }
if (($max_level <= CACHE_QUARTER_HOUR) && (get_config("system", "cache_cleared_quarter_hour")) < time() - self::duration(CACHE_QUARTER_HOUR)) { if (($max_level <= CACHE_QUARTER_HOUR) && (Config::get("system", "cache_cleared_quarter_hour")) < time() - self::duration(CACHE_QUARTER_HOUR)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d", q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 15 minutes")), intval(CACHE_QUARTER_HOUR)); dbesc(datetime_convert('UTC','UTC',"now - 15 minutes")), intval(CACHE_QUARTER_HOUR));
set_config("system", "cache_cleared_quarter_hour", time()); Config::set("system", "cache_cleared_quarter_hour", time());
} }
if (($max_level <= CACHE_FIVE_MINUTES) && (get_config("system", "cache_cleared_five_minute")) < time() - self::duration(CACHE_FIVE_MINUTES)) { if (($max_level <= CACHE_FIVE_MINUTES) && (Config::get("system", "cache_cleared_five_minute")) < time() - self::duration(CACHE_FIVE_MINUTES)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d", q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 5 minutes")), intval(CACHE_FIVE_MINUTES)); dbesc(datetime_convert('UTC','UTC',"now - 5 minutes")), intval(CACHE_FIVE_MINUTES));
set_config("system", "cache_cleared_five_minute", time()); Config::set("system", "cache_cleared_five_minute", time());
} }
if (($max_level <= CACHE_MINUTE) && (get_config("system", "cache_cleared_minute")) < time() - self::duration(CACHE_MINUTE)) { if (($max_level <= CACHE_MINUTE) && (Config::get("system", "cache_cleared_minute")) < time() - self::duration(CACHE_MINUTE)) {
q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d", q("DELETE FROM `cache` WHERE `updated` < '%s' AND `expire_mode` = %d",
dbesc(datetime_convert('UTC','UTC',"now - 1 minutes")), intval(CACHE_MINUTE)); dbesc(datetime_convert('UTC','UTC',"now - 1 minutes")), intval(CACHE_MINUTE));
set_config("system", "cache_cleared_minute", time()); Config::set("system", "cache_cleared_minute", time());
} }
} }
} }

2
include/cli_startup.php
View file

@ -23,7 +23,7 @@ function cli_startup() {
Config::load(); Config::load();
$a->set_baseurl(get_config('system','url')); $a->set_baseurl(Config::get('system','url'));
load_hooks(); load_hooks();
} }

13
include/contact_widgets.php
View file

@ -3,6 +3,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig;
require_once 'include/contact_selectors.php'; require_once 'include/contact_selectors.php';
@ -24,8 +25,8 @@ function findpeople_widget() {
$a = get_app(); $a = get_app();
$global_dir = Config::get('system', 'directory'); $global_dir = Config::get('system', 'directory');
if (get_config('system', 'invitation_only')) { if (Config::get('system', 'invitation_only')) {
$x = get_pconfig(local_user(), 'system', 'invites_remaining'); $x = PConfig::get(local_user(), 'system', 'invites_remaining');
if ($x || is_site_admin()) { if ($x || is_site_admin()) {
$a->page['aside'] .= '<div class="side-link" id="side-invite-remain">' $a->page['aside'] .= '<div class="side-link" id="side-invite-remain">'
. sprintf( tt('%d invitation available', '%d invitations available', $x), $x) . sprintf( tt('%d invitation available', '%d invitations available', $x), $x)
@ -74,11 +75,11 @@ function unavailable_networks() {
$networks[] = NETWORK_TWITTER; $networks[] = NETWORK_TWITTER;
} }
if (get_config("system", "ostatus_disabled")) { if (Config::get("system", "ostatus_disabled")) {
$networks[] = NETWORK_OSTATUS; $networks[] = NETWORK_OSTATUS;
} }
if (!get_config("system", "diaspora_enabled")) { if (!Config::get("system", "diaspora_enabled")) {
$networks[] = NETWORK_DIASPORA; $networks[] = NETWORK_DIASPORA;
} }
@ -148,7 +149,7 @@ function fileas_widget($baseurl, $selected = '') {
return ''; return '';
} }
$saved = get_pconfig(local_user(), 'system', 'filetags'); $saved = PConfig::get(local_user(), 'system', 'filetags');
if (! strlen($saved)) { if (! strlen($saved)) {
return; return;
} }
@ -182,7 +183,7 @@ function categories_widget($baseurl, $selected = '') {
return ''; return '';
} }
$saved = get_pconfig($a->profile['profile_uid'], 'system', 'filetags'); $saved = PConfig::get($a->profile['profile_uid'], 'system', 'filetags');
if (! strlen($saved)) { if (! strlen($saved)) {
return; return;
} }

6
include/conversation.php
View file

@ -1,6 +1,8 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
require_once "include/bbcode.php"; require_once "include/bbcode.php";
@ -517,7 +519,7 @@ function conversation(App $a, $items, $mode, $update, $preview = false) {
$arr_blocked = null; $arr_blocked = null;
if (local_user()) { if (local_user()) {
$str_blocked = get_pconfig(local_user(), 'system', 'blocked'); $str_blocked = PConfig::get(local_user(), 'system', 'blocked');
if ($str_blocked) { if ($str_blocked) {
$arr_blocked = explode(',', $str_blocked); $arr_blocked = explode(',', $str_blocked);
for ($x = 0; $x < count($arr_blocked); $x ++) { for ($x = 0; $x < count($arr_blocked); $x ++) {
@ -1363,7 +1365,7 @@ function get_item_children($arr, $parent) {
$a = get_app(); $a = get_app();
foreach ($arr as $item) { foreach ($arr as $item) {
if ($item['id'] != $item['parent']) { if ($item['id'] != $item['parent']) {
if (get_config('system', 'thread_allow') && $a->theme_thread_allow) { if (Config::get('system', 'thread_allow') && $a->theme_thread_allow) {
// Fallback to parent-uri if thr-parent is not set // Fallback to parent-uri if thr-parent is not set
$thr_parent = $item['thr-parent']; $thr_parent = $item['thr-parent'];
if ($thr_parent == '') { if ($thr_parent == '') {

14
include/cron.php
View file

@ -14,9 +14,9 @@ function cron_run(&$argv, &$argc){
return; 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) { if (! $poll_interval) {
$poll_interval = 10; $poll_interval = 10;
} }
@ -59,7 +59,7 @@ function cron_run(&$argv, &$argc){
Worker::add(PRIORITY_LOW, "cronjobs", "repair_database"); Worker::add(PRIORITY_LOW, "cronjobs", "repair_database");
// once daily run birthday_updates and then expire in background // 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')); $d2 = intval(datetime_convert('UTC', 'UTC', 'now', 'd'));
if ($d2 != intval($d1)) { if ($d2 != intval($d1)) {
@ -70,7 +70,7 @@ function cron_run(&$argv, &$argc){
Worker::add(PRIORITY_LOW, "discover_poco", "suggestions"); 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'); Worker::add(PRIORITY_LOW, 'expire');
@ -90,7 +90,7 @@ function cron_run(&$argv, &$argc){
logger('cron: end'); logger('cron: end');
set_config('system', 'last_cron', time()); Config::set('system', 'last_cron', time());
return; return;
} }
@ -135,7 +135,7 @@ function cron_poll_contacts($argc, $argv) {
// and which have a polling address and ignore Diaspora since // and which have a polling address and ignore Diaspora since
// we are unable to match those posts with a Diaspora GUID and prevent duplicates. // 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) { if ($abandon_days < 1) {
$abandon_days = 0; $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 * 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'. * 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); $contact['priority'] = (($poll_interval !== false) ? intval($poll_interval) : 3);
} }

8
include/cronhooks.php
View file

@ -18,9 +18,9 @@ function cronhooks_run(&$argv, &$argc) {
return; 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) { if (! $poll_interval) {
$poll_interval = 9; $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'); logger('cronhooks: start');
@ -48,7 +48,7 @@ function cronhooks_run(&$argv, &$argc) {
logger('cronhooks: end'); logger('cronhooks: end');
set_config('system', 'last_cronhook', time()); Config::set('system', 'last_cronhook', time());
return; return;
} }

12
include/cronjobs.php
View file

@ -112,7 +112,7 @@ function cron_expire_and_remove_users() {
*/ */
function cron_clear_cache(App $a) { function cron_clear_cache(App $a) {
$last = get_config('system','cache_last_cleared'); $last = Config::get('system','cache_last_cleared');
if ($last) { if ($last) {
$next = $last + (3600); // Once per hour $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($a->get_basepath()."/view/smarty3/compiled", $a->get_basepath()."/view/smarty3/compiled");
// clear cache for image proxy // 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"); 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) { if (!$cachetime) {
$cachetime = PROXY_DEFAULT_TIME; $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"); q("DELETE FROM `parsed_url` WHERE `created` < NOW() - INTERVAL 3 MONTH");
// Maximum table size in megabyte // 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) { if ($max_tablesize == 0) {
$max_tablesize = 100 * 1000000; // Default are 100 MB $max_tablesize = 100 * 1000000; // Default are 100 MB
} }
if ($max_tablesize > 0) { if ($max_tablesize > 0) {
// Minimum fragmentation level in percent // 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) { if ($fragmentation_level == 0) {
$fragmentation_level = 0.3; // Default value is 30% $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());
} }
/** /**

4
include/crypto.php
View file

@ -1,5 +1,7 @@
<?php <?php
use Friendica\Core\Config;
require_once 'library/ASNValue.class.php'; require_once 'library/ASNValue.class.php';
require_once 'library/asn1.php'; require_once 'library/asn1.php';
@ -146,7 +148,7 @@ function new_keypair($bits) {
'encrypt_key' => false 'encrypt_key' => false
); );
$conf = get_config('system', 'openssl_conf_file'); $conf = Config::get('system', 'openssl_conf_file');
if ($conf) { if ($conf) {
$openssl_options['config'] = $conf; $openssl_options['config'] = $conf;
} }

5
include/datetime.php
View file

@ -5,6 +5,7 @@
*/ */
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig;
/** /**
* @brief Two-level sort for timezones. * @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) { function dob($dob) {
list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d'); 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) { if (! $f) {
$f = 'ymd'; $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) { function datetimesel($format, $min, $max, $default, $label, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '', $required = false) {
// First day of the week (0 = Sunday) // 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) { if ($firstDay === false) {
$firstDay=0; $firstDay=0;
} }

6
include/dbstructure.php
View file

@ -1781,9 +1781,9 @@ function dbstructure_run(&$argv, &$argc) {
case "update": case "update":
update_structure(true, true); update_structure(true, true);
$build = get_config('system','build'); $build = Config::get('system','build');
if (!x($build)) { if (!x($build)) {
set_config('system', 'build', DB_UPDATE_VERSION); Config::set('system', 'build', DB_UPDATE_VERSION);
$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; return;
case "dumpsql": case "dumpsql":
print_structure(db_definition()); print_structure(db_definition());

8
include/delivery.php
View file

@ -335,7 +335,7 @@ function delivery_run(&$argv, &$argc){
$x[0]['writable'] = 1; $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); 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 // 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']) { if ($owner['prvnets']) {
break; break;
} }
if (get_config('system','ostatus_disabled') || get_config('system','dfrn_only')) { if (Config::get('system','ostatus_disabled') || Config::get('system','dfrn_only')) {
break; break;
} }
@ -386,7 +386,7 @@ function delivery_run(&$argv, &$argc){
case NETWORK_MAIL: case NETWORK_MAIL:
case NETWORK_MAIL2: case NETWORK_MAIL2:
if (get_config('system','dfrn_only')) { if (Config::get('system','dfrn_only')) {
break; break;
} }
// WARNING: does not currently convert to RFC2047 header encodings, etc. // 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); 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; break;
if ($mail) { if ($mail) {

13
include/dfrn.php
View file

@ -8,6 +8,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
@ -442,11 +443,11 @@ class dfrn {
public static function relocate($owner, $uid) { public static function relocate($owner, $uid) {
/* get site pubkey. this could be a new installation with no site keys*/ /* 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) { if (! $pubkey) {
$res = new_keypair(1024); $res = new_keypair(1024);
set_config('system','site_prvkey', $res['prvkey']); Config::set('system','site_prvkey', $res['prvkey']);
set_config('system','site_pubkey', $res['pubkey']); Config::set('system','site_pubkey', $res['pubkey']);
} }
$rp = q("SELECT `resource-id` , `scale`, type FROM `photo` $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:confirm", $owner['confirm']);
xml::add_element($doc, $relocate, "dfrn:notify", $owner['notify']); xml::add_element($doc, $relocate, "dfrn:notify", $owner['notify']);
xml::add_element($doc, $relocate, "dfrn:poll", $owner['poll']); 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); $root->appendChild($relocate);
@ -1103,12 +1104,12 @@ class dfrn {
$idtosend = '1:' . $orig_id; $idtosend = '1:' . $orig_id;
} }
$rino = get_config('system', 'rino_encrypt'); $rino = Config::get('system', 'rino_encrypt');
$rino = intval($rino); $rino = intval($rino);
logger("Local rino version: ". $rino, LOGGER_DEBUG); 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 = ''; $ssl_policy = '';
switch ($ssl_val) { switch ($ssl_val) {

12
include/diaspora.php
View file

@ -42,7 +42,7 @@ class Diaspora {
*/ */
public static function relay_list() { public static function relay_list() {
$serverdata = get_config("system", "relay_server"); $serverdata = Config::get("system", "relay_server");
if ($serverdata == "") if ($serverdata == "")
return array(); return array();
@ -411,7 +411,7 @@ class Diaspora {
*/ */
public static function dispatch_public($msg) { public static function dispatch_public($msg) {
$enabled = intval(get_config("system", "diaspora_enabled")); $enabled = intval(Config::get("system", "diaspora_enabled"));
if (!$enabled) { if (!$enabled) {
logger("diaspora is disabled"); logger("diaspora is disabled");
return false; return false;
@ -740,7 +740,7 @@ class Diaspora {
if (!$person || $update) { if (!$person || $update) {
logger("create or refresh", LOGGER_DEBUG); 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" // Note that Friendica contacts will return a "Diaspora person"
// if Diaspora connectivity is enabled on their server // if Diaspora connectivity is enabled on their server
@ -2151,7 +2151,7 @@ class Diaspora {
intval($importer["uid"]) 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", $self = q("SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1",
intval($importer["uid"]) intval($importer["uid"])
@ -2942,7 +2942,7 @@ class Diaspora {
$a = get_app(); $a = get_app();
$enabled = intval(get_config("system", "diaspora_enabled")); $enabled = intval(Config::get("system", "diaspora_enabled"));
if (!$enabled) if (!$enabled)
return 200; return 200;
@ -2958,7 +2958,7 @@ class Diaspora {
if (!$queue_run && was_recently_delayed($contact["id"])) { if (!$queue_run && was_recently_delayed($contact["id"])) {
$return_code = 0; $return_code = 0;
} else { } 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"); $content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
post_url($dest_url."/", $envelope, array("Content-Type: ".$content_type)); post_url($dest_url."/", $envelope, array("Content-Type: ".$content_type));

13
include/discover_poco.php
View file

@ -2,6 +2,7 @@
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Network\Probe;
require_once 'include/probe.php'; require_once 'include/probe.php';
require_once 'include/socgraph.php'; require_once 'include/socgraph.php';
@ -81,17 +82,17 @@ function discover_poco_run(&$argv, &$argc) {
logger($result, LOGGER_DEBUG); logger($result, LOGGER_DEBUG);
} elseif ($mode == 3) { } elseif ($mode == 3) {
update_suggestions(); update_suggestions();
} elseif (($mode == 2) && get_config('system','poco_completion')) { } elseif (($mode == 2) && Config::get('system','poco_completion')) {
discover_users(); 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); discover_directory($search);
gs_search_user($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 // Query Friendica and Hubzilla servers for their users
poco_discover(); poco_discover();
// Query GNU Social servers for their users ("statistics" addon has to be enabled on the GS server) // 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(); gs_discover();
} }
@ -234,7 +235,7 @@ function discover_directory($search) {
logger("Friendica server ".$server_url." seems to be okay.", LOGGER_DEBUG); 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) { if ($data["network"] == NETWORK_DFRN) {
logger("Profile ".$jj->url." is reachable (".$search.")", LOGGER_DEBUG); logger("Profile ".$jj->url." is reachable (".$search.")", LOGGER_DEBUG);
logger("Add profile ".$jj->url." to local directory (".$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 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 /// @TODO find all those and convert to all lower-case which is a keyword then
foreach ($contacts->data AS $user) { 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) { if ($contact["network"] != NETWORK_PHANTOM) {
$contact["about"] = $user->description; $contact["about"] = $user->description;
update_gcontact($contact); update_gcontact($contact);

3
include/enotify.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
require_once('include/Emailer.php'); require_once('include/Emailer.php');
@ -589,7 +590,7 @@ function notification($params) {
// check whether sending post content in email notifications is allowed // check whether sending post content in email notifications is allowed
// always true for SYSTEM_EMAIL // always true for SYSTEM_EMAIL
$content_allowed = ((!get_config('system', 'enotify_no_content')) || ($params['type'] == SYSTEM_EMAIL)); $content_allowed = ((!Config::get('system', 'enotify_no_content')) || ($params['type'] == SYSTEM_EMAIL));
// load the template for private message notifications // load the template for private message notifications
$tpl = get_markup_template('email_notify_html.tpl'); $tpl = get_markup_template('email_notify_html.tpl');

3
include/event.php
View file

@ -5,6 +5,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
require_once 'include/bbcode.php'; require_once 'include/bbcode.php';
@ -435,7 +436,7 @@ function event_store($arr) {
function get_event_strings() { function get_event_strings() {
// First day of the week (0 = Sunday). // 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) { if ($firstDay === false) {
$firstDay = 0; $firstDay = 0;
} }

2
include/expire.php
View file

@ -24,7 +24,7 @@ function expire_run(&$argv, &$argc){
logger('Delete expired items - done', LOGGER_DEBUG); logger('Delete expired items - done', LOGGER_DEBUG);
// make this optional as it could have a performance impact on large sites // make this optional as it could have a performance impact on large sites
if (intval(get_config('system', 'optimize_items'))) { if (intval(Config::get('system', 'optimize_items'))) {
q("OPTIMIZE TABLE `item`"); q("OPTIMIZE TABLE `item`");
} }
return; return;

53
include/features.php
View file

@ -5,18 +5,21 @@
* @brief Features management * @brief Features management
*/ */
use Friendica\Core\Config;
use Friendica\Core\PConfig;
/** /**
* @brief check if feature is enabled * @brief check if feature is enabled
* *
* @return boolean * @return boolean
*/ */
function feature_enabled($uid, $feature) { function feature_enabled($uid, $feature) {
$x = get_config('feature_lock', $feature); $x = Config::get('feature_lock', $feature);
if ($x === false) { if ($x === false) {
$x = get_pconfig($uid, 'feature', $feature); $x = PConfig::get($uid, 'feature', $feature);
if ($x === false) { if ($x === false) {
$x = get_config('feature', $feature); $x = Config::get('feature', $feature);
if ($x === false) { if ($x === false) {
$x = get_feature_default($feature); $x = get_feature_default($feature);
} }
@ -64,53 +67,53 @@ function get_features($filtered = true) {
'general' => array( 'general' => array(
t('General Features'), t('General Features'),
//array('expire', t('Content Expiration'), t('Remove old posts/comments after a period of time')), //array('expire', t('Content Expiration'), t('Remove old posts/comments after a period of time')),
array('multi_profiles', t('Multiple Profiles'), t('Ability to create multiple profiles'), false, get_config('feature_lock','multi_profiles')), 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, get_config('feature_lock','photo_location')), 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, get_config('feature_lock','export_calendar')), 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 // Post composition
'composition' => array( 'composition' => array(
t('Post Composition Features'), 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('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, get_config('feature_lock','aclautomention')), 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 // Network sidebar widgets
'widgets' => array( 'widgets' => array(
t('Network Sidebar Widgets'), t('Network Sidebar Widgets'),
array('archives', t('Search by Date'), t('Ability to select posts by date ranges'), false, get_config('feature_lock','archives')), 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, get_config('feature_lock','forumlist_widget')), 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, get_config('feature_lock','groups')), 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, get_config('feature_lock','networks')), 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, get_config('feature_lock','savedsearch')), array('savedsearch', t('Saved Searches'), t('Save search terms for re-use'), false, Config::get('feature_lock','savedsearch')),
), ),
// Network tabs // Network tabs
'net_tabs' => array( 'net_tabs' => array(
t('Network Tabs'), t('Network Tabs'),
array('personal_tab', t('Network Personal Tab'), t('Enable tab to display only Network posts that you\'ve interacted on'), false, get_config('feature_lock','personal_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, get_config('feature_lock','new_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, get_config('feature_lock','link_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 // Item tools
'tools' => array( 'tools' => array(
t('Post/Comment Tools'), t('Post/Comment Tools'),
array('multi_delete', t('Multiple Deletion'), t('Select and delete multiple posts/comments at once'), false, get_config('feature_lock','multi_delete')), 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, get_config('feature_lock','edit_posts')), 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, get_config('feature_lock','commtag')), 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, get_config('feature_lock','categories')), 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, get_config('feature_lock','filing')), 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, get_config('feature_lock','dislike')), 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, get_config('feature_lock','star_posts')), 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, get_config('feature_lock','ignore_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 Settings
'advanced_profile' => array( 'advanced_profile' => array(
t('Advanced Profile Settings'), t('Advanced Profile Settings'),
array('forumlist_profile', t('List Forums'), t('Show visitors public community forums at the Advanced Profile Page'), false, 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')),
), ),
); );

11
include/follow.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Network\Probe; use Friendica\Network\Probe;
@ -15,7 +16,7 @@ require_once 'include/diaspora.php';
function update_contact($id) { function update_contact($id) {
/* /*
Warning: Never ever fetch the public key via probe_url and write it into the contacts. Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
This will reliably kill your communication with Friendica contacts. This will reliably kill your communication with Friendica contacts.
*/ */
@ -23,9 +24,9 @@ function update_contact($id) {
if (!$r) if (!$r)
return false; return false;
$ret = probe_url($r[0]["url"]); $ret = Probe::uri($r[0]["url"]);
// If probe_url fails the network code will be different // If Probe::uri fails the network code will be different
if ($ret["network"] != $r[0]["network"]) if ($ret["network"] != $r[0]["network"])
return false; return false;
@ -125,7 +126,7 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
// NOTREACHED // NOTREACHED
} }
} elseif (get_config('system','dfrn_only')) { } elseif (Config::get('system','dfrn_only')) {
$result['message'] = t('This site is not configured to allow communications with other networks.') . EOL; $result['message'] = t('This site is not configured to allow communications with other networks.') . EOL;
$result['message'] != t('No compatible communication protocols or feeds were discovered.') . EOL; $result['message'] != t('No compatible communication protocols or feeds were discovered.') . EOL;
return $result; return $result;
@ -156,7 +157,7 @@ function new_contact($uid, $url, $interactive = false, $network = '') {
return $result; return $result;
} }
if ($ret['network'] === NETWORK_OSTATUS && get_config('system','ostatus_disabled')) { if ($ret['network'] === NETWORK_OSTATUS && Config::get('system','ostatus_disabled')) {
$result['message'] .= t('The profile address specified belongs to a network which has been disabled on this site.') . EOL; $result['message'] .= t('The profile address specified belongs to a network which has been disabled on this site.') . EOL;
$ret['notify'] = ''; $ret['notify'] = '';
} }

3
include/gprobe.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Network\Probe;
require_once 'include/probe.php'; require_once 'include/probe.php';
require_once 'include/socgraph.php'; require_once 'include/socgraph.php';
@ -31,7 +32,7 @@ function gprobe_run(&$argv, &$argc){
} }
} }
$arr = probe_url($url); $arr = Probe::uri($url);
if (is_null($result)) { if (is_null($result)) {
Cache::set("gprobe:".$urlparts["host"], $arr); Cache::set("gprobe:".$urlparts["host"], $arr);

3
include/group.php
View file

@ -1,5 +1,6 @@
<?php <?php
use Friendica\Core\PConfig;
function group_add($uid,$name) { function group_add($uid,$name) {
@ -385,7 +386,7 @@ function get_default_group($uid, $network = "") {
$default_group = 0; $default_group = 0;
if ($network == NETWORK_OSTATUS) if ($network == NETWORK_OSTATUS)
$default_group = get_pconfig($uid, "ostatus", "default_group"); $default_group = PConfig::get($uid, "ostatus", "default_group");
if ($default_group != 0) if ($default_group != 0)
return $default_group; return $default_group;

10
include/identity.php
View file

@ -4,6 +4,8 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
@ -71,12 +73,12 @@ function profile_load(App $a, $nickname, $profile = 0, $profiledata = array()) {
$a->profile = $pdata; $a->profile = $pdata;
$a->profile_uid = $pdata['profile_uid']; $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->profile['network'] = NETWORK_DFRN;
$a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename']; $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['theme'] = $a->profile['theme'];
$_SESSION['mobile-theme'] = $a->profile['mobile-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 * @todo
@ -929,7 +931,7 @@ function zrl($s, $force = false) {
*/ */
function get_theme_uid() { function get_theme_uid() {
$uid = ((!empty($_REQUEST['puid'])) ? intval($_REQUEST['puid']) : 0); $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(); return local_user();
} }

21
include/items.php
View file

@ -9,6 +9,7 @@ use Friendica\Core\System;
use Friendica\ParseUrl; use Friendica\ParseUrl;
use Friendica\Util\Lock; use Friendica\Util\Lock;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\Worker; use Friendica\Core\Worker;
require_once 'include/bbcode.php'; 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 // update the commented timestamp on the parent
// Only update "commented" if it is really a comment // 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)); dba::update('item', array('commented' => datetime_convert(), 'changed' => datetime_convert()), array('id' => $parent_id));
} else { } else {
dba::update('item', array('changed' => datetime_convert()), array('id' => $parent_id)); 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; 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 // Use a single verify token, even if multiple hubs
$verify_token = ((strlen($contact['hub-verify'])) ? $contact['hub-verify'] : random_string()); $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) { function fix_private_photos($s, $uid, $item = null, $cid = 0) {
if (get_config('system','disable_embedded')) { if (Config::get('system','disable_embedded')) {
return $s; return $s;
} }
@ -1991,7 +1992,7 @@ function item_expire($uid, $days, $network = "", $force = false) {
* $expire_network_only = save your own wall posts * $expire_network_only = save your own wall posts
* and just expire conversations started by others * 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 " : ""); $sql_extra = ((intval($expire_network_only)) ? " AND wall = 0 " : "");
if ($network != "") { if ($network != "") {
@ -2020,7 +2021,7 @@ function item_expire($uid, $days, $network = "", $force = false) {
return; 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 $expire_items = (($expire_items === false) ? 1 : intval($expire_items)); // default if not set: 1
// Forcing expiring of items - but not notes and marked items // 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_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_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_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 $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"); 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" // For former Facebook folks that left because of "timeline"
/* /*
* @TODO old-lost code? * @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; return $o;
*/ */
$visible_years = get_pconfig($uid,'system','archive_visible_years'); $visible_years = PConfig::get($uid,'system','archive_visible_years');
if (! $visible_years) { if (! $visible_years) {
$visible_years = 5; $visible_years = 5;
} }

2
include/message.php
View file

@ -170,7 +170,7 @@ function send_wallmessage($recipient='', $body='', $subject='', $replyto=''){
require_once 'include/probe.php'; require_once 'include/probe.php';
$me = probe_url($replyto); $me = Probe::uri($replyto);
if (! $me['name']) { if (! $me['name']) {
return -2; return -2;

17
include/nav.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
function nav(App $a) { function nav(App $a) {
@ -114,7 +115,7 @@ function nav_info(App $a)
$help_url = 'help'; $help_url = 'help';
if (! get_config('system', 'hide_help')) { if (!Config::get('system', 'hide_help')) {
$nav['help'] = array($help_url, t('Help'), '', t('Help and documentation')); $nav['help'] = array($help_url, t('Help'), '', t('Help and documentation'));
} }
@ -122,7 +123,7 @@ function nav_info(App $a)
$nav['apps'] = array('apps', t('Apps'), '', t('Addon applications, utilities, games')); $nav['apps'] = array('apps', t('Apps'), '', t('Addon applications, utilities, games'));
} }
if (local_user() || !get_config('system', 'local_search')) { if (local_user() || !Config::get('system', 'local_search')) {
$nav['search'] = array('search', t('Search'), '', t('Search site content')); $nav['search'] = array('search', t('Search'), '', t('Search site content'));
$nav['searchoption'] = array( $nav['searchoption'] = array(
@ -130,21 +131,21 @@ function nav_info(App $a)
t('Tags'), t('Tags'),
t('Contacts')); t('Contacts'));
if (get_config('system', 'poco_local_search')) { if (Config::get('system', 'poco_local_search')) {
$nav['searchoption'][] = t('Forums'); $nav['searchoption'][] = t('Forums');
} }
} }
$gdirpath = 'directory'; $gdirpath = 'directory';
if (strlen(get_config('system', 'singleuser'))) { if (strlen(Config::get('system', 'singleuser'))) {
$gdir = get_config('system', 'directory'); $gdir = Config::get('system', 'directory');
if (strlen($gdir)) { if (strlen($gdir)) {
$gdirpath = zrl($gdir, true); $gdirpath = zrl($gdir, true);
} }
} elseif (get_config('system', 'community_page_style') == CP_USERS_ON_SERVER) { } elseif (Config::get('system', 'community_page_style') == CP_USERS_ON_SERVER) {
$nav['community'] = array('community', t('Community'), '', t('Conversations on this site')); $nav['community'] = array('community', t('Community'), '', t('Conversations on this site'));
} elseif (get_config('system', 'community_page_style') == CP_GLOBAL_COMMUNITY) { } elseif (Config::get('system', 'community_page_style') == CP_GLOBAL_COMMUNITY) {
$nav['community'] = array('community', t('Community'), '', t('Conversations on the network')); $nav['community'] = array('community', t('Community'), '', t('Conversations on the network'));
} }
@ -203,7 +204,7 @@ function nav_info(App $a)
$nav['navigation'] = array('navigation/', t('Navigation'), '', t('Site map')); $nav['navigation'] = array('navigation/', t('Navigation'), '', t('Site map'));
// Provide a banner/logo/whatever // Provide a banner/logo/whatever
$banner = get_config('system', 'banner'); $banner = Config::get('system', 'banner');
if ($banner === false) { if ($banner === false) {
$banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>'; $banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
} }

32
include/network.php
View file

@ -124,26 +124,26 @@ function z_fetch_url($url, $binary = false, &$redirects = 0, $opts = array()) {
if (x($opts, 'timeout')) { if (x($opts, 'timeout')) {
@curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']); @curl_setopt($ch, CURLOPT_TIMEOUT, $opts['timeout']);
} else { } 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)); @curl_setopt($ch, CURLOPT_TIMEOUT, (($curl_time !== false) ? $curl_time : 60));
} }
// by default we will allow self-signed certs // by default we will allow self-signed certs
// but you can override this // 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)); @curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
if ($check_cert) { if ($check_cert) {
@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2); @curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
} }
$proxy = get_config('system', 'proxy'); $proxy = Config::get('system', 'proxy');
if (strlen($proxy)) { if (strlen($proxy)) {
@curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1); @curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
@curl_setopt($ch, CURLOPT_PROXY, $proxy); @curl_setopt($ch, CURLOPT_PROXY, $proxy);
$proxyuser = @get_config('system', 'proxyuser'); $proxyuser = @Config::get('system', 'proxyuser');
if (strlen($proxyuser)) { if (strlen($proxyuser)) {
@curl_setopt($ch, CURLOPT_PROXYUSERPWD, $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)) { if (intval($timeout)) {
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout); curl_setopt($ch, CURLOPT_TIMEOUT, $timeout);
} else { } 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)); 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); 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)); curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, (($check_cert) ? true : false));
if ($check_cert) { if ($check_cert) {
@curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2); @curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, 2);
} }
$proxy = get_config('system', 'proxy'); $proxy = Config::get('system', 'proxy');
if (strlen($proxy)) { if (strlen($proxy)) {
curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1); curl_setopt($ch, CURLOPT_HTTPPROXYTUNNEL, 1);
curl_setopt($ch, CURLOPT_PROXY, $proxy); curl_setopt($ch, CURLOPT_PROXY, $proxy);
$proxyuser = get_config('system', 'proxyuser'); $proxyuser = Config::get('system', 'proxyuser');
if (strlen($proxyuser)) { if (strlen($proxyuser)) {
curl_setopt($ch, CURLOPT_PROXYUSERPWD, $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 * @return boolean True if it's a valid URL, fals if something wrong with it
*/ */
function validate_url(&$url) { function validate_url(&$url) {
if (get_config('system','disable_url_validation')) if (Config::get('system','disable_url_validation'))
return true; return true;
// no naked subdomains (allow localhost for tests) // no naked subdomains (allow localhost for tests)
@ -493,7 +493,7 @@ function validate_url(&$url) {
*/ */
function validate_email($addr) { function validate_email($addr) {
if (get_config('system','disable_email_validation')) if (Config::get('system','disable_email_validation'))
return true; return true;
if (! strpos($addr,'@')) if (! strpos($addr,'@'))
@ -598,7 +598,7 @@ function allowed_email($email) {
return false; return false;
} }
$str_allowed = get_config('system','allowed_email'); $str_allowed = Config::get('system','allowed_email');
if (! $str_allowed) { if (! $str_allowed) {
return true; return true;
} }
@ -658,7 +658,7 @@ function parse_xml_string($s, $strict = true) {
function scale_external_images($srctext, $include_link = true, $scale_replace = false) { function scale_external_images($srctext, $include_link = true, $scale_replace = false) {
// Suppress "view full size" // 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; $include_link = false;
} }
@ -915,11 +915,11 @@ function original_url($url, $depth = 1, $fetchbody = false) {
function short_link($url) { function short_link($url) {
require_once('library/slinky.php'); require_once('library/slinky.php');
$slinky = new Slinky($url); $slinky = new Slinky($url);
$yourls_url = get_config('yourls','url1'); $yourls_url = Config::get('yourls','url1');
if ($yourls_url) { if ($yourls_url) {
$yourls_username = get_config('yourls','username1'); $yourls_username = Config::get('yourls','username1');
$yourls_password = get_config('yourls', 'password1'); $yourls_password = Config::get('yourls', 'password1');
$yourls_ssl = get_config('yourls', 'ssl1'); $yourls_ssl = Config::get('yourls', 'ssl1');
$yourls = new Slinky_YourLS(); $yourls = new Slinky_YourLS();
$yourls->set('username', $yourls_username); $yourls->set('username', $yourls_username);
$yourls->set('password', $yourls_password); $yourls->set('password', $yourls_password);

11
include/notifier.php
View file

@ -3,6 +3,7 @@
use Friendica\App; use Friendica\App;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Network\Probe;
require_once 'include/queue_fn.php'; require_once 'include/queue_fn.php';
require_once 'include/html2plain.php'; require_once 'include/html2plain.php';
@ -426,7 +427,7 @@ function notifier_run(&$argv, &$argc){
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
$probed_contact = $r[0]; $probed_contact = $r[0];
} else { } else {
$probed_contact = probe_url($thr_parent[0]['author-link']); $probed_contact = Probe::uri($thr_parent[0]['author-link']);
} }
if ($probed_contact["notify"] != "") { if ($probed_contact["notify"] != "") {
@ -441,7 +442,7 @@ function notifier_run(&$argv, &$argc){
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
$probed_contact = $r[0]; $probed_contact = $r[0];
} else { } else {
$probed_contact = probe_url($thr_parent[0]['owner-link']); $probed_contact = Probe::uri($thr_parent[0]['owner-link']);
} }
if ($probed_contact["notify"] != "") { if ($probed_contact["notify"] != "") {
@ -455,7 +456,7 @@ function notifier_run(&$argv, &$argc){
//logger('Checking tag '.$x, LOGGER_DEBUG); //logger('Checking tag '.$x, LOGGER_DEBUG);
$matches = null; $matches = null;
if (preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) { if (preg_match('/@\[url=([^\]]*)\]/',$x,$matches)) {
$probed_contact = probe_url($matches[1]); $probed_contact = Probe::uri($matches[1]);
if ($probed_contact["notify"] != "") { if ($probed_contact["notify"] != "") {
logger('Notify mentioned user '.$probed_contact["url"].': '.$probed_contact["notify"]); logger('Notify mentioned user '.$probed_contact["url"].': '.$probed_contact["notify"]);
$url_recipients[$probed_contact["notify"]] = $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 // 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 (! $mail_disabled) {
if ((! strlen($target_item['allow_cid'])) && (! strlen($target_item['allow_gid'])) 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. // 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 ($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) { foreach ($url_recipients as $url) {
if ($url) { if ($url) {
logger('notifier: urldelivery: ' . $url); logger('notifier: urldelivery: ' . $url);

10
include/oauth.php
View file

@ -6,6 +6,8 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
define('REQUEST_TOKEN_DURATION', 300); define('REQUEST_TOKEN_DURATION', 300);
@ -92,7 +94,7 @@ class FKOAuthDataStore extends OAuthDataStore {
$ret=Null; $ret=Null;
// get user for this verifier // get user for this verifier
$uverifier = get_config("oauth", $verifier); $uverifier = Config::get("oauth", $verifier);
logger(__function__.":".$verifier.",".$uverifier); logger(__function__.":".$verifier.",".$uverifier);
if (is_null($verifier) || ($uverifier!==false)){ if (is_null($verifier) || ($uverifier!==false)){
@ -115,10 +117,10 @@ class FKOAuthDataStore extends OAuthDataStore {
if (!is_null($ret) && $uverifier!==false){ if (!is_null($ret) && $uverifier!==false){
del_config("oauth", $verifier); del_config("oauth", $verifier);
/* $apps = get_pconfig($uverifier, "oauth", "apps"); /* $apps = PConfig::get($uverifier, "oauth", "apps");
if ($apps===false) $apps=array(); if ($apps===false) $apps=array();
$apps[] = $consumer->key; $apps[] = $consumer->key;
set_pconfig($uverifier, "oauth", "apps", $apps);*/ PConfig::set($uverifier, "oauth", "apps", $apps);*/
} }
return $ret; return $ret;
@ -148,7 +150,7 @@ class FKOAuth1 extends OAuthServer {
} }
$_SESSION['uid'] = $record['uid']; $_SESSION['uid'] = $record['uid'];
$_SESSION['theme'] = $record['theme']; $_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['authenticated'] = 1;
$_SESSION['page_flags'] = $record['page-flags']; $_SESSION['page_flags'] = $record['page-flags'];
$_SESSION['my_url'] = System::baseUrl() . '/profile/' . $record['nickname']; $_SESSION['my_url'] = System::baseUrl() . '/profile/' . $record['nickname'];

2
include/ostatus.php
View file

@ -1513,7 +1513,7 @@ class ostatus {
$contact = owner; $contact = owner;
if (!isset($contact["poll"])) { if (!isset($contact["poll"])) {
$data = probe_url($url); $data = Probe::uri($url);
$contact["poll"] = $data["poll"]; $contact["poll"] = $data["poll"];
if (!$contact["alias"]) if (!$contact["alias"])

2
include/pgettext.php
View file

@ -3,7 +3,7 @@
/** /**
* @brief translation support * @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. * as database may not yet be configured.
* *
* If possible, we use the value from the browser. * If possible, we use the value from the browser.

3
include/plaintext.php
View file

@ -6,6 +6,7 @@
use Friendica\App; use Friendica\App;
use Friendica\ParseUrl; use Friendica\ParseUrl;
use Friendica\Core\PConfig;
require_once("include/Photo.php"); require_once("include/Photo.php");
require_once("include/bbcode.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 // Which purpose has this line? It is now uncommented, but left as a reminder
//} elseif (strpos($b["body"], "[share") !== false) { //} elseif (strpos($b["body"], "[share") !== false) {
// $post["url"] = $b["plink"]; // $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"]; $post["url"] = $b["plink"];
} }
$msg = shortenmsg($msg, $limit); $msg = shortenmsg($msg, $limit);

3
include/plugin.php
View file

@ -6,6 +6,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
/** /**
@ -72,7 +73,7 @@ function install_plugin($plugin) {
if (! function_exists('reload_plugins')) { if (! function_exists('reload_plugins')) {
function reload_plugins() { function reload_plugins() {
$plugins = get_config('system','addon'); $plugins = Config::get('system','addon');
if (strlen($plugins)) { if (strlen($plugins)) {
$r = q("SELECT * FROM `addon` WHERE `installed` = 1"); $r = q("SELECT * FROM `addon` WHERE `installed` = 1");

32
include/post_update.php
View file

@ -3,6 +3,8 @@
* @file include/post_update.php * @file include/post_update.php
*/ */
use Friendica\Core\Config;
/** /**
* @brief Calls the post update functions * @brief Calls the post update functions
*/ */
@ -33,7 +35,7 @@ function post_update() {
function post_update_1192() { function post_update_1192() {
// Was the script completed? // Was the script completed?
if (get_config("system", "post_update_version") >= 1192) if (Config::get("system", "post_update_version") >= 1192)
return true; return true;
// Check if the first step is done (Setting "gcontact-id" in the item table) // 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)"); (`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
if ($r && ($r[0]["total"] == 0)) { if ($r && ($r[0]["total"] == 0)) {
set_config("system", "post_update_version", 1192); Config::set("system", "post_update_version", 1192);
return true; return true;
} }
@ -85,23 +87,23 @@ function post_update_1192() {
function post_update_1194() { function post_update_1194() {
// Was the script completed? // Was the script completed?
if (get_config("system", "post_update_version") >= 1194) if (Config::get("system", "post_update_version") >= 1194)
return true; return true;
logger("Start", LOGGER_DEBUG); 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) { if (!$end_id) {
$r = q("SELECT `id` FROM `item` WHERE `uid` != 0 ORDER BY `id` DESC LIMIT 1"); $r = q("SELECT `id` FROM `item` WHERE `uid` != 0 ORDER BY `id` DESC LIMIT 1");
if ($r) { if ($r) {
set_config("system", "post_update_1194_end", $r[0]["id"]); Config::set("system", "post_update_1194_end", $r[0]["id"]);
$end_id = get_config("system", "post_update_1194_end"); $end_id = Config::get("system", "post_update_1194_end");
} }
} }
logger("End ID: ".$end_id, LOGGER_DEBUG); 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` "; $query1 = "SELECT `item`.`id` FROM `item` ";
@ -119,12 +121,12 @@ function post_update_1194() {
intval($start_id), intval($end_id), intval($start_id), intval($end_id),
dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS)); dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS));
if (!$r) { if (!$r) {
set_config("system", "post_update_version", 1194); Config::set("system", "post_update_version", 1194);
logger("Update is done", LOGGER_DEBUG); logger("Update is done", LOGGER_DEBUG);
return true; return true;
} else { } else {
set_config("system", "post_update_1194_start", $r[0]["id"]); Config::set("system", "post_update_1194_start", $r[0]["id"]);
$start_id = get_config("system", "post_update_1194_start"); $start_id = Config::get("system", "post_update_1194_start");
} }
logger("Start ID: ".$start_id, LOGGER_DEBUG); logger("Start ID: ".$start_id, LOGGER_DEBUG);
@ -157,7 +159,7 @@ function post_update_1194() {
function post_update_1198() { function post_update_1198() {
// Was the script completed? // Was the script completed?
if (get_config("system", "post_update_version") >= 1198) if (Config::get("system", "post_update_version") >= 1198)
return true; return true;
logger("Start", LOGGER_DEBUG); logger("Start", LOGGER_DEBUG);
@ -172,7 +174,7 @@ function post_update_1198() {
(`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)"); (`thread`.`uid` IN (SELECT `uid` from `user`) OR `thread`.`uid` = 0)");
if ($r && ($r[0]["total"] == 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); logger("Done", LOGGER_DEBUG);
return true; return true;
} }
@ -186,7 +188,7 @@ function post_update_1198() {
logger("Updated threads", LOGGER_DEBUG); logger("Updated threads", LOGGER_DEBUG);
if (dbm::is_result($r)) { if (dbm::is_result($r)) {
set_config("system", "post_update_version", 1198); Config::set("system", "post_update_version", 1198);
logger("Done", LOGGER_DEBUG); logger("Done", LOGGER_DEBUG);
return true; return true;
} }
@ -234,7 +236,7 @@ function post_update_1198() {
*/ */
function post_update_1206() { function post_update_1206() {
// Was the script completed? // Was the script completed?
if (get_config("system", "post_update_version") >= 1206) if (Config::get("system", "post_update_version") >= 1206)
return true; return true;
logger("Start", LOGGER_DEBUG); 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); logger("Done", LOGGER_DEBUG);
return true; return true;
} }

6
include/queue_fn.php
View file

@ -1,5 +1,7 @@
<?php <?php
use Friendica\Core\Config;
function update_queue_time($id) { function update_queue_time($id) {
logger('queue: requeue item ' . $id); logger('queue: requeue item ' . $id);
q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d", q("UPDATE `queue` SET `last` = '%s' WHERE `id` = %d",
@ -48,12 +50,12 @@ function was_recently_delayed($cid) {
function add_to_queue($cid,$network,$msg,$batch = false) { function add_to_queue($cid,$network,$msg,$batch = false) {
$max_queue = get_config('system','max_contact_queue'); $max_queue = Config::get('system','max_contact_queue');
if ($max_queue < 1) { if ($max_queue < 1) {
$max_queue = 500; $max_queue = 500;
} }
$batch_queue = get_config('system','max_batch_queue'); $batch_queue = Config::get('system','max_batch_queue');
if ($batch_queue < 1) { if ($batch_queue < 1) {
$batch_queue = 1000; $batch_queue = 1000;
} }

8
include/security.php
View file

@ -1,6 +1,8 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
/** /**
@ -11,7 +13,7 @@ use Friendica\Core\System;
* @return string Hashed data * @return string Hashed data
*/ */
function cookie_hash($user) { function cookie_hash($user) {
return(hash("sha256", get_config("system", "site_prvkey"). return(hash("sha256", Config::get("system", "site_prvkey").
$user["uprvkey"]. $user["uprvkey"].
$user["password"])); $user["password"]));
} }
@ -38,7 +40,7 @@ function new_cookie($time, $user = array()) {
} }
setcookie("Friendica", $value, $time, "/", "", setcookie("Friendica", $value, $time, "/", "",
(get_config('system', 'ssl_policy') == SSL_POLICY_FULL), true); (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL), true);
} }
@ -48,7 +50,7 @@ function authenticate_success($user_record, $login_initial = false, $interactive
$_SESSION['uid'] = $user_record['uid']; $_SESSION['uid'] = $user_record['uid'];
$_SESSION['theme'] = $user_record['theme']; $_SESSION['theme'] = $user_record['theme'];
$_SESSION['mobile-theme'] = get_pconfig($user_record['uid'], 'system', 'mobile_theme'); $_SESSION['mobile-theme'] = PConfig::get($user_record['uid'], 'system', 'mobile_theme');
$_SESSION['authenticated'] = 1; $_SESSION['authenticated'] = 1;
$_SESSION['page_flags'] = $user_record['page-flags']; $_SESSION['page_flags'] = $user_record['page-flags'];
$_SESSION['my_url'] = System::baseUrl() . '/profile/' . $user_record['nickname']; $_SESSION['my_url'] = System::baseUrl() . '/profile/' . $user_record['nickname'];

2
include/session.php
View file

@ -115,7 +115,7 @@ if (Config::get('system', 'ssl_policy') == SSL_POLICY_FULL) {
ini_set('session.cookie_secure', 1); ini_set('session.cookie_secure', 1);
} }
if (!get_config('system', 'disable_database_session')) { if (!Config::get('system', 'disable_database_session')) {
session_set_save_handler('ref_session_open', 'ref_session_close', session_set_save_handler('ref_session_open', 'ref_session_close',
'ref_session_read', 'ref_session_write', 'ref_session_read', 'ref_session_write',
'ref_session_destroy', 'ref_session_gc'); 'ref_session_destroy', 'ref_session_gc');

26
include/socgraph.php
View file

@ -1556,11 +1556,11 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
$network = array(NETWORK_DFRN); $network = array(NETWORK_DFRN);
if (get_config('system','diaspora_enabled')) { if (Config::get('system','diaspora_enabled')) {
$network[] = NETWORK_DIASPORA; $network[] = NETWORK_DIASPORA;
} }
if (!get_config('system','ostatus_disabled')) { if (!Config::get('system','ostatus_disabled')) {
$network[] = NETWORK_OSTATUS; $network[] = NETWORK_OSTATUS;
} }
@ -1648,7 +1648,7 @@ function update_suggestions() {
$done[] = System::baseUrl() . '/poco'; $done[] = System::baseUrl() . '/poco';
if (strlen(get_config('system','directory'))) { if (strlen(Config::get('system','directory'))) {
$x = fetch_url(get_server()."/pubsites"); $x = fetch_url(get_server()."/pubsites");
if ($x) { if ($x) {
$j = json_decode($x); $j = json_decode($x);
@ -1709,7 +1709,7 @@ function poco_fetch_serverlist($poco) {
} }
function poco_discover_federation() { function poco_discover_federation() {
$last = get_config('poco','last_federation_discovery'); $last = Config::get('poco','last_federation_discovery');
if ($last) { if ($last) {
$next = $last + (24 * 60 * 60); $next = $last + (24 * 60 * 60);
@ -1746,7 +1746,7 @@ function poco_discover_federation() {
// Currently disabled, since the service isn't available anymore. // Currently disabled, since the service isn't available anymore.
// It is not removed since I hope that there will be a successor. // It is not removed since I hope that there will be a successor.
// Discover GNU Social Servers. // Discover GNU Social Servers.
//if (!get_config('system','ostatus_disabled')) { //if (!Config::get('system','ostatus_disabled')) {
// $serverdata = "http://gstools.org/api/get_open_instances/"; // $serverdata = "http://gstools.org/api/get_open_instances/";
// $result = z_fetch_url($serverdata); // $result = z_fetch_url($serverdata);
@ -1758,7 +1758,7 @@ function poco_discover_federation() {
// } // }
//} //}
set_config('poco','last_federation_discovery', time()); Config::set('poco','last_federation_discovery', time());
} }
function poco_discover_single_server($id) { function poco_discover_single_server($id) {
@ -1783,9 +1783,9 @@ function poco_discover_single_server($id) {
poco_discover_server($data, 2); poco_discover_server($data, 2);
if (get_config('system','poco_discovery') > 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) { if ($timeframe == 0) {
$timeframe = 30; $timeframe = 30;
} }
@ -1803,7 +1803,7 @@ function poco_discover_single_server($id) {
$success = poco_discover_server(json_decode($retdata["body"])); $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); logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG);
poco_discover_server_users($data, $server); poco_discover_server_users($data, $server);
} }
@ -1830,7 +1830,7 @@ function poco_discover($complete = false) {
$no_of_queries = 5; $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) { if ($requery_days == 0) {
$requery_days = 7; $requery_days = 7;
@ -2036,7 +2036,7 @@ function clean_contact_url($url) {
*/ */
function fix_alternate_contact_address(&$contact) { function fix_alternate_contact_address(&$contact) {
if (($contact["network"] == NETWORK_OSTATUS) && poco_alternate_ostatus_url($contact["url"])) { 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) { if ($contact["network"] == NETWORK_OSTATUS) {
logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG); logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG);
$contact["url"] = $data["url"]; $contact["url"] = $data["url"];
@ -2294,7 +2294,7 @@ function update_gcontact($contact) {
* @param str $url profile link * @param str $url profile link
*/ */
function update_gcontact_from_probe($url) { function update_gcontact_from_probe($url) {
$data = probe_url($url); $data = Probe::uri($url);
if (in_array($data["network"], array(NETWORK_PHANTOM))) { if (in_array($data["network"], array(NETWORK_PHANTOM))) {
logger("Invalid network for contact url ".$data["url"]." - Called by: ".System::callstack(), LOGGER_DEBUG); 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() { 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)); $last_update = date("c", time() - (60 * 60 * 24 * $requery_days));

34
include/text.php
View file

@ -1,6 +1,8 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
require_once "include/template_processor.php"; require_once "include/template_processor.php";
@ -718,9 +720,9 @@ function logger($msg, $level = 0) {
return; return;
} }
$debugging = get_config('system','debugging'); $debugging = Config::get('system','debugging');
$logfile = get_config('system','logfile'); $logfile = Config::get('system','logfile');
$loglevel = intval(get_config('system','loglevel')); $loglevel = intval(Config::get('system','loglevel'));
if ( if (
! $debugging ! $debugging
@ -790,7 +792,7 @@ function dlogger($msg, $level = 0) {
return; return;
} }
$logfile = get_config('system','dlogfile'); $logfile = Config::get('system','dlogfile');
if (! $logfile) { if (! $logfile) {
return; return;
@ -934,7 +936,7 @@ function contact_block() {
$o = ''; $o = '';
$a = get_app(); $a = get_app();
$shown = get_pconfig($a->profile['uid'],'system','display_friend_count'); $shown = PConfig::get($a->profile['uid'],'system','display_friend_count');
if ($shown === false) { if ($shown === false) {
$shown = 24; $shown = 24;
} }
@ -1096,7 +1098,7 @@ function search($s, $id = 'search-box', $url = 'search', $save = false, $aside =
t("Tags"), t("Tags"),
t("Contacts")); t("Contacts"));
if (get_config('system','poco_local_search')) { if (Config::get('system','poco_local_search')) {
$values['$searchoption'][] = t("Forums"); $values['$searchoption'][] = t("Forums");
} }
} }
@ -1114,7 +1116,7 @@ if (! function_exists('valid_email')) {
function valid_email($x){ function valid_email($x){
/// @TODO Removed because Fabio told me so. /// @TODO Removed because Fabio told me so.
//if (get_config('system','disable_email_validation')) //if (Config::get('system','disable_email_validation'))
// return true; // return true;
return preg_match('/^[_a-zA-Z0-9\-\+]+(\.[_a-zA-Z0-9\-\+]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/', $x); 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) { function put_item_in_cache(&$item, $update = false) {
if (($item["rendered-hash"] != hash("md5", $item["body"])) || ($item["rendered-hash"] == "") || 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. // The function "redir_private_images" changes the body.
// I'm not sure if we should store it permanently, so we save the old value. // 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; 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`", $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)); 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) if ($file_old == $file_new)
return true; return true;
$saved = get_pconfig($uid,'system','filetags'); $saved = PConfig::get($uid,'system','filetags');
if (strlen($saved)) { if (strlen($saved)) {
if ($type == 'file') { if ($type == 'file') {
$lbracket = '['; $lbracket = '[';
@ -2030,13 +2032,13 @@ function file_tag_update_pconfig($uid, $file_old, $file_new, $type = 'file') {
} }
if ($saved != $filetags_updated) { if ($saved != $filetags_updated) {
set_pconfig($uid, 'system', 'filetags', $filetags_updated); PConfig::set($uid, 'system', 'filetags', $filetags_updated);
} }
return true; return true;
} }
else else
if (strlen($file_new)) { if (strlen($file_new)) {
set_pconfig($uid, 'system', 'filetags', $file_new); PConfig::set($uid, 'system', 'filetags', $file_new);
} }
return true; return true;
} }
@ -2062,9 +2064,9 @@ function file_tag_save_file($uid, $item, $file) {
create_files_from_item($item); 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) . ']'))) { 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') ); info( t('Item filed') );
} }
@ -2110,8 +2112,8 @@ function file_tag_unsave_file($uid, $item, $file, $cat = false) {
intval($uid)); intval($uid));
if (! dbm::is_result($r)) { if (! dbm::is_result($r)) {
$saved = get_pconfig($uid,'system','filetags'); $saved = PConfig::get($uid,'system','filetags');
set_pconfig($uid, 'system', 'filetags', str_replace($pattern, '', $saved)); PConfig::set($uid, 'system', 'filetags', str_replace($pattern, '', $saved));
} }
return true; return true;

3
include/update_gcontact.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Network\Probe;
function update_gcontact_run(&$argv, &$argc) { function update_gcontact_run(&$argv, &$argc) {
global $a; global $a;
@ -29,7 +30,7 @@ function update_gcontact_run(&$argv, &$argc) {
return; return;
} }
$data = probe_url($r[0]["url"]); $data = Probe::uri($r[0]["url"]);
if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) { if (!in_array($data["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
if ($r[0]["server_url"] != "") if ($r[0]["server_url"] != "")

11
include/user.php
View file

@ -1,5 +1,6 @@
<?php <?php
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
require_once('include/config.php'); require_once('include/config.php');
@ -18,8 +19,8 @@ function create_user($arr) {
$a = get_app(); $a = get_app();
$result = array('success' => false, 'user' => null, 'password' => '', 'message' => ''); $result = array('success' => false, 'user' => null, 'password' => '', 'message' => '');
$using_invites = get_config('system','invitation_only'); $using_invites = Config::get('system','invitation_only');
$num_invites = get_config('system','number_invites'); $num_invites = Config::get('system','number_invites');
$invite_id = ((x($arr,'invite_id')) ? notags(trim($arr['invite_id'])) : ''); $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); $verified = ((x($arr,'verified')) ? intval($arr['verified']) : 0);
$publish = ((x($arr,'profile_publish_reg') && intval($arr['profile_publish_reg'])) ? 1 : 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) { if ($password1 != $confirm) {
$result['message'] .= t('Passwords do not match. Password unchanged.') . EOL; $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. // 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) { if(! $loose_reg) {
$username = mb_convert_case($username,MB_CASE_TITLE,'UTF-8'); $username = mb_convert_case($username,MB_CASE_TITLE,'UTF-8');
if(! strpos($username,' ')) 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", q("UPDATE `user` SET `allow_gid` = '%s' WHERE `uid` = %d",
dbesc("<" . $def_gid . ">"), dbesc("<" . $def_gid . ">"),
intval($newuid) intval($newuid)

12
index.php
View file

@ -51,6 +51,8 @@ if (!$install) {
* *
*/ */
use Friendica\Core\Config;
require_once "include/dba.php"; require_once "include/dba.php";
if (!$install) { if (!$install) {
@ -70,8 +72,8 @@ if (!$install) {
die("System is currently unavailable. Please try again later"); die("System is currently unavailable. Please try again later");
} }
if (get_config('system', 'force_ssl') && ($a->get_scheme() == "http") && if (Config::get('system', 'force_ssl') && ($a->get_scheme() == "http") &&
(intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) && (intval(Config::get('system', 'ssl_policy')) == SSL_POLICY_FULL) &&
(substr(System::baseUrl(), 0, 8) == "https://")) { (substr(System::baseUrl(), 0, 8) == "https://")) {
header("HTTP/1.1 302 Moved Temporarily"); header("HTTP/1.1 302 Moved Temporarily");
header("Location: " . System::baseUrl() . "/" . $a->query_string); header("Location: " . System::baseUrl() . "/" . $a->query_string);
@ -82,7 +84,7 @@ if (!$install) {
load_hooks(); load_hooks();
call_hooks('init_1'); call_hooks('init_1');
$maintenance = get_config('system', 'maintenance'); $maintenance = Config::get('system', 'maintenance');
} }
$lang = get_browser_language(); $lang = get_browser_language();
@ -204,7 +206,7 @@ if ($install && $a->module!="view") {
nav_set_selected('nothing'); nav_set_selected('nothing');
//Don't populate apps_menu if apps are private //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")) { if ((local_user()) || (! $privateapps === "1")) {
$arr = array('app_menu' => $a->apps); $arr = array('app_menu' => $a->apps);
@ -251,7 +253,7 @@ if (strlen($a->module)) {
$a->module = "login"; $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")) { 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 //Check if module is an app and if public access to apps is allowed or not

5
mod/acctlink.php
View file

@ -1,14 +1,13 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Network\Probe;
require_once 'include/probe.php';
function acctlink_init(App $a) { function acctlink_init(App $a) {
if(x($_GET,'addr')) { if(x($_GET,'addr')) {
$addr = trim($_GET['addr']); $addr = trim($_GET['addr']);
$res = probe_url($addr); $res = Probe::uri($addr);
//logger('acctlink: ' . print_r($res,true)); //logger('acctlink: ' . print_r($res,true));
if($res['url']) { if($res['url']) {
goaway($res['url']); goaway($res['url']);

326
mod/admin.php
View file

@ -329,7 +329,7 @@ function admin_page_blocklist_post(App $a) {
if (x($_POST['page_blocklist_save'])) { if (x($_POST['page_blocklist_save'])) {
// Add new item to blocklist // Add new item to blocklist
$blocklist = get_config('system', 'blocklist'); $blocklist = Config::get('system', 'blocklist');
$blocklist[] = array( $blocklist[] = array(
'domain' => notags(trim($_POST['newentry_domain'])), 'domain' => notags(trim($_POST['newentry_domain'])),
'reason' => notags(trim($_POST['newentry_reason'])) 'reason' => notags(trim($_POST['newentry_reason']))
@ -551,7 +551,7 @@ function admin_page_federation(App $a) {
'$page' => t('Federation Statistics'), '$page' => t('Federation Statistics'),
'$intro' => $intro, '$intro' => $intro,
'$hint' => $hint, '$hint' => $hint,
'$autoactive' => get_config('system', 'poco_completion'), '$autoactive' => Config::get('system', 'poco_completion'),
'$counts' => $counts, '$counts' => $counts,
'$version' => FRIENDICA_VERSION, '$version' => FRIENDICA_VERSION,
'$legendtext' => sprintf(t('Currently this node is aware of %d nodes from the following platforms:'), $total), '$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(), '$baseurl' => System::baseUrl(),
'$platform' => FRIENDICA_PLATFORM, '$platform' => FRIENDICA_PLATFORM,
'$codename' => FRIENDICA_CODENAME, '$codename' => FRIENDICA_CODENAME,
'$build' => get_config('system','build'), '$build' => Config::get('system','build'),
'$plugins' => array(t('Active plugins'), $a->plugins), '$plugins' => array(t('Active plugins'), $a->plugins),
'$showwarning' => $showwarning, '$showwarning' => $showwarning,
'$warningtext' => $warningtext '$warningtext' => $warningtext
@ -771,7 +771,7 @@ function admin_page_site_post(App $a) {
// update config // update config
$a->set_baseurl($new_url); $a->set_baseurl($new_url);
set_config('system','url',$new_url); Config::set('system','url',$new_url);
// send relocate // send relocate
$users = q("SELECT `uid` FROM `user` WHERE `account_removed` = 0 AND `account_expired` = 0"); $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) { if (!$thread_allow) {
$ostatus_disabled = true; $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) { if ($ssl_policy == SSL_POLICY_FULL) {
q("UPDATE `contact` SET q("UPDATE `contact` SET
`url` = REPLACE(`url` , 'http:' , 'https:'), `url` = REPLACE(`url` , 'http:' , 'https:'),
@ -914,24 +914,24 @@ function admin_page_site_post(App $a) {
); );
} }
} }
set_config('system','ssl_policy',$ssl_policy); Config::set('system','ssl_policy',$ssl_policy);
set_config('system','maxloadavg',$maxloadavg); Config::set('system','maxloadavg',$maxloadavg);
set_config('system','maxloadavg_frontend',$maxloadavg_frontend); Config::set('system','maxloadavg_frontend',$maxloadavg_frontend);
set_config('system','min_memory',$min_memory); Config::set('system','min_memory',$min_memory);
set_config('system','optimize_max_tablesize',$optimize_max_tablesize); Config::set('system','optimize_max_tablesize',$optimize_max_tablesize);
set_config('system','optimize_fragmentation',$optimize_fragmentation); Config::set('system','optimize_fragmentation',$optimize_fragmentation);
set_config('system','poco_completion',$poco_completion); Config::set('system','poco_completion',$poco_completion);
set_config('system','poco_requery_days',$poco_requery_days); Config::set('system','poco_requery_days',$poco_requery_days);
set_config('system','poco_discovery',$poco_discovery); Config::set('system','poco_discovery',$poco_discovery);
set_config('system','poco_discovery_since',$poco_discovery_since); Config::set('system','poco_discovery_since',$poco_discovery_since);
set_config('system','poco_local_search',$poco_local_search); Config::set('system','poco_local_search',$poco_local_search);
set_config('system','nodeinfo',$nodeinfo); Config::set('system','nodeinfo',$nodeinfo);
set_config('config','sitename',$sitename); Config::set('config','sitename',$sitename);
set_config('config','hostname',$hostname); Config::set('config','hostname',$hostname);
set_config('config','sender_email', $sender_email); Config::set('config','sender_email', $sender_email);
set_config('system','suppress_tags',$suppress_tags); Config::set('system','suppress_tags',$suppress_tags);
set_config('system','shortcut_icon',$shortcut_icon); Config::set('system','shortcut_icon',$shortcut_icon);
set_config('system','touch_icon',$touch_icon); Config::set('system','touch_icon',$touch_icon);
if ($banner == "") { if ($banner == "") {
// don't know why, but del_config doesn't work... // don't know why, but del_config doesn't work...
@ -940,91 +940,91 @@ function admin_page_site_post(App $a) {
dbesc("banner") dbesc("banner")
); );
} else { } else {
set_config('system','banner', $banner); Config::set('system','banner', $banner);
} }
if ($info == "") { if ($info == "") {
del_config('config','info'); del_config('config','info');
} else { } else {
set_config('config','info',$info); Config::set('config','info',$info);
} }
set_config('system','language', $language); Config::set('system','language', $language);
set_config('system','theme', $theme); Config::set('system','theme', $theme);
if ($theme_mobile == '---') { if ($theme_mobile == '---') {
del_config('system','mobile-theme'); del_config('system','mobile-theme');
} else { } else {
set_config('system','mobile-theme', $theme_mobile); Config::set('system','mobile-theme', $theme_mobile);
} }
if ($singleuser == '---') { if ($singleuser == '---') {
del_config('system','singleuser'); del_config('system','singleuser');
} else { } else {
set_config('system','singleuser', $singleuser); Config::set('system','singleuser', $singleuser);
} }
set_config('system', 'maximagesize', $maximagesize); Config::set('system', 'maximagesize', $maximagesize);
set_config('system', 'max_image_length', $maximagelength); Config::set('system', 'max_image_length', $maximagelength);
set_config('system', 'jpeg_quality', $jpegimagequality); Config::set('system', 'jpeg_quality', $jpegimagequality);
set_config('config', 'register_policy', $register_policy); Config::set('config', 'register_policy', $register_policy);
set_config('system', 'max_daily_registrations', $daily_registrations); Config::set('system', 'max_daily_registrations', $daily_registrations);
set_config('system', 'account_abandon_days', $abandon_days); Config::set('system', 'account_abandon_days', $abandon_days);
set_config('config', 'register_text', $register_text); Config::set('config', 'register_text', $register_text);
set_config('system', 'allowed_sites', $allowed_sites); Config::set('system', 'allowed_sites', $allowed_sites);
set_config('system', 'allowed_email', $allowed_email); Config::set('system', 'allowed_email', $allowed_email);
set_config('system', 'block_public', $block_public); Config::set('system', 'block_public', $block_public);
set_config('system', 'publish_all', $force_publish); Config::set('system', 'publish_all', $force_publish);
set_config('system', 'thread_allow', $thread_allow); Config::set('system', 'thread_allow', $thread_allow);
set_config('system', 'newuser_private', $newuser_private); Config::set('system', 'newuser_private', $newuser_private);
set_config('system', 'enotify_no_content', $enotify_no_content); Config::set('system', 'enotify_no_content', $enotify_no_content);
set_config('system', 'disable_embedded', $disable_embedded); Config::set('system', 'disable_embedded', $disable_embedded);
set_config('system', 'allow_users_remote_self', $allow_users_remote_self); Config::set('system', 'allow_users_remote_self', $allow_users_remote_self);
set_config('system', 'check_new_version_url', $check_new_version_url); Config::set('system', 'check_new_version_url', $check_new_version_url);
set_config('system', 'block_extended_register', $no_multi_reg); Config::set('system', 'block_extended_register', $no_multi_reg);
set_config('system', 'no_openid', $no_openid); Config::set('system', 'no_openid', $no_openid);
set_config('system', 'no_regfullname', $no_regfullname); Config::set('system', 'no_regfullname', $no_regfullname);
set_config('system', 'community_page_style', $community_page_style); Config::set('system', 'community_page_style', $community_page_style);
set_config('system', 'max_author_posts_community_page', $max_author_posts_community_page); Config::set('system', 'max_author_posts_community_page', $max_author_posts_community_page);
set_config('system', 'verifyssl', $verifyssl); Config::set('system', 'verifyssl', $verifyssl);
set_config('system', 'proxyuser', $proxyuser); Config::set('system', 'proxyuser', $proxyuser);
set_config('system', 'proxy', $proxy); Config::set('system', 'proxy', $proxy);
set_config('system', 'curl_timeout', $timeout); Config::set('system', 'curl_timeout', $timeout);
set_config('system', 'dfrn_only', $dfrn_only); Config::set('system', 'dfrn_only', $dfrn_only);
set_config('system', 'ostatus_disabled', $ostatus_disabled); Config::set('system', 'ostatus_disabled', $ostatus_disabled);
set_config('system', 'ostatus_full_threads', $ostatus_full_threads); Config::set('system', 'ostatus_full_threads', $ostatus_full_threads);
set_config('system', 'diaspora_enabled', $diaspora_enabled); 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); Config::set('system', 'force_ssl', $force_ssl);
set_config('system', 'hide_help', $hide_help); Config::set('system', 'hide_help', $hide_help);
if ($itemcache != '') { if ($itemcache != '') {
$itemcache = App::realpath($itemcache); $itemcache = App::realpath($itemcache);
} }
set_config('system', 'itemcache', $itemcache); Config::set('system', 'itemcache', $itemcache);
set_config('system', 'itemcache_duration', $itemcache_duration); Config::set('system', 'itemcache_duration', $itemcache_duration);
set_config('system', 'max_comments', $max_comments); Config::set('system', 'max_comments', $max_comments);
if ($temppath != '') { if ($temppath != '') {
$temppath = App::realpath($temppath); $temppath = App::realpath($temppath);
} }
set_config('system', 'temppath', $temppath); Config::set('system', 'temppath', $temppath);
if ($basepath != '') { if ($basepath != '') {
$basepath = App::realpath($basepath); $basepath = App::realpath($basepath);
} }
set_config('system', 'basepath', $basepath); Config::set('system', 'basepath', $basepath);
set_config('system', 'proxy_disabled', $proxy_disabled); Config::set('system', 'proxy_disabled', $proxy_disabled);
set_config('system', 'only_tag_search', $only_tag_search); Config::set('system', 'only_tag_search', $only_tag_search);
set_config('system', 'worker_queues', $worker_queues); Config::set('system', 'worker_queues', $worker_queues);
set_config('system', 'worker_dont_fork', $worker_dont_fork); Config::set('system', 'worker_dont_fork', $worker_dont_fork);
set_config('system', 'worker_fastlane', $worker_fastlane); Config::set('system', 'worker_fastlane', $worker_fastlane);
set_config('system', 'frontend_worker', $worker_frontend); Config::set('system', 'frontend_worker', $worker_frontend);
set_config('system', 'rino_encrypt', $rino); Config::set('system', 'rino_encrypt', $rino);
info(t('Site settings updated.').EOL); info(t('Site settings updated.').EOL);
goaway('admin/site'); goaway('admin/site');
@ -1045,9 +1045,9 @@ function admin_page_site(App $a) {
/* Installed langs */ /* Installed langs */
$lang_choices = get_available_languages(); $lang_choices = get_available_languages();
if (strlen(get_config('system','directory_submit_url')) && if (strlen(Config::get('system','directory_submit_url')) &&
!strlen(get_config('system','directory'))) { !strlen(Config::get('system','directory'))) {
set_config('system','directory', dirname(get_config('system','directory_submit_url'))); Config::set('system','directory', dirname(Config::get('system','directory_submit_url')));
del_config('system','directory_submit_url'); del_config('system','directory_submit_url');
} }
@ -1121,12 +1121,12 @@ function admin_page_site(App $a) {
} }
/* Banner */ /* Banner */
$banner = get_config('system','banner'); $banner = Config::get('system','banner');
if ($banner == false) { if ($banner == false) {
$banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>'; $banner = '<a href="https://friendi.ca"><img id="logo-img" src="images/friendica-32.png" alt="logo" /></a><span id="logo-text"><a href="https://friendi.ca">Friendica</a></span>';
} }
$banner = htmlspecialchars($banner); $banner = htmlspecialchars($banner);
$info = get_config('config','info'); $info = Config::get('config','info');
$info = htmlspecialchars($info); $info = htmlspecialchars($info);
// Automatically create temporary paths // Automatically create temporary paths
@ -1189,83 +1189,83 @@ function admin_page_site(App $a) {
'$hostname' => array('hostname', t("Host name"), $a->config['hostname'], ""), '$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"), '$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, ""), '$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.")), '$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"), get_config('system','touch_icon'), t("Link to an icon that will be used for tablets and mobiles.")), '$touch_icon' => array('touch_icon', t("Touch icon"), Config::get('system','touch_icon'), t("Link to an icon that will be used for tablets and mobiles.")),
'$info' => array('info', t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())), '$info' => array('info', t('Additional Info'), $info, sprintf(t('For public servers: you can add additional information here that will be listed at %s/siteinfo.'), get_server())),
'$language' => array('language', t("System language"), get_config('system','language'), "", $lang_choices), '$language' => array('language', t("System language"), Config::get('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 - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices), '$theme' => array('theme', t("System theme"), Config::get('system','theme'), t("Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"), $theme_choices),
'$theme_mobile' => array('theme_mobile', t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), t("Theme for mobile devices"), $theme_choices_mobile), '$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), '$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"), get_config('system','force_ssl'), t("Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.")), '$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"), 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.")), '$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), '$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.")), '$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"), 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.")), '$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"), get_config('system','jpeg_quality'), t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")), '$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), '$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.")), '$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.')), '$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"), 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_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"), 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")), '$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"), 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.")), '$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"), get_config('system','publish_all'), t("Check to force all profiles on this site to be listed in the site directory.")), '$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"), get_config('system','directory'), t("URL to the global directory. If this is not set, the global directory is completely unavailable to the application.")), '$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"), get_config('system','thread_allow'), t("Allow infinite level threading for items on this site.")), '$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"), get_config('system','newuser_private'), t("Set default post permissions for all new members to the default privacy group rather than public.")), '$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"), 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.")), '$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."), get_config('config','private_addons'), t("Checking this box will restrict addons listed in the apps menu to members only.")), '$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"), 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.")), '$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'), 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.')), '$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"), get_config('system','block_extended_register'), t("Disallow users to register additional accounts for use as pages.")), '$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"), !get_config('system','no_openid'), t("OpenID support for registration and logins.")), '$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"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")), '$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"), 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), '$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"), 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')")), '$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"), !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_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"), 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.")), '$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."), '$ostatus_not_able' => t("OStatus support can only be enabled if threading is enabled."),
'$diaspora_able' => $diaspora_able, '$diaspora_able' => $diaspora_able,
'$diaspora_not_able' => t("Diaspora support can't be enabled because Friendica was installed into a sub directory."), '$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.")), '$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'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")), '$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"), 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.")), '$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"), get_config('system','proxyuser'), ""), '$proxyuser' => array('proxyuser', t("Proxy user"), Config::get('system','proxyuser'), ""),
'$proxy' => array('proxy', t("Proxy URL"), get_config('system','proxy'), ""), '$proxy' => array('proxy', t("Proxy URL"), Config::get('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).")), '$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(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")), '$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(get_config('system','maxloadavg_frontend')) > 0)?get_config('system','maxloadavg_frontend'):50), t("Maximum system load before the frontend quits service - 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(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).")), '$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_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_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"), get_config('system','poco_requery_days'), t("Number of days after which a server is requeried for his contacts.")), '$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(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' => 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(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_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"), 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_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 <a href='http://the-federation.info/'>the-federation.info</a> 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 <a href='http://the-federation.info/'>the-federation.info</a> 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), '$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"), get_config('system','suppress_tags'), t("Suppress showing a list of hashtags at the end of the posting.")), '$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"), get_config('system','itemcache'), t("The item caches buffers generated bbcode and external images.")), '$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"), 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.")), '$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"), get_config('system','max_comments'), t("How much comments should be shown for each post? Default value is 100.")), '$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"), 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.")), '$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"), 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.")), '$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"), get_config('system','proxy_disabled'), t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwith.")), '$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"), get_config('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")), '$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.")), '$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_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"), 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_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"), 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_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'), 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_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") '$form_security_token' => get_form_security_token("admin_site")
@ -1290,10 +1290,10 @@ function admin_page_dbsync(App $a) {
$o = ''; $o = '';
if ($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') { if ($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') {
set_config('database', 'update_'.intval($a->argv[3]), 'success'); Config::set('database', 'update_'.intval($a->argv[3]), 'success');
$curr = get_config('system','build'); $curr = Config::get('system','build');
if (intval($curr) == intval($a->argv[3])) { 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); info(t('Update has been marked successful').EOL);
goaway('admin/dbsync'); goaway('admin/dbsync');
@ -1304,7 +1304,7 @@ function admin_page_dbsync(App $a) {
$retval = update_structure(false, true); $retval = update_structure(false, true);
if (!$retval) { if (!$retval) {
$o .= sprintf(t("Database structure update %s was successfully applied."), DB_UPDATE_VERSION)."<br />"; $o .= sprintf(t("Database structure update %s was successfully applied."), DB_UPDATE_VERSION)."<br />";
set_config('database', 'dbupdate_'.DB_UPDATE_VERSION, 'success'); Config::set('database', 'dbupdate_'.DB_UPDATE_VERSION, 'success');
} else { } else {
$o .= sprintf(t("Executing of database structure update %s failed with error: %s"), $o .= sprintf(t("Executing of database structure update %s failed with error: %s"),
DB_UPDATE_VERSION, $retval)."<br />"; DB_UPDATE_VERSION, $retval)."<br />";
@ -1324,13 +1324,13 @@ function admin_page_dbsync(App $a) {
} }
elseif ($retval === UPDATE_SUCCESS) { elseif ($retval === UPDATE_SUCCESS) {
$o .= sprintf(t('Update %s was successfully applied.', $func)); $o .= sprintf(t('Update %s was successfully applied.', $func));
set_config('database',$func, 'success'); Config::set('database',$func, 'success');
} else { } else {
$o .= sprintf(t('Update %s did not return a status. Unknown if it succeeded.'), $func); $o .= sprintf(t('Update %s did not return a status. Unknown if it succeeded.'), $func);
} }
} else { } else {
$o .= sprintf(t('There was no additional update function %s that needed to be called.'), $func)."<br />"; $o .= sprintf(t('There was no additional update function %s that needed to be called.'), $func)."<br />";
set_config('database',$func, 'success'); Config::set('database',$func, 'success');
} }
return $o; 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_name = (x($_POST, 'new_user_name') ? $_POST['new_user_name'] : '');
$nu_nickname = (x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); $nu_nickname = (x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : '');
$nu_email = (x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); $nu_email = (x($_POST, 'new_user_email') ? $_POST['new_user_email'] : '');
$nu_language = get_config('system', 'language'); $nu_language = Config::get('system', 'language');
check_form_security_token_redirectOnErr('/admin/users', 'admin_users'); check_form_security_token_redirectOnErr('/admin/users', 'admin_users');
@ -1702,7 +1702,7 @@ function admin_page_plugins(App $a) {
install_plugin($plugin); install_plugin($plugin);
info(sprintf(t("Plugin %s enabled."), $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'); goaway('admin/plugins');
return ''; // NOTREACHED 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 // 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; $show_plugin = true;
} }
@ -1888,7 +1888,7 @@ function rebuild_theme_table($themes) {
*/ */
function admin_page_themes(App $a) { 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_raw = explode(',',$allowed_themes_str);
$allowed_themes = array(); $allowed_themes = array();
if (count($allowed_themes_raw)) { if (count($allowed_themes_raw)) {
@ -1917,7 +1917,7 @@ function admin_page_themes(App $a) {
$is_supported = 1-(intval(file_exists($file.'/unsupported'))); $is_supported = 1-(intval(file_exists($file.'/unsupported')));
$is_allowed = intval(in_array($f,$allowed_themes)); $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); $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)); info(sprintf('Theme %s disabled.',$theme));
} }
set_config('system','allowed_themes',$s); Config::set('system','allowed_themes',$s);
goaway('admin/themes'); goaway('admin/themes');
return ''; // NOTREACHED return ''; // NOTREACHED
} }
@ -2089,9 +2089,9 @@ function admin_page_logs_post(App $a) {
$debugging = ((x($_POST,'debugging')) ? true : false); $debugging = ((x($_POST,'debugging')) ? true : false);
$loglevel = ((x($_POST,'loglevel')) ? intval(trim($_POST['loglevel'])) : 0); $loglevel = ((x($_POST,'loglevel')) ? intval(trim($_POST['loglevel'])) : 0);
set_config('system','logfile', $logfile); Config::set('system','logfile', $logfile);
set_config('system','debugging', $debugging); Config::set('system','debugging', $debugging);
set_config('system','loglevel', $loglevel); Config::set('system','loglevel', $loglevel);
} }
info(t("Log settings updated.")); info(t("Log settings updated."));
@ -2139,12 +2139,12 @@ function admin_page_logs(App $a) {
'$submit' => t('Save Settings'), '$submit' => t('Save Settings'),
'$clear' => t('Clear'), '$clear' => t('Clear'),
'$baseurl' => System::baseUrl(true), '$baseurl' => System::baseUrl(true),
'$logname' => get_config('system','logfile'), '$logname' => Config::get('system','logfile'),
// name, label, value, help string, extra data... // name, label, value, help string, extra data...
'$debugging' => array('debugging', t("Enable Debugging"),get_config('system','debugging'), ""), '$debugging' => array('debugging', t("Enable Debugging"),Config::get('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.")), '$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"), get_config('system','loglevel'), "", $log_choices), '$loglevel' => array('loglevel', t("Log level"), Config::get('system','loglevel'), "", $log_choices),
'$form_security_token' => get_form_security_token("admin_logs"), '$form_security_token' => get_form_security_token("admin_logs"),
'$phpheader' => t("PHP logging"), '$phpheader' => t("PHP logging"),
@ -2174,7 +2174,7 @@ function admin_page_logs(App $a) {
*/ */
function admin_page_viewlogs(App $a) { function admin_page_viewlogs(App $a) {
$t = get_markup_template("admin_viewlogs.tpl"); $t = get_markup_template("admin_viewlogs.tpl");
$f = get_config('system','logfile'); $f = Config::get('system','logfile');
$data = ''; $data = '';
if (!file_exists($f)) { if (!file_exists($f)) {
@ -2205,7 +2205,7 @@ function admin_page_viewlogs(App $a) {
'$title' => t('Administration'), '$title' => t('Administration'),
'$page' => t('View Logs'), '$page' => t('View Logs'),
'$data' => $data, '$data' => $data,
'$logname' => get_config('system','logfile') '$logname' => Config::get('system','logfile')
)); ));
} }
@ -2234,10 +2234,10 @@ function admin_page_features_post(App $a) {
} else { } else {
$val = 0; $val = 0;
} }
set_config('feature',$feature,$val); Config::set('feature',$feature,$val);
if (x($_POST, $featurelock)) { if (x($_POST, $featurelock)) {
set_config('feature_lock', $feature, $val); Config::set('feature_lock', $feature, $val);
} else { } else {
del_config('feature_lock', $feature); del_config('feature_lock', $feature);
} }
@ -2273,7 +2273,7 @@ function admin_page_features(App $a) {
$arr[$fname][0] = $fdata[0]; $arr[$fname][0] = $fdata[0];
foreach (array_slice($fdata,1) as $f) { foreach (array_slice($fdata,1) as $f) {
$set = get_config('feature',$f[0]); $set = Config::get('feature',$f[0]);
if ($set === false) { if ($set === false) {
$set = $f[3]; $set = $f[3];
} }

3
mod/api.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
require_once('include/api.php'); require_once('include/api.php');
@ -60,7 +61,7 @@ function api_content(App $a) {
$consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']); $consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']);
$verifier = md5($app['secret'].local_user()); $verifier = md5($app['secret'].local_user());
set_config("oauth", $verifier, local_user()); Config::set("oauth", $verifier, local_user());
if ($consumer->callback_url!=null) { if ($consumer->callback_url!=null) {

3
mod/apps.php
View file

@ -1,9 +1,10 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
function apps_content(App $a) { function apps_content(App $a) {
$privateaddons = get_config('config', 'private_addons'); $privateaddons = Config::get('config', 'private_addons');
if ($privateaddons === "1") { if ($privateaddons === "1") {
if (! local_user()) { if (! local_user()) {
info(t('You must be logged in to use addons. ')); info(t('You must be logged in to use addons. '));

8
mod/cal.php
View file

@ -7,6 +7,8 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
require_once('include/event.php'); require_once('include/event.php');
@ -16,7 +18,7 @@ function cal_init(App $a) {
if($a->argc > 1) if($a->argc > 1)
auto_redir($a, $a->argv[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; return;
} }
@ -71,7 +73,7 @@ function cal_content(App $a) {
nav_set_selected('events'); nav_set_selected('events');
// First day of the week (0 = Sunday) // 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; if ($firstDay === false) $firstDay=0;
// get the translation strings for the callendar // get the translation strings for the callendar
@ -250,7 +252,7 @@ function cal_content(App $a) {
if (x($_GET,'id')){ if (x($_GET,'id')){
$tpl = get_markup_template("event.tpl"); $tpl = get_markup_template("event.tpl");
} else { } else {
// if (get_config('experimentals','new_calendar')==1){ // if (Config::get('experimentals','new_calendar')==1){
$tpl = get_markup_template("events_js.tpl"); $tpl = get_markup_template("events_js.tpl");
// } else { // } else {
// $tpl = get_markup_template("events.tpl"); // $tpl = get_markup_template("events.tpl");

3
mod/crepair.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
require_once("include/contact_selectors.php"); require_once("include/contact_selectors.php");
require_once("mod/contacts.php"); require_once("mod/contacts.php");
@ -127,7 +128,7 @@ function crepair_content(App $a) {
$returnaddr = "contacts/$cid"; $returnaddr = "contacts/$cid";
$allow_remote_self = get_config('system','allow_users_remote_self'); $allow_remote_self = Config::get('system','allow_users_remote_self');
// Disable remote self for everything except feeds. // Disable remote self for everything except feeds.
// There is an issue when you repeat an item from maybe twitter and you got comments from friendica and twitter // There is an issue when you repeat an item from maybe twitter and you got comments from friendica and twitter

6
mod/dfrn_confirm.php
View file

@ -19,6 +19,8 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Network\Probe; use Friendica\Network\Probe;
@ -249,7 +251,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
return; return;
} }
if(strlen($leading_junk) && get_config('system','debugging')) { if(strlen($leading_junk) && Config::get('system','debugging')) {
// This might be more common. Mixed error text and some XML. // This might be more common. Mixed error text and some XML.
// If we're configured for debugging, show the text. Proceed in either case. // If we're configured for debugging, show the text. Proceed in either case.
@ -746,7 +748,7 @@ function dfrn_confirm_post(App $a, $handsfree = null) {
// Send a new friend post if we are allowed to... // Send a new friend post if we are allowed to...
if($page && intval(get_pconfig($local_uid,'system','post_joingroup'))) { if($page && intval(PConfig::get($local_uid,'system','post_joingroup'))) {
$r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1", $r = q("SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
intval($local_uid) intval($local_uid)
); );

5
mod/dfrn_notify.php
View file

@ -7,6 +7,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
require_once('include/items.php'); require_once('include/items.php');
require_once('include/dfrn.php'); require_once('include/dfrn.php');
@ -138,7 +139,7 @@ function dfrn_notify_post(App $a) {
xml_status(0, 'relationship dissolved'); xml_status(0, 'relationship dissolved');
} }
$rino = get_config('system', 'rino_encrypt'); $rino = Config::get('system', 'rino_encrypt');
$rino = intval($rino); $rino = intval($rino);
logger("Local rino version: " . $rino, LOGGER_DEBUG); logger("Local rino version: " . $rino, LOGGER_DEBUG);
@ -312,7 +313,7 @@ function dfrn_notify_content(App $a) {
$encrypted_id = bin2hex($encrypted_id); $encrypted_id = bin2hex($encrypted_id);
$rino = get_config('system', 'rino_encrypt'); $rino = Config::get('system', 'rino_encrypt');
$rino = intval($rino); $rino = intval($rino);
logger("Local rino version: ". $rino, LOGGER_DEBUG); logger("Local rino version: ". $rino, LOGGER_DEBUG);

3
mod/dfrn_poll.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
require_once('include/items.php'); require_once('include/items.php');
@ -38,7 +39,7 @@ function dfrn_poll_init(App $a) {
$hidewall = false; $hidewall = false;
if(($dfrn_id === '') && (! x($_POST,'dfrn_id'))) { if(($dfrn_id === '') && (! x($_POST,'dfrn_id'))) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
http_status_exit(403); http_status_exit(403);
} }

18
mod/dfrn_request.php
View file

@ -13,6 +13,8 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Network\Probe; use Friendica\Network\Probe;
@ -367,8 +369,8 @@ function dfrn_request_post(App $a) {
$network = NETWORK_MAIL2; $network = NETWORK_MAIL2;
$rel = CONTACT_IS_FOLLOWER; $rel = CONTACT_IS_FOLLOWER;
$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; $mail_disabled = 1;
if(! $mail_disabled) { if(! $mail_disabled) {
@ -452,7 +454,7 @@ function dfrn_request_post(App $a) {
} else { } else {
// Detect the network // Detect the network
$data = probe_url($url); $data = Probe::uri($url);
$network = $data["network"]; $network = $data["network"];
// Canonicalise email-style profile locator // Canonicalise email-style profile locator
@ -773,7 +775,7 @@ function dfrn_request_content(App $a) {
'dfrn_id' => $r[0]['issued-id'], 'dfrn_id' => $r[0]['issued-id'],
'intro_id' => $intro[0]['id'], 'intro_id' => $intro[0]['id'],
'duplex' => (($r[0]['page-flags'] == PAGE_FREELOVE) ? 1 : 0), '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); dfrn_confirm_post($a,$handsfree);
} }
@ -800,8 +802,8 @@ function dfrn_request_content(App $a) {
* Normal web request. Display our user's introduction form. * Normal web request. Display our user's introduction form.
*/ */
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { if((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
if(! get_config('system','local_block')) { if(! Config::get('system','local_block')) {
notice( t('Public access denied.') . EOL); notice( t('Public access denied.') . EOL);
return; return;
} }
@ -850,9 +852,9 @@ function dfrn_request_content(App $a) {
// see if we are allowed to have NETWORK_MAIL2 contacts // 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; $mail_disabled = 1;
} }

9
mod/directory.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
function directory_init(App $a) { function directory_init(App $a) {
$a->set_pager_itemspage(60); $a->set_pager_itemspage(60);
@ -26,8 +27,8 @@ function directory_post(App $a) {
function directory_content(App $a) { function directory_content(App $a) {
require_once("mod/proxy.php"); require_once("mod/proxy.php");
if((get_config('system','block_public')) && (! local_user()) && (! remote_user()) || if((Config::get('system','block_public')) && (! local_user()) && (! remote_user()) ||
(get_config('system','block_local_dir')) && (! local_user()) && (! remote_user())) { (Config::get('system','block_local_dir')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL); notice( t('Public access denied.') . EOL);
return; return;
} }
@ -41,7 +42,7 @@ function directory_content(App $a) {
$search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : ''); $search = ((x($_GET,'search')) ? notags(trim(rawurldecode($_GET['search']))) : '');
$gdirpath = ''; $gdirpath = '';
$dirurl = get_config('system','directory'); $dirurl = Config::get('system','directory');
if(strlen($dirurl)) { if(strlen($dirurl)) {
$gdirpath = zrl($dirurl,true); $gdirpath = zrl($dirurl,true);
} }
@ -66,7 +67,7 @@ function directory_content(App $a) {
(`profile`.`prv_keywords` LIKE '%$search%'))"; (`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` $r = q("SELECT COUNT(*) AS `total` FROM `profile`

12
mod/dirfind.php
View file

@ -1,8 +1,10 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Network\Probe;
require_once 'include/contact_widgets.php'; require_once 'include/contact_widgets.php';
require_once 'include/probe.php'; require_once 'include/probe.php';
@ -32,7 +34,7 @@ function dirfind_content(App $a, $prefix = "") {
$community = false; $community = false;
$discover_user = false; $discover_user = false;
$local = get_config('system','poco_local_search'); $local = Config::get('system','poco_local_search');
$search = $prefix.notags(trim($_REQUEST['search'])); $search = $prefix.notags(trim($_REQUEST['search']));
@ -41,7 +43,7 @@ function dirfind_content(App $a, $prefix = "") {
$header = sprintf( t('People Search - %s'), $search); $header = sprintf( t('People Search - %s'), $search);
if ((valid_email($search) && validate_email($search)) || if ((valid_email($search) && validate_email($search)) ||
(substr(normalise_link($search), 0, 7) == "http://")) { (substr(normalise_link($search), 0, 7) == "http://")) {
$user_data = probe_url($search); $user_data = Probe::uri($search);
$discover_user = (in_array($user_data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA))); $discover_user = (in_array($user_data["network"], array(NETWORK_DFRN, NETWORK_OSTATUS, NETWORK_DIASPORA)));
} }
} }
@ -90,13 +92,13 @@ function dirfind_content(App $a, $prefix = "") {
$perpage = 80; $perpage = 80;
$startrec = (($a->pager['page']) * $perpage) - $perpage; $startrec = (($a->pager['page']) * $perpage) - $perpage;
if (get_config('system','diaspora_enabled')) { if (Config::get('system','diaspora_enabled')) {
$diaspora = NETWORK_DIASPORA; $diaspora = NETWORK_DIASPORA;
} else { } else {
$diaspora = NETWORK_DFRN; $diaspora = NETWORK_DFRN;
} }
if (!get_config('system','ostatus_disabled')) { if (!Config::get('system','ostatus_disabled')) {
$ostatus = NETWORK_OSTATUS; $ostatus = NETWORK_OSTATUS;
} else { } else {
$ostatus = NETWORK_DFRN; $ostatus = NETWORK_DFRN;
@ -170,7 +172,7 @@ function dirfind_content(App $a, $prefix = "") {
$p = (($a->pager['page'] != 1) ? '&p=' . $a->pager['page'] : ''); $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)); $x = fetch_url(get_server().'/lsearch?f=' . $p . '&search=' . urlencode($search));
$j = json_decode($x); $j = json_decode($x);

5
mod/display.php
View file

@ -1,13 +1,14 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
require_once('include/dfrn.php'); require_once('include/dfrn.php');
function display_init(App $a) { function display_init(App $a) {
if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { if ((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) {
return; return;
} }
@ -198,7 +199,7 @@ function display_fetchauthor($a, $item) {
function display_content(App $a, $update = 0) { function display_content(App $a, $update = 0) {
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); notice(t('Public access denied.') . EOL);
return; return;
} }

3
mod/editpost.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
require_once('include/acl_selectors.php'); require_once('include/acl_selectors.php');
@ -62,7 +63,7 @@ function editpost_content(App $a) {
$jotplugins = ''; $jotplugins = '';
$jotnets = ''; $jotnets = '';
$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);
$mail_enabled = false; $mail_enabled = false;
$pubmail_enabled = false; $pubmail_enabled = false;

3
mod/events.php
View file

@ -5,6 +5,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
@ -469,7 +470,7 @@ function events_content(App $a) {
$fhour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0); $fhour = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'H') : 0);
$fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0); $fminute = ((x($orig_event)) ? datetime_convert('UTC', $tz, $fdt, 'i') : 0);
$f = get_config('system','event_input_format'); $f = Config::get('system','event_input_format');
if (! $f) { if (! $f) {
$f = 'ymd'; $f = 'ymd';
} }

3
mod/filer.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\PConfig;
require_once('include/security.php'); require_once('include/security.php');
require_once('include/bbcode.php'); require_once('include/bbcode.php');
@ -22,7 +23,7 @@ function filer_content(App $a) {
file_tag_save_file(local_user(),$item_id,$term); file_tag_save_file(local_user(),$item_id,$term);
} else { } else {
// return filer dialog // return filer dialog
$filetags = get_pconfig(local_user(),'system','filetags'); $filetags = PConfig::get(local_user(),'system','filetags');
$filetags = file_tag_file_to_list($filetags,'file'); $filetags = file_tag_file_to_list($filetags,'file');
$filetags = explode(",", $filetags); $filetags = explode(",", $filetags);

9
mod/follow.php
View file

@ -1,9 +1,10 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Network\Probe;
require_once 'include/probe.php';
require_once 'include/follow.php'; require_once 'include/follow.php';
require_once 'include/Contact.php'; require_once 'include/Contact.php';
require_once 'include/contact_selectors.php'; require_once 'include/contact_selectors.php';
@ -77,16 +78,16 @@ function follow_content(App $a) {
// NOTREACHED // NOTREACHED
} }
$ret = probe_url($url); $ret = Probe::uri($url);
if (($ret["network"] == NETWORK_DIASPORA) && !get_config('system','diaspora_enabled')) { if (($ret["network"] == NETWORK_DIASPORA) && !Config::get('system','diaspora_enabled')) {
notice( t("Diaspora support isn't enabled. Contact can't be added.") . EOL); notice( t("Diaspora support isn't enabled. Contact can't be added.") . EOL);
$submit = ""; $submit = "";
//goaway($_SESSION['return_url']); //goaway($_SESSION['return_url']);
// NOTREACHED // NOTREACHED
} }
if (($ret["network"] == NETWORK_OSTATUS) && get_config('system','ostatus_disabled')) { if (($ret["network"] == NETWORK_OSTATUS) && Config::get('system','ostatus_disabled')) {
notice( t("OStatus support is disabled. Contact can't be added.") . EOL); notice( t("OStatus support is disabled. Contact can't be added.") . EOL);
$submit = ""; $submit = "";
//goaway($_SESSION['return_url']); //goaway($_SESSION['return_url']);

6
mod/group.php
View file

@ -6,6 +6,8 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
function group_init(App $a) { function group_init(App $a) {
@ -81,9 +83,9 @@ function group_content(App $a) {
// Switch to text mode interface if we have more than 'n' contacts or group members // Switch to text mode interface if we have more than 'n' contacts or group members
$switchtotext = get_pconfig(local_user(), 'system', 'groupedit_image_limit'); $switchtotext = PConfig::get(local_user(), 'system', 'groupedit_image_limit');
if ($switchtotext === false) { if ($switchtotext === false) {
$switchtotext = get_config('system', 'groupedit_image_limit'); $switchtotext = Config::get('system', 'groupedit_image_limit');
} }
if ($switchtotext === false) { if ($switchtotext === false) {
$switchtotext = 400; $switchtotext = 400;

3
mod/hcard.php
View file

@ -1,11 +1,12 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
function hcard_init(App $a) { function hcard_init(App $a) {
$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false); $blocked = (((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
if ($a->argc > 1) { if ($a->argc > 1) {
$which = $a->argv[1]; $which = $a->argv[1];

5
mod/home.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
if(! function_exists('home_init')) { if(! function_exists('home_init')) {
@ -13,8 +14,8 @@ function home_init(App $a) {
goaway(System::baseUrl()."/network"); goaway(System::baseUrl()."/network");
} }
if (strlen(get_config('system','singleuser'))) { if (strlen(Config::get('system','singleuser'))) {
goaway(System::baseUrl()."/profile/" . get_config('system','singleuser')); goaway(System::baseUrl()."/profile/" . Config::get('system','singleuser'));
} }
}} }}

11
mod/hostxrd.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
require_once('include/crypto.php'); require_once('include/crypto.php');
@ -8,25 +9,25 @@ require_once('include/crypto.php');
function hostxrd_init(App $a) { function hostxrd_init(App $a) {
header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
header("Content-type: text/xml"); header("Content-type: text/xml");
$pubkey = get_config('system','site_pubkey'); $pubkey = Config::get('system','site_pubkey');
if(! $pubkey) { if(! $pubkey) {
$res = new_keypair(1024); $res = new_keypair(1024);
set_config('system','site_prvkey', $res['prvkey']); Config::set('system','site_prvkey', $res['prvkey']);
set_config('system','site_pubkey', $res['pubkey']); Config::set('system','site_pubkey', $res['pubkey']);
} }
//$tpl = file_get_contents('view/xrd_host.tpl'); //$tpl = file_get_contents('view/xrd_host.tpl');
/*echo str_replace(array( /*echo str_replace(array(
'$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->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'); $tpl = get_markup_template('xrd_host.tpl');
echo replace_macros($tpl, array( echo replace_macros($tpl, array(
'$zhost' => $a->get_hostname(), '$zhost' => $a->get_hostname(),
'$zroot' => System::baseUrl(), '$zroot' => System::baseUrl(),
'$domain' => System::baseUrl(), '$domain' => System::baseUrl(),
'$zot_post' => System::baseUrl() . '/post', '$zot_post' => System::baseUrl() . '/post',
'$bigkey' => salmon_key(get_config('system','site_pubkey')), '$bigkey' => salmon_key(Config::get('system','site_pubkey')),
)); ));
exit(); exit();

3
mod/hovercard.php
View file

@ -9,6 +9,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
require_once("include/socgraph.php"); require_once("include/socgraph.php");
require_once("include/Contact.php"); require_once("include/Contact.php");
@ -23,7 +24,7 @@ function hovercard_content() {
$datatype = (x($_REQUEST,'datatype') ?$_REQUEST['datatype'] : "json"); $datatype = (x($_REQUEST,'datatype') ?$_REQUEST['datatype'] : "json");
// Get out if the system doesn't have public access allowed // 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); http_status_exit(401);
// Return the raw content of the template. We use this to make templates usable for js functions. // Return the raw content of the template. We use this to make templates usable for js functions.

20
mod/invite.php
View file

@ -8,6 +8,8 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
require_once('include/email.php'); require_once('include/email.php');
@ -21,12 +23,12 @@ function invite_post(App $a) {
check_form_security_token_redirectOnErr('/', 'send_invite'); 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) { if (! $max_invites) {
$max_invites = 50; $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) { if ($current_invites > $max_invites) {
notice( t('Total invitation limit exceeded.') . EOL); notice( t('Total invitation limit exceeded.') . EOL);
return; return;
@ -38,9 +40,9 @@ function invite_post(App $a) {
$total = 0; $total = 0;
if (get_config('system','invitation_only')) { if (Config::get('system','invitation_only')) {
$invonly = true; $invonly = true;
$x = get_pconfig(local_user(),'system','invites_remaining'); $x = PConfig::get(local_user(),'system','invites_remaining');
if ((! $x) && (! is_site_admin())) { if ((! $x) && (! is_site_admin())) {
return; return;
} }
@ -67,7 +69,7 @@ function invite_post(App $a) {
if (! is_site_admin()) { if (! is_site_admin()) {
$x --; $x --;
if ($x >= 0) { if ($x >= 0) {
set_pconfig(local_user(),'system','invites_remaining',$x); PConfig::set(local_user(),'system','invites_remaining',$x);
} else { } else {
return; return;
} }
@ -85,7 +87,7 @@ function invite_post(App $a) {
if ($res) { if ($res) {
$total ++; $total ++;
$current_invites ++; $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) { if($current_invites > $max_invites) {
notice( t('Invitation limit exceeded. Please contact your site administrator.') . EOL); notice( t('Invitation limit exceeded. Please contact your site administrator.') . EOL);
return; return;
@ -110,16 +112,16 @@ function invite_content(App $a) {
$tpl = get_markup_template('invite.tpl'); $tpl = get_markup_template('invite.tpl');
$invonly = false; $invonly = false;
if (get_config('system','invitation_only')) { if (Config::get('system','invitation_only')) {
$invonly = true; $invonly = true;
$x = get_pconfig(local_user(),'system','invites_remaining'); $x = PConfig::get(local_user(),'system','invites_remaining');
if ((! $x) && (! is_site_admin())) { if ((! $x) && (! is_site_admin())) {
notice( t('You have no more invitations available') . EOL); notice( t('You have no more invitations available') . EOL);
return ''; return '';
} }
} }
$dirloc = get_config('system','directory'); $dirloc = Config::get('system','directory');
if (strlen($dirloc)) { if (strlen($dirloc)) {
if ($a->config['register_policy'] == REGISTER_CLOSED) { 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'); $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');

11
mod/item.php
View file

@ -16,8 +16,10 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Network\Probe;
require_once 'include/crypto.php'; require_once 'include/crypto.php';
require_once 'include/enotify.php'; require_once 'include/enotify.php';
@ -27,7 +29,6 @@ require_once 'include/files.php';
require_once 'include/threads.php'; require_once 'include/threads.php';
require_once 'include/text.php'; require_once 'include/text.php';
require_once 'include/items.php'; require_once 'include/items.php';
require_once 'include/probe.php';
require_once 'include/diaspora.php'; require_once 'include/diaspora.php';
require_once 'include/Contact.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"]); $parent_contact = get_contact_details_by_url($thrparent[0]["author-link"]);
if (!isset($parent_contact["nick"])) { 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) { if ($probed_contact["network"] != NETWORK_FEED) {
$parent_contact = $probed_contact; $parent_contact = $probed_contact;
$parent_contact["nurl"] = normalise_link($probed_contact["url"]); $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 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)) { 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) { if (! $mail_disabled) {
/// @TODO Check if only pubmail is loaded, * loads all columns /// @TODO Check if only pubmail is loaded, * loads all columns
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", $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)) { if (dbm::is_result($r)) {
$data = $r[0]; $data = $r[0];
} else { } else {
$data = probe_url($matches[1]); $data = Probe::uri($matches[1]);
} }
if ($data["alias"] != "") { 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)) { if (!dbm::is_result($r)) {
$probed = probe_url($name); $probed = Probe::uri($name);
if ($result['network'] != NETWORK_PHANTOM) { if ($result['network'] != NETWORK_PHANTOM) {
update_gcontact($probed); update_gcontact($probed);
$r = q("SELECT `url`, `name`, `nick`, `network`, `alias`, `notify` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1", $r = q("SELECT `url`, `name`, `nick`, `network`, `alias`, `notify` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",

3
mod/match.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
require_once('include/text.php'); require_once('include/text.php');
@ -48,7 +49,7 @@ function match_content(App $a) {
if($a->pager['page'] != 1) if($a->pager['page'] != 1)
$params['p'] = $a->pager['page']; $params['p'] = $a->pager['page'];
if(strlen(get_config('system','directory'))) if(strlen(Config::get('system','directory')))
$x = post_url(get_server().'/msearch', $params); $x = post_url(get_server().'/msearch', $params);
else else
$x = post_url(System::baseUrl() . '/msearch', $params); $x = post_url(System::baseUrl() . '/msearch', $params);

5
mod/newmember.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
function newmember_content(App $a) { function newmember_content(App $a) {
@ -26,7 +27,7 @@ function newmember_content(App $a) {
$o .= '<h4>' . t('Connecting') . '</h4>'; $o .= '<h4>' . t('Connecting') . '</h4>';
$o .= '<ul>'; $o .= '<ul>';
$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 (!$mail_disabled) {
$o .= '<li>' . '<a target="newmember" href="settings/connectors">' . t('Importing Emails') . '</a><br />' . 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') . '</li>' . EOL; $o .= '<li>' . '<a target="newmember" href="settings/connectors">' . t('Importing Emails') . '</a><br />' . 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') . '</li>' . EOL;
@ -40,7 +41,7 @@ function newmember_content(App $a) {
$o .= '<ul>'; $o .= '<ul>';
$o .= '<li>' . '<a target="newmember" href="contacts">' . t('Group Your Contacts') . '</a><br />' . 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.') . '</li>' . EOL; $o .= '<li>' . '<a target="newmember" href="contacts">' . t('Group Your Contacts') . '</a><br />' . 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.') . '</li>' . EOL;
if (get_config('system', 'newuser_private')) { if (Config::get('system', 'newuser_private')) {
$o .= '<li>' . '<a target="newmember" href="help/Groups-and-Privacy">' . t("Why Aren't My Posts Public?") . '</a><br />' . 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.") . '</li>' . EOL; $o .= '<li>' . '<a target="newmember" href="help/Groups-and-Privacy">' . t("Why Aren't My Posts Public?") . '</a><br />' . 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.") . '</li>' . EOL;
} }

3
mod/openid.php
View file

@ -1,13 +1,14 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
require_once('library/openid.php'); require_once('library/openid.php');
function openid_content(App $a) { function openid_content(App $a) {
$noid = get_config('system','no_openid'); $noid = Config::get('system','no_openid');
if($noid) if($noid)
goaway(System::baseUrl()); goaway(System::baseUrl());

13
mod/ostatus_subscribe.php
View file

@ -1,9 +1,10 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Network\Probe;
require_once 'include/probe.php';
require_once 'include/follow.php'; require_once 'include/follow.php';
function ostatus_subscribe_content(App $a) { function ostatus_subscribe_content(App $a) {
@ -22,13 +23,13 @@ function ostatus_subscribe_content(App $a) {
$counter = intval($_REQUEST['counter']); $counter = intval($_REQUEST['counter']);
if (get_pconfig($uid, "ostatus", "legacy_friends") == "") { if (PConfig::get($uid, "ostatus", "legacy_friends") == "") {
if ($_REQUEST["url"] == "") { if ($_REQUEST["url"] == "") {
return $o.t("No contact provided."); return $o.t("No contact provided.");
} }
$contact = probe_url($_REQUEST["url"]); $contact = Probe::uri($_REQUEST["url"]);
if (!$contact) { if (!$contact) {
return $o.t("Couldn't fetch information for contact."); return $o.t("Couldn't fetch information for contact.");
@ -43,10 +44,10 @@ function ostatus_subscribe_content(App $a) {
return $o.t("Couldn't fetch friends for contact."); return $o.t("Couldn't fetch friends for contact.");
} }
set_pconfig($uid, "ostatus", "legacy_friends", $data["body"]); PConfig::set($uid, "ostatus", "legacy_friends", $data["body"]);
} }
$friends = json_decode(get_pconfig($uid, "ostatus", "legacy_friends")); $friends = json_decode(PConfig::get($uid, "ostatus", "legacy_friends"));
$total = sizeof($friends); $total = sizeof($friends);
@ -64,7 +65,7 @@ function ostatus_subscribe_content(App $a) {
$o .= "<p>".$counter."/".$total.": ".$url; $o .= "<p>".$counter."/".$total.": ".$url;
$data = probe_url($url); $data = Probe::uri($url);
if ($data["network"] == NETWORK_OSTATUS) { if ($data["network"] == NETWORK_OSTATUS) {
$result = new_contact($uid, $url, true, NETWORK_OSTATUS); $result = new_contact($uid, $url, true, NETWORK_OSTATUS);
if ($result["success"]) { if ($result["success"]) {

8
mod/photos.php
View file

@ -22,7 +22,7 @@ function photos_init(App $a) {
auto_redir($a, $a->argv[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; return;
} }
@ -811,7 +811,7 @@ function photos_post(App $a) {
logger('photos: upload: received file: ' . $filename . ' as ' . $src . ' ('. $type . ') ' . $filesize . ' bytes', LOGGER_DEBUG); 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)) { if (($maximagesize) && ($filesize > $maximagesize)) {
notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL); 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); $exif = $ph->orient($src);
@unlink($src); @unlink($src);
$max_length = get_config('system', 'max_image_length'); $max_length = Config::get('system', 'max_image_length');
if (! $max_length) { if (! $max_length) {
$max_length = MAX_IMAGE_LENGTH; $max_length = MAX_IMAGE_LENGTH;
} }
@ -961,7 +961,7 @@ function photos_content(App $a) {
// photos/name/image/xxxxx/edit // 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); notice( t('Public access denied.') . EOL);
return; return;
} }

12
mod/profile.php
View file

@ -1,6 +1,8 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
require_once('include/contact_widgets.php'); require_once('include/contact_widgets.php');
@ -37,7 +39,7 @@ function profile_init(App $a) {
profile_load($a,$which,$profile); profile_load($a,$which,$profile);
$blocked = (((get_config('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false); $blocked = (((Config::get('system','block_public')) && (! local_user()) && (! remote_user())) ? true : false);
$userblock = (($a->profile['hidewall'] && (! local_user()) && (! remote_user())) ? true : false); $userblock = (($a->profile['hidewall'] && (! local_user()) && (! remote_user())) ? true : false);
if((x($a->profile,'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY)) { 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'] : ''); $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(); 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 // check if we serve a mobile device and get the user settings
// accordingly // accordingly
if ($a->is_mobile) { 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); $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 10);
} else { } 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); $itemspage_network = ((intval($itemspage_network)) ? $itemspage_network : 20);
} }
// now that we have the user settings, see if the theme forces // 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(); $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_birthdays();
$o .= get_events(); $o .= get_events();
} }

9
mod/profile_photo.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
@ -129,7 +130,7 @@ function profile_photo_post(App $a) {
info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL); info( t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
// Update global directory in background // Update global directory in background
$url = System::baseUrl() . '/profile/' . $a->user['nickname']; $url = System::baseUrl() . '/profile/' . $a->user['nickname'];
if ($url && strlen(get_config('system','directory'))) { if ($url && strlen(Config::get('system','directory'))) {
Worker::add(PRIORITY_LOW, "directory", $url); Worker::add(PRIORITY_LOW, "directory", $url);
} }
@ -151,7 +152,7 @@ function profile_photo_post(App $a) {
$filetype = guess_image_type($filename); $filetype = guess_image_type($filename);
} }
$maximagesize = get_config('system','maximagesize'); $maximagesize = Config::get('system','maximagesize');
if (($maximagesize) && ($filesize > $maximagesize)) { if (($maximagesize) && ($filesize > $maximagesize)) {
notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL); 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 // Update global directory in background
$url = $_SESSION['my_url']; $url = $_SESSION['my_url'];
if ($url && strlen(get_config('system','directory'))) { if ($url && strlen(Config::get('system','directory'))) {
Worker::add(PRIORITY_LOW, "directory", $url); Worker::add(PRIORITY_LOW, "directory", $url);
} }
@ -286,7 +287,7 @@ function profile_photo_content(App $a) {
if(! function_exists('profile_photo_crop_ui_head')) { if(! function_exists('profile_photo_crop_ui_head')) {
function profile_photo_crop_ui_head(App $a, $ph) { 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) { if (! $max_length) {
$max_length = MAX_IMAGE_LENGTH; $max_length = MAX_IMAGE_LENGTH;
} }

14
mod/profiles.php
View file

@ -1,6 +1,8 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Network\Probe; use Friendica\Network\Probe;
@ -323,7 +325,7 @@ function profiles_post(App $a) {
$hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0); $hide_friends = (($_POST['hide-friends'] == 1) ? 1: 0);
set_pconfig(local_user(), 'system', 'detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0)); PConfig::set(local_user(), 'system', 'detailled_profile', (($_POST['detailled_profile'] == 1) ? 1: 0));
$changes = array(); $changes = array();
$value = ''; $value = '';
@ -497,7 +499,7 @@ function profiles_post(App $a) {
// Update global directory in background // Update global directory in background
$url = $_SESSION['my_url']; $url = $_SESSION['my_url'];
if ($url && strlen(get_config('system', 'directory'))) { if ($url && strlen(Config::get('system', 'directory'))) {
Worker::add(PRIORITY_LOW, "directory", $url); Worker::add(PRIORITY_LOW, "directory", $url);
} }
@ -517,11 +519,11 @@ function profile_activity($changed, $value) {
return; return;
} }
if ($a->user['hidewall'] || get_config('system', 'block_public')) { if ($a->user['hidewall'] || Config::get('system', 'block_public')) {
return; return;
} }
if (! get_pconfig(local_user(), 'system', 'post_profilechange')) { if (! PConfig::get(local_user(), 'system', 'post_profilechange')) {
return; return;
} }
@ -648,9 +650,9 @@ function profiles_content(App $a) {
$personal_account = !(in_array($a->user["page-flags"], $personal_account = !(in_array($a->user["page-flags"],
array(PAGE_COMMUNITY, PAGE_PRVGROUP))); 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) { if (! $f) {
$f = 'ymd'; $f = 'ymd';
} }

6
mod/profperm.php
View file

@ -1,6 +1,8 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
function profperm_init(App $a) { function profperm_init(App $a) {
@ -31,9 +33,9 @@ function profperm_content(App $a) {
// Switch to text mod interface if we have more than 'n' contacts or group members // Switch to text mod interface if we have more than 'n' contacts or group members
$switchtotext = get_pconfig(local_user(),'system','groupedit_image_limit'); $switchtotext = PConfig::get(local_user(),'system','groupedit_image_limit');
if($switchtotext === false) if($switchtotext === false)
$switchtotext = get_config('system','groupedit_image_limit'); $switchtotext = Config::get('system','groupedit_image_limit');
if($switchtotext === false) if($switchtotext === false)
$switchtotext = 400; $switchtotext = 400;

3
mod/proxy.php
View file

@ -2,6 +2,7 @@
// Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/> // Based upon "Privacy Image Cache" by Tobias Hößl <https://github.com/CatoTH/>
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
define('PROXY_DEFAULT_TIME', 86400); // 1 Day define('PROXY_DEFAULT_TIME', 86400); // 1 Day
@ -258,7 +259,7 @@ function proxy_url($url, $writemode = false, $size = '') {
return $url; return $url;
} }
if (get_config('system', 'proxy_disabled')) { if (Config::get('system', 'proxy_disabled')) {
return $url; return $url;
} }

3
mod/pubsubhubbub.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
function post_var($name) { function post_var($name) {
return (x($_POST, $name)) ? notags(trim($_POST[$name])) : ''; return (x($_POST, $name)) ? notags(trim($_POST[$name])) : '';
@ -9,7 +10,7 @@ function post_var($name) {
function pubsubhubbub_init(App $a) { function pubsubhubbub_init(App $a) {
// PuSH subscription must be considered "public" so just block it // PuSH subscription must be considered "public" so just block it
// if public access isn't enabled. // if public access isn't enabled.
if (get_config('system', 'block_public')) { if (Config::get('system', 'block_public')) {
http_status_exit(403); http_status_exit(403);
} }

3
mod/qsearch.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
function qsearch_init(App $a) { function qsearch_init(App $a) {
@ -8,7 +9,7 @@ function qsearch_init(App $a) {
killme(); killme();
} }
$limit = (get_config('system','qsearch_limit') ? intval(get_config('system','qsearch_limit')) : 100); $limit = (Config::get('system','qsearch_limit') ? intval(Config::get('system','qsearch_limit')) : 100);
$search = ((x($_GET,'s')) ? notags(trim(urldecode($_GET['s']))) : ''); $search = ((x($_GET,'s')) ? notags(trim(urldecode($_GET['s']))) : '');

3
mod/receive.php
View file

@ -5,13 +5,14 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
require_once('include/salmon.php'); require_once('include/salmon.php');
require_once('include/crypto.php'); require_once('include/crypto.php');
require_once('include/diaspora.php'); require_once('include/diaspora.php');
function receive_post(App $a) { function receive_post(App $a) {
$enabled = intval(get_config('system', 'diaspora_enabled')); $enabled = intval(Config::get('system', 'diaspora_enabled'));
if (!$enabled) { if (!$enabled) {
logger('mod-diaspora: disabled'); logger('mod-diaspora: disabled');
http_status_exit(500); http_status_exit(500);

22
mod/register.php
View file

@ -1,6 +1,8 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
@ -20,7 +22,7 @@ function register_post(App $a) {
$arr = array('post' => $_POST); $arr = array('post' => $_POST);
call_hooks('register_post', $arr); 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) { if($max_dailies) {
$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day"); $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
if($r && $r[0]['total'] >= $max_dailies) { if($r && $r[0]['total'] >= $max_dailies) {
@ -73,8 +75,8 @@ function register_post(App $a) {
Worker::add(PRIORITY_LOW, "directory", $url); Worker::add(PRIORITY_LOW, "directory", $url);
} }
$using_invites = get_config('system','invitation_only'); $using_invites = Config::get('system','invitation_only');
$num_invites = get_config('system','number_invites'); $num_invites = Config::get('system','number_invites');
$invite_id = ((x($_POST,'invite_id')) ? notags(trim($_POST['invite_id'])) : ''); $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) { if($using_invites && $invite_id) {
q("delete * from register where hash = '%s' limit 1", dbesc($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 // Only send a password mail when the password wasn't manually provided
@ -130,7 +132,7 @@ function register_post(App $a) {
// invite system // invite system
if($using_invites && $invite_id) { if($using_invites && $invite_id) {
q("delete * from register where hash = '%s' limit 1", dbesc($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 // send email to admins
@ -183,7 +185,7 @@ function register_content(App $a) {
// even with closed registrations, unless specifically prohibited by site policy. // even with closed registrations, unless specifically prohibited by site policy.
// 'block_extended_register' blocks all registrations, period. // '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)) { if(local_user() && ($block)) {
notice("Permission denied." . EOL); notice("Permission denied." . EOL);
@ -195,7 +197,7 @@ function register_content(App $a) {
return; return;
} }
$max_dailies = intval(get_config('system','max_daily_registrations')); $max_dailies = intval(Config::get('system','max_daily_registrations'));
if($max_dailies) { if($max_dailies) {
$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day"); $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
if($r && $r[0]['total'] >= $max_dailies) { 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']) : '')); $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'] : '')); $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) { if($noid) {
$oidhtml = ''; $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.'); $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 = '<input type="hidden" name="profile_publish_reg" value="1" />'; $profile_publish_reg = '<input type="hidden" name="profile_publish_reg" value="1" />';
} }
else { else {
@ -267,7 +269,7 @@ function register_content(App $a) {
$o = replace_macros($o, array( $o = replace_macros($o, array(
'$oidhtml' => $oidhtml, '$oidhtml' => $oidhtml,
'$invitations' => get_config('system','invitation_only'), '$invitations' => Config::get('system','invitation_only'),
'$permonly' => $a->config['register_policy'] == REGISTER_APPROVE, '$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')), '$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.'), '$invite_desc' => t('Membership on this site is by invitation only.'),

3
mod/regmod.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Core\Worker; use Friendica\Core\Worker;
@ -42,7 +43,7 @@ function user_allow($hash) {
); );
if (dbm::is_result($r) && $r[0]['net-publish']) { if (dbm::is_result($r) && $r[0]['net-publish']) {
$url = System::baseUrl() . '/profile/' . $user[0]['nickname']; $url = System::baseUrl() . '/profile/' . $user[0]['nickname'];
if ($url && strlen(get_config('system','directory'))) { if ($url && strlen(Config::get('system','directory'))) {
Worker::add(PRIORITY_LOW, "directory", $url); Worker::add(PRIORITY_LOW, "directory", $url);
} }
} }

3
mod/salmon.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\PConfig;
require_once('include/salmon.php'); require_once('include/salmon.php');
require_once('include/ostatus.php'); require_once('include/ostatus.php');
@ -159,7 +160,7 @@ function salmon_post(App $a) {
); );
if (! dbm::is_result($r)) { if (! dbm::is_result($r)) {
logger('mod-salmon: Author unknown to us.'); logger('mod-salmon: Author unknown to us.');
if(get_pconfig($importer['uid'],'system','ostatus_autofriend')) { if(PConfig::get($importer['uid'],'system','ostatus_autofriend')) {
$result = new_contact($importer['uid'],$author_link); $result = new_contact($importer['uid'],$author_link);
if($result['success']) { if($result['success']) {
$r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s') $r = q("SELECT * FROM `contact` WHERE `network` = '%s' AND ( `url` = '%s' OR `alias` = '%s')

13
mod/search.php
View file

@ -1,6 +1,7 @@
<?php <?php
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
require_once("include/bbcode.php"); require_once("include/bbcode.php");
require_once('include/security.php'); require_once('include/security.php');
@ -85,12 +86,12 @@ function search_post(App $a) {
function search_content(App $a) { function search_content(App $a) {
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); notice(t('Public access denied.') . EOL);
return; return;
} }
if (get_config('system','local_search') && !local_user() && !remote_user()) { if (Config::get('system','local_search') && !local_user() && !remote_user()) {
http_status_exit(403, http_status_exit(403,
array("title" => t("Public access denied."), array("title" => t("Public access denied."),
"description" => t("Only logged in users are permitted to perform a search."))); "description" => t("Only logged in users are permitted to perform a search.")));
@ -99,15 +100,15 @@ function search_content(App $a) {
//return; //return;
} }
if (get_config('system','permit_crawling') && !local_user() && !remote_user()) { if (Config::get('system','permit_crawling') && !local_user() && !remote_user()) {
// Default values: // Default values:
// 10 requests are "free", after the 11th only a call per minute is allowed // 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) if ($free_crawls == 0)
$free_crawls = 10; $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) if ($crawl_permit_period == 0)
$crawl_permit_period = 10; $crawl_permit_period = 10;
@ -176,7 +177,7 @@ function search_content(App $a) {
if (! $search) if (! $search)
return $o; return $o;
if (get_config('system','only_tag_search')) if (Config::get('system','only_tag_search'))
$tag = true; $tag = true;
// Here is the way permissions work in the search module... // Here is the way permissions work in the search module...

11
mod/statistics_json.php
View file

@ -5,12 +5,13 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
require_once("include/plugin.php"); require_once("include/plugin.php");
function statistics_json_init(App $a) { function statistics_json_init(App $a) {
if (!get_config("system", "nodeinfo")) { if (!Config::get("system", "nodeinfo")) {
http_status_exit(404); http_status_exit(404);
killme(); killme();
} }
@ -20,10 +21,10 @@ function statistics_json_init(App $a) {
"network" => FRIENDICA_PLATFORM, "network" => FRIENDICA_PLATFORM,
"version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION, "version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION,
"registrations_open" => ($a->config['register_policy'] != 0), "registrations_open" => ($a->config['register_policy'] != 0),
"total_users" => get_config('nodeinfo', 'total_users'), "total_users" => Config::get('nodeinfo', 'total_users'),
"active_users_halfyear" => get_config('nodeinfo', 'active_users_halfyear'), "active_users_halfyear" => Config::get('nodeinfo', 'active_users_halfyear'),
"active_users_monthly" => get_config('nodeinfo', 'active_users_monthly'), "active_users_monthly" => Config::get('nodeinfo', 'active_users_monthly'),
"local_posts" => get_config('nodeinfo', 'local_posts') "local_posts" => Config::get('nodeinfo', 'local_posts')
); );
$statistics["services"] = array(); $statistics["services"] = array();

3
mod/uimport.php
View file

@ -5,6 +5,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
require_once("include/uimport.php"); require_once("include/uimport.php");
@ -45,7 +46,7 @@ function uimport_content(App $a) {
return; return;
} }
$max_dailies = intval(get_config('system', 'max_daily_registrations')); $max_dailies = intval(Config::get('system', 'max_daily_registrations'));
if ($max_dailies) { if ($max_dailies) {
$r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day"); $r = q("select count(*) as total from user where register_date > UTC_TIMESTAMP - INTERVAL 1 day");
if ($r && $r[0]['total'] >= $max_dailies) { if ($r && $r[0]['total'] >= $max_dailies) {

3
mod/update_community.php
View file

@ -3,6 +3,7 @@
// See update_profile.php for documentation // See update_profile.php for documentation
use Friendica\App; use Friendica\App;
use Friendica\Core\PConfig;
require_once("mod/community.php"); require_once("mod/community.php");
@ -17,7 +18,7 @@ function update_community_content(App $a) {
$replace = "<img\${1} dst=\"\${2}\""; $replace = "<img\${1} dst=\"\${2}\"";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
if (get_pconfig(local_user(), "system", "bandwith_saver")) { if (PConfig::get(local_user(), "system", "bandwith_saver")) {
$replace = "<br />".t("[Embedded content - reload page to view]")."<br />"; $replace = "<br />".t("[Embedded content - reload page to view]")."<br />";
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);

3
mod/update_display.php
View file

@ -3,6 +3,7 @@
// See update_profile.php for documentation // See update_profile.php for documentation
use Friendica\App; use Friendica\App;
use Friendica\Core\PConfig;
require_once("mod/display.php"); require_once("mod/display.php");
require_once("include/group.php"); require_once("include/group.php");
@ -21,7 +22,7 @@ function update_display_content(App $a) {
$replace = "<img\${1} dst=\"\${2}\""; $replace = "<img\${1} dst=\"\${2}\"";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
if (get_pconfig(local_user(), "system", "bandwith_saver")) { if (PConfig::get(local_user(), "system", "bandwith_saver")) {
$replace = "<br />".t("[Embedded content - reload page to view]")."<br />"; $replace = "<br />".t("[Embedded content - reload page to view]")."<br />";
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);

5
mod/update_network.php
View file

@ -3,6 +3,7 @@
// See update_profile.php for documentation // See update_profile.php for documentation
use Friendica\App; use Friendica\App;
use Friendica\Core\PConfig;
require_once("mod/network.php"); require_once("mod/network.php");
require_once("include/group.php"); require_once("include/group.php");
@ -15,7 +16,7 @@ function update_network_content(App $a) {
echo "<!DOCTYPE html><html><body>\r\n"; echo "<!DOCTYPE html><html><body>\r\n";
echo "<section>"; echo "<section>";
if (!get_pconfig($profile_uid, "system", "no_auto_update") || ($_GET["force"] == 1)) { if (!PConfig::get($profile_uid, "system", "no_auto_update") || ($_GET["force"] == 1)) {
$text = network_content($a, $profile_uid); $text = network_content($a, $profile_uid);
} else { } else {
$text = ""; $text = "";
@ -25,7 +26,7 @@ function update_network_content(App $a) {
$replace = "<img\${1} dst=\"\${2}\""; $replace = "<img\${1} dst=\"\${2}\"";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);
if (get_pconfig(local_user(), "system", "bandwith_saver")) { if (PConfig::get(local_user(), "system", "bandwith_saver")) {
$replace = "<br />".t("[Embedded content - reload page to view]")."<br />"; $replace = "<br />".t("[Embedded content - reload page to view]")."<br />";
$pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i"; $pattern = "/<\s*audio[^>]*>(.*?)<\s*\/\s*audio>/i";
$text = preg_replace($pattern, $replace, $text); $text = preg_replace($pattern, $replace, $text);

Some files were not shown because too many files have changed in this diff Show more