Merge pull request #5295 from MrPetovan/task/4889-move-config-to-config
Move configuration to config/
This commit is contained in:
Michael Vogel
GitHub
commit
66a103e36a
116 changed files with 1900 additions and 1294 deletions
|
|
@ -845,6 +845,12 @@ function admin_page_summary(App $a)
|
|||
$warningtext[] = L10n::t('The last worker execution was on %s UTC. This is older than one hour. Please check your crontab settings.', $last_worker_call);
|
||||
}
|
||||
|
||||
// Legacy config file warning
|
||||
if (file_exists('.htconfig.php')) {
|
||||
$showwarning = true;
|
||||
$warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.ini.php, please copy config/local-sample.ini.php and move your config from <code>.htconfig.php</code>. See <a href="%s">the Config help page</a> for help with the transition.', $a->get_baseurl() . '/help/Config');
|
||||
}
|
||||
|
||||
$r = q("SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`");
|
||||
$accounts = [
|
||||
[L10n::t('Normal Account'), 0],
|
||||
|
|
@ -938,8 +944,6 @@ function admin_page_site_post(App $a)
|
|||
|
||||
function update_table($table_name, $fields, $old_url, $new_url)
|
||||
{
|
||||
global $a;
|
||||
|
||||
$dbold = dbesc($old_url);
|
||||
$dbnew = dbesc($new_url);
|
||||
|
||||
|
|
@ -1378,8 +1382,8 @@ function admin_page_site(App $a)
|
|||
"develop" => L10n::t("check the development version")
|
||||
];
|
||||
|
||||
if ($a->config['hostname'] == "") {
|
||||
$a->config['hostname'] = $a->get_hostname();
|
||||
if (empty(Config::get('config', 'hostname'))) {
|
||||
Config::set('config', 'hostname', $a->get_hostname());
|
||||
}
|
||||
$diaspora_able = ($a->get_path() == "");
|
||||
|
||||
|
|
@ -1388,8 +1392,6 @@ function admin_page_site(App $a)
|
|||
if ($optimize_max_tablesize <= 0) {
|
||||
$optimize_max_tablesize = -1;
|
||||
}
|
||||
// Default list of forbidden names, classic role names from RFC 2142
|
||||
$default_forbidden_nicknames = 'info, marketing, sales, support, abuse, noc, security, postmaster, hostmaster, usenet, news, webmaster, www, uucp, ftp, root, sysop';
|
||||
|
||||
$t = get_markup_template('admin/site.tpl');
|
||||
return replace_macros($t, [
|
||||
|
|
@ -1408,9 +1410,9 @@ function admin_page_site(App $a)
|
|||
'$relocate' => L10n::t('Relocate - WARNING: advanced function. Could make this server unreachable.'),
|
||||
'$baseurl' => System::baseUrl(true),
|
||||
// name, label, value, help string, extra data...
|
||||
'$sitename' => ['sitename', L10n::t("Site name"), $a->config['sitename'],''],
|
||||
'$hostname' => ['hostname', L10n::t("Host name"), $a->config['hostname'], ""],
|
||||
'$sender_email' => ['sender_email', L10n::t("Sender Email"), $a->config['sender_email'], L10n::t("The email address your server shall use to send notification emails from."), "", "", "email"],
|
||||
'$sitename' => ['sitename', L10n::t("Site name"), Config::get('config', 'sitename'),''],
|
||||
'$hostname' => ['hostname', L10n::t("Host name"), Config::get('config', 'hostname'), ""],
|
||||
'$sender_email' => ['sender_email', L10n::t("Sender Email"), Config::get('config', 'sender_email'), L10n::t("The email address your server shall use to send notification emails from."), "", "", "email"],
|
||||
'$banner' => ['banner', L10n::t("Banner/Logo"), $banner, ""],
|
||||
'$shortcut_icon' => ['shortcut_icon', L10n::t("Shortcut icon"), Config::get('system','shortcut_icon'), L10n::t("Link to an icon that will be used for browsers.")],
|
||||
'$touch_icon' => ['touch_icon', L10n::t("Touch icon"), Config::get('system','touch_icon'), L10n::t("Link to an icon that will be used for tablets and mobiles.")],
|
||||
|
|
@ -1426,10 +1428,10 @@ function admin_page_site(App $a)
|
|||
'$maximagelength' => ['maximagelength', L10n::t("Maximum image length"), Config::get('system','max_image_length'), L10n::t("Maximum length in pixels of the longest side of uploaded images. Default is -1, which means no limits.")],
|
||||
'$jpegimagequality' => ['jpegimagequality', L10n::t("JPEG image quality"), Config::get('system','jpeg_quality'), L10n::t("Uploaded JPEGS will be saved at this quality setting [0-100]. Default is 100, which is full quality.")],
|
||||
|
||||
'$register_policy' => ['register_policy', L10n::t("Register policy"), $a->config['register_policy'], "", $register_choices],
|
||||
'$register_policy' => ['register_policy', L10n::t("Register policy"), Config::get('config', 'register_policy'), "", $register_choices],
|
||||
'$daily_registrations' => ['max_daily_registrations', L10n::t("Maximum Daily Registrations"), Config::get('system', 'max_daily_registrations'), L10n::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' => ['register_text', L10n::t("Register text"), $a->config['register_text'], L10n::t("Will be displayed prominently on the registration page. You can use BBCode here.")],
|
||||
'$forbidden_nicknames' => ['forbidden_nicknames', L10n::t('Forbidden Nicknames'), Config::get('system', 'forbidden_nicknames', $default_forbidden_nicknames), L10n::t('Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142.')],
|
||||
'$register_text' => ['register_text', L10n::t("Register text"), Config::get('config', 'register_text'), L10n::t("Will be displayed prominently on the registration page. You can use BBCode here.")],
|
||||
'$forbidden_nicknames' => ['forbidden_nicknames', L10n::t('Forbidden Nicknames'), Config::get('system', 'forbidden_nicknames'), L10n::t('Comma separated list of nicknames that are forbidden from registration. Preset is a list of role names according RFC 2142.')],
|
||||
'$abandon_days' => ['abandon_days', L10n::t('Accounts abandoned after x days'), Config::get('system','account_abandon_days'), L10n::t('Will not waste system resources polling external sites for abandonded accounts. Enter 0 for no time limit.')],
|
||||
'$allowed_sites' => ['allowed_sites', L10n::t("Allowed friend domains"), Config::get('system','allowed_sites'), L10n::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' => ['allowed_email', L10n::t("Allowed email domains"), Config::get('system','allowed_email'), L10n::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")],
|
||||
|
|
@ -1666,13 +1668,13 @@ function admin_page_users_post(App $a)
|
|||
|
||||
Thank you and welcome to %4$s.'));
|
||||
|
||||
$preamble = sprintf($preamble, $user['username'], $a->config['sitename']);
|
||||
$body = sprintf($body, System::baseUrl(), $user['email'], $result['password'], $a->config['sitename']);
|
||||
$preamble = sprintf($preamble, $user['username'], Config::get('config', 'sitename'));
|
||||
$body = sprintf($body, System::baseUrl(), $user['email'], $result['password'], Config::get('config', 'sitename'));
|
||||
|
||||
notification([
|
||||
'type' => SYSTEM_EMAIL,
|
||||
'to_email' => $user['email'],
|
||||
'subject' => L10n::t('Registration details for %s', $a->config['sitename']),
|
||||
'subject' => L10n::t('Registration details for %s', Config::get('config', 'sitename')),
|
||||
'preamble' => $preamble,
|
||||
'body' => $body]);
|
||||
}
|
||||
|
|
@ -1797,7 +1799,7 @@ function admin_page_users(App $a)
|
|||
ORDER BY $sql_order $sql_order_direction LIMIT %d, %d", intval($a->pager['start']), intval($a->pager['itemspage'])
|
||||
);
|
||||
|
||||
$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
|
||||
$adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
|
||||
$_setup_users = function ($e) use ($adminlist) {
|
||||
$page_types = [
|
||||
PAGE_NORMAL => L10n::t('Normal Account Page'),
|
||||
|
|
@ -1824,7 +1826,6 @@ function admin_page_users(App $a)
|
|||
$e['register_date'] = Temporal::getRelativeDate($e['register_date']);
|
||||
$e['login_date'] = Temporal::getRelativeDate($e['login_date']);
|
||||
$e['lastitem_date'] = Temporal::getRelativeDate($e['lastitem_date']);
|
||||
//$e['is_admin'] = ($e['email'] === $a->config['admin_email']);
|
||||
$e['is_admin'] = in_array($e['email'], $adminlist);
|
||||
$e['is_deletable'] = (intval($e['uid']) != local_user());
|
||||
$e['deleted'] = ($e['account_removed'] ? Temporal::getRelativeDate($e['account_expires_on']) : False);
|
||||
|
|
@ -2378,7 +2379,7 @@ function admin_page_logs(App $a)
|
|||
'$loglevel' => ['loglevel', L10n::t("Log level"), Config::get('system', 'loglevel'), "", $log_choices],
|
||||
'$form_security_token' => get_form_security_token("admin_logs"),
|
||||
'$phpheader' => L10n::t("PHP logging"),
|
||||
'$phphint' => L10n::t("To enable logging of PHP errors and warnings you can add the following to the .htconfig.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."),
|
||||
'$phphint' => L10n::t("To temporarily enable logging of PHP errors and warnings you can prepend the following to the index.php file of your installation. The filename set in the 'error_log' line is relative to the friendica top-level directory and must be writeable by the web server. The option '1' for 'log_errors' and 'display_errors' is to enable these options, set to '0' to disable them."),
|
||||
'$phplogcode' => "error_reporting(E_ERROR | E_WARNING | E_PARSE);\nini_set('error_log','php.out');\nini_set('log_errors','1');\nini_set('display_errors', '1');",
|
||||
'$phplogenabled' => $phplogenabled,
|
||||
]);
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\ACL;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Module\Login;
|
||||
|
|
@ -21,7 +22,7 @@ function bookmarklet_content(App $a)
|
|||
{
|
||||
if (!local_user()) {
|
||||
$o = '<h2>' . L10n::t('Login') . '</h2>';
|
||||
$o .= Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? false : true);
|
||||
$o .= Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? false : true);
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -611,7 +611,7 @@ function dfrn_request_content(App $a)
|
|||
} elseif (x($_GET, 'address') && ($_GET['address'] != "")) {
|
||||
$myaddr = $_GET['address'];
|
||||
} elseif (local_user()) {
|
||||
if (strlen($a->path)) {
|
||||
if (strlen($a->urlpath)) {
|
||||
$myaddr = System::baseUrl() . '/profile/' . $a->user['nickname'];
|
||||
} else {
|
||||
$myaddr = $a->user['nickname'] . '@' . substr(System::baseUrl(), strpos(System::baseUrl(), '://') + 3);
|
||||
|
|
|
|||
|
|
@ -2,11 +2,12 @@
|
|||
/**
|
||||
* @file mod/friendica.php
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Addon;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Database\DBM;
|
||||
|
||||
function friendica_init(App $a)
|
||||
|
|
@ -16,10 +17,10 @@ function friendica_init(App $a)
|
|||
|
||||
$sql_extra = '';
|
||||
if (x($a->config, 'admin_nickname')) {
|
||||
$sql_extra = sprintf(" AND `nickname` = '%s' ", dbesc($a->config['admin_nickname']));
|
||||
$sql_extra = sprintf(" AND `nickname` = '%s' ", dbesc(Config::get('config', 'admin_nickname')));
|
||||
}
|
||||
if (isset($a->config['admin_email']) && $a->config['admin_email']!='') {
|
||||
$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
|
||||
if (!empty(Config::get('config', 'admin_email'))) {
|
||||
$adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
|
||||
|
||||
$r = q("SELECT `username`, `nickname` FROM `user` WHERE `email` = '%s' $sql_extra", dbesc($adminlist[0]));
|
||||
$admin = [
|
||||
|
|
@ -55,13 +56,13 @@ function friendica_init(App $a)
|
|||
$data = [
|
||||
'version' => FRIENDICA_VERSION,
|
||||
'url' => System::baseUrl(),
|
||||
'addons' => $visible_addons,
|
||||
'addons' => $visible_addons,
|
||||
'locked_features' => $locked_features,
|
||||
'register_policy' => $register_policy[$a->config['register_policy']],
|
||||
'register_policy' => $register_policy[intval(Config::get('config', 'register_policy'))],
|
||||
'admin' => $admin,
|
||||
'site_name' => $a->config['sitename'],
|
||||
'site_name' => Config::get('config', 'sitename'),
|
||||
'platform' => FRIENDICA_PLATFORM,
|
||||
'info' => ((x($a->config, 'info')) ? $a->config['info'] : ''),
|
||||
'info' => Config::get('config', 'info'),
|
||||
'no_scrape_url' => System::baseUrl().'/noscrape'
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ function hcard_init(App $a)
|
|||
|
||||
$a->page['htmlhead'] .= '<meta name="dfrn-global-visibility" content="' . (($a->profile['net-publish']) ? 'true' : 'false') . '" />' . "\r\n" ;
|
||||
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/dfrn_poll/' . $which .'" />' . "\r\n" ;
|
||||
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
|
||||
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . (($a->urlpath) ? '/' . $a->urlpath : ''));
|
||||
$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
|
||||
header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
|
||||
|
||||
|
|
|
|||
94
mod/help.php
94
mod/help.php
|
|
@ -2,44 +2,45 @@
|
|||
/**
|
||||
* @file mod/help.php
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Content\Nav;
|
||||
use Friendica\Content\Text\Markdown;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\System;
|
||||
|
||||
if (!function_exists('load_doc_file')) {
|
||||
|
||||
function load_doc_file($s) {
|
||||
global $lang;
|
||||
if (!isset($lang))
|
||||
$lang = 'en';
|
||||
$b = basename($s);
|
||||
$d = dirname($s);
|
||||
if (file_exists("$d/$lang/$b"))
|
||||
return file_get_contents("$d/$lang/$b");
|
||||
if (file_exists($s))
|
||||
return file_get_contents($s);
|
||||
return '';
|
||||
function load_doc_file($s)
|
||||
{
|
||||
$lang = Config::get('system', 'language');
|
||||
$b = basename($s);
|
||||
$d = dirname($s);
|
||||
if (file_exists("$d/$lang/$b")) {
|
||||
return file_get_contents("$d/$lang/$b");
|
||||
}
|
||||
|
||||
if (file_exists($s)) {
|
||||
return file_get_contents($s);
|
||||
}
|
||||
|
||||
return '';
|
||||
}
|
||||
|
||||
function help_content(App $a) {
|
||||
|
||||
function help_content(App $a)
|
||||
{
|
||||
Nav::setSelected('help');
|
||||
|
||||
global $lang;
|
||||
|
||||
$text = '';
|
||||
|
||||
if ($a->argc > 1) {
|
||||
$path = '';
|
||||
// looping through the argv keys bigger than 0 to build
|
||||
// a path relative to /help
|
||||
for($x = 1; $x < argc(); $x ++) {
|
||||
if(strlen($path))
|
||||
for ($x = 1; $x < argc(); $x ++) {
|
||||
if (strlen($path)) {
|
||||
$path .= '/';
|
||||
}
|
||||
|
||||
$path .= argv($x);
|
||||
}
|
||||
$title = basename($path);
|
||||
|
|
@ -47,6 +48,7 @@ function help_content(App $a) {
|
|||
$text = load_doc_file('doc/' . $path . '.md');
|
||||
$a->page['title'] = L10n::t('Help:') . ' ' . str_replace('-', ' ', notags($title));
|
||||
}
|
||||
|
||||
$home = load_doc_file('doc/Home.md');
|
||||
if (!$text) {
|
||||
$text = $home;
|
||||
|
|
@ -60,8 +62,8 @@ function help_content(App $a) {
|
|||
header($_SERVER["SERVER_PROTOCOL"] . ' 404 ' . L10n::t('Not Found'));
|
||||
$tpl = get_markup_template("404.tpl");
|
||||
return replace_macros($tpl, [
|
||||
'$message' => L10n::t('Page not found.')
|
||||
]);
|
||||
'$message' => L10n::t('Page not found.')
|
||||
]);
|
||||
}
|
||||
|
||||
$html = Markdown::convert($text, false);
|
||||
|
|
@ -69,34 +71,46 @@ function help_content(App $a) {
|
|||
if ($filename !== "Home") {
|
||||
// create TOC but not for home
|
||||
$lines = explode("\n", $html);
|
||||
$toc="<h2>TOC</h2><ul id='toc'>";
|
||||
$lastlevel=1;
|
||||
$idnum = [0,0,0,0,0,0,0];
|
||||
foreach($lines as &$line){
|
||||
if (substr($line,0,2)=="<h") {
|
||||
$level = substr($line,2,1);
|
||||
if ($level!="r") {
|
||||
$toc = "<h2>TOC</h2><ul id='toc'>";
|
||||
$lastlevel = 1;
|
||||
$idnum = [0, 0, 0, 0, 0, 0, 0];
|
||||
foreach ($lines as &$line) {
|
||||
if (substr($line, 0, 2) == "<h") {
|
||||
$level = substr($line, 2, 1);
|
||||
if ($level != "r") {
|
||||
$level = intval($level);
|
||||
if ($level<$lastlevel) {
|
||||
for($k=$level;$k<$lastlevel; $k++) $toc.="</ul>";
|
||||
for($k=$level+1;$k<count($idnum);$k++) $idnum[$k]=0;
|
||||
if ($level < $lastlevel) {
|
||||
for ($k = $level; $k < $lastlevel; $k++) {
|
||||
$toc .= "</ul>";
|
||||
}
|
||||
|
||||
for ($k = $level + 1; $k < count($idnum); $k++) {
|
||||
$idnum[$k] = 0;
|
||||
}
|
||||
}
|
||||
if ($level>$lastlevel) $toc.="<ul>";
|
||||
$idnum[$level]++;
|
||||
$id = implode("_", array_slice($idnum,1,$level));
|
||||
$href = System::baseUrl()."/help/{$filename}#{$id}";
|
||||
$toc .= "<li><a href='{$href}'>".strip_tags($line)."</a></li>";
|
||||
$line = "<a name='{$id}'></a>".$line;
|
||||
|
||||
if ($level > $lastlevel) {
|
||||
$toc .= "<ul>";
|
||||
}
|
||||
|
||||
$idnum[$level] ++;
|
||||
$id = implode("_", array_slice($idnum, 1, $level));
|
||||
$href = System::baseUrl() . "/help/{$filename}#{$id}";
|
||||
$toc .= "<li><a href='{$href}'>" . strip_tags($line) . "</a></li>";
|
||||
$line = "<a name='{$id}'></a>" . $line;
|
||||
$lastlevel = $level;
|
||||
}
|
||||
}
|
||||
}
|
||||
for($k=0;$k<$lastlevel; $k++) $toc.="</ul>";
|
||||
$html = implode("\n",$lines);
|
||||
|
||||
for ($k = 0; $k < $lastlevel; $k++) {
|
||||
$toc .= "</ul>";
|
||||
}
|
||||
|
||||
$html = implode("\n", $lines);
|
||||
|
||||
$a->page['aside'] = '<div class="help-aside-wrapper widget"><div id="toc-wrapper">' . $toc . '</div>' . $a->page['aside'] . '</div>';
|
||||
}
|
||||
|
||||
return $html;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ function home_content(App $a) {
|
|||
}
|
||||
|
||||
$customhome = false;
|
||||
$defaultheader = '<h1>'.((x($a->config,'sitename')) ? L10n::t("Welcome to %s", $a->config['sitename']) : "").'</h1>';
|
||||
$defaultheader = '<h1>' . (Config::get('config', 'sitename') ? L10n::t('Welcome to %s', Config::get('config', 'sitename')) : '') . '</h1>';
|
||||
|
||||
$homefilepath = $a->basepath . "/home.html";
|
||||
$cssfilepath = $a->basepath . "/home.css";
|
||||
|
|
@ -45,9 +45,9 @@ function home_content(App $a) {
|
|||
if (file_exists($cssfilepath)) {
|
||||
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.System::baseUrl().'/home.css'.'" media="all" />';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$login = Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1);
|
||||
$login = Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 0 : 1);
|
||||
|
||||
$content = '';
|
||||
Addon::callHooks("home_content",$content);
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@ function install_init(App $a) {
|
|||
|
||||
// We overwrite current theme css, because during install we could not have a working mod_rewrite
|
||||
// so we could not have a css at all. Here we set a static css file for the install procedure pages
|
||||
$a->config['system']['theme'] = "../install";
|
||||
|
||||
$a->setConfigValue('system', 'value', '../install');
|
||||
$a->theme['stylesheet'] = System::baseUrl()."/view/install/style.css";
|
||||
|
||||
Install::setInstallMode();
|
||||
|
|
@ -67,12 +68,11 @@ function install_post(App $a) {
|
|||
$timezone = notags(trim($_POST['timezone']));
|
||||
$language = notags(trim($_POST['language']));
|
||||
$adminmail = notags(trim($_POST['adminmail']));
|
||||
$rino = 1;
|
||||
|
||||
// connect to db
|
||||
dba::connect($dbhost, $dbuser, $dbpass, $dbdata);
|
||||
|
||||
Install::install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail, $rino);
|
||||
Install::install($urlpath, $dbhost, $dbuser, $dbpass, $dbdata, $phpath, $timezone, $language, $adminmail);
|
||||
|
||||
return;
|
||||
break;
|
||||
|
|
@ -140,9 +140,7 @@ function install_content(App $a) {
|
|||
switch ($install_wizard_pass) {
|
||||
case 1: { // System check
|
||||
|
||||
if (x($_POST, 'phpath')) {
|
||||
$phpath = notags(trim($_POST['phpath']));
|
||||
}
|
||||
$phpath = defaults($_POST, 'phpath', 'php');
|
||||
|
||||
list($checks, $checkspassed) = Install::check($phpath);
|
||||
|
||||
|
|
@ -163,13 +161,12 @@ function install_content(App $a) {
|
|||
|
||||
case 2: { // Database config
|
||||
|
||||
$dbhost = ((x($_POST, 'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
|
||||
$dbuser = notags(trim($_POST['dbuser']));
|
||||
$dbpass = notags(trim($_POST['dbpass']));
|
||||
$dbdata = notags(trim($_POST['dbdata']));
|
||||
$phpath = notags(trim($_POST['phpath']));
|
||||
|
||||
$adminmail = notags(trim($_POST['adminmail']));
|
||||
$dbhost = notags(trim(defaults($_POST, 'dbhost' , 'localhost')));
|
||||
$dbuser = notags(trim(defaults($_POST, 'dbuser' , '' )));
|
||||
$dbpass = notags(trim(defaults($_POST, 'dbpass' , '' )));
|
||||
$dbdata = notags(trim(defaults($_POST, 'dbdata' , '' )));
|
||||
$phpath = notags(trim(defaults($_POST, 'phpath' , '' )));
|
||||
$adminmail = notags(trim(defaults($_POST, 'adminmail', '' )));
|
||||
|
||||
$tpl = get_markup_template('install_db.tpl');
|
||||
$o .= replace_macros($tpl, [
|
||||
|
|
@ -187,8 +184,6 @@ function install_content(App $a) {
|
|||
'$dbdata' => ['dbdata', L10n::t('Database Name'), $dbdata, '', 'required'],
|
||||
'$adminmail' => ['adminmail', L10n::t('Site administrator email address'), $adminmail, L10n::t('Your account email address must match this in order to use the web admin panel.'), 'required', 'autofocus', 'email'],
|
||||
|
||||
|
||||
|
||||
'$lbl_10' => L10n::t('Please select a default timezone for your website'),
|
||||
|
||||
'$baseurl' => System::baseUrl(),
|
||||
|
|
@ -196,7 +191,6 @@ function install_content(App $a) {
|
|||
'$phpath' => $phpath,
|
||||
|
||||
'$submit' => L10n::t('Submit'),
|
||||
|
||||
]);
|
||||
return $o;
|
||||
}; break;
|
||||
|
|
@ -245,7 +239,7 @@ function install_content(App $a) {
|
|||
|
||||
function manual_config(App $a) {
|
||||
$data = htmlentities($a->data['txt'],ENT_COMPAT, 'UTF-8');
|
||||
$o = L10n::t('The database configuration file ".htconfig.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
|
||||
$o = L10n::t('The database configuration file "config/local.ini.php" could not be written. Please use the enclosed text to create a configuration file in your web server root.');
|
||||
$o .= "<textarea rows=\"24\" cols=\"80\" >$data</textarea>";
|
||||
return $o;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -126,14 +126,14 @@ function invite_content(App $a) {
|
|||
|
||||
$dirloc = Config::get('system', 'directory');
|
||||
if (strlen($dirloc)) {
|
||||
if ($a->config['register_policy'] == REGISTER_CLOSED) {
|
||||
if (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED) {
|
||||
$linktxt = L10n::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');
|
||||
} else {
|
||||
$linktxt = L10n::t('To accept this invitation, please visit and register at %s or any other public Friendica website.', System::baseUrl())
|
||||
. "\r\n" . "\r\n" . L10n::t('Friendica sites all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites you can join.', $dirloc . '/servers');
|
||||
}
|
||||
} else { // there is no global directory URL defined
|
||||
if ($a->config['register_policy'] == REGISTER_CLOSED) {
|
||||
if (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED) {
|
||||
$o = L10n::t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
|
||||
return $o;
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ function lostpass_post(App $a)
|
|||
info(L10n::t('Password reset request issued. Check your email.') . EOL);
|
||||
}
|
||||
|
||||
$sitename = $a->config['sitename'];
|
||||
$sitename = Config::get('config', 'sitename');
|
||||
$resetlink = System::baseUrl() . '/lostpass/' . $pwdreset_token;
|
||||
|
||||
$preamble = deindent(L10n::t('
|
||||
|
|
@ -145,7 +145,7 @@ function lostpass_generate_password($user)
|
|||
|
||||
info("Your password has been reset." . EOL);
|
||||
|
||||
$sitename = $a->config['sitename'];
|
||||
$sitename = Config::get('config', 'sitename');
|
||||
$preamble = deindent(L10n::t('
|
||||
Dear %1$s,
|
||||
Your password has been changed as requested. Please retain this
|
||||
|
|
|
|||
|
|
@ -61,9 +61,9 @@ function nodeinfo_init(App $a) {
|
|||
|
||||
$nodeinfo['usage'] = [];
|
||||
|
||||
$nodeinfo['openRegistrations'] = ($a->config['register_policy'] != 0);
|
||||
$nodeinfo['openRegistrations'] = intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED;
|
||||
|
||||
$nodeinfo['metadata'] = ['nodeName' => $a->config['sitename']];
|
||||
$nodeinfo['metadata'] = ['nodeName' => Config::get('config', 'sitename')];
|
||||
|
||||
if (Config::get('system', 'nodeinfo')) {
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ function openid_content(App $a) {
|
|||
// Successful OpenID login - but we can't match it to an existing account.
|
||||
// New registration?
|
||||
|
||||
if ($a->config['register_policy'] == REGISTER_CLOSED) {
|
||||
if (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED) {
|
||||
notice(L10n::t('Account not found and OpenID registration is not permitted on this site.') . EOL);
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ use Friendica\Content\ForumManager;
|
|||
use Friendica\Content\Text\BBCode;
|
||||
use Friendica\Core\Addon;
|
||||
use Friendica\Core\Cache;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\PConfig;
|
||||
use Friendica\Core\System;
|
||||
|
|
@ -200,7 +201,7 @@ function ping_init(App $a)
|
|||
);
|
||||
$mail_count = count($mails);
|
||||
|
||||
if ($a->config['register_policy'] == REGISTER_APPROVE && is_site_admin()) {
|
||||
if (intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE && is_site_admin()) {
|
||||
$regs = q(
|
||||
"SELECT `contact`.`name`, `contact`.`url`, `contact`.`micro`, `register`.`created`
|
||||
FROM `contact` RIGHT JOIN `register` ON `register`.`uid` = `contact`.`uid`
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ function profile_init(App $a)
|
|||
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/" title="' . L10n::t('%s\'s posts', $a->profile['username']) . '"/>' . "\r\n";
|
||||
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/comments" title="' . L10n::t('%s\'s comments', $a->profile['username']) . '"/>' . "\r\n";
|
||||
$a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . System::baseUrl() . '/feed/' . $which . '/activity" title="' . L10n::t('%s\'s timeline', $a->profile['username']) . '"/>' . "\r\n";
|
||||
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . ($a->path ? '/' . $a->path : ''));
|
||||
$uri = urlencode('acct:' . $a->profile['nickname'] . '@' . $a->get_hostname() . ($a->urlpath ? '/' . $a->urlpath : ''));
|
||||
$a->page['htmlhead'] .= '<link rel="lrdd" type="application/xrd+xml" href="' . System::baseUrl() . '/xrd/?uri=' . $uri . '" />' . "\r\n";
|
||||
header('Link: <' . System::baseUrl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
|
||||
|
||||
|
|
|
|||
|
|
@ -13,54 +13,52 @@ use Friendica\Model\Contact;
|
|||
use Friendica\Model\Photo;
|
||||
use Friendica\Model\Profile;
|
||||
use Friendica\Object\Image;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
|
||||
function profile_photo_init(App $a)
|
||||
{
|
||||
if (! local_user()) {
|
||||
if (!local_user()) {
|
||||
return;
|
||||
}
|
||||
|
||||
Profile::load($a, $a->user['nickname']);
|
||||
}
|
||||
|
||||
function profile_photo_post(App $a) {
|
||||
function profile_photo_post(App $a)
|
||||
{
|
||||
|
||||
if (! local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL );
|
||||
if (!local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo');
|
||||
|
||||
if((x($_POST,'cropfinal')) && ($_POST['cropfinal'] == 1)) {
|
||||
if ((x($_POST, 'cropfinal')) && ($_POST['cropfinal'] == 1)) {
|
||||
|
||||
// unless proven otherwise
|
||||
$is_default_profile = 1;
|
||||
|
||||
if($_REQUEST['profile']) {
|
||||
$r = q("select id, `is-default` from profile where id = %d and uid = %d limit 1",
|
||||
intval($_REQUEST['profile']),
|
||||
if ($_REQUEST['profile']) {
|
||||
$r = q("select id, `is-default` from profile where id = %d and uid = %d limit 1", intval($_REQUEST['profile']),
|
||||
intval(local_user())
|
||||
);
|
||||
if (DBM::is_result($r) && (! intval($r[0]['is-default'])))
|
||||
$is_default_profile = 0;
|
||||
if (DBM::is_result($r) && (!intval($r[0]['is-default']))) $is_default_profile = 0;
|
||||
}
|
||||
|
||||
|
||||
|
||||
// phase 2 - we have finished cropping
|
||||
|
||||
if($a->argc != 2) {
|
||||
notice(L10n::t('Image uploaded but image cropping failed.') . EOL );
|
||||
if ($a->argc != 2) {
|
||||
notice(L10n::t('Image uploaded but image cropping failed.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
$image_id = $a->argv[1];
|
||||
|
||||
if(substr($image_id,-2,1) == '-') {
|
||||
$scale = substr($image_id,-1,1);
|
||||
$image_id = substr($image_id,0,-2);
|
||||
if (substr($image_id, -2, 1) == '-') {
|
||||
$scale = substr($image_id, -1, 1);
|
||||
$image_id = substr($image_id, 0, -2);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -69,10 +67,8 @@ function profile_photo_post(App $a) {
|
|||
$srcW = $_POST['xfinal'] - $srcX;
|
||||
$srcH = $_POST['yfinal'] - $srcY;
|
||||
|
||||
$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1",
|
||||
dbesc($image_id),
|
||||
dbesc(local_user()),
|
||||
intval($scale));
|
||||
$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d AND `scale` = %d LIMIT 1", dbesc($image_id),
|
||||
dbesc(local_user()), intval($scale));
|
||||
|
||||
if (DBM::is_result($r)) {
|
||||
|
||||
|
|
@ -80,9 +76,10 @@ function profile_photo_post(App $a) {
|
|||
|
||||
$Image = new Image($base_image['data'], $base_image['type']);
|
||||
if ($Image->isValid()) {
|
||||
$Image->crop(175,$srcX,$srcY,$srcW,$srcH);
|
||||
$Image->crop(175, $srcX, $srcY, $srcW, $srcH);
|
||||
|
||||
$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 4, $is_default_profile);
|
||||
$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
|
||||
L10n::t('Profile Photos'), 4, $is_default_profile);
|
||||
|
||||
if ($r === false) {
|
||||
notice(L10n::t('Image size reduction [%s] failed.', "175") . EOL);
|
||||
|
|
@ -90,7 +87,8 @@ function profile_photo_post(App $a) {
|
|||
|
||||
$Image->scaleDown(80);
|
||||
|
||||
$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 5, $is_default_profile);
|
||||
$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
|
||||
L10n::t('Profile Photos'), 5, $is_default_profile);
|
||||
|
||||
if ($r === false) {
|
||||
notice(L10n::t('Image size reduction [%s] failed.', "80") . EOL);
|
||||
|
|
@ -98,7 +96,8 @@ function profile_photo_post(App $a) {
|
|||
|
||||
$Image->scaleDown(48);
|
||||
|
||||
$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'],$base_image['filename'], L10n::t('Profile Photos'), 6, $is_default_profile);
|
||||
$r = Photo::store($Image, local_user(), 0, $base_image['resource-id'], $base_image['filename'],
|
||||
L10n::t('Profile Photos'), 6, $is_default_profile);
|
||||
|
||||
if ($r === false) {
|
||||
notice(L10n::t('Image size reduction [%s] failed.', "48") . EOL);
|
||||
|
|
@ -108,15 +107,13 @@ function profile_photo_post(App $a) {
|
|||
|
||||
if ($is_default_profile) {
|
||||
$r = q("UPDATE `photo` SET `profile` = 0 WHERE `profile` = 1 AND `resource-id` != '%s' AND `uid` = %d",
|
||||
dbesc($base_image['resource-id']),
|
||||
intval(local_user())
|
||||
dbesc($base_image['resource-id']), intval(local_user())
|
||||
);
|
||||
} else {
|
||||
$r = q("update profile set photo = '%s', thumb = '%s' where id = %d and uid = %d",
|
||||
dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-4.' . $Image->getExt()),
|
||||
dbesc(System::baseUrl() . '/photo/' . $base_image['resource-id'] . '-5.' . $Image->getExt()),
|
||||
intval($_REQUEST['profile']),
|
||||
intval(local_user())
|
||||
intval($_REQUEST['profile']), intval(local_user())
|
||||
);
|
||||
}
|
||||
|
||||
|
|
@ -125,7 +122,7 @@ function profile_photo_post(App $a) {
|
|||
info(L10n::t('Shift-reload the page or clear browser cache if the new photo does not display immediately.') . EOL);
|
||||
// Update global directory in background
|
||||
$url = System::baseUrl() . '/profile/' . $a->user['nickname'];
|
||||
if ($url && strlen(Config::get('system','directory'))) {
|
||||
if ($url && strlen(Config::get('system', 'directory'))) {
|
||||
Worker::add(PRIORITY_LOW, "Directory", $url);
|
||||
}
|
||||
|
||||
|
|
@ -139,7 +136,7 @@ function profile_photo_post(App $a) {
|
|||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
$src = $_FILES['userfile']['tmp_name'];
|
||||
$src = $_FILES['userfile']['tmp_name'];
|
||||
$filename = basename($_FILES['userfile']['name']);
|
||||
$filesize = intval($_FILES['userfile']['size']);
|
||||
$filetype = $_FILES['userfile']['type'];
|
||||
|
|
@ -158,7 +155,7 @@ function profile_photo_post(App $a) {
|
|||
$imagedata = @file_get_contents($src);
|
||||
$ph = new Image($imagedata, $filetype);
|
||||
|
||||
if (! $ph->isValid()) {
|
||||
if (!$ph->isValid()) {
|
||||
notice(L10n::t('Unable to process image.') . EOL);
|
||||
@unlink($src);
|
||||
return;
|
||||
|
|
@ -166,25 +163,28 @@ function profile_photo_post(App $a) {
|
|||
|
||||
$ph->orient($src);
|
||||
@unlink($src);
|
||||
return profile_photo_crop_ui_head($a, $ph);
|
||||
profile_photo_crop_ui_head($a, $ph);
|
||||
}
|
||||
|
||||
function profile_photo_content(App $a)
|
||||
{
|
||||
|
||||
function profile_photo_content(App $a) {
|
||||
|
||||
if (! local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL );
|
||||
if (!local_user()) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
||||
$newuser = false;
|
||||
|
||||
if($a->argc == 2 && $a->argv[1] === 'new')
|
||||
if ($a->argc == 2 && $a->argv[1] === 'new') {
|
||||
$newuser = true;
|
||||
}
|
||||
|
||||
if( $a->argv[1]=='use'){
|
||||
if ($a->argc<3){
|
||||
notice(L10n::t('Permission denied.') . EOL );
|
||||
$imagecrop = [];
|
||||
|
||||
if ($a->argv[1] == 'use') {
|
||||
if ($a->argc < 3) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
return;
|
||||
};
|
||||
|
||||
|
|
@ -192,36 +192,32 @@ function profile_photo_content(App $a) {
|
|||
|
||||
$resource_id = $a->argv[2];
|
||||
//die(":".local_user());
|
||||
$r=q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC",
|
||||
intval(local_user()),
|
||||
$r = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' ORDER BY `scale` ASC", intval(local_user()),
|
||||
dbesc($resource_id)
|
||||
);
|
||||
if (!DBM::is_result($r)){
|
||||
notice(L10n::t('Permission denied.') . EOL );
|
||||
);
|
||||
if (!DBM::is_result($r)) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
$havescale = false;
|
||||
foreach ($r as $rr) {
|
||||
if($rr['scale'] == 5)
|
||||
$havescale = true;
|
||||
if ($rr['scale'] == 5) $havescale = true;
|
||||
}
|
||||
|
||||
// set an already uloaded photo as profile photo
|
||||
// if photo is in 'Profile Photos', change it in db
|
||||
if (($r[0]['album']== L10n::t('Profile Photos')) && ($havescale)){
|
||||
$r=q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d",
|
||||
intval(local_user()));
|
||||
if (($r[0]['album'] == L10n::t('Profile Photos')) && ($havescale)) {
|
||||
$r = q("UPDATE `photo` SET `profile`=0 WHERE `profile`=1 AND `uid`=%d", intval(local_user()));
|
||||
|
||||
$r=q("UPDATE `photo` SET `profile`=1 WHERE `uid` = %d AND `resource-id` = '%s'",
|
||||
intval(local_user()),
|
||||
$r = q("UPDATE `photo` SET `profile`=1 WHERE `uid` = %d AND `resource-id` = '%s'", intval(local_user()),
|
||||
dbesc($resource_id)
|
||||
);
|
||||
);
|
||||
|
||||
Contact::updateSelfFromUserID(local_user(), true);
|
||||
|
||||
// Update global directory in background
|
||||
$url = $_SESSION['my_url'];
|
||||
if ($url && strlen(Config::get('system','directory'))) {
|
||||
if ($url && strlen(Config::get('system', 'directory'))) {
|
||||
Worker::add(PRIORITY_LOW, "Directory", $url);
|
||||
}
|
||||
|
||||
|
|
@ -229,7 +225,7 @@ function profile_photo_content(App $a) {
|
|||
return; // NOTREACHED
|
||||
}
|
||||
$ph = new Image($r[0]['data'], $r[0]['type']);
|
||||
profile_photo_crop_ui_head($a, $ph);
|
||||
$imagecrop = profile_photo_crop_ui_head($a, $ph);
|
||||
// go ahead as we have jus uploaded a new photo to crop
|
||||
}
|
||||
|
||||
|
|
@ -238,11 +234,11 @@ function profile_photo_content(App $a) {
|
|||
);
|
||||
|
||||
|
||||
if(! x($a->config,'imagecrop')) {
|
||||
|
||||
if (!empty($imagecrop)) {
|
||||
$tpl = get_markup_template('profile_photo.tpl');
|
||||
|
||||
$o = replace_macros($tpl,[
|
||||
$o = replace_macros($tpl,
|
||||
[
|
||||
'$user' => $a->user['nickname'],
|
||||
'$lbl_upfile' => L10n::t('Upload File:'),
|
||||
'$lbl_profiles' => L10n::t('Select a profile:'),
|
||||
|
|
@ -250,23 +246,24 @@ function profile_photo_content(App $a) {
|
|||
'$submit' => L10n::t('Upload'),
|
||||
'$profiles' => $profiles,
|
||||
'$form_security_token' => get_form_security_token("profile_photo"),
|
||||
'$select' => sprintf('%s %s', L10n::t('or'), ($newuser) ? '<a href="' . System::baseUrl() . '">' . L10n::t('skip this step') . '</a>' : '<a href="'. System::baseUrl() . '/photos/' . $a->user['nickname'] . '">' . L10n::t('select a photo from your photo albums') . '</a>')
|
||||
'$select' => sprintf('%s %s', L10n::t('or'),
|
||||
($newuser) ? '<a href="' . System::baseUrl() . '">' . L10n::t('skip this step') . '</a>' : '<a href="' . System::baseUrl() . '/photos/' . $a->user['nickname'] . '">' . L10n::t('select a photo from your photo albums') . '</a>')
|
||||
]);
|
||||
|
||||
return $o;
|
||||
}
|
||||
else {
|
||||
$filename = $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'] . '.'.$a->config['imagecrop_ext'];
|
||||
} else {
|
||||
$filename = $imagecrop['hash'] . '-' . $imagecrop['resolution'] . '.' . $imagecrop['ext'];
|
||||
$tpl = get_markup_template("cropbody.tpl");
|
||||
$o = replace_macros($tpl,[
|
||||
'$filename' => $filename,
|
||||
'$profile' => intval($_REQUEST['profile']),
|
||||
'$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
|
||||
$o = replace_macros($tpl,
|
||||
[
|
||||
'$filename' => $filename,
|
||||
'$profile' => intval($_REQUEST['profile']),
|
||||
'$resource' => $imagecrop['hash'] . '-' . $imagecrop['resolution'],
|
||||
'$image_url' => System::baseUrl() . '/photo/' . $filename,
|
||||
'$title' => L10n::t('Crop Image'),
|
||||
'$desc' => L10n::t('Please adjust the image cropping for optimum viewing.'),
|
||||
'$title' => L10n::t('Crop Image'),
|
||||
'$desc' => L10n::t('Please adjust the image cropping for optimum viewing.'),
|
||||
'$form_security_token' => get_form_security_token("profile_photo"),
|
||||
'$done' => L10n::t('Done Editing')
|
||||
'$done' => L10n::t('Done Editing')
|
||||
]);
|
||||
return $o;
|
||||
}
|
||||
|
|
@ -274,10 +271,10 @@ function profile_photo_content(App $a) {
|
|||
return; // NOTREACHED
|
||||
}
|
||||
|
||||
|
||||
function profile_photo_crop_ui_head(App $a, Image $Image) {
|
||||
$max_length = Config::get('system','max_image_length');
|
||||
if (! $max_length) {
|
||||
function profile_photo_crop_ui_head(App $a, Image $Image)
|
||||
{
|
||||
$max_length = Config::get('system', 'max_image_length');
|
||||
if (!$max_length) {
|
||||
$max_length = MAX_IMAGE_LENGTH;
|
||||
}
|
||||
if ($max_length > 0) {
|
||||
|
|
@ -318,10 +315,14 @@ function profile_photo_crop_ui_head(App $a, Image $Image) {
|
|||
}
|
||||
}
|
||||
|
||||
$a->config['imagecrop'] = $hash;
|
||||
$a->config['imagecrop_resolution'] = $smallest;
|
||||
$a->config['imagecrop_ext'] = $Image->getExt();
|
||||
$a->page['htmlhead'] .= replace_macros(get_markup_template("crophead.tpl"), []);
|
||||
$a->page['end'] .= replace_macros(get_markup_template("cropend.tpl"), []);
|
||||
return;
|
||||
|
||||
$imagecrop = [
|
||||
'hash' => $hash,
|
||||
'resolution' => $smallest,
|
||||
'ext' => $Image->getExt(),
|
||||
];
|
||||
|
||||
return $imagecrop;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ function redir_init(App $a) {
|
|||
}
|
||||
|
||||
if (remote_user()) {
|
||||
$host = substr(System::baseUrl() . ($a->path ? '/' . $a->path : ''), strpos(System::baseUrl(), '://') + 3);
|
||||
$host = substr(System::baseUrl() . ($a->urlpath ? '/' . $a->urlpath : ''), strpos(System::baseUrl(), '://') + 3);
|
||||
$remotehost = substr($contact['addr'], strpos($contact['addr'], '@') + 1);
|
||||
|
||||
// On a local instance we have to check if the local user has already authenticated
|
||||
|
|
|
|||
|
|
@ -21,8 +21,6 @@ function register_post(App $a)
|
|||
{
|
||||
check_form_security_token_redirectOnErr('/register', 'register');
|
||||
|
||||
global $lang;
|
||||
|
||||
$verified = 0;
|
||||
$blocked = 1;
|
||||
|
||||
|
|
@ -37,7 +35,7 @@ function register_post(App $a)
|
|||
}
|
||||
}
|
||||
|
||||
switch ($a->config['register_policy']) {
|
||||
switch (Config::get('config', 'register_policy')) {
|
||||
case REGISTER_OPEN:
|
||||
$blocked = 0;
|
||||
$verified = 1;
|
||||
|
|
@ -50,7 +48,7 @@ function register_post(App $a)
|
|||
|
||||
default:
|
||||
case REGISTER_CLOSED:
|
||||
if ((!x($_SESSION, 'authenticated') && (!x($_SESSION, 'administrator')))) {
|
||||
if (empty($_SESSION['authenticated']) && empty($_SESSION['administrator'])) {
|
||||
notice(L10n::t('Permission denied.') . EOL);
|
||||
return;
|
||||
}
|
||||
|
|
@ -76,7 +74,7 @@ function register_post(App $a)
|
|||
|
||||
$user = $result['user'];
|
||||
|
||||
if ($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) {
|
||||
if ($netpublish && intval(Config::get('config', 'register_policy')) !== REGISTER_APPROVE) {
|
||||
$url = System::baseUrl() . '/profile/' . $user['nickname'];
|
||||
Worker::add(PRIORITY_LOW, "Directory", $url);
|
||||
}
|
||||
|
|
@ -85,7 +83,7 @@ function register_post(App $a)
|
|||
$num_invites = Config::get('system', 'number_invites');
|
||||
$invite_id = ((x($_POST, 'invite_id')) ? notags(trim($_POST['invite_id'])) : '');
|
||||
|
||||
if ($a->config['register_policy'] == REGISTER_OPEN) {
|
||||
if (intval(Config::get('config', 'register_policy')) === REGISTER_OPEN) {
|
||||
if ($using_invites && $invite_id) {
|
||||
q("delete * from register where hash = '%s' limit 1", dbesc($invite_id));
|
||||
PConfig::set($user['uid'], 'system', 'invites_remaining', $num_invites);
|
||||
|
|
@ -94,7 +92,7 @@ function register_post(App $a)
|
|||
// Only send a password mail when the password wasn't manually provided
|
||||
if (!x($_POST, 'password1') || !x($_POST, 'confirm')) {
|
||||
$res = User::sendRegisterOpenEmail(
|
||||
$user['email'], $a->config['sitename'], System::baseUrl(), $user['username'], $result['password']);
|
||||
$user['email'], Config::get('config', 'sitename'), System::baseUrl(), $user['username'], $result['password']);
|
||||
|
||||
if ($res) {
|
||||
info(L10n::t('Registration successful. Please check your email for further instructions.') . EOL);
|
||||
|
|
@ -111,8 +109,8 @@ function register_post(App $a)
|
|||
info(L10n::t('Registration successful.') . EOL);
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
} elseif ($a->config['register_policy'] == REGISTER_APPROVE) {
|
||||
if (!strlen($a->config['admin_email'])) {
|
||||
} elseif (intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE) {
|
||||
if (!strlen(Config::get('config', 'admin_email'))) {
|
||||
notice(L10n::t('Your registration can not be processed.') . EOL);
|
||||
goaway(System::baseUrl());
|
||||
}
|
||||
|
|
@ -123,7 +121,7 @@ function register_post(App $a)
|
|||
dbesc(DateTimeFormat::utcNow()),
|
||||
intval($user['uid']),
|
||||
dbesc($result['password']),
|
||||
dbesc($lang),
|
||||
dbesc(Config::get('system', 'language')),
|
||||
dbesc($_POST['permonlybox'])
|
||||
);
|
||||
|
||||
|
|
@ -134,7 +132,7 @@ function register_post(App $a)
|
|||
}
|
||||
|
||||
// send email to admins
|
||||
$admin_mail_list = "'" . implode("','", array_map("dbesc", explode(",", str_replace(" ", "", $a->config['admin_email'])))) . "'";
|
||||
$admin_mail_list = "'" . implode("','", array_map("dbesc", explode(",", str_replace(" ", "", Config::get('config', 'admin_email'))))) . "'";
|
||||
$adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s)",
|
||||
$admin_mail_list
|
||||
);
|
||||
|
|
@ -158,7 +156,7 @@ function register_post(App $a)
|
|||
}
|
||||
// send notification to the user, that the registration is pending
|
||||
User::sendRegisterPendingEmail(
|
||||
$user['email'], $a->config['sitename'], $user['username']);
|
||||
$user['email'], Config::get('config', 'sitename'), $user['username']);
|
||||
|
||||
info(L10n::t('Your registration is pending approval by the site owner.') . EOL);
|
||||
goaway(System::baseUrl());
|
||||
|
|
@ -179,7 +177,7 @@ function register_content(App $a)
|
|||
return;
|
||||
}
|
||||
|
||||
if ((!local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
|
||||
if ((!local_user()) && (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED)) {
|
||||
notice("Permission denied." . EOL);
|
||||
return;
|
||||
}
|
||||
|
|
@ -258,7 +256,7 @@ function register_content(App $a)
|
|||
$o = replace_macros($tpl, [
|
||||
'$oidhtml' => $oidhtml,
|
||||
'$invitations' => Config::get('system', 'invitation_only'),
|
||||
'$permonly' => $a->config['register_policy'] == REGISTER_APPROVE,
|
||||
'$permonly' => intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE,
|
||||
'$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node')],
|
||||
'$invite_desc' => L10n::t('Membership on this site is by invitation only.'),
|
||||
'$invite_label' => L10n::t('Your invitation code: '),
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
/**
|
||||
* @file mod/regmod.php
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\L10n;
|
||||
|
|
@ -57,7 +58,7 @@ function user_allow($hash)
|
|||
|
||||
$res = User::sendRegisterOpenEmail(
|
||||
$user[0]['email'],
|
||||
$a->config['sitename'],
|
||||
Config::get('config', 'sitename'),
|
||||
System::baseUrl(),
|
||||
$user[0]['username'],
|
||||
$register[0]['password']);
|
||||
|
|
@ -96,11 +97,9 @@ function user_deny($hash)
|
|||
|
||||
function regmod_content(App $a)
|
||||
{
|
||||
global $lang;
|
||||
|
||||
if (!local_user()) {
|
||||
info(L10n::t('Please login.') . EOL);
|
||||
$o = '<br /><br />' . Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1);
|
||||
$o = '<br /><br />' . Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 0 : 1);
|
||||
return $o;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,11 +2,13 @@
|
|||
/**
|
||||
* @file mod/removeme.php
|
||||
*/
|
||||
|
||||
use Friendica\App;
|
||||
use Friendica\Core\Config;
|
||||
use Friendica\Core\L10n;
|
||||
use Friendica\Core\System;
|
||||
use Friendica\Model\User;
|
||||
use Friendica\Database\DBM;
|
||||
use Friendica\Model\User;
|
||||
|
||||
require_once 'include/enotify.php';
|
||||
|
||||
|
|
@ -34,7 +36,7 @@ function removeme_post(App $a)
|
|||
|
||||
// send notification to admins so that they can clean um the backups
|
||||
// send email to admins
|
||||
$admin_mails = explode(",", str_replace(" ", "", $a->config['admin_email']));
|
||||
$admin_mails = explode(",", str_replace(" ", "", Config::get('config', 'admin_email')));
|
||||
foreach ($admin_mails as $mail) {
|
||||
$admin = dba::selectFirst('user', ['uid', 'language', 'email'], ['email' => $mail]);
|
||||
if (!DBM::is_result($admin)) {
|
||||
|
|
|
|||
|
|
@ -26,14 +26,12 @@ use Friendica\Util\Temporal;
|
|||
function get_theme_config_file($theme)
|
||||
{
|
||||
$a = get_app();
|
||||
if (!empty($a->theme_info['extends'])) {
|
||||
$base_theme = $a->theme_info['extends'];
|
||||
}
|
||||
$base_theme = defaults($a->theme_info, 'extends');
|
||||
|
||||
if (file_exists("view/theme/$theme/config.php")) {
|
||||
return "view/theme/$theme/config.php";
|
||||
}
|
||||
if (!empty($base_theme) && file_exists("view/theme/$base_theme/config.php")) {
|
||||
if ($base_theme && file_exists("view/theme/$base_theme/config.php")) {
|
||||
return "view/theme/$base_theme/config.php";
|
||||
}
|
||||
return null;
|
||||
|
|
@ -511,9 +509,8 @@ function settings_post(App $a)
|
|||
$err .= L10n::t('Invalid email.');
|
||||
}
|
||||
// ensure new email is not the admin mail
|
||||
//if ((x($a->config, 'admin_email')) && (strcasecmp($email, $a->config['admin_email']) == 0)) {
|
||||
if (x($a->config, 'admin_email')) {
|
||||
$adminlist = explode(",", str_replace(" ", "", strtolower($a->config['admin_email'])));
|
||||
if (Config::get('config', 'admin_email')) {
|
||||
$adminlist = explode(",", str_replace(" ", "", strtolower(Config::get('config', 'admin_email'))));
|
||||
if (in_array(strtolower($email), $adminlist)) {
|
||||
$err .= L10n::t('Cannot change to that email.');
|
||||
$email = $a->user['email'];
|
||||
|
|
|
|||
|
|
@ -17,10 +17,10 @@ function statistics_json_init(App $a) {
|
|||
}
|
||||
|
||||
$statistics = [
|
||||
"name" => $a->config["sitename"],
|
||||
"name" => Config::get('config', 'sitename'),
|
||||
"network" => FRIENDICA_PLATFORM,
|
||||
"version" => FRIENDICA_VERSION . "-" . DB_UPDATE_VERSION,
|
||||
"registrations_open" => ($a->config['register_policy'] != 0),
|
||||
"registrations_open" => intval(Config::get('config', 'register_policy')) !== REGISTER_CLOSED,
|
||||
"total_users" => Config::get('nodeinfo', 'total_users'),
|
||||
"active_users_halfyear" => Config::get('nodeinfo', 'active_users_halfyear'),
|
||||
"active_users_monthly" => Config::get('nodeinfo', 'active_users_monthly'),
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ use Friendica\Core\UserImport;
|
|||
|
||||
function uimport_post(App $a)
|
||||
{
|
||||
switch ($a->config['register_policy']) {
|
||||
switch (Config::get('config', 'register_policy')) {
|
||||
case REGISTER_OPEN:
|
||||
$blocked = 0;
|
||||
$verified = 1;
|
||||
|
|
@ -42,7 +42,7 @@ function uimport_post(App $a)
|
|||
|
||||
function uimport_content(App $a) {
|
||||
|
||||
if ((!local_user()) && ($a->config['register_policy'] == REGISTER_CLOSED)) {
|
||||
if ((!local_user()) && (intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED)) {
|
||||
notice("Permission denied." . EOL);
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue