oldkid/friendica
1
0
Fork 0
mirror of https://git.sekbaer.de/Friendica/friendica.git synced 2025-06-16 20:05:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Class file relocations

Browse source 
Issue #3878
This commit is contained in:
Adam Magness 2017-11-07 22:57:46 -05:00
parent 6189f6c8e7
commit 4ca68c7af0
151 changed files with 987 additions and 8742 deletions
Download patch file Download diff file Expand all files Collapse all files

29
mod/settings.php
View file

@ -5,6 +5,7 @@ use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Database\DBM;
require_once('include/group.php');
require_once('include/socgraph.php');
@ -228,7 +229,7 @@ function settings_post(App $a) {
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
intval(local_user())
);
if (!dbm::is_result($r)) {
if (!DBM::is_result($r)) {
dba::insert('mailacct', array('uid' => local_user()));
}
if (strlen($mail_pass)) {
@ -253,7 +254,7 @@ function settings_post(App $a) {
$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d LIMIT 1",
intval(local_user())
);
if (dbm::is_result($r)) {
if (DBM::is_result($r)) {
$eacct = $r[0];
require_once('include/email.php');
$mb = construct_mailbox_name($eacct);
@ -704,7 +705,7 @@ function settings_content(App $a) {
dbesc($a->argv[3]),
local_user());
if (!dbm::is_result($r)) {
if (!DBM::is_result($r)) {
notice(t("You can't edit this application."));
return;
}
@ -735,7 +736,7 @@ function settings_content(App $a) {
return;
}
/// @TODO validate result with dbm::is_result()
/// @TODO validate result with DBM::is_result()
$r = q("SELECT clients.*, tokens.id as oauth_token, (clients.uid=%d) AS my
FROM clients
LEFT JOIN tokens ON clients.client_id=tokens.client_id
@ -765,7 +766,7 @@ function settings_content(App $a) {
$settings_addons = "";
$r = q("SELECT * FROM `hook` WHERE `hook` = 'plugin_settings' ");
if (!dbm::is_result($r)) {
if (!DBM::is_result($r)) {
$settings_addons = t('No Plugin settings configured');
}
@ -874,15 +875,15 @@ function settings_content(App $a) {
$r = null;
}
$mail_server = ((dbm::is_result($r)) ? $r[0]['server'] : '');
$mail_port = ((dbm::is_result($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
$mail_ssl = ((dbm::is_result($r)) ? $r[0]['ssltype'] : '');
$mail_user = ((dbm::is_result($r)) ? $r[0]['user'] : '');
$mail_replyto = ((dbm::is_result($r)) ? $r[0]['reply_to'] : '');
$mail_pubmail = ((dbm::is_result($r)) ? $r[0]['pubmail'] : 0);
$mail_action = ((dbm::is_result($r)) ? $r[0]['action'] : 0);
$mail_movetofolder = ((dbm::is_result($r)) ? $r[0]['movetofolder'] : '');
$mail_chk = ((dbm::is_result($r)) ? $r[0]['last_check'] : NULL_DATE);
$mail_server = ((DBM::is_result($r)) ? $r[0]['server'] : '');
$mail_port = ((DBM::is_result($r) && intval($r[0]['port'])) ? intval($r[0]['port']) : '');
$mail_ssl = ((DBM::is_result($r)) ? $r[0]['ssltype'] : '');
$mail_user = ((DBM::is_result($r)) ? $r[0]['user'] : '');
$mail_replyto = ((DBM::is_result($r)) ? $r[0]['reply_to'] : '');
$mail_pubmail = ((DBM::is_result($r)) ? $r[0]['pubmail'] : 0);
$mail_action = ((DBM::is_result($r)) ? $r[0]['action'] : 0);
$mail_movetofolder = ((DBM::is_result($r)) ? $r[0]['movetofolder'] : '');
$mail_chk = ((DBM::is_result($r)) ? $r[0]['last_check'] : NULL_DATE);
$tpl = get_markup_template("settings_connectors.tpl");