X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Ffriendica.php;h=36fb18c0ac008ab70397b741d2fac72a570e17b1;hb=0b5f7da270bcaa679cb684dbbbbe40781f0b49c6;hp=bbfdbfe09688e7c651b1b00f9089b1b6e19566a7;hpb=1c38540f20b3207a0fd09ef0802125e45e83bcf6;p=friendica.git diff --git a/mod/friendica.php b/mod/friendica.php index bbfdbfe096..36fb18c0ac 100644 --- a/mod/friendica.php +++ b/mod/friendica.php @@ -1,7 +1,9 @@ argv[1] == "json"){ @@ -17,7 +19,7 @@ function friendica_init(App $a) { $r = q("SELECT `username`, `nickname` FROM `user` WHERE `email` = '%s' $sql_extra", dbesc($adminlist[0])); $admin = array( 'name' => $r[0]['username'], - 'profile'=> App::get_baseurl() . '/profile/' . $r[0]['nickname'], + 'profile'=> System::baseUrl() . '/profile/' . $r[0]['nickname'], ); } else { $admin = false; @@ -26,7 +28,7 @@ function friendica_init(App $a) { $visible_plugins = array(); if (is_array($a->plugins) && count($a->plugins)) { $r = q("SELECT * FROM `addon` WHERE `hidden` = 0"); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { foreach($r as $rr) { $visible_plugins[] = $rr['name']; } @@ -47,7 +49,7 @@ function friendica_init(App $a) { $data = Array( 'version' => FRIENDICA_VERSION, - 'url' => z_root(), + 'url' => System::baseUrl(), 'plugins' => $visible_plugins, 'locked_features' => $locked_features, 'register_policy' => $register_policy[$a->config['register_policy']], @@ -55,7 +57,7 @@ function friendica_init(App $a) { 'site_name' => $a->config['sitename'], 'platform' => FRIENDICA_PLATFORM, 'info' => ((x($a->config,'info')) ? $a->config['info'] : ''), - 'no_scrape_url' => App::get_baseurl().'/noscrape' + 'no_scrape_url' => System::baseUrl().'/noscrape' ); echo json_encode($data); @@ -67,11 +69,11 @@ function friendica_content(App $a) { $o = '
'; $o .= t('This is Friendica, version') . ' ' . FRIENDICA_VERSION . ' '; - $o .= t('running at web location') . ' ' . z_root(); + $o .= t('running at web location') . ' ' . System::baseUrl(); $o .= '
' . PHP_EOL; $o .= ''; - $o .= t('Please visit Friendica.com to learn more about the Friendica project.') . PHP_EOL; + $o .= t('Please visit Friendi.ca to learn more about the Friendica project.') . PHP_EOL; $o .= '
' . PHP_EOL; $o .= ''; @@ -84,7 +86,7 @@ function friendica_content(App $a) { $visible_plugins = array(); if (is_array($a->plugins) && count($a->plugins)) { $r = q("SELECT * FROM `addon` WHERE `hidden` = 0"); - if (dbm::is_result($r)) { + if (DBM::is_result($r)) { foreach($r as $rr) { $visible_plugins[] = $rr['name']; }