1
0
Fork 0

Class file relocations

Issue #3878
This commit is contained in:
Adam Magness 2017-11-07 22:57:46 -05:00
commit 4ca68c7af0
151 changed files with 987 additions and 8742 deletions

View file

@ -11,6 +11,7 @@ use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
$frio = "view/theme/frio";
@ -225,7 +226,7 @@ function frio_remote_nav($a,&$nav) {
// user info
$r = q("SELECT `micro` FROM `contact` WHERE `uid` = %d AND `self`", intval($a->user['uid']));
$r[0]['photo'] = (dbm::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg");
$r[0]['photo'] = (DBM::is_result($r) ? $a->remove_baseurl($r[0]['micro']) : "images/person-48.jpg");
$r[0]['name'] = $a->user['username'];
} elseif (!local_user() && remote_user()) {
@ -241,9 +242,9 @@ function frio_remote_nav($a,&$nav) {
$r = false;
}
if (dbm::is_result($r)) {
if (DBM::is_result($r)) {
$nav['userinfo'] = array(
'icon' => (dbm::is_result($r) ? $r[0]['photo'] : "images/person-48.jpg"),
'icon' => (DBM::is_result($r) ? $r[0]['photo'] : "images/person-48.jpg"),
'name' => $r[0]['name'],
);
}
@ -306,7 +307,7 @@ function frio_acl_lookup(App $a, &$results) {
$r = q("SELECT COUNT(*) AS `total` FROM `contact`
WHERE `uid` = %d AND NOT `self` AND NOT `pending` $sql_extra $sql_extra2 ",
intval($_SESSION['uid']));
if (dbm::is_result($r)) {
if (DBM::is_result($r)) {
$total = $r[0]["total"];
}
@ -318,7 +319,7 @@ function frio_acl_lookup(App $a, &$results) {
$contacts = array();
if (dbm::is_result($r)) {
if (DBM::is_result($r)) {
foreach ($r as $rr) {
$contacts[] = _contact_detail_for_template($rr);
}

View file

@ -13,6 +13,7 @@ use Friendica\App;
use Friendica\Core\Config;
use Friendica\Core\PConfig;
use Friendica\Core\System;
use Friendica\Database\DBM;
require_once "include/plugin.php";
require_once "include/socgraph.php";
@ -141,7 +142,7 @@ function vier_community_info() {
$r = suggestion_query(local_user(), 0, 9);
$tpl = get_markup_template('ch_directory_item.tpl');
if (dbm::is_result($r)) {
if (DBM::is_result($r)) {
$aside['$comunity_profiles_title'] = t('Community Profiles');
$aside['$comunity_profiles_items'] = array();
@ -171,7 +172,7 @@ function vier_community_info() {
WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $order LIMIT %d , %d ",
0, 9);
if (dbm::is_result($r)) {
if (DBM::is_result($r)) {
$aside['$lastusers_title'] = t('Last users');
$aside['$lastusers_items'] = array();
@ -381,7 +382,7 @@ function vier_community_info() {
$tpl = get_markup_template('ch_connectors.tpl');
if (dbm::is_result($r)) {
if (DBM::is_result($r)) {
$con_services = array();
$con_services['title'] = array("", t('Connect Services'), "", "");