From 6387a77b52a3c4b01c3ae0a1542afa9dfe11dd74 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 14 Apr 2019 11:13:18 -0400 Subject: [PATCH 01/37] Move admin summary to src/Module - Add BaseAdminModule class - Add Module\Admin\Summary class - Add Route for Admin\Summary module - Remove admin_page_summary() in mod/admin - Remove $showwarning variable from admin/summary.tpl --- mod/admin.php | 133 ----------------- src/App/Router.php | 4 + src/Module/Admin/Summary.php | 149 ++++++++++++++++++++ src/Module/BaseAdminModule.php | 74 ++++++++++ view/templates/admin/summary.tpl | 2 +- view/theme/frio/templates/admin/summary.tpl | 2 +- 6 files changed, 229 insertions(+), 135 deletions(-) create mode 100644 src/Module/Admin/Summary.php create mode 100644 src/Module/BaseAdminModule.php diff --git a/mod/admin.php b/mod/admin.php index 22bb66265b..0c7724573d 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -298,8 +298,6 @@ function admin_content(App $a) default: notice(L10n::t("Item not found.")); } - } else { - $o = admin_page_summary($a); } if ($a->isAjax()) { @@ -837,137 +835,6 @@ function admin_page_workerqueue(App $a, $deferred) ]); } -/** - * @brief Admin Summary Page - * - * The summary page is the "start page" of the admin panel. It gives the admin - * a first overview of the open adminastrative tasks. - * - * The returned string contains the HTML content of the generated page. - * - * @param App $a - * @return string - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ -function admin_page_summary(App $a) -{ - // are there MyISAM tables in the DB? If so, trigger a warning message - $r = q("SELECT `engine` FROM `information_schema`.`tables` WHERE `engine` = 'myisam' AND `table_schema` = '%s' LIMIT 1", DBA::escape(DBA::databaseName())); - $showwarning = false; - $warningtext = []; - if (DBA::isResult($r)) { - $showwarning = true; - $warningtext[] = L10n::t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See here for a guide that may be helpful converting the table engines. You may also use the command php bin/console.php dbstructure toinnodb of your Friendica installation for an automatic conversion.
', 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html'); - } - // Check if github.com/friendica/master/VERSION is higher then - // the local version of Friendica. Check is opt-in, source may be master or devel branch - if (Config::get('system', 'check_new_version_url', 'none') != 'none') { - $gitversion = Config::get('system', 'git_friendica_version'); - if (version_compare(FRIENDICA_VERSION, $gitversion) < 0) { - $warningtext[] = L10n::t('There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s', FRIENDICA_VERSION, $gitversion); - $showwarning = true; - } - } - - if (Config::get('system', 'dbupdate', DBStructure::UPDATE_NOT_CHECKED) == DBStructure::UPDATE_NOT_CHECKED) { - DBStructure::update($a->getBasePath(), false, true); - } - if (Config::get('system', 'dbupdate') == DBStructure::UPDATE_FAILED) { - $showwarning = true; - $warningtext[] = L10n::t('The database update failed. Please run "php bin/console.php dbstructure update" from the command line and have a look at the errors that might appear.'); - } - if (Config::get('system', 'update') == Update::FAILED) { - $showwarning = true; - $warningtext[] = L10n::t('The last update failed. Please run "php bin/console.php dbstructure update" from the command line and have a look at the errors that might appear. (Some of the errors are possibly inside the logfile.)'); - } - - $last_worker_call = Config::get('system', 'last_worker_execution', false); - if (!$last_worker_call) { - $showwarning = true; - $warningtext[] = L10n::t('The worker was never executed. Please check your database structure!'); - } elseif ((strtotime(DateTimeFormat::utcNow()) - strtotime($last_worker_call)) > 60 * 60) { - $showwarning = true; - $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.config.php, please copy config/local-sample.config.php and move your config from .htconfig.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config'); - } - if (file_exists('config/local.ini.php')) { - $showwarning = true; - $warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from config/local.ini.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config'); - } - - // Check server vitality - if (!admin_page_server_vital()) { - $showwarning = true; - $well_known = $a->getBaseURL() . '/.well-known/host-meta'; - $warningtext[] = L10n::t('%s is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See the installation page for help.', - $well_known, $well_known, $a->getBaseURL() . '/help/Install'); - } - - $r = q("SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`"); - $accounts = [ - [L10n::t('Normal Account'), 0], - [L10n::t('Automatic Follower Account'), 0], - [L10n::t('Public Forum Account'), 0], - [L10n::t('Automatic Friend Account'), 0], - [L10n::t('Blog Account'), 0], - [L10n::t('Private Forum Account'), 0] - ]; - - $users = 0; - foreach ($r as $u) { - $accounts[$u['page-flags']][1] = $u['count']; - $users += $u['count']; - } - - Logger::log('accounts: ' . print_r($accounts, true), Logger::DATA); - - $pending = Register::getPendingCount(); - - $deferred = DBA::count('workerqueue', ["`executed` <= ? AND NOT `done` AND `next_try` > ?", - DBA::NULL_DATETIME, DateTimeFormat::utcNow()]); - - $workerqueue = DBA::count('workerqueue', ["`executed` <= ? AND NOT `done` AND `next_try` < ?", - DBA::NULL_DATETIME, DateTimeFormat::utcNow()]); - - // We can do better, but this is a quick queue status - - $queues = ['label' => L10n::t('Message queues'), 'deferred' => $deferred, 'workerq' => $workerqueue]; - - - $r = q("SHOW variables LIKE 'max_allowed_packet'"); - $max_allowed_packet = (($r) ? $r[0]['Value'] : 0); - - $server_settings = ['label' => L10n::t('Server Settings'), - 'php' => ['upload_max_filesize' => ini_get('upload_max_filesize'), - 'post_max_size' => ini_get('post_max_size'), - 'memory_limit' => ini_get('memory_limit')], - 'mysql' => ['max_allowed_packet' => $max_allowed_packet]]; - - $t = Renderer::getMarkupTemplate('admin/summary.tpl'); - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Summary'), - '$queues' => $queues, - '$users' => [L10n::t('Registered users'), $users], - '$accounts' => $accounts, - '$pending' => [L10n::t('Pending registrations'), $pending], - '$version' => [L10n::t('Version'), FRIENDICA_VERSION], - '$baseurl' => System::baseUrl(), - '$platform' => FRIENDICA_PLATFORM, - '$codename' => FRIENDICA_CODENAME, - '$build' => Config::get('system', 'build'), - '$addons' => [L10n::t('Active addons'), Addon::getEnabledList()], - '$serversettings' => $server_settings, - '$showwarning' => $showwarning, - '$warningtext' => $warningtext - ]); -} - /** * @brief Process send data from Admin Site Page * diff --git a/src/App/Router.php b/src/App/Router.php index cdd40ac9da..85134bf444 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -117,6 +117,10 @@ class Router $this->routeCollector->addRoute(['GET'], '/tos', Module\Tos::class); $this->routeCollector->addRoute(['GET'], '/webfinger', Module\WebFinger::class); $this->routeCollector->addRoute(['GET'], '/xrd', Module\Xrd::class); + + $this->routeCollector->addGroup('/admin', function (RouteCollector $collector) { + $collector->addRoute(['GET'] , '[/]' , Module\Admin\Summary::class); + }); } public function __construct(RouteCollector $routeCollector = null) diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php new file mode 100644 index 0000000000..49ad59cdf6 --- /dev/null +++ b/src/Module/Admin/Summary.php @@ -0,0 +1,149 @@ + 'myisam', 'table_schema' => DBA::databaseName()])) { + $warningtext[] = L10n::t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See here for a guide that may be helpful converting the table engines. You may also use the command php bin/console.php dbstructure toinnodb of your Friendica installation for an automatic conversion.
', 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html'); + } + + // Check if github.com/friendica/master/VERSION is higher then + // the local version of Friendica. Check is opt-in, source may be master or devel branch + if (Config::get('system', 'check_new_version_url', 'none') != 'none') { + $gitversion = Config::get('system', 'git_friendica_version'); + if (version_compare(FRIENDICA_VERSION, $gitversion) < 0) { + $warningtext[] = L10n::t('There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s', FRIENDICA_VERSION, $gitversion); + } + } + + if (Config::get('system', 'dbupdate', DBStructure::UPDATE_NOT_CHECKED) == DBStructure::UPDATE_NOT_CHECKED) { + DBStructure::update($a->getBasePath(), false, true); + } + + if (Config::get('system', 'dbupdate') == DBStructure::UPDATE_FAILED) { + $warningtext[] = L10n::t('The database update failed. Please run "php bin/console.php dbstructure update" from the command line and have a look at the errors that might appear.'); + } + + if (Config::get('system', 'update') == Update::FAILED) { + $warningtext[] = L10n::t('The last update failed. Please run "php bin/console.php dbstructure update" from the command line and have a look at the errors that might appear. (Some of the errors are possibly inside the logfile.)'); + } + + $last_worker_call = Config::get('system', 'last_worker_execution', false); + if (!$last_worker_call) { + $warningtext[] = L10n::t('The worker was never executed. Please check your database structure!'); + } elseif ((strtotime(DateTimeFormat::utcNow()) - strtotime($last_worker_call)) > 60 * 60) { + $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')) { + $warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from .htconfig.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config'); + } + + if (file_exists('config/local.ini.php')) { + $warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from config/local.ini.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config'); + } + + // Check server vitality + if (!self::checkSelfHostMeta()) { + $well_known = $a->getBaseURL() . '/.well-known/host-meta'; + $warningtext[] = L10n::t('%s is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See the installation page for help.', + $well_known, $well_known, $a->getBaseURL() . '/help/Install'); + } + + $accounts = [ + [L10n::t('Normal Account'), 0], + [L10n::t('Automatic Follower Account'), 0], + [L10n::t('Public Forum Account'), 0], + [L10n::t('Automatic Friend Account'), 0], + [L10n::t('Blog Account'), 0], + [L10n::t('Private Forum Account'), 0] + ]; + + $users = 0; + $pageFlagsCountStmt = DBA::p('SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`'); + while ($pageFlagsCount = DBA::fetch($pageFlagsCountStmt)) { + $accounts[$pageFlagsCount['page-flags']][1] = $pageFlagsCount['count']; + $users += $pageFlagsCount['count']; + } + DBA::close($pageFlagsCountStmt); + + Logger::log('accounts: ' . print_r($accounts, true), Logger::DATA); + + $pending = Register::getPendingCount(); + + $queue = DBA::count('queue', []); + + $deferred = DBA::count('workerqueue', ['`executed` <= ? AND NOT `done` AND `next_try` > ?', + DBA::NULL_DATETIME, DateTimeFormat::utcNow()]); + + $workerqueue = DBA::count('workerqueue', ['`executed` <= ? AND NOT `done` AND `next_try` < ?', + DBA::NULL_DATETIME, DateTimeFormat::utcNow()]); + + // We can do better, but this is a quick queue status + $queues = ['label' => L10n::t('Message queues'), 'queue' => $queue, 'deferred' => $deferred, 'workerq' => $workerqueue]; + + $variables = DBA::toArray(DBA::p('SHOW variables LIKE "max_allowed_packet"')); + $max_allowed_packet = $variables ? $variables[0]['Value'] : 0; + + $server_settings = [ + 'label' => L10n::t('Server Settings'), + 'php' => [ + 'upload_max_filesize' => ini_get('upload_max_filesize'), + 'post_max_size' => ini_get('post_max_size'), + 'memory_limit' => ini_get('memory_limit') + ], + 'mysql' => [ + 'max_allowed_packet' => $max_allowed_packet + ] + ]; + + $t = Renderer::getMarkupTemplate('admin/summary.tpl'); + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Summary'), + '$queues' => $queues, + '$users' => [L10n::t('Registered users'), $users], + '$accounts' => $accounts, + '$pending' => [L10n::t('Pending registrations'), $pending], + '$version' => [L10n::t('Version'), FRIENDICA_VERSION], + '$baseurl' => System::baseUrl(), + '$platform' => FRIENDICA_PLATFORM, + '$codename' => FRIENDICA_CODENAME, + '$build' => Config::get('system', 'build'), + '$addons' => [L10n::t('Active addons'), Addon::getEnabledList()], + '$serversettings' => $server_settings, + '$warningtext' => $warningtext + ]); + } + + private static function checkSelfHostMeta() + { + // Fetch the host-meta to check if this really is a vital server + return Network::curl(System::baseUrl() . '/.well-known/host-meta')->isSuccess(); + } + +} \ No newline at end of file diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php new file mode 100644 index 0000000000..4664c90fc0 --- /dev/null +++ b/src/Module/BaseAdminModule.php @@ -0,0 +1,74 @@ +page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/settings_head.tpl'), []); + + /* + * Side bar links + */ + + // array(url, name, extra css classes) + // not part of $aside to make the template more adjustable + $aside_sub = [ + 'information' => [L10n::t('Information'), [ + 'overview' => ['admin' , L10n::t('Overview') , 'overview'], + ]], + ]; + + $addons_admin = []; + $addonsAdminStmt = DBA::select('addon', ['name'], ['plugin_admin' => 1], ['order' => ['name']]); + foreach (DBA::toArray($addonsAdminStmt) as $addon) { + $addons_admin[] = ['admin/addons/' . $addon['name'], $addon['name'], 'addon']; + } + + $t = Renderer::getMarkupTemplate('admin/aside.tpl'); + $a->page['aside'] .= Renderer::replaceMacros($t, [ + '$admin' => ['addons_admin' => $addons_admin], + '$subpages' => $aside_sub, + '$admtxt' => L10n::t('Admin'), + '$plugadmtxt' => L10n::t('Addon Features'), + '$h_pending' => L10n::t('User registrations waiting for confirmation'), + '$admurl' => 'admin/' + ]); + + return ''; + } +} diff --git a/view/templates/admin/summary.tpl b/view/templates/admin/summary.tpl index 09419929d2..7b655a8ecc 100644 --- a/view/templates/admin/summary.tpl +++ b/view/templates/admin/summary.tpl @@ -1,7 +1,7 @@

{{$title}} - {{$page}}

-{{if $showwarning}} +{{if $warningtext|count}}
{{foreach $warningtext as $wt}}

{{$wt nofilter}}

diff --git a/view/theme/frio/templates/admin/summary.tpl b/view/theme/frio/templates/admin/summary.tpl index d183e3fa20..9dbd3f7e6b 100644 --- a/view/theme/frio/templates/admin/summary.tpl +++ b/view/theme/frio/templates/admin/summary.tpl @@ -2,7 +2,7 @@

{{$title}} - {{$page}}

- {{if $showwarning}} + {{if $warningtext|count}}
{{foreach $warningtext as $wt}}

{{$wt nofilter}}

From 35d222f95d482de4daf85afec9728bc023cc597d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 14 Apr 2019 11:20:44 -0400 Subject: [PATCH 02/37] Move admin/federation to src/Module - Add Module\Admin\Federation class - Add missing abstract keyword in Module\BaseAdminModule - Add route for admin/federation - Remove admin_page_federation() from mod/admin.php --- mod/admin.php | 193 ------------------------------ src/App/Router.php | 1 + src/Module/Admin/Federation.php | 200 ++++++++++++++++++++++++++++++++ src/Module/BaseAdminModule.php | 3 +- 4 files changed, 203 insertions(+), 194 deletions(-) create mode 100644 src/Module/Admin/Federation.php diff --git a/mod/admin.php b/mod/admin.php index 0c7724573d..dd441023d0 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -280,9 +280,6 @@ function admin_content(App $a) case 'workerqueue': $o = admin_page_workerqueue($a, false); break; - case 'federation': - $o = admin_page_federation($a); - break; case 'contactblock': $o = admin_page_contactblock($a); break; @@ -594,196 +591,6 @@ function admin_page_deleteitem_post(App $a) return; // NOTREACHED } -/** - * @brief Subpage with some stats about "the federation" network - * - * This function generates the "Federation Statistics" subpage for the admin - * panel. The page lists some numbers to the part of "The Federation" known to - * the node. This data includes the different connected networks (e.g. - * Diaspora, Hubzilla, GNU Social) and the used versions in the different - * networks. - * - * The returned string contains the HTML code of the subpage for display. - * - * @param App $a - * @return string - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ -function admin_page_federation(App $a) -{ - // get counts on active friendica, diaspora, redmatrix, hubzilla, gnu - // social and statusnet nodes this node is knowing - // - // We are looking for the following platforms in the DB, "Red" should find - // all variants of that platform ID string as the q() function is stripping - // off one % two of them are needed in the query - // Add more platforms if you like, when one returns 0 known nodes it is not - // displayed on the stats page. - $platforms = ['Friendi%%a', 'Diaspora', '%%red%%', 'Hubzilla', 'BlaBlaNet', 'GNU Social', 'StatusNet', 'Mastodon', 'Pleroma', 'socialhome', 'ganggo']; - $colors = [ - 'Friendi%%a' => '#ffc018', // orange from the logo - 'Diaspora' => '#a1a1a1', // logo is black and white, makes a gray - '%%red%%' => '#c50001', // fire red from the logo - 'Hubzilla' => '#43488a', // blue from the logo - 'BlaBlaNet' => '#3B5998', // blue from the navbar at blablanet-dot-com - 'GNU Social' => '#a22430', // dark red from the logo - 'StatusNet' => '#789240', // the green from the logo (red and blue have already others - 'Mastodon' => '#1a9df9', // blue from the Mastodon logo - 'Pleroma' => '#E46F0F', // Orange from the text that is used on Pleroma instances - 'socialhome' => '#52056b' , // lilac from the Django Image used at the Socialhome homepage - 'ganggo' => '#69d7e2' // from the favicon - ]; - $counts = []; - $total = 0; - $users = 0; - - foreach ($platforms as $p) { - // get a total count for the platform, the name and version of the - // highest version and the protocol tpe - $c = q('SELECT COUNT(*) AS `total`, SUM(`registered-users`) AS `users`, ANY_VALUE(`platform`) AS `platform`, - ANY_VALUE(`network`) AS `network`, MAX(`version`) AS `version` FROM `gserver` - WHERE `platform` LIKE "%s" AND `last_contact` >= `last_failure` - ORDER BY `version` ASC;', $p); - $total += $c[0]['total']; - $users += $c[0]['users']; - - // what versions for that platform do we know at all? - // again only the active nodes - $v = q('SELECT COUNT(*) AS `total`, `version` FROM `gserver` - WHERE `last_contact` >= `last_failure` AND `platform` LIKE "%s" - GROUP BY `version` - ORDER BY `version`;', $p); - - // - // clean up version numbers - // - // some platforms do not provide version information, add a unkown there - // to the version string for the displayed list. - foreach ($v as $key => $value) { - if ($v[$key]['version'] == '') { - $v[$key] = ['total' => $v[$key]['total'], 'version' => L10n::t('unknown')]; - } - } - - // Reformat and compact version numbers - if ($p == 'Pleroma') { - $compacted = []; - - foreach ($v as $key => $value) { - $version = $v[$key]['version']; - $parts = explode(' ', trim($version)); - do { - $part = array_pop($parts); - } while (!empty($parts) && ((strlen($part) >= 40) || (strlen($part) <= 3))); - // only take the x.x.x part of the version, not the "release" after the dash - $part = array_shift(explode('-', $part)); - - if (!empty($part)) { - if (empty($compacted[$part])) { - $compacted[$part] = $v[$key]['total']; - } else { - $compacted[$part] += $v[$key]['total']; - } - } - } - - $v = []; - foreach ($compacted as $version => $pl_total) { - $v[] = ['version' => $version, 'total' => $pl_total]; - } - } - - // in the DB the Diaspora versions have the format x.x.x.x-xx the last - // part (-xx) should be removed to clean up the versions from the "head - // commit" information and combined into a single entry for x.x.x.x - if ($p == 'Diaspora') { - $newV = []; - $newVv = []; - foreach ($v as $vv) { - $newVC = $vv['total']; - $newVV = $vv['version']; - $posDash = strpos($newVV, '-'); - if ($posDash) { - $newVV = substr($newVV, 0, $posDash); - } - if (isset($newV[$newVV])) { - $newV[$newVV] += $newVC; - } else { - $newV[$newVV] = $newVC; - } - } - foreach ($newV as $key => $value) { - array_push($newVv, ['total' => $value, 'version' => $key]); - } - $v = $newVv; - } - - // early friendica versions have the format x.x.xxxx where xxxx is the - // DB version stamp; those should be operated out and versions be - // conbined - if ($p == 'Friendi%%a') { - $newV = []; - $newVv = []; - foreach ($v as $vv) { - $newVC = $vv['total']; - $newVV = $vv['version']; - $lastDot = strrpos($newVV, '.'); - $len = strlen($newVV) - 1; - if (($lastDot == $len - 4) && (!strrpos($newVV, '-rc') == $len - 3)) { - $newVV = substr($newVV, 0, $lastDot); - } - if (isset($newV[$newVV])) { - $newV[$newVV] += $newVC; - } else { - $newV[$newVV] = $newVC; - } - } - foreach ($newV as $key => $value) { - array_push($newVv, ['total' => $value, 'version' => $key]); - } - $v = $newVv; - } - - // Assure that the versions are sorted correctly - $v2 = []; - $versions = []; - foreach ($v as $vv) { - $version = trim(strip_tags($vv["version"])); - $v2[$version] = $vv; - $versions[] = $version; - } - - usort($versions, 'version_compare'); - - $v = []; - foreach ($versions as $version) { - $v[] = $v2[$version]; - } - - // the 3rd array item is needed for the JavaScript graphs as JS does - // not like some characters in the names of variables... - $counts[$p] = [$c[0], $v, str_replace([' ', '%'], '', $p), $colors[$p]]; - } - - // some helpful text - $intro = L10n::t('This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of.'); - $hint = L10n::t('The Auto Discovered Contact Directory feature is not enabled, it will improve the data displayed here.'); - - // load the template, replace the macros and return the page content - $t = Renderer::getMarkupTemplate('admin/federation.tpl'); - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Federation Statistics'), - '$intro' => $intro, - '$hint' => $hint, - '$autoactive' => Config::get('system', 'poco_completion'), - '$counts' => $counts, - '$version' => FRIENDICA_VERSION, - '$legendtext' => L10n::t('Currently this node is aware of %d nodes with %d registered users from the following platforms:', $total, $users), - '$baseurl' => System::baseUrl(), - ]); -} - /** * @brief Admin Inspect Worker Queue Page * diff --git a/src/App/Router.php b/src/App/Router.php index 85134bf444..4137c4ada4 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -120,6 +120,7 @@ class Router $this->routeCollector->addGroup('/admin', function (RouteCollector $collector) { $collector->addRoute(['GET'] , '[/]' , Module\Admin\Summary::class); + $collector->addRoute(['GET'] , '/federation' , Module\Admin\Federation::class); }); } diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php new file mode 100644 index 0000000000..3d697a7fda --- /dev/null +++ b/src/Module/Admin/Federation.php @@ -0,0 +1,200 @@ + '#ffc018', // orange from the logo + 'Diaspora' => '#a1a1a1', // logo is black and white, makes a gray + '%%red%%' => '#c50001', // fire red from the logo + 'Hubzilla' => '#43488a', // blue from the logo + 'BlaBlaNet' => '#3B5998', // blue from the navbar at blablanet-dot-com + 'GNU Social' => '#a22430', // dark red from the logo + 'StatusNet' => '#789240', // the green from the logo (red and blue have already others + 'Mastodon' => '#1a9df9', // blue from the Mastodon logo + 'Pleroma' => '#E46F0F', // Orange from the text that is used on Pleroma instances + 'socialhome' => '#52056b', // lilac from the Django Image used at the Socialhome homepage + 'ganggo' => '#69d7e2', // from the favicon + ]; + $counts = []; + $total = 0; + $users = 0; + + foreach ($platforms as $platform) { + // get a total count for the platform, the name and version of the + // highest version and the protocol tpe + $platformCountStmt = DBA::p('SELECT + COUNT(*) AS `total`, + SUM(`registered-users`) AS `users`, + ANY_VALUE(`platform`) AS `platform`, + ANY_VALUE(`network`) AS `network`, + MAX(`version`) AS `version` FROM `gserver` + WHERE `platform` LIKE ? + AND `last_contact` >= `last_failure` + ORDER BY `version` ASC', $platform); + $platformCount = DBA::fetch($platformCountStmt); + $total += $platformCount['total']; + $users += $platformCount['users']; + + DBA::close($platformCountStmt); + + // what versions for that platform do we know at all? + // again only the active nodes + $versionCountsStmt = DBA::p('SELECT + COUNT(*) AS `total`, + `version` FROM `gserver` + WHERE `last_contact` >= `last_failure` + AND `platform` LIKE ? + GROUP BY `version` + ORDER BY `version`;', $platform); + $versionCounts = DBA::toArray($versionCountsStmt); + + // + // clean up version numbers + // + // some platforms do not provide version information, add a unkown there + // to the version string for the displayed list. + foreach ($versionCounts as $key => $value) { + if ($versionCounts[$key]['version'] == '') { + $versionCounts[$key] = ['total' => $versionCounts[$key]['total'], 'version' => L10n::t('unknown')]; + } + } + + // Reformat and compact version numbers + if ($platform == 'Pleroma') { + $compacted = []; + + foreach ($versionCounts as $key => $value) { + $version = $versionCounts[$key]['version']; + $parts = explode(' ', trim($version)); + do { + $part = array_pop($parts); + } while (!empty($parts) && ((strlen($part) >= 40) || (strlen($part) <= 3))); + + if (!empty($part)) { + if (empty($compacted[$part])) { + $compacted[$part] = $versionCounts[$key]['total']; + } else { + $compacted[$part] += $versionCounts[$key]['total']; + } + } + } + + $versionCounts = []; + foreach ($compacted as $version => $pl_total) { + $versionCounts[] = ['version' => $version, 'total' => $pl_total]; + } + } + + // in the DB the Diaspora versions have the format x.x.x.x-xx the last + // part (-xx) should be removed to clean up the versions from the "head + // commit" information and combined into a single entry for x.x.x.x + if ($platform == 'Diaspora') { + $newV = []; + $newVv = []; + foreach ($versionCounts as $vv) { + $newVC = $vv['total']; + $newVV = $vv['version']; + $posDash = strpos($newVV, '-'); + if ($posDash) { + $newVV = substr($newVV, 0, $posDash); + } + if (isset($newV[$newVV])) { + $newV[$newVV] += $newVC; + } else { + $newV[$newVV] = $newVC; + } + } + foreach ($newV as $key => $value) { + array_push($newVv, ['total' => $value, 'version' => $key]); + } + $versionCounts = $newVv; + } + + // early friendica versions have the format x.x.xxxx where xxxx is the + // DB version stamp; those should be operated out and versions be + // conbined + if ($platform == 'Friendi%%a') { + $newV = []; + $newVv = []; + foreach ($versionCounts as $vv) { + $newVC = $vv['total']; + $newVV = $vv['version']; + $lastDot = strrpos($newVV, '.'); + $len = strlen($newVV) - 1; + if (($lastDot == $len - 4) && (!strrpos($newVV, '-rc') == $len - 3)) { + $newVV = substr($newVV, 0, $lastDot); + } + if (isset($newV[$newVV])) { + $newV[$newVV] += $newVC; + } else { + $newV[$newVV] = $newVC; + } + } + foreach ($newV as $key => $value) { + array_push($newVv, ['total' => $value, 'version' => $key]); + } + $versionCounts = $newVv; + } + + // Assure that the versions are sorted correctly + $v2 = []; + $versions = []; + foreach ($versionCounts as $vv) { + $version = trim(strip_tags($vv["version"])); + $v2[$version] = $vv; + $versions[] = $version; + } + + usort($versions, 'version_compare'); + + $versionCounts = []; + foreach ($versions as $version) { + $versionCounts[] = $v2[$version]; + } + + // the 3rd array item is needed for the JavaScript graphs as JS does + // not like some characters in the names of variables... + $counts[$platform] = [$platformCount, $versionCounts, str_replace([' ', '%'], '', $platform), $colors[$platform]]; + } + + // some helpful text + $intro = L10n::t('This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of.'); + $hint = L10n::t('The Auto Discovered Contact Directory feature is not enabled, it will improve the data displayed here.'); + + // load the template, replace the macros and return the page content + $t = Renderer::getMarkupTemplate('admin/federation.tpl'); + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Federation Statistics'), + '$intro' => $intro, + '$hint' => $hint, + '$autoactive' => Config::get('system', 'poco_completion'), + '$counts' => $counts, + '$version' => FRIENDICA_VERSION, + '$legendtext' => L10n::t('Currently this node is aware of %d nodes with %d registered users from the following platforms:', $total, $users), + '$baseurl' => System::baseUrl(), + ]); + } +} diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php index 4664c90fc0..2df7a6b825 100644 --- a/src/Module/BaseAdminModule.php +++ b/src/Module/BaseAdminModule.php @@ -7,7 +7,7 @@ use Friendica\Core\L10n; use Friendica\Core\Renderer; use Friendica\Database\DBA; -class BaseAdminModule extends BaseModule +abstract class BaseAdminModule extends BaseModule { public static function post() { @@ -50,6 +50,7 @@ class BaseAdminModule extends BaseModule $aside_sub = [ 'information' => [L10n::t('Information'), [ 'overview' => ['admin' , L10n::t('Overview') , 'overview'], + 'federation' => ['admin/federation' , L10n::t('Federation Statistics') , 'federation'] ]], ]; From 488e425416f4c946a0f4c7de95e8e77d6ee107cf Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 14 Apr 2019 11:25:27 -0400 Subject: [PATCH 03/37] Move admin/tos to src/Module - Add Module\Admin\Tos class - Add route for admin/tos - Add admin aside menu entry - Remove admin_page_tos and admin_page_tos_post from mod/admin.php --- mod/admin.php | 57 ---------------------------------- src/App/Router.php | 2 ++ src/Module/Admin/Tos.php | 53 +++++++++++++++++++++++++++++++ src/Module/BaseAdminModule.php | 3 ++ 4 files changed, 58 insertions(+), 57 deletions(-) create mode 100644 src/Module/Admin/Tos.php diff --git a/mod/admin.php b/mod/admin.php index dd441023d0..af4c874c2c 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -126,9 +126,6 @@ function admin_post(App $a) } $return_path = 'admin/themes/' . $theme . (!empty($_GET['mode']) ? '?mode=' . $_GET['mode'] : ''); break; - case 'tos': - admin_page_tos_post($a); - break; case 'features': admin_page_features_post($a); break; @@ -289,9 +286,6 @@ function admin_content(App $a) case 'deleteitem': $o = admin_page_deleteitem($a); break; - case 'tos': - $o = admin_page_tos($a); - break; default: notice(L10n::t("Item not found.")); } @@ -305,57 +299,6 @@ function admin_content(App $a) } } -/** - * @brief Subpage to define the display of a Terms of Usage page. - * - * @param App $a - * @return string - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ -function admin_page_tos(App $a) -{ - $tos = new Tos(); - $t = Renderer::getMarkupTemplate('admin/tos.tpl'); - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Terms of Service'), - '$displaytos' => ['displaytos', L10n::t('Display Terms of Service'), Config::get('system', 'tosdisplay'), L10n::t('Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page.')], - '$displayprivstatement' => ['displayprivstatement', L10n::t('Display Privacy Statement'), Config::get('system', 'tosprivstatement'), L10n::t('Show some informations regarding the needed information to operate the node according e.g. to EU-GDPR.', 'https://en.wikipedia.org/wiki/General_Data_Protection_Regulation')], - '$preview' => L10n::t('Privacy Statement Preview'), - '$privtext' => $tos->privacy_complete, - '$tostext' => ['tostext', L10n::t('The Terms of Service'), Config::get('system', 'tostext'), L10n::t('Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below.')], - '$form_security_token' => BaseModule::getFormSecurityToken("admin_tos"), - '$submit' => L10n::t('Save Settings'), - ]); -} - -/** - * @brief Process send data from Admin TOS Page - * - * @param App $a - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ -function admin_page_tos_post(App $a) -{ - BaseModule::checkFormSecurityTokenRedirectOnError('/admin/tos', 'admin_tos'); - - if (empty($_POST['page_tos'])) { - return; - } - - $displaytos = !empty($_POST['displaytos']); - $displayprivstatement = !empty($_POST['displayprivstatement']); - $tostext = (!empty($_POST['tostext']) ? strip_tags(trim($_POST['tostext'])) : ''); - - Config::set('system', 'tosdisplay', $displaytos); - Config::set('system', 'tosprivstatement', $displayprivstatement); - Config::set('system', 'tostext', $tostext); - - $a->internalRedirect('admin/tos'); - - return; // NOTREACHED -} - /** * @brief Subpage to modify the server wide block list via the admin panel. * diff --git a/src/App/Router.php b/src/App/Router.php index 4137c4ada4..ca362f4842 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -121,6 +121,8 @@ class Router $this->routeCollector->addGroup('/admin', function (RouteCollector $collector) { $collector->addRoute(['GET'] , '[/]' , Module\Admin\Summary::class); $collector->addRoute(['GET'] , '/federation' , Module\Admin\Federation::class); + + $collector->addRoute(['GET', 'POST'], '/tos' , Module\Admin\Tos::class); }); } diff --git a/src/Module/Admin/Tos.php b/src/Module/Admin/Tos.php new file mode 100644 index 0000000000..efab22f8ef --- /dev/null +++ b/src/Module/Admin/Tos.php @@ -0,0 +1,53 @@ +internalRedirect('admin/tos'); + } + + public static function content() + { + parent::content(); + + $tos = new \Friendica\Module\Tos(); + $t = Renderer::getMarkupTemplate('admin/tos.tpl'); + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Terms of Service'), + '$displaytos' => ['displaytos', L10n::t('Display Terms of Service'), Config::get('system', 'tosdisplay'), L10n::t('Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page.')], + '$displayprivstatement' => ['displayprivstatement', L10n::t('Display Privacy Statement'), Config::get('system', 'tosprivstatement'), L10n::t('Show some informations regarding the needed information to operate the node according e.g. to EU-GDPR.', 'https://en.wikipedia.org/wiki/General_Data_Protection_Regulation')], + '$preview' => L10n::t('Privacy Statement Preview'), + '$privtext' => $tos->privacy_complete, + '$tostext' => ['tostext', L10n::t('The Terms of Service'), Config::get('system', 'tostext'), L10n::t('Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below.')], + '$form_security_token' => parent::getFormSecurityToken('admin_tos'), + '$submit' => L10n::t('Save Settings'), + ]); + } +} \ No newline at end of file diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php index 2df7a6b825..90f7810378 100644 --- a/src/Module/BaseAdminModule.php +++ b/src/Module/BaseAdminModule.php @@ -52,6 +52,9 @@ abstract class BaseAdminModule extends BaseModule 'overview' => ['admin' , L10n::t('Overview') , 'overview'], 'federation' => ['admin/federation' , L10n::t('Federation Statistics') , 'federation'] ]], + 'configuration' => [L10n::t('Configuration'), [ + 'tos' => ['admin/tos' , L10n::t('Terms of Service') , 'tos'], + ]], ]; $addons_admin = []; From 9227aab83749fcb69525a914369a6819294fb53f Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 15 Apr 2019 01:04:02 -0400 Subject: [PATCH 04/37] Add system.allowed_themes config key handling in Core\Theme - Add Theme::setAllowedList method - Update the allowed theme list on theme install/uninstall - Add theme file inclusion on uninstall allowing for theme_uninstall function to be called - Removing logging from frontend methods --- src/Core/Theme.php | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/src/Core/Theme.php b/src/Core/Theme.php index c972e09fc7..ae389515c2 100644 --- a/src/Core/Theme.php +++ b/src/Core/Theme.php @@ -34,6 +34,11 @@ class Theme return $allowed_themes; } + public static function setAllowedList(array $allowed_themes) + { + Config::set('system', 'allowed_themes', implode(',', $allowed_themes)); + } + /** * @brief Parse theme comment in search of theme infos. * @@ -133,13 +138,20 @@ class Theme // silently fail if theme was removed or if $theme is funky if (file_exists("view/theme/$theme/theme.php")) { - Logger::log("Addons: uninstalling theme " . $theme); + include_once "view/theme/$theme/theme.php"; - if (function_exists("{$theme}_uninstall")) { - $func = "{$theme}_uninstall"; + $func = "{$theme}_uninstall"; + if (function_exists($func)) { $func(); } } + + $allowed_themes = Theme::getAllowedList(); + $key = array_search($theme, $allowed_themes); + if ($key !== false) { + unset($allowed_themes[$key]); + Theme::setAllowedList($allowed_themes); + } } public static function install($theme) @@ -151,16 +163,20 @@ class Theme return false; } - Logger::log("Addons: installing theme $theme"); + try { + include_once "view/theme/$theme/theme.php"; - include_once "view/theme/$theme/theme.php"; - - if (function_exists("{$theme}_install")) { $func = "{$theme}_install"; - $func(); + if (function_exists($func)) { + $func(); + } + + $allowed_themes = Theme::getAllowedList(); + $allowed_themes[] = $theme; + Theme::setAllowedList($allowed_themes); + return true; - } else { - Logger::log("Addons: FAILED installing theme $theme"); + } catch (\Exception $e) { return false; } } From a13bc149338b3d2b1b34cf053f28b5d7e34742c4 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Mon, 15 Apr 2019 01:11:46 -0400 Subject: [PATCH 05/37] Move admin/themes to src/Module - Add Module\Admin\Themes\Index class - Add route for admin/themes - Add themes admin aside menu entry - Add admin/addons/index.tpl template - Remove theme list from mod/admin --- mod/admin.php | 38 --------- src/App/Router.php | 2 + src/Module/Admin/Themes/Index.php | 109 ++++++++++++++++++++++++++ src/Module/BaseAdminModule.php | 1 + view/templates/admin/addons/index.tpl | 24 ++++++ 5 files changed, 136 insertions(+), 38 deletions(-) create mode 100644 src/Module/Admin/Themes/Index.php create mode 100644 view/templates/admin/addons/index.tpl diff --git a/mod/admin.php b/mod/admin.php index af4c874c2c..a717943d6b 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -2017,44 +2017,6 @@ function admin_page_themes(App $a) '$form_security_token' => BaseModule::getFormSecurityToken("admin_themes"), ]); } - - // reload active themes - if (!empty($_GET['a']) && $_GET['a'] == "r") { - BaseModule::checkFormSecurityTokenRedirectOnError(System::baseUrl() . '/admin/themes', 'admin_themes', 't'); - foreach ($themes as $th) { - if ($th['allowed']) { - Theme::uninstall($th['name']); - Theme::install($th['name']); - } - } - info("Themes reloaded"); - $a->internalRedirect('admin/themes'); - } - - /* - * List themes - */ - - $addons = []; - foreach ($themes as $th) { - $addons[] = [$th['name'], (($th['allowed']) ? "on" : "off"), Theme::getInfo($th['name'])]; - } - - $t = Renderer::getMarkupTemplate('admin/addons.tpl'); - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Themes'), - '$submit' => L10n::t('Save Settings'), - '$reload' => L10n::t('Reload active themes'), - '$baseurl' => System::baseUrl(true), - '$function' => 'themes', - '$addons' => $addons, - '$pcount' => count($themes), - '$noplugshint' => L10n::t('No themes found on the system. They should be placed in %1$s', '/view/themes'), - '$experimental' => L10n::t('[Experimental]'), - '$unsupported' => L10n::t('[Unsupported]'), - '$form_security_token' => BaseModule::getFormSecurityToken("admin_themes"), - ]); } /** diff --git a/src/App/Router.php b/src/App/Router.php index ca362f4842..e1accefd9f 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -122,6 +122,8 @@ class Router $collector->addRoute(['GET'] , '[/]' , Module\Admin\Summary::class); $collector->addRoute(['GET'] , '/federation' , Module\Admin\Federation::class); + $collector->addRoute(['GET', 'POST'], '/themes' , Module\Admin\Themes\Index::class); + $collector->addRoute(['GET', 'POST'], '/tos' , Module\Admin\Tos::class); }); } diff --git a/src/Module/Admin/Themes/Index.php b/src/Module/Admin/Themes/Index.php new file mode 100644 index 0000000000..2b89c4e200 --- /dev/null +++ b/src/Module/Admin/Themes/Index.php @@ -0,0 +1,109 @@ +internalRedirect('admin/themes'); + } + + $themes = []; + $files = glob('view/theme/*'); + if (is_array($files)) { + foreach ($files as $file) { + $theme = basename($file); + + // Is there a style file? + $theme_files = glob('view/theme/' . $theme . '/style.*'); + + // If not then quit + if (count($theme_files) == 0) { + continue; + } + + $is_experimental = intval(file_exists($file . '/experimental')); + $is_supported = 1 - (intval(file_exists($file . '/unsupported'))); + $is_allowed = intval(in_array($theme, $allowed_themes)); + + if ($is_allowed || $is_supported || Config::get('system', 'show_unsupported_themes')) { + $themes[] = ['name' => $theme, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed]; + } + } + } + + $addons = []; + foreach ($themes as $theme) { + $addons[] = [$theme['name'], (($theme['allowed']) ? 'on' : 'off'), Theme::getInfo($theme['name'])]; + } + + $t = Renderer::getMarkupTemplate('admin/addons/index.tpl'); + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Themes'), + '$submit' => L10n::t('Save Settings'), + '$reload' => L10n::t('Reload active themes'), + '$baseurl' => System::baseUrl(true), + '$function' => 'themes', + '$addons' => $addons, + '$pcount' => count($themes), + '$noplugshint' => L10n::t('No themes found on the system. They should be placed in %1$s', '/view/themes'), + '$experimental' => L10n::t('[Experimental]'), + '$unsupported' => L10n::t('[Unsupported]'), + '$form_security_token' => parent::getFormSecurityToken('admin_themes'), + ]); + } +} \ No newline at end of file diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php index 90f7810378..330b9dd749 100644 --- a/src/Module/BaseAdminModule.php +++ b/src/Module/BaseAdminModule.php @@ -53,6 +53,7 @@ abstract class BaseAdminModule extends BaseModule 'federation' => ['admin/federation' , L10n::t('Federation Statistics') , 'federation'] ]], 'configuration' => [L10n::t('Configuration'), [ + 'themes' => ['admin/themes' , L10n::t('Themes') , 'themes'], 'tos' => ['admin/tos' , L10n::t('Terms of Service') , 'tos'], ]], ]; diff --git a/view/templates/admin/addons/index.tpl b/view/templates/admin/addons/index.tpl new file mode 100644 index 0000000000..4a2b057bf6 --- /dev/null +++ b/view/templates/admin/addons/index.tpl @@ -0,0 +1,24 @@ + +
+

{{$title}} - {{$page}}

+{{if $pcount eq 0}} +
+ {{$noplugshint}} +
+{{else}} + {{$reload}} +
    + {{foreach $addons as $p}} +
  • + + + + + {{$p.2.name}} - {{$p.2.version}} + {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}} +
    {{$p.2.description nofilter}}
    +
    • + {{/foreach}} +
+{{/if}} +
From 9bbb4385345640b39d51086b9d8e0471ff682591 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 21 Apr 2019 12:20:04 -0400 Subject: [PATCH 06/37] Move admin/addons to src/Module - Add Module\Admin\Addons\Index class - Add route for admin/addons - Add addons admin aside menu entry - Remove unused template admin/addons.tpl from base and frio - Remove addon list from mod/admin --- mod/admin.php | 50 --------------- src/App/Router.php | 2 + src/Core/Addon.php | 32 +++++++++- src/Module/Admin/Addons/Index.php | 72 ++++++++++++++++++++++ src/Module/BaseAdminModule.php | 1 + view/templates/admin/addons.tpl | 22 ------- view/theme/frio/templates/admin/addons.tpl | 22 ------- 7 files changed, 104 insertions(+), 97 deletions(-) create mode 100644 src/Module/Admin/Addons/Index.php delete mode 100644 view/templates/admin/addons.tpl delete mode 100644 view/theme/frio/templates/admin/addons.tpl diff --git a/mod/admin.php b/mod/admin.php index a717943d6b..b3933a16bf 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -1762,56 +1762,6 @@ function admin_page_addons(App $a, array $addons_admin) '$form_security_token' => BaseModule::getFormSecurityToken("admin_themes"), ]); } - - /* - * List addons - */ - if (!empty($_GET['a']) && $_GET['a'] == "r") { - BaseModule::checkFormSecurityTokenRedirectOnError($a->getBaseURL() . '/admin/addons', 'admin_themes', 't'); - Addon::reload(); - info("Addons reloaded"); - $a->internalRedirect('admin/addons'); - } - - $addons = []; - $files = glob("addon/*/"); - if (is_array($files)) { - foreach ($files as $file) { - if (is_dir($file)) { - list($tmp, $id) = array_map("trim", explode("/", $file)); - $info = Addon::getInfo($id); - $show_addon = true; - - // If the addon is unsupported, then only show it, when it is enabled - if ((strtolower($info["status"]) == "unsupported") && !Addon::isEnabled($id)) { - $show_addon = false; - } - - // Override the above szenario, when the admin really wants to see outdated stuff - if (Config::get("system", "show_unsupported_addons")) { - $show_addon = true; - } - - if ($show_addon) { - $addons[] = [$id, (Addon::isEnabled($id) ? "on" : "off"), $info]; - } - } - } - } - - $t = Renderer::getMarkupTemplate('admin/addons.tpl'); - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Addons'), - '$submit' => L10n::t('Save Settings'), - '$reload' => L10n::t('Reload active addons'), - '$baseurl' => System::baseUrl(true), - '$function' => 'addons', - '$addons' => $addons, - '$pcount' => count($addons), - '$noplugshint' => L10n::t('There are currently no addons available on your node. You can find the official addon repository at %1$s and might find other interesting addons in the open addon registry at %2$s', 'https://github.com/friendica/friendica-addons', 'http://addons.friendi.ca'), - '$form_security_token' => BaseModule::getFormSecurityToken("admin_themes"), - ]); } /** diff --git a/src/App/Router.php b/src/App/Router.php index e1accefd9f..eacf95db35 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -120,6 +120,8 @@ class Router $this->routeCollector->addGroup('/admin', function (RouteCollector $collector) { $collector->addRoute(['GET'] , '[/]' , Module\Admin\Summary::class); + + $collector->addRoute(['GET', 'POST'], '/addons' , Module\Admin\Addons\Index::class); $collector->addRoute(['GET'] , '/federation' , Module\Admin\Federation::class); $collector->addRoute(['GET', 'POST'], '/themes' , Module\Admin\Themes\Index::class); diff --git a/src/Core/Addon.php b/src/Core/Addon.php index 06a731b2cd..2c28c24ee9 100644 --- a/src/Core/Addon.php +++ b/src/Core/Addon.php @@ -26,6 +26,29 @@ class Addon extends BaseObject */ private static $addons = []; + public static function getAvailableList() + { + $addons = []; + $files = glob('addon/*/'); + if (is_array($files)) { + foreach ($files as $file) { + if (is_dir($file)) { + list($tmp, $addon) = array_map('trim', explode('/', $file)); + $info = self::getInfo($addon); + + if (Config::get('system', 'show_unsupported_addons') + || strtolower($info['status']) != 'unsupported' + || self::isEnabled($addon) + ) { + $addons[] = [$addon, (self::isEnabled($addon) ? 'on' : 'off'), $info]; + } + } + } + } + + return $addons; + } + /** * @brief Synchronize addons: * @@ -94,6 +117,8 @@ class Addon extends BaseObject } unset(self::$addons[array_search($addon, self::$addons)]); + + Addon::saveEnabledList(); } /** @@ -136,9 +161,11 @@ class Addon extends BaseObject self::$addons[] = $addon; } + Addon::saveEnabledList(); + return true; } else { - Logger::error("Addon {addon}: {action} failed", ['action' => 'uninstall', 'addon' => $addon]); + Logger::error("Addon {addon}: {action} failed", ['action' => 'install', 'addon' => $addon]); return false; } } @@ -283,11 +310,10 @@ class Addon extends BaseObject * Saves the current enabled addon list in the system.addon config key * * @return boolean - * @throws \Friendica\Network\HTTPException\InternalServerErrorException */ public static function saveEnabledList() { - return Config::set("system", "addon", implode(", ", self::$addons)); + return Config::set('system', 'addon', implode(', ', self::$addons)); } /** diff --git a/src/Module/Admin/Addons/Index.php b/src/Module/Admin/Addons/Index.php new file mode 100644 index 0000000000..20d8ff196e --- /dev/null +++ b/src/Module/Admin/Addons/Index.php @@ -0,0 +1,72 @@ +internalRedirect('admin/addons'); + } + + $addons_admin = []; + $addonsAdminStmt = DBA::select('addon', ['name'], ['plugin_admin' => 1], ['order' => ['name']]); + foreach (DBA::toArray($addonsAdminStmt) as $addon) { + $addons_admin[] = $addon['name']; + } + + $addons = Addon::getAvailableList(); + + $t = Renderer::getMarkupTemplate('admin/addons/index.tpl'); + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Addons'), + '$submit' => L10n::t('Save Settings'), + '$reload' => L10n::t('Reload active addons'), + '$baseurl' => System::baseUrl(true), + '$function' => 'addons', + '$addons' => $addons, + '$pcount' => count($addons), + '$noplugshint' => L10n::t('There are currently no addons available on your node. You can find the official addon repository at %1$s and might find other interesting addons in the open addon registry at %2$s', 'https://github.com/friendica/friendica-addons', 'http://addons.friendi.ca'), + '$form_security_token' => parent::getFormSecurityToken('admin_addons'), + ]); + } +} \ No newline at end of file diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php index 330b9dd749..44ef39113f 100644 --- a/src/Module/BaseAdminModule.php +++ b/src/Module/BaseAdminModule.php @@ -53,6 +53,7 @@ abstract class BaseAdminModule extends BaseModule 'federation' => ['admin/federation' , L10n::t('Federation Statistics') , 'federation'] ]], 'configuration' => [L10n::t('Configuration'), [ + 'addons' => ['admin/addons' , L10n::t('Addons') , 'addons'], 'themes' => ['admin/themes' , L10n::t('Themes') , 'themes'], 'tos' => ['admin/tos' , L10n::t('Terms of Service') , 'tos'], ]], diff --git a/view/templates/admin/addons.tpl b/view/templates/admin/addons.tpl deleted file mode 100644 index c144a5eec6..0000000000 --- a/view/templates/admin/addons.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -
-

{{$title}} - {{$page}}

- {{if $pcount eq 0}} -
- {{$noplugshint}} -
- {{else}} - {{$reload}} -
    - {{foreach $addons as $p}} -
  • - - {{$p.2.name}} - {{$p.2.version}} - {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}} - -
    {{$p.2.description nofilter}}
    -
    • - {{/foreach}} -
- {{/if}} -
diff --git a/view/theme/frio/templates/admin/addons.tpl b/view/theme/frio/templates/admin/addons.tpl deleted file mode 100644 index fa598f4679..0000000000 --- a/view/theme/frio/templates/admin/addons.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -
-

{{$title}} - {{$page}}

- {{if $pcount eq 0}} -
- {{$noplugshint}} -
- {{else}} - {{$reload}} -
    - {{foreach $addons as $p}} -
  • - - - {{$p.2.name}} - {{$p.2.version}} - {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}} -
    {{$p.2.description nofilter}}
    -
    • - {{/foreach}} -
- {{/if}} -
From 87e51ddd6715a27ca74d68ed96f95c6952e5ed22 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 21 Apr 2019 15:47:25 -0400 Subject: [PATCH 07/37] Move admin/addons/{addon} to src/Module - Add Module\Admin\Addons\Details class - Add route for admin/addons/{addon} - Remove addons pages from mod/admin --- mod/admin.php | 121 ---------------------- src/App/Router.php | 2 + src/Module/Admin/Addons/Details.php | 129 ++++++++++++++++++++++++ view/templates/admin/addons/details.tpl | 37 +++++++ 4 files changed, 168 insertions(+), 121 deletions(-) create mode 100644 src/Module/Admin/Addons/Details.php create mode 100644 view/templates/admin/addons/details.tpl diff --git a/mod/admin.php b/mod/admin.php index b3933a16bf..22fd5adf3e 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -10,7 +10,6 @@ use Friendica\BaseModule; use Friendica\Content\Feature; use Friendica\Content\Pager; use Friendica\Content\Text\Markdown; -use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Logger; @@ -91,17 +90,6 @@ function admin_post(App $a) case 'users': admin_page_users_post($a); break; - case 'addons': - if ($a->argc > 2 && - is_file("addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php")) { - include_once "addon/" . $a->argv[2] . "/" . $a->argv[2] . ".php"; - if (function_exists($a->argv[2] . '_addon_admin_post')) { - $func = $a->argv[2] . '_addon_admin_post'; - $func($a); - } - } - $return_path = 'admin/addons/' . $a->argv[2]; - break; case 'themes': if ($a->argc < 2) { if ($a->isAjax()) { @@ -220,17 +208,7 @@ function admin_content(App $a) ]] ]; - /* get addons admin page */ - - $r = q("SELECT `name` FROM `addon` WHERE `plugin_admin` = 1 ORDER BY `name`"); $aside_tools['addons_admin'] = []; - $addons_admin = []; - foreach ($r as $h) { - $addon = $h['name']; - $aside_tools['addons_admin'][] = ["admin/addons/" . $addon, $addon, "addon"]; - // temp addons with admin - $addons_admin[] = $addon; - } $t = Renderer::getMarkupTemplate('admin/aside.tpl'); $a->page['aside'] .= Renderer::replaceMacros($t, [ @@ -253,9 +231,6 @@ function admin_content(App $a) case 'users': $o = admin_page_users($a); break; - case 'addons': - $o = admin_page_addons($a, $addons_admin); - break; case 'themes': $o = admin_page_themes($a); break; @@ -1668,102 +1643,6 @@ function admin_page_users(App $a) return $o; } -/** - * @brief Addons admin page - * - * This function generates the admin panel page for managing addons on the - * friendica node. If an addon name is given a single page showing the details - * for this addon is generated. If no name is given, a list of available - * addons is shown. - * - * The template used for displaying the list of addons and the details of the - * addon are the same as used for the templates. - * - * The returned string returned hulds the HTML code of the page. - * - * @param App $a - * @param array $addons_admin A list of admin addon names - * @return string - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ -function admin_page_addons(App $a, array $addons_admin) -{ - /* - * Single addon - */ - if ($a->argc == 3) { - $addon = $a->argv[2]; - if (!is_file("addon/$addon/$addon.php")) { - notice(L10n::t("Item not found.")); - return ''; - } - - if (defaults($_GET, 'a', '') == "t") { - BaseModule::checkFormSecurityTokenRedirectOnError('/admin/addons', 'admin_themes', 't'); - - // Toggle addon status - if (Addon::isEnabled($addon)) { - Addon::uninstall($addon); - info(L10n::t("Addon %s disabled.", $addon)); - } else { - Addon::install($addon); - info(L10n::t("Addon %s enabled.", $addon)); - } - - Addon::saveEnabledList(); - $a->internalRedirect('admin/addons'); - return ''; // NOTREACHED - } - - // display addon details - if (Addon::isEnabled($addon)) { - $status = "on"; - $action = L10n::t("Disable"); - } else { - $status = "off"; - $action = L10n::t("Enable"); - } - - $readme = null; - if (is_file("addon/$addon/README.md")) { - $readme = Markdown::convert(file_get_contents("addon/$addon/README.md"), false); - } elseif (is_file("addon/$addon/README")) { - $readme = "
" . file_get_contents("addon/$addon/README") . "
"; - } - - $admin_form = ""; - if (in_array($addon, $addons_admin)) { - require_once "addon/$addon/$addon.php"; - $func = $addon . '_addon_admin'; - $func($a, $admin_form); - } - - $t = Renderer::getMarkupTemplate('admin/addon_details.tpl'); - - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Addons'), - '$toggle' => L10n::t('Toggle'), - '$settings' => L10n::t('Settings'), - '$baseurl' => $a->getBaseURL(true), - - '$addon' => $addon, - '$status' => $status, - '$action' => $action, - '$info' => Addon::getInfo($addon), - '$str_author' => L10n::t('Author: '), - '$str_maintainer' => L10n::t('Maintainer: '), - - '$admin_form' => $admin_form, - '$function' => 'addons', - '$screenshot' => '', - '$readme' => $readme, - - '$form_security_token' => BaseModule::getFormSecurityToken("admin_themes"), - ]); - } -} - /** * @param array $themes * @param string $th diff --git a/src/App/Router.php b/src/App/Router.php index eacf95db35..6c152eb8a0 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -122,6 +122,8 @@ class Router $collector->addRoute(['GET'] , '[/]' , Module\Admin\Summary::class); $collector->addRoute(['GET', 'POST'], '/addons' , Module\Admin\Addons\Index::class); + $collector->addRoute(['GET', 'POST'], '/addons/{addon}' , Module\Admin\Addons\Details::class); + $collector->addRoute(['GET'] , '/federation' , Module\Admin\Federation::class); $collector->addRoute(['GET', 'POST'], '/themes' , Module\Admin\Themes\Index::class); diff --git a/src/Module/Admin/Addons/Details.php b/src/Module/Admin/Addons/Details.php new file mode 100644 index 0000000000..9ef2035dec --- /dev/null +++ b/src/Module/Admin/Addons/Details.php @@ -0,0 +1,129 @@ +argc > 2) { + // @TODO: Replace with parameter from router + $addon = $a->argv[2]; + $addon = Strings::sanitizeFilePathItem($addon); + if (is_file('addon/' . $addon . '/' . $addon . '.php')) { + include_once 'addon/' . $addon . '/' . $addon . '.php'; + if (function_exists($addon . '_addon_admin_post')) { + $func = $addon . '_addon_admin_post'; + $func($a); + } + + $a->internalRedirect('admin/addons/' . $addon); + } + } + + $a->internalRedirect('admin/addons'); + } + + public static function content() + { + parent::content(); + + $a = self::getApp(); + + $addons_admin = []; + $addonsAdminStmt = DBA::select('addon', ['name'], ['plugin_admin' => 1], ['order' => ['name']]); + foreach (DBA::toArray($addonsAdminStmt) as $addon) { + $addonName = $addon['name']; + // temp addons with admin + $addons_admin[] = $addonName; + } + + if ($a->argc > 2) { + // @TODO: Replace with parameter from router + $addon = $a->argv[2]; + $addon = Strings::sanitizeFilePathItem($addon); + if (!is_file("addon/$addon/$addon.php")) { + notice(L10n::t('Item not found.')); + $a->internalRedirect('admin/addons'); + } + + if (defaults($_GET, 'action', '') == 'toggle') { + parent::checkFormSecurityTokenRedirectOnError('/admin/addons', 'admin_themes', 't'); + + // Toggle addon status + if (Addon::isEnabled($addon)) { + Addon::uninstall($addon); + info(L10n::t('Addon %s disabled.', $addon)); + } else { + Addon::install($addon); + info(L10n::t('Addon %s enabled.', $addon)); + } + + Addon::saveEnabledList(); + + $a->internalRedirect('admin/addons/' . $addon); + } + + // display addon details + if (Addon::isEnabled($addon)) { + $status = 'on'; + $action = L10n::t('Disable'); + } else { + $status = 'off'; + $action = L10n::t('Enable'); + } + + $readme = null; + if (is_file("addon/$addon/README.md")) { + $readme = Markdown::convert(file_get_contents("addon/$addon/README.md"), false); + } elseif (is_file("addon/$addon/README")) { + $readme = '
' . file_get_contents("addon/$addon/README") . '
'; + } + + $admin_form = ''; + if (in_array($addon, $addons_admin)) { + require_once "addon/$addon/$addon.php"; + $func = $addon . '_addon_admin'; + $func($a, $admin_form); + } + + $t = Renderer::getMarkupTemplate('admin/addons/details.tpl'); + + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Addons'), + '$toggle' => L10n::t('Toggle'), + '$settings' => L10n::t('Settings'), + '$baseurl' => $a->getBaseURL(true), + + '$addon' => $addon, + '$status' => $status, + '$action' => $action, + '$info' => Addon::getInfo($addon), + '$str_author' => L10n::t('Author: '), + '$str_maintainer' => L10n::t('Maintainer: '), + + '$admin_form' => $admin_form, + '$function' => 'addons', + '$screenshot' => '', + '$readme' => $readme, + + '$form_security_token' => parent::getFormSecurityToken('admin_themes'), + ]); + } + + $a->internalRedirect('admin/addons'); + } +} \ No newline at end of file diff --git a/view/templates/admin/addons/details.tpl b/view/templates/admin/addons/details.tpl new file mode 100644 index 0000000000..f5bb165e05 --- /dev/null +++ b/view/templates/admin/addons/details.tpl @@ -0,0 +1,37 @@ + +
+

{{$title}} - {{$page}}

+ +

{{$info.name}} - {{$info.version}} : {{$action}}

+

{{$info.description nofilter}}

+ +

{{$str_author}} + {{foreach $info.author as $a name=authors}} + {{if $a.link}}{{$a.name}}{{else}}{{$a.name}}{{/if}}{{if $smarty.foreach.authors.last}}{{else}}, {{/if}} + {{/foreach}} +

+ +

{{$str_maintainer}} + {{foreach $info.maintainer as $a name=maintainers}} + {{if $a.link}}{{$a.name}}{{else}}{{$a.name}}{{/if}}{{if $smarty.foreach.maintainers.last}}{{else}}, {{/if}} + {{/foreach}} +

+ + {{if $screenshot}} + {{$screenshot.1}} + {{/if}} + + {{if $admin_form}} +

{{$settings}}

+
+ {{$admin_form nofilter}} +
+ {{/if}} + + {{if $readme}} +

Readme

+
+ {{$readme nofilter}} +
+ {{/if}} +
From f3f055758ceb7d270731995600b8c59ad2984710 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 21 Apr 2019 19:14:31 -0400 Subject: [PATCH 08/37] Move admin/users to src/Module - Add Module\Admin\Users class - Add route for admin/users[/{action}/{uid}] - Add users admin aside menu entry - Remove admin_page_users and admin_page_users_post from mod/admin.php --- mod/admin.php | 312 ------------------ src/App/Router.php | 2 + src/Module/Admin/Users.php | 319 +++++++++++++++++++ src/Module/BaseAdminModule.php | 1 + view/templates/admin/users.tpl | 6 +- view/theme/frio/templates/admin/users.tpl | 17 +- view/theme/quattro/templates/admin/users.tpl | 6 +- 7 files changed, 343 insertions(+), 320 deletions(-) create mode 100644 src/Module/Admin/Users.php diff --git a/mod/admin.php b/mod/admin.php index 22fd5adf3e..d6b447c793 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -87,9 +87,6 @@ function admin_post(App $a) case 'site': admin_page_site_post($a); break; - case 'users': - admin_page_users_post($a); - break; case 'themes': if ($a->argc < 2) { if ($a->isAjax()) { @@ -228,9 +225,6 @@ function admin_content(App $a) case 'site': $o = admin_page_site($a); break; - case 'users': - $o = admin_page_users($a); - break; case 'themes': $o = admin_page_themes($a); break; @@ -1337,312 +1331,6 @@ function admin_page_dbsync(App $a) return $o; } -/** - * @brief Process data send by Users admin page - * - * @param App $a - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ -function admin_page_users_post(App $a) -{ - $pending = defaults($_POST, 'pending' , []); - $users = defaults($_POST, 'user' , []); - $nu_name = defaults($_POST, 'new_user_name' , ''); - $nu_nickname = defaults($_POST, 'new_user_nickname', ''); - $nu_email = defaults($_POST, 'new_user_email' , ''); - $nu_language = Config::get('system', 'language'); - - BaseModule::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users'); - - if (!($nu_name === "") && !($nu_email === "") && !($nu_nickname === "")) { - try { - $result = User::create([ - 'username' => $nu_name, - 'email' => $nu_email, - 'nickname' => $nu_nickname, - 'verified' => 1, - 'language' => $nu_language - ]); - } catch (Exception $ex) { - notice($ex->getMessage()); - return; - } - - $user = $result['user']; - $preamble = Strings::deindent(L10n::t(' - Dear %1$s, - the administrator of %2$s has set up an account for you.')); - $body = Strings::deindent(L10n::t(' - The login details are as follows: - - Site Location: %1$s - Login Name: %2$s - Password: %3$s - - You may change your password from your account "Settings" page after logging - in. - - Please take a few moments to review the other account settings on that page. - - You may also wish to add some basic information to your default profile - ' . "\x28" . 'on the "Profiles" page' . "\x29" . ' so that other people can easily find you. - - We recommend setting your full name, adding a profile photo, - adding some profile "keywords" ' . "\x28" . 'very useful in making new friends' . "\x29" . ' - and - perhaps what country you live in; if you do not wish to be more specific - than that. - - We fully respect your right to privacy, and none of these items are necessary. - If you are new and do not know anybody here, they may help - you to make some new and interesting friends. - - If you ever want to delete your account, you can do so at %1$s/removeme - - Thank you and welcome to %4$s.')); - - $preamble = sprintf($preamble, $user['username'], Config::get('config', 'sitename')); - $body = sprintf($body, System::baseUrl(), $user['nickname'], $result['password'], Config::get('config', 'sitename')); - - notification([ - 'type' => SYSTEM_EMAIL, - 'language' => $user['language'], - 'to_name' => $user['username'], - 'to_email' => $user['email'], - 'uid' => $user['uid'], - 'subject' => L10n::t('Registration details for %s', Config::get('config', 'sitename')), - 'preamble' => $preamble, - 'body' => $body]); - } - - if (!empty($_POST['page_users_block'])) { - foreach ($users as $uid) { - q("UPDATE `user` SET `blocked` = 1-`blocked` WHERE `uid` = %s", intval($uid) - ); - } - notice(L10n::tt("%s user blocked/unblocked", "%s users blocked/unblocked", count($users))); - } - if (!empty($_POST['page_users_delete'])) { - foreach ($users as $uid) { - if (local_user() != $uid) { - User::remove($uid); - } else { - notice(L10n::t('You can\'t remove yourself')); - } - } - notice(L10n::tt("%s user deleted", "%s users deleted", count($users))); - } - - if (!empty($_POST['page_users_approve'])) { - require_once "mod/regmod.php"; - foreach ($pending as $hash) { - user_allow($hash); - } - } - if (!empty($_POST['page_users_deny'])) { - require_once "mod/regmod.php"; - foreach ($pending as $hash) { - user_deny($hash); - } - } - $a->internalRedirect('admin/users'); - return; // NOTREACHED -} - -/** - * @brief Admin panel subpage for User management - * - * This function generates the admin panel page for user management of the - * node. It offers functionality to add/block/delete users and offers some - * statistics about the userbase. - * - * The returned string holds the HTML code of the page. - * - * @param App $a - * @return string - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ -function admin_page_users(App $a) -{ - if ($a->argc > 2) { - $uid = $a->argv[3]; - $user = DBA::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]); - if (!DBA::isResult($user)) { - notice('User not found' . EOL); - $a->internalRedirect('admin/users'); - return ''; // NOTREACHED - } - switch ($a->argv[2]) { - case "delete": - if (local_user() != $uid) { - BaseModule::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); - // delete user - User::remove($uid); - - notice(L10n::t("User '%s' deleted", $user['username'])); - } else { - notice(L10n::t('You can\'t remove yourself')); - } - break; - case "block": - BaseModule::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); - q("UPDATE `user` SET `blocked` = %d WHERE `uid` = %s", - intval(1 - $user['blocked']), - intval($uid) - ); - notice(sprintf(($user['blocked'] ? L10n::t("User '%s' unblocked") : L10n::t("User '%s' blocked")), $user['username']) . EOL); - break; - } - $a->internalRedirect('admin/users'); - return ''; // NOTREACHED - } - - /* get pending */ - $pending = Register::getPending(); - - $pager = new Pager($a->query_string, 100); - - /* ordering */ - $valid_orders = [ - 'contact.name', - 'user.email', - 'user.register_date', - 'user.login_date', - 'lastitem_date', - 'user.page-flags' - ]; - - $order = "contact.name"; - $order_direction = "+"; - if (!empty($_GET['o'])) { - $new_order = $_GET['o']; - if ($new_order[0] === "-") { - $order_direction = "-"; - $new_order = substr($new_order, 1); - } - - if (in_array($new_order, $valid_orders)) { - $order = $new_order; - } - } - $sql_order = "`" . str_replace('.', '`.`', $order) . "`"; - $sql_order_direction = ($order_direction === "+") ? "ASC" : "DESC"; - - $users = q("SELECT `user`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`account_expired`, `contact`.`last-item` AS `lastitem_date` - FROM `user` - INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self` - WHERE `user`.`verified` - ORDER BY $sql_order $sql_order_direction LIMIT %d, %d", $pager->getStart(), $pager->getItemsPerPage() - ); - - $adminlist = explode(",", str_replace(" ", "", Config::get('config', 'admin_email'))); - $_setup_users = function ($e) use ($adminlist) { - $page_types = [ - User::PAGE_FLAGS_NORMAL => L10n::t('Normal Account Page'), - User::PAGE_FLAGS_SOAPBOX => L10n::t('Soapbox Page'), - User::PAGE_FLAGS_COMMUNITY => L10n::t('Public Forum'), - User::PAGE_FLAGS_FREELOVE => L10n::t('Automatic Friend Page'), - User::PAGE_FLAGS_PRVGROUP => L10n::t('Private Forum') - ]; - $account_types = [ - User::ACCOUNT_TYPE_PERSON => L10n::t('Personal Page'), - User::ACCOUNT_TYPE_ORGANISATION => L10n::t('Organisation Page'), - User::ACCOUNT_TYPE_NEWS => L10n::t('News Page'), - User::ACCOUNT_TYPE_COMMUNITY => L10n::t('Community Forum'), - User::ACCOUNT_TYPE_RELAY => L10n::t('Relay'), - ]; - - $e['page_flags_raw'] = $e['page-flags']; - $e['page-flags'] = $page_types[$e['page-flags']]; - - $e['account_type_raw'] = ($e['page_flags_raw'] == 0) ? $e['account-type'] : -1; - $e['account-type'] = ($e['page_flags_raw'] == 0) ? $account_types[$e['account-type']] : ""; - - $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'] = 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); - - return $e; - }; - - $users = array_map($_setup_users, $users); - - - // Get rid of dashes in key names, Smarty3 can't handle them - // and extracting deleted users - - $tmp_users = []; - $deleted = []; - - while (count($users)) { - $new_user = []; - foreach (array_pop($users) as $k => $v) { - $k = str_replace('-', '_', $k); - $new_user[$k] = $v; - } - if ($new_user['deleted']) { - array_push($deleted, $new_user); - } else { - array_push($tmp_users, $new_user); - } - } - //Reversing the two array, and moving $tmp_users to $users - array_reverse($deleted); - while (count($tmp_users)) { - array_push($users, array_pop($tmp_users)); - } - - $th_users = array_map(null, [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Type')], $valid_orders); - - $t = Renderer::getMarkupTemplate('admin/users.tpl'); - $o = Renderer::replaceMacros($t, [ - // strings // - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Users'), - '$submit' => L10n::t('Add User'), - '$select_all' => L10n::t('select all'), - '$h_pending' => L10n::t('User registrations waiting for confirm'), - '$h_deleted' => L10n::t('User waiting for permanent deletion'), - '$th_pending' => [L10n::t('Request date'), L10n::t('Name'), L10n::t('Email')], - '$no_pending' => L10n::t('No registrations.'), - '$pendingnotetext' => L10n::t('Note from the user'), - '$approve' => L10n::t('Approve'), - '$deny' => L10n::t('Deny'), - '$delete' => L10n::t('Delete'), - '$block' => L10n::t('Block'), - '$blocked' => L10n::t('User blocked'), - '$unblock' => L10n::t('Unblock'), - '$siteadmin' => L10n::t('Site admin'), - '$accountexpired' => L10n::t('Account expired'), - - '$h_users' => L10n::t('Users'), - '$h_newuser' => L10n::t('New User'), - '$th_deleted' => [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Permanent deletion')], - '$th_users' => $th_users, - '$order_users' => $order, - '$order_direction_users' => $order_direction, - - '$confirm_delete_multi' => L10n::t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'), - '$confirm_delete' => L10n::t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'), - - '$form_security_token' => BaseModule::getFormSecurityToken("admin_users"), - - // values // - '$baseurl' => $a->getBaseURL(true), - - '$pending' => $pending, - 'deleted' => $deleted, - '$users' => $users, - '$newusername' => ['new_user_name', L10n::t("Name"), '', L10n::t("Name of the new user.")], - '$newusernickname' => ['new_user_nickname', L10n::t("Nickname"), '', L10n::t("Nickname of the new user.")], - '$newuseremail' => ['new_user_email', L10n::t("Email"), '', L10n::t("Email address of the new user."), '', '', 'email'], - ]); - $o .= $pager->renderFull(DBA::count('user')); - return $o; -} - /** * @param array $themes * @param string $th diff --git a/src/App/Router.php b/src/App/Router.php index 6c152eb8a0..30f48f7c56 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -129,6 +129,8 @@ class Router $collector->addRoute(['GET', 'POST'], '/themes' , Module\Admin\Themes\Index::class); $collector->addRoute(['GET', 'POST'], '/tos' , Module\Admin\Tos::class); + + $collector->addRoute(['GET', 'POST'], '/users[/{action}/{uid}]' , Module\Admin\Users::class); }); } diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php new file mode 100644 index 0000000000..85567fd2ab --- /dev/null +++ b/src/Module/Admin/Users.php @@ -0,0 +1,319 @@ + $nu_name, + 'email' => $nu_email, + 'nickname' => $nu_nickname, + 'verified' => 1, + 'language' => $nu_language + ]); + } catch (\Exception $ex) { + notice($ex->getMessage()); + return; + } + + $user = $result['user']; + $preamble = Strings::deindent(L10n::t(' + Dear %1$s, + the administrator of %2$s has set up an account for you.')); + $body = Strings::deindent(L10n::t(' + The login details are as follows: + + Site Location: %1$s + Login Name: %2$s + Password: %3$s + + You may change your password from your account "Settings" page after logging + in. + + Please take a few moments to review the other account settings on that page. + + You may also wish to add some basic information to your default profile + (on the "Profiles" page) so that other people can easily find you. + + We recommend setting your full name, adding a profile photo, + adding some profile "keywords" (very useful in making new friends) - and + perhaps what country you live in; if you do not wish to be more specific + than that. + + We fully respect your right to privacy, and none of these items are necessary. + If you are new and do not know anybody here, they may help + you to make some new and interesting friends. + + If you ever want to delete your account, you can do so at %1$s/removeme + + Thank you and welcome to %4$s.')); + + $preamble = sprintf($preamble, $user['username'], Config::get('config', 'sitename')); + $body = sprintf($body, System::baseUrl(), $user['nickname'], $result['password'], Config::get('config', 'sitename')); + + notification([ + 'type' => SYSTEM_EMAIL, + 'language' => $user['language'], + 'to_name' => $user['username'], + 'to_email' => $user['email'], + 'uid' => $user['uid'], + 'subject' => L10n::t('Registration details for %s', Config::get('config', 'sitename')), + 'preamble' => $preamble, + 'body' => $body]); + } + + if (!empty($_POST['page_users_block'])) { + DBA::update('user', ['blocked' => 1], ['uid' => $users]); + notice(L10n::tt('%s user blocked', '%s users blocked', count($users))); + } + + if (!empty($_POST['page_users_unblock'])) { + DBA::update('user', ['blocked' => 0], ['uid' => $users]); + notice(L10n::tt('%s user unblocked', '%s users unblocked', count($users))); + } + + if (!empty($_POST['page_users_delete'])) { + foreach ($users as $uid) { + if (local_user() != $uid) { + User::remove($uid); + } else { + notice(L10n::t('You can\'t remove yourself')); + } + } + + notice(L10n::tt('%s user deleted', '%s users deleted', count($users))); + } + + if (!empty($_POST['page_users_approve'])) { + require_once 'mod/regmod.php'; + foreach ($pending as $hash) { + user_allow($hash); + } + } + + if (!empty($_POST['page_users_deny'])) { + require_once 'mod/regmod.php'; + foreach ($pending as $hash) { + user_deny($hash); + } + } + + $a->internalRedirect('admin/users'); + } + + public static function content() + { + parent::content(); + + $a = self::getApp(); + + if ($a->argc > 3) { + // @TODO: Replace with parameter from router + $action = $a->argv[2]; + $uid = $a->argv[3]; + $user = DBA::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]); + if (!DBA::isResult($user)) { + notice('User not found' . EOL); + $a->internalRedirect('admin/users'); + return ''; // NOTREACHED + } + + switch ($action) { + case 'delete': + if (local_user() != $uid) { + parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); + // delete user + User::remove($uid); + + notice(L10n::t('User "%s" deleted', $user['username'])); + } else { + notice(L10n::t('You can\'t remove yourself')); + } + break; + case 'block': + parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); + DBA::update('user', ['blocked' => 1], ['uid' => $uid]); + notice(L10n::t('User "%s" blocked', $user['username'])); + break; + case 'unblock': + parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); + DBA::update('user', ['blocked' => 0], ['uid' => $uid]); + notice(L10n::t('User "%s" unblocked', $user['username'])); + break; + } + + $a->internalRedirect('admin/users'); + } + + /* get pending */ + $pending = Register::getPending(); + + $pager = new Pager($a->query_string, 100); + + /* ordering */ + $valid_orders = [ + 'contact.name', + 'user.email', + 'user.register_date', + 'user.login_date', + 'lastitem_date', + 'user.page-flags' + ]; + + $order = 'contact.name'; + $order_direction = '+'; + if (!empty($_GET['o'])) { + $new_order = $_GET['o']; + if ($new_order[0] === '-') { + $order_direction = '-'; + $new_order = substr($new_order, 1); + } + + if (in_array($new_order, $valid_orders)) { + $order = $new_order; + } + } + $sql_order = '`' . str_replace('.', '`.`', $order) . '`'; + $sql_order_direction = ($order_direction === '+') ? 'ASC' : 'DESC'; + + $usersStmt = DBA::p("SELECT `user`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`account_expired`, `contact`.`last-item` AS `lastitem_date` + FROM `user` + INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self` + WHERE `user`.`verified` + ORDER BY $sql_order $sql_order_direction LIMIT ?, ?", $pager->getStart(), $pager->getItemsPerPage() + ); + $users = DBA::toArray($usersStmt); + + $adminlist = explode(',', str_replace(' ', '', Config::get('config', 'admin_email'))); + $_setup_users = function ($e) use ($adminlist) { + $page_types = [ + User::PAGE_FLAGS_NORMAL => L10n::t('Normal Account Page'), + User::PAGE_FLAGS_SOAPBOX => L10n::t('Soapbox Page'), + User::PAGE_FLAGS_COMMUNITY => L10n::t('Public Forum'), + User::PAGE_FLAGS_FREELOVE => L10n::t('Automatic Friend Page'), + User::PAGE_FLAGS_PRVGROUP => L10n::t('Private Forum') + ]; + $account_types = [ + User::ACCOUNT_TYPE_PERSON => L10n::t('Personal Page'), + User::ACCOUNT_TYPE_ORGANISATION => L10n::t('Organisation Page'), + User::ACCOUNT_TYPE_NEWS => L10n::t('News Page'), + User::ACCOUNT_TYPE_COMMUNITY => L10n::t('Community Forum'), + User::ACCOUNT_TYPE_RELAY => L10n::t('Relay'), + ]; + + $e['page_flags_raw'] = $e['page-flags']; + $e['page-flags'] = $page_types[$e['page-flags']]; + + $e['account_type_raw'] = ($e['page_flags_raw'] == 0) ? $e['account-type'] : -1; + $e['account-type'] = ($e['page_flags_raw'] == 0) ? $account_types[$e['account-type']] : ''; + + $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'] = 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); + + return $e; + }; + + $tmp_users = array_map($_setup_users, $users); + + // Get rid of dashes in key names, Smarty3 can't handle them + // and extracting deleted users + + $deleted = []; + $users = []; + foreach ($tmp_users as $user) { + foreach ($user as $k => $v) { + $newkey = str_replace('-', '_', $k); + $user[$newkey] = $v; + } + + if ($user['deleted']) { + $deleted[] = $user; + } else { + $users[] = $user; + } + } + + $th_users = array_map(null, [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Type')], $valid_orders); + + $t = Renderer::getMarkupTemplate('admin/users.tpl'); + $o = Renderer::replaceMacros($t, [ + // strings // + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Users'), + '$submit' => L10n::t('Add User'), + '$select_all' => L10n::t('select all'), + '$h_pending' => L10n::t('User registrations waiting for confirm'), + '$h_deleted' => L10n::t('User waiting for permanent deletion'), + '$th_pending' => [L10n::t('Request date'), L10n::t('Name'), L10n::t('Email')], + '$no_pending' => L10n::t('No registrations.'), + '$pendingnotetext' => L10n::t('Note from the user'), + '$approve' => L10n::t('Approve'), + '$deny' => L10n::t('Deny'), + '$delete' => L10n::t('Delete'), + '$block' => L10n::t('Block'), + '$blocked' => L10n::t('User blocked'), + '$unblock' => L10n::t('Unblock'), + '$siteadmin' => L10n::t('Site admin'), + '$accountexpired' => L10n::t('Account expired'), + + '$h_users' => L10n::t('Users'), + '$h_newuser' => L10n::t('New User'), + '$th_deleted' => [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Permanent deletion')], + '$th_users' => $th_users, + '$order_users' => $order, + '$order_direction_users' => $order_direction, + + '$confirm_delete_multi' => L10n::t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'), + '$confirm_delete' => L10n::t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'), + + '$form_security_token' => parent::getFormSecurityToken('admin_users'), + + // values // + '$baseurl' => $a->getBaseURL(true), + + '$pending' => $pending, + 'deleted' => $deleted, + '$users' => $users, + '$newusername' => ['new_user_name', L10n::t('Name'), '', L10n::t('Name of the new user.')], + '$newusernickname' => ['new_user_nickname', L10n::t('Nickname'), '', L10n::t('Nickname of the new user.')], + '$newuseremail' => ['new_user_email', L10n::t('Email'), '', L10n::t('Email address of the new user.'), '', '', 'email'], + ]); + + $o .= $pager->renderFull(DBA::count('user')); + + return $o; + } +} \ No newline at end of file diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php index 44ef39113f..cf434537ec 100644 --- a/src/Module/BaseAdminModule.php +++ b/src/Module/BaseAdminModule.php @@ -53,6 +53,7 @@ abstract class BaseAdminModule extends BaseModule 'federation' => ['admin/federation' , L10n::t('Federation Statistics') , 'federation'] ]], 'configuration' => [L10n::t('Configuration'), [ + 'users' => ['admin/users' , L10n::t('Users') , 'users'], 'addons' => ['admin/addons' , L10n::t('Addons') , 'addons'], 'themes' => ['admin/themes' , L10n::t('Themes') , 'themes'], 'tos' => ['admin/tos' , L10n::t('Terms of Service') , 'tos'], diff --git a/view/templates/admin/users.tpl b/view/templates/admin/users.tpl index 88feb6136a..6ca85fe7aa 100644 --- a/view/templates/admin/users.tpl +++ b/view/templates/admin/users.tpl @@ -105,7 +105,11 @@
{{$select_all}}
-
+
+ + + +
{{else}} NO USERS?!? {{/if}} diff --git a/view/theme/frio/templates/admin/users.tpl b/view/theme/frio/templates/admin/users.tpl index 273eb81e68..f2d407845b 100644 --- a/view/theme/frio/templates/admin/users.tpl +++ b/view/theme/frio/templates/admin/users.tpl @@ -223,13 +223,15 @@ {{if $u.is_deletable}} - - {{if $u.blocked == 0}} - - {{else}} + {{if $u.blocked}} + - {{/if}} + {{else}} + + + + {{/if}} @@ -256,7 +258,10 @@
+ + +
+
+ +
+
+
+
+ + + From a88df9b25921fef25b5c9bb16347e98464d97c86 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 25 Apr 2019 22:06:27 -0400 Subject: [PATCH 14/37] Ensure theme consistency when using filebrowser - Send frio filebrowser result to current frame instead of parent one --- mod/fbrowser.php | 7 +++++++ view/theme/frio/js/filebrowser.js | 16 +++++----------- view/theme/frio/js/modal.js | 4 ++-- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/mod/fbrowser.php b/mod/fbrowser.php index 559896acb1..faff17381b 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -11,6 +11,7 @@ use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Object\Image; +use Friendica\Util\Strings; /** * @param App $a @@ -27,6 +28,12 @@ function fbrowser_content(App $a) exit(); } + // Needed to match the correct template in a module that uses a different theme than the user/site/default + $theme = Strings::sanitizeFilePathItem(defaults($_GET, 'theme', null)); + if ($theme && is_file("view/theme/$theme/config.php")) { + $a->setCurrentTheme($theme); + } + $template_file = "filebrowser.tpl"; $o = ''; diff --git a/view/theme/frio/js/filebrowser.js b/view/theme/frio/js/filebrowser.js index 40c0fbb744..16d60b61d1 100644 --- a/view/theme/frio/js/filebrowser.js +++ b/view/theme/frio/js/filebrowser.js @@ -99,7 +99,7 @@ var FileBrowser = { // Click on album link $(".fbrowser").on("click", ".folders a, .path a", function(e) { e.preventDefault(); - var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none"; + var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + this.dataset.folder + "?mode=none&theme=frio"; FileBrowser.folder = this.dataset.folder; FileBrowser.loadContent(url); @@ -134,7 +134,7 @@ var FileBrowser = { console.log(FileBrowser.event, this.dataset.filename, embed, FileBrowser.id); - parent.$("body").trigger(FileBrowser.event, [ + $("body").trigger(FileBrowser.event, [ this.dataset.filename, embed, FileBrowser.id, @@ -152,7 +152,7 @@ var FileBrowser = { e.preventDefault(); FileBrowser.type = this.getAttribute("data-mode"); $(".fbrowser").removeClass().addClass("fbrowser " + FileBrowser.type); - url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"; + url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none&theme=frio"; FileBrowser.loadContent(url); }); @@ -183,10 +183,7 @@ var FileBrowser = { return; } -// location = baseurl + "/fbrowser/image/?mode=none"+location['hash']; -// location.reload(true); - - var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + FileBrowser.folder + "?mode=none"; + var url = baseurl + "/fbrowser/" + FileBrowser.type + "/" + FileBrowser.folder + "?mode=none&theme=frio"; // load new content to fbrowser window FileBrowser.loadContent(url); } @@ -214,10 +211,7 @@ var FileBrowser = { return; } -// location = baseurl + "/fbrowser/file/?mode=none"+location['hash']; -// location.reload(true); - - var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none"; + var url = baseurl + "/fbrowser/" + FileBrowser.type + "?mode=none&theme=frio"; // Load new content to fbrowser window FileBrowser.loadContent(url); } diff --git a/view/theme/frio/js/modal.js b/view/theme/frio/js/modal.js index 1c5314c4b4..ab263bc2ab 100644 --- a/view/theme/frio/js/modal.js +++ b/view/theme/frio/js/modal.js @@ -120,7 +120,7 @@ Dialog.show = function(url, title) { Dialog._get_url = function(type, name, id) { var hash = name; if (id !== undefined) hash = hash + "-" + id; - return "fbrowser/"+type+"/?mode=none#"+hash; + return "fbrowser/"+type+"/?mode=none&theme=frio#"+hash; }; // Does load the filebrowser into the jot modal. @@ -148,7 +148,7 @@ Dialog._load = function(url) { var type = $("#fb-type").attr("value"); // Try to fetch the hash form the url. - var match = url.match(/fbrowser\/[a-z]+\/\?mode=none(.*)/); + var match = url.match(/fbrowser\/[a-z]+\/.*(#.*)/); if (match===null) return; //not fbrowser var hash = match[1]; From d6a5274bb92fb0f8174cdf5e6121d319a6995fba Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 25 Apr 2019 22:17:04 -0400 Subject: [PATCH 15/37] [frio] Update theme settings form for use in embed mode - Replace jRange with native slider to prevent overflowing on the right in embed mode - Move color swatch to the left of colorinput fields to prevent overflowing on the right in embed mode --- view/theme/frio/config.php | 2 +- view/theme/frio/css/style.css | 47 -- view/theme/frio/frameworks/jRange/LICENSE | 21 - view/theme/frio/frameworks/jRange/README.md | 5 - .../frameworks/jRange/jquery.range-min.js | 1 - .../frio/frameworks/jRange/jquery.range.css | 173 -------- .../frio/frameworks/jRange/jquery.range.js | 401 ------------------ .../frio/frameworks/jRange/jquery.range.less | 198 --------- .../theme/frio/frameworks/jRange/package.json | 23 - .../theme/frio/templates/field_colorinput.tpl | 2 +- view/theme/frio/templates/theme_settings.tpl | 40 +- 11 files changed, 15 insertions(+), 898 deletions(-) delete mode 100644 view/theme/frio/frameworks/jRange/LICENSE delete mode 100644 view/theme/frio/frameworks/jRange/README.md delete mode 100644 view/theme/frio/frameworks/jRange/jquery.range-min.js delete mode 100644 view/theme/frio/frameworks/jRange/jquery.range.css delete mode 100644 view/theme/frio/frameworks/jRange/jquery.range.js delete mode 100644 view/theme/frio/frameworks/jRange/jquery.range.less delete mode 100644 view/theme/frio/frameworks/jRange/package.json diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php index 7ac7f489ef..cd4d7b8948 100644 --- a/view/theme/frio/config.php +++ b/view/theme/frio/config.php @@ -30,7 +30,7 @@ function theme_post(App $a) function theme_admin_post(App $a) { - if (!local_user()) { + if (!is_site_admin()) { return; } diff --git a/view/theme/frio/css/style.css b/view/theme/frio/css/style.css index 968e1dd7b6..e6b42e52ea 100644 --- a/view/theme/frio/css/style.css +++ b/view/theme/frio/css/style.css @@ -3236,53 +3236,6 @@ main .nav-tabs>li.active>a:hover { * Framework overwrite */ -/* jRange */ -.theme-frio .back-bar { - height: 5px !important; - border-radius: 2px; - background-color: #eeeeee; - background-color: #e7e7e7; - background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#eeeeee), to(#dddddd)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); - background-image: -o-linear-gradient(top, #eeeeee, #dddddd); - background-image: linear-gradient(to bottom, #eeeeee, #dddddd); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeeeeee', endColorstr='#ffdddddd', GradientType=0); -} -.theme-frio .back-bar .selected-bar { - border-radius: 2px; - background-color: $link_color; -/* background-image: -moz-linear-gradient(top, #bdfade, #76fabc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#bdfade), to(#76fabc)); - background-image: -webkit-linear-gradient(top, #bdfade, #76fabc); - background-image: -o-linear-gradient(top, #bdfade, #76fabc); - background-image: linear-gradient(to bottom, #bdfade, #76fabc); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffbdfade', endColorstr='#ff76fabc', GradientType=0);*/ -} -.theme-frio .back-bar .pointer { - width: 14px !important; - height: 14px !important; - top: -5px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - border-radius: 10px; - border: 1px solid #AAA; - background-color: #e7e7e7 !important; - background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#eeeeee), to(#dddddd)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); - background-image: -o-linear-gradient(top, #eeeeee, #dddddd); - background-image: linear-gradient(to bottom, #eeeeee, #dddddd); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeeeeee', endColorstr='#ffdddddd', GradientType=0); -} -.theme-frio .back-bar .pointer-label { - color: #999; -} - /* textcomplete for contact filtering*/ #contact-list ul.dropdown-menu.textcomplete-dropdown.media-list { position: relative !important; diff --git a/view/theme/frio/frameworks/jRange/LICENSE b/view/theme/frio/frameworks/jRange/LICENSE deleted file mode 100644 index 8f47b9a632..0000000000 --- a/view/theme/frio/frameworks/jRange/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2014 Nitin Hayaran - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/view/theme/frio/frameworks/jRange/README.md b/view/theme/frio/frameworks/jRange/README.md deleted file mode 100644 index 5cbfe6aa83..0000000000 --- a/view/theme/frio/frameworks/jRange/README.md +++ /dev/null @@ -1,5 +0,0 @@ -## jQuery plugin to create Range Selector - -![jRange Preview](http://i.imgur.com/da8uZwx.png) - -[Demo and Documentation](http://nitinhayaran.github.io/jRange/demo/) \ No newline at end of file diff --git a/view/theme/frio/frameworks/jRange/jquery.range-min.js b/view/theme/frio/frameworks/jRange/jquery.range-min.js deleted file mode 100644 index 2bf854e233..0000000000 --- a/view/theme/frio/frameworks/jRange/jquery.range-min.js +++ /dev/null @@ -1 +0,0 @@ -!function($,t,i,s){"use strict";var o=function(){return this.init.apply(this,arguments)};o.prototype={defaults:{onstatechange:function(){},ondragend:function(){},onbarclicked:function(){},isRange:!1,showLabels:!0,showScale:!0,step:1,format:"%s",theme:"theme-green",width:300,disable:!1,snap:!1},template:'
123456
456789
',init:function(t,i){this.options=$.extend({},this.defaults,i),this.inputNode=$(t),this.options.value=this.inputNode.val()||(this.options.isRange?this.options.from+","+this.options.from:this.options.from),this.domNode=$(this.template),this.domNode.addClass(this.options.theme),this.inputNode.after(this.domNode),this.domNode.on("change",this.onChange),this.pointers=$(".pointer",this.domNode),this.lowPointer=this.pointers.first(),this.highPointer=this.pointers.last(),this.labels=$(".pointer-label",this.domNode),this.lowLabel=this.labels.first(),this.highLabel=this.labels.last(),this.scale=$(".scale",this.domNode),this.bar=$(".selected-bar",this.domNode),this.clickableBar=this.domNode.find(".clickable-dummy"),this.interval=this.options.to-this.options.from,this.render()},render:function(){return 0!==this.inputNode.width()||this.options.width?(this.options.width=this.options.width||this.inputNode.width(),this.domNode.width(this.options.width),this.inputNode.hide(),this.isSingle()&&(this.lowPointer.hide(),this.lowLabel.hide()),this.options.showLabels||this.labels.hide(),this.attachEvents(),this.options.showScale&&this.renderScale(),void this.setValue(this.options.value)):void console.log("jRange : no width found, returning")},isSingle:function(){return"number"==typeof this.options.value?!0:-1!==this.options.value.indexOf(",")||this.options.isRange?!1:!0},attachEvents:function(){this.clickableBar.click($.proxy(this.barClicked,this)),this.pointers.on("mousedown touchstart",$.proxy(this.onDragStart,this)),this.pointers.bind("dragstart",function(t){t.preventDefault()})},onDragStart:function(t){if(!(this.options.disable||"mousedown"===t.type&&1!==t.which)){t.stopPropagation(),t.preventDefault();var s=$(t.target);this.pointers.removeClass("last-active"),s.addClass("focused last-active"),this[(s.hasClass("low")?"low":"high")+"Label"].addClass("focused"),$(i).on("mousemove.slider touchmove.slider",$.proxy(this.onDrag,this,s)),$(i).on("mouseup.slider touchend.slider touchcancel.slider",$.proxy(this.onDragEnd,this))}},onDrag:function(t,i){i.stopPropagation(),i.preventDefault(),i.originalEvent.touches&&i.originalEvent.touches.length?i=i.originalEvent.touches[0]:i.originalEvent.changedTouches&&i.originalEvent.changedTouches.length&&(i=i.originalEvent.changedTouches[0]);var s=i.clientX-this.domNode.offset().left;this.domNode.trigger("change",[this,t,s])},onDragEnd:function(t){this.pointers.removeClass("focused").trigger("rangeslideend"),this.labels.removeClass("focused"),$(i).off(".slider"),this.options.ondragend.call(this,this.options.value)},barClicked:function(t){if(!this.options.disable){var i=t.pageX-this.clickableBar.offset().left;if(this.isSingle())this.setPosition(this.pointers.last(),i,!0,!0);else{var s=Math.abs(parseFloat(this.pointers.first().css("left"),10)),o=this.pointers.first().width()/2,e=Math.abs(parseFloat(this.pointers.last().css("left"),10)),n=this.pointers.first().width()/2,a=Math.abs(s-i+o),h=Math.abs(e-i+n),l;l=a==h?s>i?this.pointers.first():this.pointers.last():h>a?this.pointers.first():this.pointers.last(),this.setPosition(l,i,!0,!0),this.options.onbarclicked.call(this,this.options.value)}}},onChange:function(t,i,s,o){var e,n;e=0,n=i.domNode.width(),i.isSingle()||(e=s.hasClass("high")?parseFloat(i.lowPointer.css("left"))+i.lowPointer.width()/2:0,n=s.hasClass("low")?parseFloat(i.highPointer.css("left"))+i.highPointer.width()/2:i.domNode.width());var a=Math.min(Math.max(o,e),n);i.setPosition(s,a,!0)},setPosition:function(t,i,s,o){var e,n,a=parseFloat(this.lowPointer.css("left")),h=parseFloat(this.highPointer.css("left"))||0,l=this.highPointer.width()/2;if(s||(i=this.prcToPx(i)),this.options.snap){var r=this.correctPositionForSnap(i);if(-1===r)return;i=r}t[0]===this.highPointer[0]?h=Math.round(i-l):a=Math.round(i-l),t[o?"animate":"css"]({left:Math.round(i-l)}),this.isSingle()?e=0:(e=a+l,n=h+l);var d=Math.round(h+l-e);this.bar[o?"animate":"css"]({width:Math.abs(d),left:d>0?e:e+d}),this.showPointerValue(t,i,o),this.isReadonly()},correctPositionForSnap:function(t){var i=this.positionToValue(t)-this.options.from,s=this.options.width/(this.interval/this.options.step),o=i/this.options.step*s;return o+s/2>=t&&t>=o-s/2?o:-1},setValue:function(t){var i=t.toString().split(",");i[0]=Math.min(Math.max(i[0],this.options.from),this.options.to)+"",i.length>1&&(i[1]=Math.min(Math.max(i[1],this.options.from),this.options.to)+""),this.options.value=t;var s=this.valuesToPrc(2===i.length?i:[0,i[0]]);this.isSingle()?this.setPosition(this.highPointer,s[1]):(this.setPosition(this.lowPointer,s[0]),this.setPosition(this.highPointer,s[1]))},renderScale:function(){for(var t=this.options.scale||[this.options.from,this.options.to],i=Math.round(100/(t.length-1)*10)/10,s="",o=0;o'+("|"!=t[o]?""+t[o]+"":"")+"";this.scale.html(s),$("ins",this.scale).each(function(){$(this).css({marginLeft:-$(this).outerWidth()/2})})},getBarWidth:function(){var t=this.options.value.split(",");return t.length>1?parseFloat(t[1])-parseFloat(t[0]):parseFloat(t[0])},showPointerValue:function(t,i,o){var e=$(".pointer-label",this.domNode)[t.hasClass("low")?"first":"last"](),n,a=this.positionToValue(i);if($.isFunction(this.options.format)){var h=this.isSingle()?s:t.hasClass("low")?"low":"high";n=this.options.format(a,h)}else n=this.options.format.replace("%s",a);var l=e.html(n).width(),r=i-l/2;r=Math.min(Math.max(r,0),this.options.width-l),e[o?"animate":"css"]({left:r}),this.setInputValue(t,a)},valuesToPrc:function(t){var i=100*(parseFloat(t[0])-parseFloat(this.options.from))/this.interval,s=100*(parseFloat(t[1])-parseFloat(this.options.from))/this.interval;return[i,s]},prcToPx:function(t){return this.domNode.width()*t/100},isDecimal:function(){return-1===(this.options.value+this.options.from+this.options.to).indexOf(".")?!1:!0},positionToValue:function(t){var i=t/this.domNode.width()*this.interval;if(i=parseFloat(i,10)+parseFloat(this.options.from,10),this.isDecimal()){var s=Math.round(Math.round(i/this.options.step)*this.options.step*100)/100;if(0!==s)for(s=""+s,-1===s.indexOf(".")&&(s+=".");s.length-s.indexOf(".")<3;)s+="0";else s="0.00";return s}return Math.round(i/this.options.step)*this.options.step},setInputValue:function(t,i){if(this.isSingle())this.options.value=i.toString();else{var s=this.options.value.split(",");t.hasClass("low")?this.options.value=i+","+s[1]:this.options.value=s[0]+","+i}this.inputNode.val()!==this.options.value&&(this.inputNode.val(this.options.value).trigger("change"),this.options.onstatechange.call(this,this.options.value))},getValue:function(){return this.options.value},getOptions:function(){return this.options},getRange:function(){return this.options.from+","+this.options.to},isReadonly:function(){this.domNode.toggleClass("slider-readonly",this.options.disable)},disable:function(){this.options.disable=!0,this.isReadonly()},enable:function(){this.options.disable=!1,this.isReadonly()},toggleDisable:function(){this.options.disable=!this.options.disable,this.isReadonly()},updateRange:function(t,i){var s=t.toString().split(",");this.interval=parseInt(s[1])-parseInt(s[0]),i?this.setValue(i):this.setValue(this.getValue())}};var e="jRange";$.fn[e]=function(i){var s=arguments,n;return this.each(function(){var a=$(this),h=$.data(this,"plugin_"+e),l="object"==typeof i&&i;h||(a.data("plugin_"+e,h=new o(this,l)),$(t).resize(function(){h.setValue(h.getValue())})),"string"==typeof i&&(n=h[i].apply(h,Array.prototype.slice.call(s,1)))}),n||this}}(jQuery,window,document); \ No newline at end of file diff --git a/view/theme/frio/frameworks/jRange/jquery.range.css b/view/theme/frio/frameworks/jRange/jquery.range.css deleted file mode 100644 index 62dc15b4f3..0000000000 --- a/view/theme/frio/frameworks/jRange/jquery.range.css +++ /dev/null @@ -1,173 +0,0 @@ -.slider-container { - width: 300px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; -} -.slider-container .back-bar { - height: 10px; - position: relative; -} -.slider-container .back-bar .selected-bar { - position: absolute; - height: 100%; -} -.slider-container .back-bar .pointer { - position: absolute; - width: 10px; - height: 10px; - background-color: red; - cursor: col-resize; - opacity: 1; - z-index: 2; -} -.slider-container .back-bar .pointer.last-active { - z-index: 3; -} -.slider-container .back-bar .pointer-label { - position: absolute; - top: -17px; - font-size: 8px; - background: white; - white-space: nowrap; - line-height: 1; -} -.slider-container .back-bar .focused { - z-index: 10; -} -.slider-container .clickable-dummy { - cursor: pointer; - position: absolute; - width: 100%; - height: 100%; - z-index: 1; -} -.slider-container .scale { - top: 2px; - position: relative; -} -.slider-container .scale span { - position: absolute; - height: 5px; - border-left: 1px solid #999; - font-size: 0; -} -.slider-container .scale ins { - font-size: 9px; - text-decoration: none; - position: absolute; - left: 0; - top: 5px; - color: #999; - line-height: 1; -} -.slider-container.slider-readonly .clickable-dummy, -.slider-container.slider-readonly .pointer { - cursor: auto; -} -.theme-green .back-bar { - height: 5px; - border-radius: 2px; - background-color: #eeeeee; - background-color: #e7e7e7; - background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#eeeeee), to(#dddddd)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); - background-image: -o-linear-gradient(top, #eeeeee, #dddddd); - background-image: linear-gradient(to bottom, #eeeeee, #dddddd); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeeeeee', endColorstr='#ffdddddd', GradientType=0); -} -.theme-green .back-bar .selected-bar { - border-radius: 2px; - background-color: #a1fad0; - background-image: -moz-linear-gradient(top, #bdfade, #76fabc); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#bdfade), to(#76fabc)); - background-image: -webkit-linear-gradient(top, #bdfade, #76fabc); - background-image: -o-linear-gradient(top, #bdfade, #76fabc); - background-image: linear-gradient(to bottom, #bdfade, #76fabc); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffbdfade', endColorstr='#ff76fabc', GradientType=0); -} -.theme-green .back-bar .pointer { - width: 14px; - height: 14px; - top: -5px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - border-radius: 10px; - border: 1px solid #AAA; - background-color: #e7e7e7; - background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#eeeeee), to(#dddddd)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); - background-image: -o-linear-gradient(top, #eeeeee, #dddddd); - background-image: linear-gradient(to bottom, #eeeeee, #dddddd); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeeeeee', endColorstr='#ffdddddd', GradientType=0); -} -.theme-green .back-bar .pointer-label { - color: #999; -} -.theme-green .back-bar .focused { - color: #333; -} -.theme-green .scale span { - border-left: 1px solid #e5e5e5; -} -.theme-green .scale ins { - color: #999; -} -.theme-blue .back-bar { - height: 5px; - border-radius: 2px; - background-color: #eeeeee; - background-color: #e7e7e7; - background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#eeeeee), to(#dddddd)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); - background-image: -o-linear-gradient(top, #eeeeee, #dddddd); - background-image: linear-gradient(to bottom, #eeeeee, #dddddd); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeeeeee', endColorstr='#ffdddddd', GradientType=0); -} -.theme-blue .back-bar .selected-bar { - border-radius: 2px; - background-color: #92c1f9; - background-image: -moz-linear-gradient(top, #b1d1f9, #64a8f9); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#b1d1f9), to(#64a8f9)); - background-image: -webkit-linear-gradient(top, #b1d1f9, #64a8f9); - background-image: -o-linear-gradient(top, #b1d1f9, #64a8f9); - background-image: linear-gradient(to bottom, #b1d1f9, #64a8f9); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffb1d1f9', endColorstr='#ff64a8f9', GradientType=0); -} -.theme-blue .back-bar .pointer { - width: 14px; - height: 14px; - top: -5px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - border-radius: 10px; - border: 1px solid #AAA; - background-color: #e7e7e7; - background-image: -moz-linear-gradient(top, #eeeeee, #dddddd); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#eeeeee), to(#dddddd)); - background-image: -webkit-linear-gradient(top, #eeeeee, #dddddd); - background-image: -o-linear-gradient(top, #eeeeee, #dddddd); - background-image: linear-gradient(to bottom, #eeeeee, #dddddd); - background-repeat: repeat-x; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffeeeeee', endColorstr='#ffdddddd', GradientType=0); -} -.theme-blue .back-bar .pointer-label { - color: #999; -} -.theme-blue .back-bar .focused { - color: #333; -} -.theme-blue .scale span { - border-left: 1px solid #e5e5e5; -} -.theme-blue .scale ins { - color: #999; -} diff --git a/view/theme/frio/frameworks/jRange/jquery.range.js b/view/theme/frio/frameworks/jRange/jquery.range.js deleted file mode 100644 index 188ee749db..0000000000 --- a/view/theme/frio/frameworks/jRange/jquery.range.js +++ /dev/null @@ -1,401 +0,0 @@ -/*jshint multistr:true, curly: false */ -/*global jQuery:false, define: false */ -/** - * jRange - Awesome range control - * - * Written by - * ---------- - * Nitin Hayaran (nitinhayaran@gmail.com) - * - * Licensed under the MIT (MIT-LICENSE.txt). - * - * @author Nitin Hayaran - * @version 0.1-RELEASE - * - * Dependencies - * ------------ - * jQuery (http://jquery.com) - * - **/ -; -(function($, window, document, undefined) { - 'use strict'; - - var jRange = function() { - return this.init.apply(this, arguments); - }; - jRange.prototype = { - defaults: { - onstatechange: function() {}, - ondragend: function() {}, - onbarclicked: function() {}, - isRange: false, - showLabels: true, - showScale: true, - step: 1, - format: '%s', - theme: 'theme-green', - width: 300, - disable: false, - snap: false - }, - template: '
\ -
\ -
\ -
123456
\ -
456789
\ -
\ -
\ -
\ -
', - init: function(node, options) { - this.options = $.extend({}, this.defaults, options); - this.inputNode = $(node); - this.options.value = this.inputNode.val() || (this.options.isRange ? this.options.from + ',' + this.options.from : this.options.from); - this.domNode = $(this.template); - this.domNode.addClass(this.options.theme); - this.inputNode.after(this.domNode); - this.domNode.on('change', this.onChange); - this.pointers = $('.pointer', this.domNode); - this.lowPointer = this.pointers.first(); - this.highPointer = this.pointers.last(); - this.labels = $('.pointer-label', this.domNode); - this.lowLabel = this.labels.first(); - this.highLabel = this.labels.last(); - this.scale = $('.scale', this.domNode); - this.bar = $('.selected-bar', this.domNode); - this.clickableBar = this.domNode.find('.clickable-dummy'); - this.interval = this.options.to - this.options.from; - this.render(); - }, - render: function() { - // Check if inputNode is visible, and have some width, so that we can set slider width accordingly. - if (this.inputNode.width() === 0 && !this.options.width) { - console.log('jRange : no width found, returning'); - return; - } else { - this.options.width = this.options.width || this.inputNode.width(); - this.domNode.width(this.options.width); - this.inputNode.hide(); - } - - if (this.isSingle()) { - this.lowPointer.hide(); - this.lowLabel.hide(); - } - if (!this.options.showLabels) { - this.labels.hide(); - } - this.attachEvents(); - if (this.options.showScale) { - this.renderScale(); - } - this.setValue(this.options.value); - }, - isSingle: function() { - if (typeof(this.options.value) === 'number') { - return true; - } - return (this.options.value.indexOf(',') !== -1 || this.options.isRange) ? - false : true; - }, - attachEvents: function() { - this.clickableBar.click($.proxy(this.barClicked, this)); - this.pointers.on('mousedown touchstart', $.proxy(this.onDragStart, this)); - this.pointers.bind('dragstart', function(event) { - event.preventDefault(); - }); - }, - onDragStart: function(e) { - if ( this.options.disable || (e.type === 'mousedown' && e.which !== 1)) { - return; - } - e.stopPropagation(); - e.preventDefault(); - var pointer = $(e.target); - this.pointers.removeClass('last-active'); - pointer.addClass('focused last-active'); - this[(pointer.hasClass('low') ? 'low' : 'high') + 'Label'].addClass('focused'); - $(document).on('mousemove.slider touchmove.slider', $.proxy(this.onDrag, this, pointer)); - $(document).on('mouseup.slider touchend.slider touchcancel.slider', $.proxy(this.onDragEnd, this)); - }, - onDrag: function(pointer, e) { - e.stopPropagation(); - e.preventDefault(); - - if (e.originalEvent.touches && e.originalEvent.touches.length) { - e = e.originalEvent.touches[0]; - } else if (e.originalEvent.changedTouches && e.originalEvent.changedTouches.length) { - e = e.originalEvent.changedTouches[0]; - } - - var position = e.clientX - this.domNode.offset().left; - this.domNode.trigger('change', [this, pointer, position]); - }, - onDragEnd: function(e) { - this.pointers.removeClass('focused') - .trigger('rangeslideend'); - this.labels.removeClass('focused'); - $(document).off('.slider'); - this.options.ondragend.call(this, this.options.value); - }, - barClicked: function(e) { - if(this.options.disable) return; - var x = e.pageX - this.clickableBar.offset().left; - if (this.isSingle()) - this.setPosition(this.pointers.last(), x, true, true); - else { - var firstLeft = Math.abs(parseFloat(this.pointers.first().css('left'), 10)), - firstHalfWidth = this.pointers.first().width() / 2, - lastLeft = Math.abs(parseFloat(this.pointers.last().css('left'), 10)), - lastHalfWidth = this.pointers.first().width() / 2, - leftSide = Math.abs(firstLeft - x + firstHalfWidth), - rightSide = Math.abs(lastLeft - x + lastHalfWidth), - pointer; - - if(leftSide == rightSide) { - pointer = x < firstLeft ? this.pointers.first() : this.pointers.last(); - } else { - pointer = leftSide < rightSide ? this.pointers.first() : this.pointers.last(); - } - this.setPosition(pointer, x, true, true); - } - this.options.onbarclicked.call(this, this.options.value); - }, - onChange: function(e, self, pointer, position) { - var min, max; - min = 0; - max = self.domNode.width(); - - if (!self.isSingle()) { - min = pointer.hasClass('high') ? parseFloat(self.lowPointer.css("left")) + (self.lowPointer.width() / 2) : 0; - max = pointer.hasClass('low') ? parseFloat(self.highPointer.css("left")) + (self.highPointer.width() / 2) : self.domNode.width(); - } - - var value = Math.min(Math.max(position, min), max); - self.setPosition(pointer, value, true); - }, - setPosition: function(pointer, position, isPx, animate) { - var leftPos, rightPos, - lowPos = parseFloat(this.lowPointer.css("left")), - highPos = parseFloat(this.highPointer.css("left")) || 0, - circleWidth = this.highPointer.width() / 2; - if (!isPx) { - position = this.prcToPx(position); - } - if(this.options.snap){ - var expPos = this.correctPositionForSnap(position); - if(expPos === -1){ - return; - }else{ - position = expPos; - } - } - if (pointer[0] === this.highPointer[0]) { - highPos = Math.round(position - circleWidth); - } else { - lowPos = Math.round(position - circleWidth); - } - pointer[animate ? 'animate' : 'css']({ - 'left': Math.round(position - circleWidth) - }); - if (this.isSingle()) { - leftPos = 0; - } else { - leftPos = lowPos + circleWidth; - rightPos = highPos + circleWidth; - } - var w = Math.round(highPos + circleWidth - leftPos); - this.bar[animate ? 'animate' : 'css']({ - 'width': Math.abs(w), - 'left': (w>0) ? leftPos : leftPos + w - }); - this.showPointerValue(pointer, position, animate); - this.isReadonly(); - }, - correctPositionForSnap: function(position){ - var currentValue = this.positionToValue(position) - this.options.from; - var diff = this.options.width / (this.interval / this.options.step), - expectedPosition = (currentValue / this.options.step) * diff; - if( position <= expectedPosition + diff / 2 && position >= expectedPosition - diff / 2){ - return expectedPosition; - }else{ - return -1; - } - }, - // will be called from outside - setValue: function(value) { - var values = value.toString().split(','); - values[0] = Math.min(Math.max(values[0], this.options.from), this.options.to) + ''; - if (values.length > 1){ - values[1] = Math.min(Math.max(values[1], this.options.from), this.options.to) + ''; - } - this.options.value = value; - var prc = this.valuesToPrc(values.length === 2 ? values : [0, values[0]]); - if (this.isSingle()) { - this.setPosition(this.highPointer, prc[1]); - } else { - this.setPosition(this.lowPointer, prc[0]); - this.setPosition(this.highPointer, prc[1]); - } - }, - renderScale: function() { - var s = this.options.scale || [this.options.from, this.options.to]; - var prc = Math.round((100 / (s.length - 1)) * 10) / 10; - var str = ''; - for (var i = 0; i < s.length; i++) { - str += '' + (s[i] != '|' ? '' + s[i] + '' : '') + ''; - } - this.scale.html(str); - - $('ins', this.scale).each(function() { - $(this).css({ - marginLeft: -$(this).outerWidth() / 2 - }); - }); - }, - getBarWidth: function() { - var values = this.options.value.split(','); - if (values.length > 1) { - return parseFloat(values[1]) - parseFloat(values[0]); - } else { - return parseFloat(values[0]); - } - }, - showPointerValue: function(pointer, position, animate) { - var label = $('.pointer-label', this.domNode)[pointer.hasClass('low') ? 'first' : 'last'](); - var text; - var value = this.positionToValue(position); - // Is it higer or lower than it should be? - - if ($.isFunction(this.options.format)) { - var type = this.isSingle() ? undefined : (pointer.hasClass('low') ? 'low' : 'high'); - text = this.options.format(value, type); - } else { - text = this.options.format.replace('%s', value); - } - - var width = label.html(text).width(), - left = position - width / 2; - left = Math.min(Math.max(left, 0), this.options.width - width); - label[animate ? 'animate' : 'css']({ - left: left - }); - this.setInputValue(pointer, value); - }, - valuesToPrc: function(values) { - var lowPrc = ((parseFloat(values[0]) - parseFloat(this.options.from)) * 100 / this.interval), - highPrc = ((parseFloat(values[1]) - parseFloat(this.options.from)) * 100 / this.interval); - return [lowPrc, highPrc]; - }, - prcToPx: function(prc) { - return (this.domNode.width() * prc) / 100; - }, - isDecimal: function() { - return ((this.options.value + this.options.from + this.options.to).indexOf(".")===-1) ? false : true; - }, - positionToValue: function(pos) { - var value = (pos / this.domNode.width()) * this.interval; - value = parseFloat(value, 10) + parseFloat(this.options.from, 10); - if (this.isDecimal()) { - var final = Math.round(Math.round(value / this.options.step) * this.options.step *100)/100; - if (final!==0.0) { - final = '' + final; - if (final.indexOf(".")===-1) { - final = final + "."; - } - while (final.length - final.indexOf('.')<3) { - final = final + "0"; - } - } else { - final = "0.00"; - } - return final; - } else { - return Math.round(value / this.options.step) * this.options.step; - } - }, - setInputValue: function(pointer, v) { - // if(!isChanged) return; - if (this.isSingle()) { - this.options.value = v.toString(); - } else { - var values = this.options.value.split(','); - if (pointer.hasClass('low')) { - this.options.value = v + ',' + values[1]; - } else { - this.options.value = values[0] + ',' + v; - } - } - if (this.inputNode.val() !== this.options.value) { - this.inputNode.val(this.options.value) - .trigger('change'); - this.options.onstatechange.call(this, this.options.value); - } - }, - getValue: function() { - return this.options.value; - }, - getOptions: function() { - return this.options; - }, - getRange: function() { - return this.options.from + "," + this.options.to; - }, - isReadonly: function(){ - this.domNode.toggleClass('slider-readonly', this.options.disable); - }, - disable: function(){ - this.options.disable = true; - this.isReadonly(); - }, - enable: function(){ - this.options.disable = false; - this.isReadonly(); - }, - toggleDisable: function(){ - this.options.disable = !this.options.disable; - this.isReadonly(); - }, - updateRange: function(range, value) { - var values = range.toString().split(','); - this.interval = parseInt(values[1]) - parseInt(values[0]); - if(value){ - this.setValue(value); - }else{ - this.setValue(this.getValue()); - } - } - }; - - var pluginName = 'jRange'; - // A really lightweight plugin wrapper around the constructor, - // preventing against multiple instantiations - $.fn[pluginName] = function(option) { - var args = arguments, - result; - - this.each(function() { - var $this = $(this), - data = $.data(this, 'plugin_' + pluginName), - options = typeof option === 'object' && option; - if (!data) { - $this.data('plugin_' + pluginName, (data = new jRange(this, options))); - $(window).resize(function() { - data.setValue(data.getValue()); - }); // Update slider position when window is resized to keep it in sync with scale - } - // if first argument is a string, call silimarly named function - // this gives flexibility to call functions of the plugin e.g. - // - $('.dial').plugin('destroy'); - // - $('.dial').plugin('render', $('.new-child')); - if (typeof option === 'string') { - result = data[option].apply(data, Array.prototype.slice.call(args, 1)); - } - }); - - // To enable plugin returns values - return result || this; - }; - -})(jQuery, window, document); diff --git a/view/theme/frio/frameworks/jRange/jquery.range.less b/view/theme/frio/frameworks/jRange/jquery.range.less deleted file mode 100644 index 4034bdd66c..0000000000 --- a/view/theme/frio/frameworks/jRange/jquery.range.less +++ /dev/null @@ -1,198 +0,0 @@ -#gradient { - .horizontal(@startColor: #555, @endColor: #333) { - background-color: @endColor; - background-image: -moz-linear-gradient(left, @startColor, @endColor); // FF 3.6+ - background-image: -webkit-gradient(linear, 0 0, 100% 0, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ - background-image: -webkit-linear-gradient(left, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(left, @startColor, @endColor); // Opera 11.10 - background-image: linear-gradient(to right, @startColor, @endColor); // Standard, IE10 - background-repeat: repeat-x; - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=1)",argb(@startColor),argb(@endColor))); // IE9 and down - } - .vertical(@startColor: #555, @endColor: #333) { - background-color: mix(@startColor, @endColor, 60%); - background-image: -moz-linear-gradient(top, @startColor, @endColor); // FF 3.6+ - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), to(@endColor)); // Safari 4+, Chrome 2+ - background-image: -webkit-linear-gradient(top, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(top, @startColor, @endColor); // Opera 11.10 - background-image: linear-gradient(to bottom, @startColor, @endColor); // Standard, IE10 - background-repeat: repeat-x; - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down - } - .directional(@startColor: #555, @endColor: #333, @deg: 45deg) { - background-color: @endColor; - background-repeat: repeat-x; - background-image: -moz-linear-gradient(@deg, @startColor, @endColor); // FF 3.6+ - background-image: -webkit-linear-gradient(@deg, @startColor, @endColor); // Safari 5.1+, Chrome 10+ - background-image: -o-linear-gradient(@deg, @startColor, @endColor); // Opera 11.10 - background-image: linear-gradient(@deg, @startColor, @endColor); // Standard, IE10 - } - .vertical-three-colors(@startColor: #00b3ee, @midColor: #7a43b6, @colorStop: 50%, @endColor: #c3325f) { - background-color: mix(@midColor, @endColor, 80%); - background-image: -webkit-gradient(linear, 0 0, 0 100%, from(@startColor), color-stop(@colorStop, @midColor), to(@endColor)); - background-image: -webkit-linear-gradient(@startColor, @midColor @colorStop, @endColor); - background-image: -moz-linear-gradient(top, @startColor, @midColor @colorStop, @endColor); - background-image: -o-linear-gradient(@startColor, @midColor @colorStop, @endColor); - background-image: linear-gradient(@startColor, @midColor @colorStop, @endColor); - background-repeat: no-repeat; - filter: e(%("progid:DXImageTransform.Microsoft.gradient(startColorstr='%d', endColorstr='%d', GradientType=0)",argb(@startColor),argb(@endColor))); // IE9 and down, gets no color-stop at all for proper fallback - } - .radial(@innerColor: #555, @outerColor: #333) { - background-color: @outerColor; - background-image: -webkit-gradient(radial, center center, 0, center center, 460, from(@innerColor), to(@outerColor)); - background-image: -webkit-radial-gradient(circle, @innerColor, @outerColor); - background-image: -moz-radial-gradient(circle, @innerColor, @outerColor); - background-image: -o-radial-gradient(circle, @innerColor, @outerColor); - background-repeat: no-repeat; - } - .striped(@color: #555, @angle: 45deg) { - background-color: @color; - background-image: -webkit-gradient(linear, 0 100%, 100% 0, color-stop(.25, rgba(255,255,255,.15)), color-stop(.25, transparent), color-stop(.5, transparent), color-stop(.5, rgba(255,255,255,.15)), color-stop(.75, rgba(255,255,255,.15)), color-stop(.75, transparent), to(transparent)); - background-image: -webkit-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: -moz-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: -o-linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - background-image: linear-gradient(@angle, rgba(255,255,255,.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,.15) 50%, rgba(255,255,255,.15) 75%, transparent 75%, transparent); - } -} - -.slider-container { - width: 300px; - font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; - .back-bar { - height: 10px; - position: relative; - .selected-bar { - position: absolute; - height: 100%; - } - .pointer { - position: absolute; - width: 10px; - height: 10px; - background-color: red; - cursor: col-resize; - opacity: 1; - z-index: 2; - &.last-active{ - z-index: 3; - } - } - .pointer-label { - position: absolute; - top: -17px; - font-size: 8px; - background: white; - white-space: nowrap; - line-height: 1; - } - .focused { - z-index: 10; - } - } - .clickable-dummy { - cursor: pointer; - position: absolute; - width: 100%; - height: 100%; - z-index: 1; - } - .scale { - top: 2px; - position: relative; - span { - position: absolute; - height: 5px; - border-left: 1px solid #999; - font-size: 0; - } - ins { - font-size: 9px; - text-decoration: none; - position: absolute; - left: 0; - top: 5px; - color: #999; - line-height: 1; - } - } - &.slider-readonly{ - .clickable-dummy, .pointer { - cursor: auto; - } - } -} -.theme-green { - .back-bar { - height: 5px; - border-radius: 2px; - background-color: #eeeeee; - #gradient > .vertical(#eeeeee, #dddddd); - .selected-bar { - border-radius: 2px; - #gradient > .vertical(#bdfade, #76fabc); - } - .pointer { - width: 14px; - height: 14px; - top: -5px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - border-radius: 10px; - border: 1px solid #AAA; - #gradient > .vertical(#eeeeee, #dddddd); - } - .pointer-label { - color: #999; - } - .focused { - color: #333; - } - } - .scale { - span { - border-left: 1px solid #e5e5e5; - } - ins { - color: #999; - } - } -} - -.theme-blue { - .back-bar { - height: 5px; - border-radius: 2px; - background-color: #eeeeee; - #gradient > .vertical(#eeeeee, #dddddd); - .selected-bar { - border-radius: 2px; - #gradient > .vertical(#b1d1f9, #64a8f9); - } - .pointer { - width: 14px; - height: 14px; - top: -5px; - -webkit-box-sizing: border-box; - -moz-box-sizing: border-box; - box-sizing: border-box; - border-radius: 10px; - border: 1px solid #AAA; - #gradient > .vertical(#eeeeee, #dddddd); - } - .pointer-label { - color: #999; - } - .focused { - color: #333; - } - } - .scale { - span { - border-left: 1px solid #e5e5e5; - } - ins { - color: #999; - } - } -} diff --git a/view/theme/frio/frameworks/jRange/package.json b/view/theme/frio/frameworks/jRange/package.json deleted file mode 100644 index 25d0cd3d96..0000000000 --- a/view/theme/frio/frameworks/jRange/package.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "name": "jquery-range", - "version": "1.0.0", - "description": "jQuery plugin to create range selector", - "main": "jquery.range-min.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/nitinhayaran/jRange.git" - }, - "keywords": [ - "jquery", - "range" - ], - "author": "Nitin Hayaran ", - "license": "ISC", - "bugs": { - "url": "https://github.com/nitinhayaran/jRange/issues" - }, - "homepage": "https://github.com/nitinhayaran/jRange#readme" -} diff --git a/view/theme/frio/templates/field_colorinput.tpl b/view/theme/frio/templates/field_colorinput.tpl index 285501ef3b..c4affb7eeb 100644 --- a/view/theme/frio/templates/field_colorinput.tpl +++ b/view/theme/frio/templates/field_colorinput.tpl @@ -2,9 +2,9 @@
+ {{if $field.4}}{{$field.4}}{{/if}} -
{{if $field.3}} {{$field.3 nofilter}} diff --git a/view/theme/frio/templates/theme_settings.tpl b/view/theme/frio/templates/theme_settings.tpl index b84f5f28a8..3ac6282cab 100644 --- a/view/theme/frio/templates/theme_settings.tpl +++ b/view/theme/frio/templates/theme_settings.tpl @@ -1,7 +1,4 @@ - - - {{include file="field_select.tpl" field=$scheme}} @@ -17,7 +14,19 @@ {{if $contentbg_transp}}
- + +
+
+ +
+
+
+ + % +
+
+
+ {{$contentbg_transp.3}}
@@ -171,25 +180,6 @@ if($("#id_frio_background_image").val().length != 0) { $("#frio_bg_image_options").show(); } - - $('.slider-input').jRange({ - from: 0, - to: 100, - step: 1, - scale: [0,10,20,30,40,50,60,70,80,90,100], - format: '%s', - width: '100%', - showLabels: true, - theme: 'theme-frio', - }); - - // The position of the slider is wrong calculated on hidden elements. - // So set an event listener toggle and update the jRange value. - $(document).on('click', '#custom-settings-title a', function() { - var bgTransp = $('#frio_contentbg_transp').val(); - $('.slider-input').jRange('setValue', bgTransp); - }); - }); @@ -197,7 +187,3 @@
- - From a5da0fd98fb53ebf54b2898ce82c11ff4f6fb7e7 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 25 Apr 2019 22:20:20 -0400 Subject: [PATCH 16/37] Add admin/themes/{theme}/embed module - This module allows editing the site settings for a theme with a different user theme --- src/App/Router.php | 1 + src/Module/Admin/Themes/Embed.php | 92 +++++++++++++++++++++++++++ view/templates/admin/addons/embed.tpl | 5 ++ 3 files changed, 98 insertions(+) create mode 100644 src/Module/Admin/Themes/Embed.php create mode 100644 view/templates/admin/addons/embed.tpl diff --git a/src/App/Router.php b/src/App/Router.php index 0fbb78b8bc..649d347bb9 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -133,6 +133,7 @@ class Router $collector->addRoute(['GET'] , '/queue[/deferred]' , Module\Admin\Queue::class); $collector->addRoute(['GET', 'POST'], '/themes' , Module\Admin\Themes\Index::class); + $collector->addRoute(['GET', 'POST'], '/themes/{theme}/embed' , Module\Admin\Themes\Embed::class); $collector->addRoute(['GET', 'POST'], '/tos' , Module\Admin\Tos::class); diff --git a/src/Module/Admin/Themes/Embed.php b/src/Module/Admin/Themes/Embed.php new file mode 100644 index 0000000000..0a309e23ce --- /dev/null +++ b/src/Module/Admin/Themes/Embed.php @@ -0,0 +1,92 @@ +argc > 2) { + // @TODO: Replace with parameter from router + $theme = $a->argv[2]; + $theme = Strings::sanitizeFilePathItem($theme); + if (is_file("view/theme/$theme/config.php")) { + $a->setCurrentTheme($theme); + } + } + } + + public static function post() + { + parent::post(); + + $a = self::getApp(); + + if ($a->argc > 2) { + // @TODO: Replace with parameter from router + $theme = $a->argv[2]; + $theme = Strings::sanitizeFilePathItem($theme); + if (is_file("view/theme/$theme/config.php")) { + self::checkFormSecurityTokenRedirectOnError('/admin/themes/' . $theme . '/embed?mode=minimal', 'admin_theme_settings'); + + require_once "view/theme/$theme/config.php"; + + if (function_exists('theme_admin_post')) { + theme_admin_post($a); + } + } + + info(L10n::t('Theme settings updated.')); + + if ($a->isAjax()) { + return; + } + + $a->internalRedirect('admin/themes/' . $theme . '/embed?mode=minimal'); + } + } + + public static function content() + { + parent::content(); + + $a = self::getApp(); + + if ($a->argc > 2) { + // @TODO: Replace with parameter from router + $theme = $a->argv[2]; + $theme = Strings::sanitizeFilePathItem($theme); + if (!is_dir("view/theme/$theme")) { + notice(L10n::t('Unknown theme.')); + return ''; + } + + $admin_form = ''; + if (is_file("view/theme/$theme/config.php")) { + require_once "view/theme/$theme/config.php"; + + if (function_exists('theme_admin')) { + $admin_form = theme_admin($a); + } + } + + $t = Renderer::getMarkupTemplate('admin/addons/embed.tpl'); + return Renderer::replaceMacros($t, [ + '$action' => '/admin/themes/' . $theme . '/embed?mode=minimal', + '$form' => $admin_form, + '$form_security_token' => parent::getFormSecurityToken("admin_theme_settings"), + ]); + } + + return ''; + } +} \ No newline at end of file diff --git a/view/templates/admin/addons/embed.tpl b/view/templates/admin/addons/embed.tpl new file mode 100644 index 0000000000..71fb12d43c --- /dev/null +++ b/view/templates/admin/addons/embed.tpl @@ -0,0 +1,5 @@ + + + + {{$form nofilter}} + From d0b40cda4c26d1e57f0b23e68a52dd366d568b40 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 25 Apr 2019 22:25:13 -0400 Subject: [PATCH 17/37] Move admin/themes/{theme} to src/Module - Remove now unused templates/admin/addon_detail.tpl - Remove references to themes admin in mod/admin.php --- mod/admin.php | 249 ------------------------- src/App/Router.php | 1 + src/Module/Admin/Themes/Details.php | 128 +++++++++++++ view/templates/admin/addon_details.tpl | 37 ---- 4 files changed, 129 insertions(+), 286 deletions(-) create mode 100644 src/Module/Admin/Themes/Details.php delete mode 100644 view/templates/admin/addon_details.tpl diff --git a/mod/admin.php b/mod/admin.php index 7f2077bead..d2bba6f11d 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -38,23 +38,6 @@ use Friendica\Util\Strings; use Friendica\Util\Temporal; use Psr\Log\LogLevel; -/** - * Sets the current theme for theme settings pages. - * - * This needs to be done before the post() or content() methods are called. - * - * @param App $a - */ -function admin_init(App $a) -{ - if ($a->argc > 2 && $a->argv[1] == 'themes') { - $theme = $a->argv[2]; - if (is_file("view/theme/$theme/config.php")) { - $a->setCurrentTheme($theme); - } - } -} - /** * @brief Process send data from the admin panels subpages * @@ -87,30 +70,6 @@ function admin_post(App $a) case 'site': admin_page_site_post($a); break; - case 'themes': - if ($a->argc < 2) { - if ($a->isAjax()) { - return; - } - $a->internalRedirect('admin/'); - return; - } - - $theme = $a->argv[2]; - if (is_file("view/theme/$theme/config.php")) { - require_once "view/theme/$theme/config.php"; - - if (function_exists('theme_admin_post')) { - theme_admin_post($a); - } - } - - info(L10n::t('Theme settings updated.')); - if ($a->isAjax()) { - return; - } - $return_path = 'admin/themes/' . $theme . (!empty($_GET['mode']) ? '?mode=' . $_GET['mode'] : ''); - break; case 'logs': admin_page_logs_post($a); break; @@ -216,9 +175,6 @@ function admin_content(App $a) case 'site': $o = admin_page_site($a); break; - case 'themes': - $o = admin_page_themes($a); - break; case 'logs': $o = admin_page_logs($a); break; @@ -1082,211 +1038,6 @@ function admin_page_dbsync(App $a) return $o; } -/** - * @param array $themes - * @param string $th - * @param int $result - */ -function toggle_theme(&$themes, $th, &$result) -{ - $count = count($themes); - for ($x = 0; $x < $count; $x++) { - if ($themes[$x]['name'] === $th) { - if ($themes[$x]['allowed']) { - $themes[$x]['allowed'] = 0; - $result = 0; - } else { - $themes[$x]['allowed'] = 1; - $result = 1; - } - } - } -} - -/** - * @param array $themes - * @param string $th - * @return int - */ -function theme_status($themes, $th) -{ - $count = count($themes); - for ($x = 0; $x < $count; $x++) { - if ($themes[$x]['name'] === $th) { - if ($themes[$x]['allowed']) { - return 1; - } else { - return 0; - } - } - } - return 0; -} - -/** - * @param array $themes - * @return string - */ -function rebuild_theme_table($themes) -{ - $o = ''; - if (count($themes)) { - foreach ($themes as $th) { - if ($th['allowed']) { - if (strlen($o)) { - $o .= ','; - } - $o .= $th['name']; - } - } - } - return $o; -} - -/** - * @brief Themes admin page - * - * This function generates the admin panel page to control the themes available - * on the friendica node. If the name of a theme is given as parameter a page - * with the details for the theme is shown. Otherwise a list of available - * themes is generated. - * - * The template used for displaying the list of themes and the details of the - * themes are the same as used for the addons. - * - * The returned string contains the HTML code of the admin panel page. - * - * @param App $a - * @return string - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ -function admin_page_themes(App $a) -{ - $allowed_themes_str = Config::get('system', 'allowed_themes'); - $allowed_themes_raw = explode(',', $allowed_themes_str); - $allowed_themes = []; - if (count($allowed_themes_raw)) { - foreach ($allowed_themes_raw as $x) { - if (strlen(trim($x))) { - $allowed_themes[] = trim($x); - } - } - } - - $themes = []; - $files = glob('view/theme/*'); - if (is_array($files)) { - foreach ($files as $file) { - $f = basename($file); - - // Is there a style file? - $theme_files = glob('view/theme/' . $f . '/style.*'); - - // If not then quit - if (count($theme_files) == 0) { - continue; - } - - $is_experimental = intval(file_exists($file . '/experimental')); - $is_supported = 1 - (intval(file_exists($file . '/unsupported'))); - $is_allowed = intval(in_array($f, $allowed_themes)); - - if ($is_allowed || $is_supported || Config::get("system", "show_unsupported_themes")) { - $themes[] = ['name' => $f, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed]; - } - } - } - - if (!count($themes)) { - notice(L10n::t('No themes found.')); - return ''; - } - - /* - * Single theme - */ - - if ($a->argc == 3) { - $theme = $a->argv[2]; - if (!is_dir("view/theme/$theme")) { - notice(L10n::t("Item not found.")); - return ''; - } - - if (!empty($_GET['a']) && $_GET['a'] == "t") { - BaseModule::checkFormSecurityTokenRedirectOnError('/admin/themes', 'admin_themes', 't'); - - // Toggle theme status - - toggle_theme($themes, $theme, $result); - $s = rebuild_theme_table($themes); - if ($result) { - Theme::install($theme); - info(sprintf('Theme %s enabled.', $theme)); - } else { - Theme::uninstall($theme); - info(sprintf('Theme %s disabled.', $theme)); - } - - Config::set('system', 'allowed_themes', $s); - $a->internalRedirect('admin/themes'); - return ''; // NOTREACHED - } - - // display theme details - if (theme_status($themes, $theme)) { - $status = "on"; - $action = L10n::t("Disable"); - } else { - $status = "off"; - $action = L10n::t("Enable"); - } - - $readme = null; - - if (is_file("view/theme/$theme/README.md")) { - $readme = Markdown::convert(file_get_contents("view/theme/$theme/README.md"), false); - } elseif (is_file("view/theme/$theme/README")) { - $readme = "
" . file_get_contents("view/theme/$theme/README") . "
"; - } - - $admin_form = ''; - if (is_file("view/theme/$theme/config.php")) { - require_once "view/theme/$theme/config.php"; - - if (function_exists('theme_admin')) { - $admin_form = theme_admin($a); - } - } - - $screenshot = [Theme::getScreenshot($theme), L10n::t('Screenshot')]; - if (!stristr($screenshot[0], $theme)) { - $screenshot = null; - } - - $t = Renderer::getMarkupTemplate('admin/addon_details.tpl'); - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Themes'), - '$toggle' => L10n::t('Toggle'), - '$settings' => L10n::t('Settings'), - '$baseurl' => System::baseUrl(true), - '$addon' => $theme . (!empty($_GET['mode']) ? '?mode=' . $_GET['mode'] : ''), - '$status' => $status, - '$action' => $action, - '$info' => Theme::getInfo($theme), - '$function' => 'themes', - '$admin_form' => $admin_form, - '$str_author' => L10n::t('Author: '), - '$str_maintainer' => L10n::t('Maintainer: '), - '$screenshot' => $screenshot, - '$readme' => $readme, - - '$form_security_token' => BaseModule::getFormSecurityToken("admin_themes"), - ]); - } -} - /** * @brief Prosesses data send by Logs admin page * diff --git a/src/App/Router.php b/src/App/Router.php index 649d347bb9..b78c58bc45 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -133,6 +133,7 @@ class Router $collector->addRoute(['GET'] , '/queue[/deferred]' , Module\Admin\Queue::class); $collector->addRoute(['GET', 'POST'], '/themes' , Module\Admin\Themes\Index::class); + $collector->addRoute(['GET', 'POST'], '/themes/{theme}' , Module\Admin\Themes\Details::class); $collector->addRoute(['GET', 'POST'], '/themes/{theme}/embed' , Module\Admin\Themes\Embed::class); $collector->addRoute(['GET', 'POST'], '/tos' , Module\Admin\Tos::class); diff --git a/src/Module/Admin/Themes/Details.php b/src/Module/Admin/Themes/Details.php new file mode 100644 index 0000000000..540083bb2f --- /dev/null +++ b/src/Module/Admin/Themes/Details.php @@ -0,0 +1,128 @@ +argc > 2) { + // @TODO: Replace with parameter from router + $theme = $a->argv[2]; + $theme = Strings::sanitizeFilePathItem($theme); + if (is_file("view/theme/$theme/config.php")) { + require_once "view/theme/$theme/config.php"; + + if (function_exists('theme_admin_post')) { + theme_admin_post($a); + } + } + + info(L10n::t('Theme settings updated.')); + + if ($a->isAjax()) { + return; + } + + $a->internalRedirect('admin/themes/' . $theme); + } + } + + public static function content() + { + parent::content(); + + $a = self::getApp(); + + if ($a->argc > 2) { + // @TODO: Replace with parameter from router + $theme = $a->argv[2]; + $theme = Strings::sanitizeFilePathItem($theme); + if (!is_dir("view/theme/$theme")) { + notice(L10n::t("Item not found.")); + return ''; + } + + $isEnabled = in_array($theme, Theme::getAllowedList()); + if ($isEnabled) { + $status = "on"; + $action = L10n::t("Disable"); + } else { + $status = "off"; + $action = L10n::t("Enable"); + } + + if (!empty($_GET['action']) && $_GET['action'] == 'toggle') { + parent::checkFormSecurityTokenRedirectOnError('/admin/themes', 'admin_themes', 't'); + + if ($isEnabled) { + Theme::uninstall($theme); + info(L10n::t('Theme %s disabled.', $theme)); + } elseif (Theme::install($theme)) { + info(L10n::t('Theme %s successfully enabled.', $theme)); + } else { + info(L10n::t('Theme %s failed to install.', $theme)); + } + + $a->internalRedirect('admin/themes/' . $theme); + } + + $readme = null; + if (is_file("view/theme/$theme/README.md")) { + $readme = Markdown::convert(file_get_contents("view/theme/$theme/README.md"), false); + } elseif (is_file("view/theme/$theme/README")) { + $readme = "
" . file_get_contents("view/theme/$theme/README") . "
"; + } + + $admin_form = ''; + if (is_file("view/theme/$theme/config.php")) { + require_once "view/theme/$theme/config.php"; + + if (function_exists('theme_admin')) { + $admin_form = ''; + } + } + + $screenshot = [Theme::getScreenshot($theme), L10n::t('Screenshot')]; + if (!stristr($screenshot[0], $theme)) { + $screenshot = null; + } + + $t = Renderer::getMarkupTemplate('admin/addons/details.tpl'); + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Themes'), + '$toggle' => L10n::t('Toggle'), + '$settings' => L10n::t('Settings'), + '$baseurl' => System::baseUrl(true), + '$addon' => $theme, + '$status' => $status, + '$action' => $action, + '$info' => Theme::getInfo($theme), + '$function' => 'themes', + '$admin_form' => $admin_form, + '$str_author' => L10n::t('Author: '), + '$str_maintainer' => L10n::t('Maintainer: '), + '$screenshot' => $screenshot, + '$readme' => $readme, + + '$form_security_token' => parent::getFormSecurityToken("admin_themes"), + ]); + } + + $a->internalRedirect('admin/themes'); + } +} \ No newline at end of file diff --git a/view/templates/admin/addon_details.tpl b/view/templates/admin/addon_details.tpl deleted file mode 100644 index 7479b1385e..0000000000 --- a/view/templates/admin/addon_details.tpl +++ /dev/null @@ -1,37 +0,0 @@ - -
-

{{$title}} - {{$page}}

- -

{{$info.name}} - {{$info.version}} : {{$action}}

-

{{$info.description nofilter}}

- -

{{$str_author}} - {{foreach $info.author as $a name=authors}} - {{if $a.link}}{{$a.name}}{{else}}{{$a.name}}{{/if}}{{if $smarty.foreach.authors.last}}{{else}}, {{/if}} - {{/foreach}} -

- -

{{$str_maintainer}} - {{foreach $info.maintainer as $a name=maintainers}} - {{if $a.link}}{{$a.name}}{{else}}{{$a.name}}{{/if}}{{if $smarty.foreach.maintainers.last}}{{else}}, {{/if}} - {{/foreach}} -

- - {{if $screenshot}} - {{$screenshot.1}} - {{/if}} - - {{if $admin_form}} -

{{$settings}}

-
- {{$admin_form nofilter}} -
- {{/if}} - - {{if $readme}} -

Readme

-
- {{$readme nofilter}} -
- {{/if}} -
From 740723534f1154ea417ec88aa1b47d9ebe673a5e Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 25 Apr 2019 22:35:38 -0400 Subject: [PATCH 18/37] Move admin/site to src/Module - Replace default theme settings modal with simple link to admin/themes --- mod/admin.php | 685 ----------------------- src/App/Router.php | 2 + src/Module/Admin/Site.php | 685 +++++++++++++++++++++++ src/Module/BaseAdminModule.php | 1 + view/templates/admin/site.tpl | 41 -- view/theme/frio/templates/admin/site.tpl | 41 -- 6 files changed, 688 insertions(+), 767 deletions(-) create mode 100644 src/Module/Admin/Site.php diff --git a/mod/admin.php b/mod/admin.php index d2bba6f11d..ad4dcf3988 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -67,9 +67,6 @@ function admin_post(App $a) $return_path = 'admin'; if ($a->argc > 1) { switch ($a->argv[1]) { - case 'site': - admin_page_site_post($a); - break; case 'logs': admin_page_logs_post($a); break; @@ -172,9 +169,6 @@ function admin_content(App $a) // urls if ($a->argc > 1) { switch ($a->argv[1]) { - case 'site': - $o = admin_page_site($a); - break; case 'logs': $o = admin_page_logs($a); break; @@ -261,685 +255,6 @@ function admin_page_deleteitem_post(App $a) return; // NOTREACHED } -/** - * @brief Process send data from Admin Site Page - * - * @param App $a - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ -function admin_page_site_post(App $a) -{ - BaseModule::checkFormSecurityTokenRedirectOnError('/admin/site', 'admin_site'); - - if (!empty($_POST['republish_directory'])) { - Worker::add(PRIORITY_LOW, 'Directory'); - return; - } - - if (empty($_POST['page_site'])) { - return; - } - - // relocate - if (!empty($_POST['relocate']) && !empty($_POST['relocate_url']) && $_POST['relocate_url'] != "") { - $new_url = $_POST['relocate_url']; - $new_url = rtrim($new_url, "/"); - - $parsed = @parse_url($new_url); - if (!is_array($parsed) || empty($parsed['host']) || empty($parsed['scheme'])) { - notice(L10n::t("Can not parse base url. Must have at least ://")); - $a->internalRedirect('admin/site'); - } - - /* steps: - * replace all "baseurl" to "new_url" in config, profile, term, items and contacts - * send relocate for every local user - * */ - - $old_url = $a->getBaseURL(true); - - // Generate host names for relocation the addresses in the format user@address.tld - $new_host = str_replace("http://", "@", Strings::normaliseLink($new_url)); - $old_host = str_replace("http://", "@", Strings::normaliseLink($old_url)); - - function update_table(App $a, $table_name, $fields, $old_url, $new_url) - { - $dbold = DBA::escape($old_url); - $dbnew = DBA::escape($new_url); - - $upd = []; - foreach ($fields as $f) { - $upd[] = "`$f` = REPLACE(`$f`, '$dbold', '$dbnew')"; - } - - $upds = implode(", ", $upd); - - $r = q("UPDATE %s SET %s;", $table_name, $upds); - - if (!DBA::isResult($r)) { - notice("Failed updating '$table_name': " . DBA::errorMessage()); - $a->internalRedirect('admin/site'); - } - } - - // update tables - // update profile links in the format "http://server.tld" - update_table($a, "profile", ['photo', 'thumb'], $old_url, $new_url); - update_table($a, "term", ['url'], $old_url, $new_url); - update_table($a, "contact", ['photo', 'thumb', 'micro', 'url', 'nurl', 'alias', 'request', 'notify', 'poll', 'confirm', 'poco', 'avatar'], $old_url, $new_url); - update_table($a, "gcontact", ['url', 'nurl', 'photo', 'server_url', 'notify', 'alias'], $old_url, $new_url); - update_table($a, "item", ['owner-link', 'author-link', 'body', 'plink', 'tag'], $old_url, $new_url); - - // update profile addresses in the format "user@server.tld" - update_table($a, "contact", ['addr'], $old_host, $new_host); - update_table($a, "gcontact", ['connect', 'addr'], $old_host, $new_host); - - // update config - Config::set('system', 'url', $new_url); - $a->setBaseURL($new_url); - - // send relocate - $users = q("SELECT `uid` FROM `user` WHERE `account_removed` = 0 AND `account_expired` = 0"); - - foreach ($users as $user) { - Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', $user['uid']); - } - - info("Relocation started. Could take a while to complete."); - - $a->internalRedirect('admin/site'); - } - // end relocate - - $sitename = (!empty($_POST['sitename']) ? Strings::escapeTags(trim($_POST['sitename'])) : ''); - $sender_email = (!empty($_POST['sender_email']) ? Strings::escapeTags(trim($_POST['sender_email'])) : ''); - $banner = (!empty($_POST['banner']) ? trim($_POST['banner']) : false); - $shortcut_icon = (!empty($_POST['shortcut_icon']) ? Strings::escapeTags(trim($_POST['shortcut_icon'])) : ''); - $touch_icon = (!empty($_POST['touch_icon']) ? Strings::escapeTags(trim($_POST['touch_icon'])) : ''); - $additional_info = (!empty($_POST['additional_info']) ? trim($_POST['additional_info']) : ''); - $language = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language'])) : ''); - $theme = (!empty($_POST['theme']) ? Strings::escapeTags(trim($_POST['theme'])) : ''); - $theme_mobile = (!empty($_POST['theme_mobile']) ? Strings::escapeTags(trim($_POST['theme_mobile'])) : ''); - $maximagesize = (!empty($_POST['maximagesize']) ? intval(trim($_POST['maximagesize'])) : 0); - $maximagelength = (!empty($_POST['maximagelength']) ? intval(trim($_POST['maximagelength'])) : MAX_IMAGE_LENGTH); - $jpegimagequality = (!empty($_POST['jpegimagequality']) ? intval(trim($_POST['jpegimagequality'])) : JPEG_QUALITY); - - $register_policy = (!empty($_POST['register_policy']) ? intval(trim($_POST['register_policy'])) : 0); - $daily_registrations = (!empty($_POST['max_daily_registrations']) ? intval(trim($_POST['max_daily_registrations'])) : 0); - $abandon_days = (!empty($_POST['abandon_days']) ? intval(trim($_POST['abandon_days'])) : 0); - - $register_text = (!empty($_POST['register_text']) ? strip_tags(trim($_POST['register_text'])) : ''); - - $allowed_sites = (!empty($_POST['allowed_sites']) ? Strings::escapeTags(trim($_POST['allowed_sites'])) : ''); - $allowed_email = (!empty($_POST['allowed_email']) ? Strings::escapeTags(trim($_POST['allowed_email'])) : ''); - $forbidden_nicknames = (!empty($_POST['forbidden_nicknames']) ? strtolower(Strings::escapeTags(trim($_POST['forbidden_nicknames']))) : ''); - $no_oembed_rich_content = !empty($_POST['no_oembed_rich_content']); - $allowed_oembed = (!empty($_POST['allowed_oembed']) ? Strings::escapeTags(trim($_POST['allowed_oembed'])) : ''); - $block_public = !empty($_POST['block_public']); - $force_publish = !empty($_POST['publish_all']); - $global_directory = (!empty($_POST['directory']) ? Strings::escapeTags(trim($_POST['directory'])) : ''); - $newuser_private = !empty($_POST['newuser_private']); - $enotify_no_content = !empty($_POST['enotify_no_content']); - $private_addons = !empty($_POST['private_addons']); - $disable_embedded = !empty($_POST['disable_embedded']); - $allow_users_remote_self = !empty($_POST['allow_users_remote_self']); - $explicit_content = !empty($_POST['explicit_content']); - - $no_multi_reg = !empty($_POST['no_multi_reg']); - $no_openid = !empty($_POST['no_openid']); - $no_regfullname = !empty($_POST['no_regfullname']); - $community_page_style = (!empty($_POST['community_page_style']) ? intval(trim($_POST['community_page_style'])) : 0); - $max_author_posts_community_page = (!empty($_POST['max_author_posts_community_page']) ? intval(trim($_POST['max_author_posts_community_page'])) : 0); - - $verifyssl = !empty($_POST['verifyssl']); - $proxyuser = (!empty($_POST['proxyuser']) ? Strings::escapeTags(trim($_POST['proxyuser'])) : ''); - $proxy = (!empty($_POST['proxy']) ? Strings::escapeTags(trim($_POST['proxy'])) : ''); - $timeout = (!empty($_POST['timeout']) ? intval(trim($_POST['timeout'])) : 60); - $maxloadavg = (!empty($_POST['maxloadavg']) ? intval(trim($_POST['maxloadavg'])) : 20); - $maxloadavg_frontend = (!empty($_POST['maxloadavg_frontend']) ? intval(trim($_POST['maxloadavg_frontend'])) : 50); - $min_memory = (!empty($_POST['min_memory']) ? intval(trim($_POST['min_memory'])) : 0); - $optimize_max_tablesize = (!empty($_POST['optimize_max_tablesize']) ? intval(trim($_POST['optimize_max_tablesize'])) : 100); - $optimize_fragmentation = (!empty($_POST['optimize_fragmentation']) ? intval(trim($_POST['optimize_fragmentation'])) : 30); - $poco_completion = (!empty($_POST['poco_completion']) ? intval(trim($_POST['poco_completion'])) : false); - $poco_requery_days = (!empty($_POST['poco_requery_days']) ? intval(trim($_POST['poco_requery_days'])) : 7); - $poco_discovery = (!empty($_POST['poco_discovery']) ? intval(trim($_POST['poco_discovery'])) : PortableContact::DISABLED); - $poco_discovery_since = (!empty($_POST['poco_discovery_since']) ? intval(trim($_POST['poco_discovery_since'])) : 30); - $poco_local_search = !empty($_POST['poco_local_search']); - $nodeinfo = !empty($_POST['nodeinfo']); - $dfrn_only = !empty($_POST['dfrn_only']); - $ostatus_disabled = !empty($_POST['ostatus_disabled']); - $ostatus_full_threads = !empty($_POST['ostatus_full_threads']); - $diaspora_enabled = !empty($_POST['diaspora_enabled']); - $ssl_policy = (!empty($_POST['ssl_policy']) ? intval($_POST['ssl_policy']) : 0); - $force_ssl = !empty($_POST['force_ssl']); - $hide_help = !empty($_POST['hide_help']); - $dbclean = !empty($_POST['dbclean']); - $dbclean_expire_days = (!empty($_POST['dbclean_expire_days']) ? intval($_POST['dbclean_expire_days']) : 0); - $dbclean_unclaimed = (!empty($_POST['dbclean_unclaimed']) ? intval($_POST['dbclean_unclaimed']) : 0); - $dbclean_expire_conv = (!empty($_POST['dbclean_expire_conv']) ? intval($_POST['dbclean_expire_conv']) : 0); - $suppress_tags = !empty($_POST['suppress_tags']); - $itemcache = (!empty($_POST['itemcache']) ? Strings::escapeTags(trim($_POST['itemcache'])) : ''); - $itemcache_duration = (!empty($_POST['itemcache_duration']) ? intval($_POST['itemcache_duration']) : 0); - $max_comments = (!empty($_POST['max_comments']) ? intval($_POST['max_comments']) : 0); - $temppath = (!empty($_POST['temppath']) ? Strings::escapeTags(trim($_POST['temppath'])) : ''); - $singleuser = (!empty($_POST['singleuser']) ? Strings::escapeTags(trim($_POST['singleuser'])) : ''); - $proxy_disabled = !empty($_POST['proxy_disabled']); - $only_tag_search = !empty($_POST['only_tag_search']); - $rino = (!empty($_POST['rino']) ? intval($_POST['rino']) : 0); - $check_new_version_url = (!empty($_POST['check_new_version_url']) ? Strings::escapeTags(trim($_POST['check_new_version_url'])) : 'none'); - - $worker_queues = (!empty($_POST['worker_queues']) ? intval($_POST['worker_queues']) : 10); - $worker_dont_fork = !empty($_POST['worker_dont_fork']); - $worker_fastlane = !empty($_POST['worker_fastlane']); - $worker_frontend = !empty($_POST['worker_frontend']); - - $relay_directly = !empty($_POST['relay_directly']); - $relay_server = (!empty($_POST['relay_server']) ? Strings::escapeTags(trim($_POST['relay_server'])) : ''); - $relay_subscribe = !empty($_POST['relay_subscribe']); - $relay_scope = (!empty($_POST['relay_scope']) ? Strings::escapeTags(trim($_POST['relay_scope'])) : ''); - $relay_server_tags = (!empty($_POST['relay_server_tags']) ? Strings::escapeTags(trim($_POST['relay_server_tags'])) : ''); - $relay_user_tags = !empty($_POST['relay_user_tags']); - $active_panel = (!empty($_POST['active_panel']) ? "#" . Strings::escapeTags(trim($_POST['active_panel'])) : ''); - - /** - * @var $storagebackend \Friendica\Model\Storage\IStorage - */ - $storagebackend = Strings::escapeTags(trim(defaults($_POST, 'storagebackend', ''))); - - // save storage backend form - if (!is_null($storagebackend) && $storagebackend != "") { - if (StorageManager::setBackend($storagebackend)) { - $storage_opts = $storagebackend::getOptions(); - $storage_form_prefix = preg_replace('|[^a-zA-Z0-9]|', '', $storagebackend); - $storage_opts_data = []; - foreach ($storage_opts as $name => $info) { - $fieldname = $storage_form_prefix . '_' . $name; - switch ($info[0]) { // type - case 'checkbox': - case 'yesno': - $value = !empty($_POST[$fieldname]); - break; - default: - $value = defaults($_POST, $fieldname, ''); - } - $storage_opts_data[$name] = $value; - } - unset($name); - unset($info); - - $storage_form_errors = $storagebackend::saveOptions($storage_opts_data); - if (count($storage_form_errors)) { - foreach ($storage_form_errors as $name => $err) { - notice('Storage backend, ' . $storage_opts[$name][1] . ': ' . $err); - } - $a->internalRedirect('admin/site' . $active_panel); - } - } else { - info(L10n::t('Invalid storage backend setting value.')); - } - } - - - - // Has the directory url changed? If yes, then resubmit the existing profiles there - if ($global_directory != Config::get('system', 'directory') && ($global_directory != '')) { - Config::set('system', 'directory', $global_directory); - Worker::add(PRIORITY_LOW, 'Directory'); - } - - if ($a->getURLPath() != "") { - $diaspora_enabled = false; - } - if ($ssl_policy != intval(Config::get('system', 'ssl_policy'))) { - if ($ssl_policy == BaseURL::SSL_POLICY_FULL) { - q("UPDATE `contact` SET - `url` = REPLACE(`url` , 'http:' , 'https:'), - `photo` = REPLACE(`photo` , 'http:' , 'https:'), - `thumb` = REPLACE(`thumb` , 'http:' , 'https:'), - `micro` = REPLACE(`micro` , 'http:' , 'https:'), - `request` = REPLACE(`request`, 'http:' , 'https:'), - `notify` = REPLACE(`notify` , 'http:' , 'https:'), - `poll` = REPLACE(`poll` , 'http:' , 'https:'), - `confirm` = REPLACE(`confirm`, 'http:' , 'https:'), - `poco` = REPLACE(`poco` , 'http:' , 'https:') - WHERE `self` = 1" - ); - q("UPDATE `profile` SET - `photo` = REPLACE(`photo` , 'http:' , 'https:'), - `thumb` = REPLACE(`thumb` , 'http:' , 'https:') - WHERE 1 " - ); - } elseif ($ssl_policy == BaseURL::SSL_POLICY_SELFSIGN) { - q("UPDATE `contact` SET - `url` = REPLACE(`url` , 'https:' , 'http:'), - `photo` = REPLACE(`photo` , 'https:' , 'http:'), - `thumb` = REPLACE(`thumb` , 'https:' , 'http:'), - `micro` = REPLACE(`micro` , 'https:' , 'http:'), - `request` = REPLACE(`request`, 'https:' , 'http:'), - `notify` = REPLACE(`notify` , 'https:' , 'http:'), - `poll` = REPLACE(`poll` , 'https:' , 'http:'), - `confirm` = REPLACE(`confirm`, 'https:' , 'http:'), - `poco` = REPLACE(`poco` , 'https:' , 'http:') - WHERE `self` = 1" - ); - q("UPDATE `profile` SET - `photo` = REPLACE(`photo` , 'https:' , 'http:'), - `thumb` = REPLACE(`thumb` , 'https:' , 'http:') - WHERE 1 " - ); - } - } - Config::set('system', 'ssl_policy' , $ssl_policy); - Config::set('system', 'maxloadavg' , $maxloadavg); - Config::set('system', 'maxloadavg_frontend' , $maxloadavg_frontend); - Config::set('system', 'min_memory' , $min_memory); - Config::set('system', 'optimize_max_tablesize', $optimize_max_tablesize); - Config::set('system', 'optimize_fragmentation', $optimize_fragmentation); - Config::set('system', 'poco_completion' , $poco_completion); - Config::set('system', 'poco_requery_days' , $poco_requery_days); - Config::set('system', 'poco_discovery' , $poco_discovery); - Config::set('system', 'poco_discovery_since' , $poco_discovery_since); - Config::set('system', 'poco_local_search' , $poco_local_search); - Config::set('system', 'nodeinfo' , $nodeinfo); - Config::set('config', 'sitename' , $sitename); - Config::set('config', 'sender_email' , $sender_email); - Config::set('system', 'suppress_tags' , $suppress_tags); - Config::set('system', 'shortcut_icon' , $shortcut_icon); - Config::set('system', 'touch_icon' , $touch_icon); - - if ($banner == "") { - Config::delete('system', 'banner'); - } else { - Config::set('system', 'banner', $banner); - } - - if (empty($additional_info)) { - Config::delete('config', 'info'); - } else { - Config::set('config', 'info', $additional_info); - } - Config::set('system', 'language', $language); - Config::set('system', 'theme', $theme); - Theme::install($theme); - - if ($theme_mobile == '---') { - Config::delete('system', 'mobile-theme'); - } else { - Config::set('system', 'mobile-theme', $theme_mobile); - } - if ($singleuser == '---') { - Config::delete('system', 'singleuser'); - } else { - Config::set('system', 'singleuser', $singleuser); - } - Config::set('system', 'maximagesize' , $maximagesize); - Config::set('system', 'max_image_length' , $maximagelength); - Config::set('system', 'jpeg_quality' , $jpegimagequality); - - Config::set('config', 'register_policy' , $register_policy); - Config::set('system', 'max_daily_registrations', $daily_registrations); - Config::set('system', 'account_abandon_days' , $abandon_days); - Config::set('config', 'register_text' , $register_text); - Config::set('system', 'allowed_sites' , $allowed_sites); - Config::set('system', 'allowed_email' , $allowed_email); - Config::set('system', 'forbidden_nicknames' , $forbidden_nicknames); - Config::set('system', 'no_oembed_rich_content' , $no_oembed_rich_content); - Config::set('system', 'allowed_oembed' , $allowed_oembed); - Config::set('system', 'block_public' , $block_public); - Config::set('system', 'publish_all' , $force_publish); - Config::set('system', 'newuser_private' , $newuser_private); - Config::set('system', 'enotify_no_content' , $enotify_no_content); - Config::set('system', 'disable_embedded' , $disable_embedded); - Config::set('system', 'allow_users_remote_self', $allow_users_remote_self); - Config::set('system', 'explicit_content' , $explicit_content); - Config::set('system', 'check_new_version_url' , $check_new_version_url); - - Config::set('system', 'block_extended_register', $no_multi_reg); - Config::set('system', 'no_openid' , $no_openid); - Config::set('system', 'no_regfullname' , $no_regfullname); - Config::set('system', 'community_page_style' , $community_page_style); - Config::set('system', 'max_author_posts_community_page', $max_author_posts_community_page); - Config::set('system', 'verifyssl' , $verifyssl); - Config::set('system', 'proxyuser' , $proxyuser); - Config::set('system', 'proxy' , $proxy); - Config::set('system', 'curl_timeout' , $timeout); - Config::set('system', 'dfrn_only' , $dfrn_only); - Config::set('system', 'ostatus_disabled' , $ostatus_disabled); - Config::set('system', 'ostatus_full_threads' , $ostatus_full_threads); - Config::set('system', 'diaspora_enabled' , $diaspora_enabled); - - Config::set('config', 'private_addons' , $private_addons); - - Config::set('system', 'force_ssl' , $force_ssl); - Config::set('system', 'hide_help' , $hide_help); - - Config::set('system', 'dbclean' , $dbclean); - Config::set('system', 'dbclean-expire-days' , $dbclean_expire_days); - Config::set('system', 'dbclean_expire_conversation', $dbclean_expire_conv); - - if ($dbclean_unclaimed == 0) { - $dbclean_unclaimed = $dbclean_expire_days; - } - - Config::set('system', 'dbclean-expire-unclaimed', $dbclean_unclaimed); - - if ($itemcache != '') { - $itemcache = BasePath::getRealPath($itemcache); - } - - Config::set('system', 'itemcache', $itemcache); - Config::set('system', 'itemcache_duration', $itemcache_duration); - Config::set('system', 'max_comments', $max_comments); - - if ($temppath != '') { - $temppath = BasePath::getRealPath($temppath); - } - - Config::set('system', 'temppath', $temppath); - - Config::set('system', 'proxy_disabled' , $proxy_disabled); - Config::set('system', 'only_tag_search' , $only_tag_search); - - Config::set('system', 'worker_queues' , $worker_queues); - Config::set('system', 'worker_dont_fork' , $worker_dont_fork); - Config::set('system', 'worker_fastlane' , $worker_fastlane); - Config::set('system', 'frontend_worker' , $worker_frontend); - - Config::set('system', 'relay_directly' , $relay_directly); - Config::set('system', 'relay_server' , $relay_server); - Config::set('system', 'relay_subscribe' , $relay_subscribe); - Config::set('system', 'relay_scope' , $relay_scope); - Config::set('system', 'relay_server_tags', $relay_server_tags); - Config::set('system', 'relay_user_tags' , $relay_user_tags); - - Config::set('system', 'rino_encrypt' , $rino); - - info(L10n::t('Site settings updated.') . EOL); - - $a->internalRedirect('admin/site' . $active_panel); - return; // NOTREACHED -} - -/** - * @brief Generate Admin Site subpage - * - * This function generates the main configuration page of the admin panel. - * - * @param App $a - * @return string - * @throws \Friendica\Network\HTTPException\InternalServerErrorException - */ -function admin_page_site(App $a) -{ - /* Installed langs */ - $lang_choices = L10n::getAvailableLanguages(); - - if (strlen(Config::get('system', 'directory_submit_url')) && - !strlen(Config::get('system', 'directory'))) { - Config::set('system', 'directory', dirname(Config::get('system', 'directory_submit_url'))); - Config::delete('system', 'directory_submit_url'); - } - - /* Installed themes */ - $theme_choices = []; - $theme_choices_mobile = []; - $theme_choices_mobile["---"] = L10n::t("No special theme for mobile devices"); - $files = glob('view/theme/*'); - if (is_array($files)) { - $allowed_theme_list = Config::get('system', 'allowed_themes'); - - foreach ($files as $file) { - if (intval(file_exists($file . '/unsupported'))) { - continue; - } - - $f = basename($file); - - // Only show allowed themes here - if (($allowed_theme_list != '') && !strstr($allowed_theme_list, $f)) { - continue; - } - - $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f); - - if (file_exists($file . '/mobile')) { - $theme_choices_mobile[$f] = $theme_name; - } else { - $theme_choices[$f] = $theme_name; - } - } - } - - /* Community page style */ - $community_page_style_choices = [ - CP_NO_INTERNAL_COMMUNITY => L10n::t("No community page for local users"), - CP_NO_COMMUNITY_PAGE => L10n::t("No community page"), - CP_USERS_ON_SERVER => L10n::t("Public postings from users of this site"), - CP_GLOBAL_COMMUNITY => L10n::t("Public postings from the federated network"), - CP_USERS_AND_GLOBAL => L10n::t("Public postings from local users and the federated network") - ]; - - $poco_discovery_choices = [ - PortableContact::DISABLED => L10n::t("Disabled"), - PortableContact::USERS => L10n::t("Users"), - PortableContact::USERS_GCONTACTS => L10n::t("Users, Global Contacts"), - PortableContact::USERS_GCONTACTS_FALLBACK => L10n::t("Users, Global Contacts/fallback"), - ]; - - $poco_discovery_since_choices = [ - "30" => L10n::t("One month"), - "91" => L10n::t("Three months"), - "182" => L10n::t("Half a year"), - "365" => L10n::t("One year"), - ]; - - /* get user names to make the install a personal install of X */ - $user_names = []; - $user_names['---'] = L10n::t('Multi user instance'); - $users = q("SELECT `username`, `nickname` FROM `user`"); - - foreach ($users as $user) { - $user_names[$user['nickname']] = $user['username']; - } - - /* Banner */ - $banner = Config::get('system', 'banner'); - - if ($banner == false) { - $banner = 'logoFriendica'; - } - - $additional_info = Config::get('config', 'info'); - - // Automatically create temporary paths - get_temppath(); - get_itemcachepath(); - - //echo "
"; var_dump($lang_choices); die("
"); - - /* Register policy */ - $register_choices = [ - Module\Register::CLOSED => L10n::t("Closed"), - Module\Register::APPROVE => L10n::t("Requires approval"), - Module\Register::OPEN => L10n::t("Open") - ]; - - $ssl_choices = [ - BaseURL::SSL_POLICY_NONE => L10n::t("No SSL policy, links will track page SSL state"), - BaseURL::SSL_POLICY_FULL => L10n::t("Force all links to use SSL"), - BaseURL::SSL_POLICY_SELFSIGN => L10n::t("Self-signed certificate, use SSL for local links only \x28discouraged\x29") - ]; - - $check_git_version_choices = [ - "none" => L10n::t("Don't check"), - "master" => L10n::t("check the stable version"), - "develop" => L10n::t("check the development version") - ]; - - $diaspora_able = ($a->getURLPath() == ""); - - $optimize_max_tablesize = Config::get('system', 'optimize_max_tablesize', -1); - - if ($optimize_max_tablesize <= 0) { - $optimize_max_tablesize = -1; - } - - /* storage backend */ - $storage_backends = StorageManager::listBackends(); - /** - * @var $storage_current_backend \Friendica\Model\Storage\IStorage - */ - $storage_current_backend = StorageManager::getBackend(); - - $storage_backends_choices = []; - - // show legacy option only if it is the current backend: - // once changed can't be selected anymore - if ($storage_current_backend == '') { - $storage_backends_choices[''] = L10n::t('Database (legacy)'); - }; - - foreach ($storage_backends as $name => $class) { - $storage_backends_choices[$class] = $name; - } - unset($storage_backends); - - // build storage config form, - $storage_form_prefix=preg_replace('|[^a-zA-Z0-9]|' ,'', $storage_current_backend); - - $storage_form = []; - if (!is_null($storage_current_backend) && $storage_current_backend != "") { - foreach ($storage_current_backend::getOptions() as $name => $info) { - $type = $info[0]; - $info[0] = $storage_form_prefix . '_' . $name; - $info['type'] = $type; - $info['field'] = 'field_' . $type . '.tpl'; - $storage_form[$name] = $info; - } - } - - - $t = Renderer::getMarkupTemplate('admin/site.tpl'); - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Site'), - '$submit' => L10n::t('Save Settings'), - '$republish' => L10n::t('Republish users to directory'), - '$registration' => L10n::t('Registration'), - '$upload' => L10n::t('File upload'), - '$corporate' => L10n::t('Policies'), - '$advanced' => L10n::t('Advanced'), - '$portable_contacts' => L10n::t('Auto Discovered Contact Directory'), - '$performance' => L10n::t('Performance'), - '$worker_title' => L10n::t('Worker'), - '$relay_title' => L10n::t('Message Relay'), - '$relocate' => L10n::t('Relocate Instance'), - '$relocate_warning' => L10n::t('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"), Config::get('config', 'sitename'), ''], - '$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.")], - '$additional_info' => ['additional_info', L10n::t('Additional Info'), $additional_info, L10n::t('For public servers: you can add additional information here that will be listed at %s/servers.', get_server())], - '$language' => ['language', L10n::t("System language"), Config::get('system', 'language'), "", $lang_choices], - '$theme' => ['theme', L10n::t("System theme"), Config::get('system', 'theme'), L10n::t("Default system theme - may be over-ridden by user profiles - change theme settings"), $theme_choices], - '$theme_mobile' => ['theme_mobile', L10n::t("Mobile system theme"), Config::get('system', 'mobile-theme', '---'), L10n::t("Theme for mobile devices"), $theme_choices_mobile], - '$ssl_policy' => ['ssl_policy', L10n::t("SSL link policy"), (string)intval(Config::get('system', 'ssl_policy')), L10n::t("Determines whether generated links should be forced to use SSL"), $ssl_choices], - '$force_ssl' => ['force_ssl', L10n::t("Force SSL"), Config::get('system', 'force_ssl'), L10n::t("Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.")], - '$hide_help' => ['hide_help', L10n::t("Hide help entry from navigation menu"), Config::get('system', 'hide_help'), L10n::t("Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.")], - '$singleuser' => ['singleuser', L10n::t("Single user instance"), Config::get('system', 'singleuser', '---'), L10n::t("Make this instance multi-user or single-user for the named user"), $user_names], - - '$storagebackend' => ['storagebackend', L10n::t("File storage backend"), $storage_current_backend, L10n::t('The backend used to store uploaded data. If you change the storage backend, you can manually move the existing files. If you do not do so, the files uploaded before the change will still be available at the old backend. Please see the settings documentation for more information about the choices and the moving procedure.'), $storage_backends_choices], - '$storageform' => $storage_form, - '$maximagesize' => ['maximagesize', L10n::t("Maximum image size"), Config::get('system', 'maximagesize'), L10n::t("Maximum size in bytes of uploaded images. Default is 0, which means no limits.")], - '$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"), 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"), 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")], - '$no_oembed_rich_content' => ['no_oembed_rich_content', L10n::t("No OEmbed rich content"), Config::get('system', 'no_oembed_rich_content'), L10n::t("Don't show the rich content \x28e.g. embedded PDF\x29, except from the domains listed below.")], - '$allowed_oembed' => ['allowed_oembed', L10n::t("Allowed OEmbed domains"), Config::get('system', 'allowed_oembed'), L10n::t("Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted.")], - '$block_public' => ['block_public', L10n::t("Block public"), Config::get('system', 'block_public'), L10n::t("Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.")], - '$force_publish' => ['publish_all', L10n::t("Force publish"), Config::get('system', 'publish_all'), L10n::t("Check to force all profiles on this site to be listed in the site directory.") . '' . L10n::t('Enabling this may violate privacy laws like the GDPR') . ''], - '$global_directory' => ['directory', L10n::t("Global directory URL"), Config::get('system', 'directory', 'https://dir.friendica.social'), L10n::t("URL to the global directory. If this is not set, the global directory is completely unavailable to the application.")], - '$newuser_private' => ['newuser_private', L10n::t("Private posts by default for new users"), Config::get('system', 'newuser_private'), L10n::t("Set default post permissions for all new members to the default privacy group rather than public.")], - '$enotify_no_content' => ['enotify_no_content', L10n::t("Don't include post content in email notifications"), Config::get('system', 'enotify_no_content'), L10n::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' => ['private_addons', L10n::t("Disallow public access to addons listed in the apps menu."), Config::get('config', 'private_addons'), L10n::t("Checking this box will restrict addons listed in the apps menu to members only.")], - '$disable_embedded' => ['disable_embedded', L10n::t("Don't embed private images in posts"), Config::get('system', 'disable_embedded'), L10n::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.")], - '$explicit_content' => ['explicit_content', L10n::t('Explicit Content'), Config::get('system', 'explicit_content', false), L10n::t('Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page.')], - '$allow_users_remote_self'=> ['allow_users_remote_self', L10n::t('Allow Users to set remote_self'), Config::get('system', 'allow_users_remote_self'), L10n::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' => ['no_multi_reg', L10n::t("Block multiple registrations"), Config::get('system', 'block_extended_register'), L10n::t("Disallow users to register additional accounts for use as pages.")], - '$no_openid' => ['no_openid', L10n::t("Disable OpenID"), Config::get('system', 'no_openid'), L10n::t("Disable OpenID support for registration and logins.")], - '$no_regfullname' => ['no_regfullname', L10n::t("No Fullname check"), Config::get('system', 'no_regfullname'), L10n::t("Allow users to register without a space between the first name and the last name in their full name.")], - '$community_page_style' => ['community_page_style', L10n::t("Community pages for visitors"), Config::get('system', 'community_page_style'), L10n::t("Which community pages should be available for visitors. Local users always see both pages."), $community_page_style_choices], - '$max_author_posts_community_page' => ['max_author_posts_community_page', L10n::t("Posts per user on community page"), Config::get('system', 'max_author_posts_community_page'), L10n::t("The maximum number of posts per user on the community page. \x28Not valid for 'Global Community'\x29")], - '$ostatus_disabled' => ['ostatus_disabled', L10n::t("Disable OStatus support"), Config::get('system', 'ostatus_disabled'), L10n::t("Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")], - '$ostatus_full_threads' => ['ostatus_full_threads', L10n::t("Only import OStatus/ActivityPub threads from our contacts"), Config::get('system', 'ostatus_full_threads'), L10n::t("Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system.")], - '$ostatus_not_able' => L10n::t("OStatus support can only be enabled if threading is enabled."), - '$diaspora_able' => $diaspora_able, - '$diaspora_not_able' => L10n::t("Diaspora support can't be enabled because Friendica was installed into a sub directory."), - '$diaspora_enabled' => ['diaspora_enabled', L10n::t("Enable Diaspora support"), Config::get('system', 'diaspora_enabled', $diaspora_able), L10n::t("Provide built-in Diaspora network compatibility.")], - '$dfrn_only' => ['dfrn_only', L10n::t('Only allow Friendica contacts'), Config::get('system', 'dfrn_only'), L10n::t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")], - '$verifyssl' => ['verifyssl', L10n::t("Verify SSL"), Config::get('system', 'verifyssl'), L10n::t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect \x28at all\x29 to self-signed SSL sites.")], - '$proxyuser' => ['proxyuser', L10n::t("Proxy user"), Config::get('system', 'proxyuser'), ""], - '$proxy' => ['proxy', L10n::t("Proxy URL"), Config::get('system', 'proxy'), ""], - '$timeout' => ['timeout', L10n::t("Network timeout"), Config::get('system', 'curl_timeout', 60), L10n::t("Value is in seconds. Set to 0 for unlimited \x28not recommended\x29.")], - '$maxloadavg' => ['maxloadavg', L10n::t("Maximum Load Average"), Config::get('system', 'maxloadavg', 20), L10n::t("Maximum system load before delivery and poll processes are deferred - default %d.", 20)], - '$maxloadavg_frontend' => ['maxloadavg_frontend', L10n::t("Maximum Load Average \x28Frontend\x29"), Config::get('system', 'maxloadavg_frontend', 50), L10n::t("Maximum system load before the frontend quits service - default 50.")], - '$min_memory' => ['min_memory', L10n::t("Minimal Memory"), Config::get('system', 'min_memory', 0), L10n::t("Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 \x28deactivated\x29.")], - '$optimize_max_tablesize' => ['optimize_max_tablesize', L10n::t("Maximum table size for optimization"), $optimize_max_tablesize, L10n::t("Maximum table size \x28in MB\x29 for the automatic optimization. Enter -1 to disable it.")], - '$optimize_fragmentation' => ['optimize_fragmentation', L10n::t("Minimum level of fragmentation"), Config::get('system', 'optimize_fragmentation', 30), L10n::t("Minimum fragmenation level to start the automatic optimization - default value is 30%.")], - - '$poco_completion' => ['poco_completion', L10n::t("Periodical check of global contacts"), Config::get('system', 'poco_completion'), L10n::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' => ['poco_requery_days', L10n::t("Days between requery"), Config::get('system', 'poco_requery_days'), L10n::t("Number of days after which a server is requeried for his contacts.")], - '$poco_discovery' => ['poco_discovery', L10n::t("Discover contacts from other servers"), (string)intval(Config::get('system', 'poco_discovery')), L10n::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 recommended setting is 'Users, Global Contacts'."), $poco_discovery_choices], - '$poco_discovery_since' => ['poco_discovery_since', L10n::t("Timeframe for fetching global contacts"), (string)intval(Config::get('system', 'poco_discovery_since')), L10n::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' => ['poco_local_search', L10n::t("Search the local directory"), Config::get('system', 'poco_local_search'), L10n::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' => ['nodeinfo', L10n::t("Publish server information"), Config::get('system', 'nodeinfo'), L10n::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 the-federation.info for details.")], - - '$check_new_version_url' => ['check_new_version_url', L10n::t("Check upstream version"), Config::get('system', 'check_new_version_url'), L10n::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' => ['suppress_tags', L10n::t("Suppress Tags"), Config::get('system', 'suppress_tags'), L10n::t("Suppress showing a list of hashtags at the end of the posting.")], - '$dbclean' => ['dbclean', L10n::t("Clean database"), Config::get('system', 'dbclean', false), L10n::t("Remove old remote items, orphaned database records and old content from some other helper tables.")], - '$dbclean_expire_days' => ['dbclean_expire_days', L10n::t("Lifespan of remote items"), Config::get('system', 'dbclean-expire-days', 0), L10n::t("When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items are always kept. 0 disables this behaviour.")], - '$dbclean_unclaimed' => ['dbclean_unclaimed', L10n::t("Lifespan of unclaimed items"), Config::get('system', 'dbclean-expire-unclaimed', 90), L10n::t("When the database cleanup is enabled, this defines the days after which unclaimed remote items (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general lifespan value of remote items if set to 0.")], - '$dbclean_expire_conv' => ['dbclean_expire_conv', L10n::t("Lifespan of raw conversation data"), Config::get('system', 'dbclean_expire_conversation', 90), L10n::t("The conversation data is used for ActivityPub and OStatus, as well as for debug purposes. It should be safe to remove it after 14 days, default is 90 days.")], - '$itemcache' => ['itemcache', L10n::t("Path to item cache"), Config::get('system', 'itemcache'), L10n::t("The item caches buffers generated bbcode and external images.")], - '$itemcache_duration' => ['itemcache_duration', L10n::t("Cache duration in seconds"), Config::get('system', 'itemcache_duration'), L10n::t("How long should the cache files be hold? Default value is 86400 seconds \x28One day\x29. To disable the item cache, set the value to -1.")], - '$max_comments' => ['max_comments', L10n::t("Maximum numbers of comments per post"), Config::get('system', 'max_comments'), L10n::t("How much comments should be shown for each post? Default value is 100.")], - '$temppath' => ['temppath', L10n::t("Temp path"), Config::get('system', 'temppath'), L10n::t("If you have a restricted system where the webserver can't access the system temp path, enter another path here.")], - '$proxy_disabled' => ['proxy_disabled', L10n::t("Disable picture proxy"), Config::get('system', 'proxy_disabled'), L10n::t("The picture proxy increases performance and privacy. It shouldn't be used on systems with very low bandwidth.")], - '$only_tag_search' => ['only_tag_search', L10n::t("Only search in tags"), Config::get('system', 'only_tag_search'), L10n::t("On large systems the text search can slow down the system extremely.")], - - '$relocate_url' => ['relocate_url', L10n::t("New base url"), System::baseUrl(), L10n::t("Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.")], - - '$rino' => ['rino', L10n::t("RINO Encryption"), intval(Config::get('system', 'rino_encrypt')), L10n::t("Encryption layer between nodes."), [0 => L10n::t("Disabled"), 1 => L10n::t("Enabled")]], - - '$worker_queues' => ['worker_queues', L10n::t("Maximum number of parallel workers"), Config::get('system', 'worker_queues'), L10n::t("On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.", 5, 20, 10)], - '$worker_dont_fork' => ['worker_dont_fork', L10n::t("Don't use 'proc_open' with the worker"), Config::get('system', 'worker_dont_fork'), L10n::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 worker calls in your crontab.")], - '$worker_fastlane' => ['worker_fastlane', L10n::t("Enable fastlane"), Config::get('system', 'worker_fastlane'), L10n::t("When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.")], - '$worker_frontend' => ['worker_frontend', L10n::t('Enable frontend worker'), Config::get('system', 'frontend_worker'), L10n::t("When enabled the Worker process is triggered when backend access is performed \x28e.g. messages being delivered\x29. 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())], - - '$relay_subscribe' => ['relay_subscribe', L10n::t("Subscribe to relay"), Config::get('system', 'relay_subscribe'), L10n::t("Enables the receiving of public posts from the relay. They will be included in the search, subscribed tags and on the global community page.")], - '$relay_server' => ['relay_server', L10n::t("Relay server"), Config::get('system', 'relay_server', 'https://relay.diasp.org'), L10n::t("Address of the relay server where public posts should be send to. For example https://relay.diasp.org")], - '$relay_directly' => ['relay_directly', L10n::t("Direct relay transfer"), Config::get('system', 'relay_directly'), L10n::t("Enables the direct transfer to other servers without using the relay servers")], - '$relay_scope' => ['relay_scope', L10n::t("Relay scope"), Config::get('system', 'relay_scope'), L10n::t("Can be 'all' or 'tags'. 'all' means that every public post should be received. 'tags' means that only posts with selected tags should be received."), ['' => L10n::t('Disabled'), 'all' => L10n::t('all'), 'tags' => L10n::t('tags')]], - '$relay_server_tags' => ['relay_server_tags', L10n::t("Server tags"), Config::get('system', 'relay_server_tags'), L10n::t("Comma separated list of tags for the 'tags' subscription.")], - '$relay_user_tags' => ['relay_user_tags', L10n::t("Allow user tags"), Config::get('system', 'relay_user_tags', true), L10n::t("If enabled, the tags from the saved searches will used for the 'tags' subscription in addition to the 'relay_server_tags'.")], - - '$form_security_token' => BaseModule::getFormSecurityToken("admin_site"), - '$relocate_button' => L10n::t('Start Relocation'), - ]); -} - /** * @brief Generates admin panel subpage for DB syncronization * diff --git a/src/App/Router.php b/src/App/Router.php index b78c58bc45..cd806e59e6 100644 --- a/src/App/Router.php +++ b/src/App/Router.php @@ -132,6 +132,8 @@ class Router $collector->addRoute(['GET'] , '/queue[/deferred]' , Module\Admin\Queue::class); + $collector->addRoute(['GET', 'POST'], '/site' , Module\Admin\Site::class); + $collector->addRoute(['GET', 'POST'], '/themes' , Module\Admin\Themes\Index::class); $collector->addRoute(['GET', 'POST'], '/themes/{theme}' , Module\Admin\Themes\Details::class); $collector->addRoute(['GET', 'POST'], '/themes/{theme}/embed' , Module\Admin\Themes\Embed::class); diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php new file mode 100644 index 0000000000..b6b6f51794 --- /dev/null +++ b/src/Module/Admin/Site.php @@ -0,0 +1,685 @@ +://")); + $a->internalRedirect('admin/site'); + } + + /* steps: + * replace all "baseurl" to "new_url" in config, profile, term, items and contacts + * send relocate for every local user + * */ + + $old_url = $a->getBaseURL(true); + + // Generate host names for relocation the addresses in the format user@address.tld + $new_host = str_replace("http://", "@", Strings::normaliseLink($new_url)); + $old_host = str_replace("http://", "@", Strings::normaliseLink($old_url)); + + function update_table(App $a, $table_name, $fields, $old_url, $new_url) + { + $dbold = DBA::escape($old_url); + $dbnew = DBA::escape($new_url); + + $upd = []; + foreach ($fields as $f) { + $upd[] = "`$f` = REPLACE(`$f`, '$dbold', '$dbnew')"; + } + + $upds = implode(", ", $upd); + + $r = DBA::e(sprintf("UPDATE %s SET %s;", $table_name, $upds)); + if (!DBA::isResult($r)) { + notice("Failed updating '$table_name': " . DBA::errorMessage()); + $a->internalRedirect('admin/site'); + } + } + + // update tables + // update profile links in the format "http://server.tld" + update_table($a, "profile", ['photo', 'thumb'], $old_url, $new_url); + update_table($a, "term", ['url'], $old_url, $new_url); + update_table($a, "contact", ['photo', 'thumb', 'micro', 'url', 'nurl', 'alias', 'request', 'notify', 'poll', 'confirm', 'poco', 'avatar'], $old_url, $new_url); + update_table($a, "gcontact", ['url', 'nurl', 'photo', 'server_url', 'notify', 'alias'], $old_url, $new_url); + update_table($a, "item", ['owner-link', 'author-link', 'body', 'plink', 'tag'], $old_url, $new_url); + + // update profile addresses in the format "user@server.tld" + update_table($a, "contact", ['addr'], $old_host, $new_host); + update_table($a, "gcontact", ['connect', 'addr'], $old_host, $new_host); + + // update config + Config::set('system', 'url', $new_url); + $a->setBaseURL($new_url); + + // send relocate + $usersStmt = DBA::select('user', ['uid'], ['account_removed' => false, 'account_expired' => false]); + while ($user = DBA::fetch($usersStmt)) { + Worker::add(PRIORITY_HIGH, 'Notifier', 'relocate', $user['uid']); + } + + info("Relocation started. Could take a while to complete."); + + $a->internalRedirect('admin/site'); + } + // end relocate + + $sitename = (!empty($_POST['sitename']) ? Strings::escapeTags(trim($_POST['sitename'])) : ''); + $sender_email = (!empty($_POST['sender_email']) ? Strings::escapeTags(trim($_POST['sender_email'])) : ''); + $banner = (!empty($_POST['banner']) ? trim($_POST['banner']) : false); + $shortcut_icon = (!empty($_POST['shortcut_icon']) ? Strings::escapeTags(trim($_POST['shortcut_icon'])) : ''); + $touch_icon = (!empty($_POST['touch_icon']) ? Strings::escapeTags(trim($_POST['touch_icon'])) : ''); + $additional_info = (!empty($_POST['additional_info']) ? trim($_POST['additional_info']) : ''); + $language = (!empty($_POST['language']) ? Strings::escapeTags(trim($_POST['language'])) : ''); + $theme = (!empty($_POST['theme']) ? Strings::escapeTags(trim($_POST['theme'])) : ''); + $theme_mobile = (!empty($_POST['theme_mobile']) ? Strings::escapeTags(trim($_POST['theme_mobile'])) : ''); + $maximagesize = (!empty($_POST['maximagesize']) ? intval(trim($_POST['maximagesize'])) : 0); + $maximagelength = (!empty($_POST['maximagelength']) ? intval(trim($_POST['maximagelength'])) : MAX_IMAGE_LENGTH); + $jpegimagequality = (!empty($_POST['jpegimagequality']) ? intval(trim($_POST['jpegimagequality'])) : JPEG_QUALITY); + + $register_policy = (!empty($_POST['register_policy']) ? intval(trim($_POST['register_policy'])) : 0); + $daily_registrations = (!empty($_POST['max_daily_registrations']) ? intval(trim($_POST['max_daily_registrations'])) : 0); + $abandon_days = (!empty($_POST['abandon_days']) ? intval(trim($_POST['abandon_days'])) : 0); + + $register_text = (!empty($_POST['register_text']) ? strip_tags(trim($_POST['register_text'])) : ''); + + $allowed_sites = (!empty($_POST['allowed_sites']) ? Strings::escapeTags(trim($_POST['allowed_sites'])) : ''); + $allowed_email = (!empty($_POST['allowed_email']) ? Strings::escapeTags(trim($_POST['allowed_email'])) : ''); + $forbidden_nicknames = (!empty($_POST['forbidden_nicknames']) ? strtolower(Strings::escapeTags(trim($_POST['forbidden_nicknames']))) : ''); + $no_oembed_rich_content = !empty($_POST['no_oembed_rich_content']); + $allowed_oembed = (!empty($_POST['allowed_oembed']) ? Strings::escapeTags(trim($_POST['allowed_oembed'])) : ''); + $block_public = !empty($_POST['block_public']); + $force_publish = !empty($_POST['publish_all']); + $global_directory = (!empty($_POST['directory']) ? Strings::escapeTags(trim($_POST['directory'])) : ''); + $newuser_private = !empty($_POST['newuser_private']); + $enotify_no_content = !empty($_POST['enotify_no_content']); + $private_addons = !empty($_POST['private_addons']); + $disable_embedded = !empty($_POST['disable_embedded']); + $allow_users_remote_self = !empty($_POST['allow_users_remote_self']); + $explicit_content = !empty($_POST['explicit_content']); + + $no_multi_reg = !empty($_POST['no_multi_reg']); + $no_openid = !empty($_POST['no_openid']); + $no_regfullname = !empty($_POST['no_regfullname']); + $community_page_style = (!empty($_POST['community_page_style']) ? intval(trim($_POST['community_page_style'])) : 0); + $max_author_posts_community_page = (!empty($_POST['max_author_posts_community_page']) ? intval(trim($_POST['max_author_posts_community_page'])) : 0); + + $verifyssl = !empty($_POST['verifyssl']); + $proxyuser = (!empty($_POST['proxyuser']) ? Strings::escapeTags(trim($_POST['proxyuser'])) : ''); + $proxy = (!empty($_POST['proxy']) ? Strings::escapeTags(trim($_POST['proxy'])) : ''); + $timeout = (!empty($_POST['timeout']) ? intval(trim($_POST['timeout'])) : 60); + $maxloadavg = (!empty($_POST['maxloadavg']) ? intval(trim($_POST['maxloadavg'])) : 20); + $maxloadavg_frontend = (!empty($_POST['maxloadavg_frontend']) ? intval(trim($_POST['maxloadavg_frontend'])) : 50); + $min_memory = (!empty($_POST['min_memory']) ? intval(trim($_POST['min_memory'])) : 0); + $optimize_max_tablesize = (!empty($_POST['optimize_max_tablesize']) ? intval(trim($_POST['optimize_max_tablesize'])) : 100); + $optimize_fragmentation = (!empty($_POST['optimize_fragmentation']) ? intval(trim($_POST['optimize_fragmentation'])) : 30); + $poco_completion = (!empty($_POST['poco_completion']) ? intval(trim($_POST['poco_completion'])) : false); + $poco_requery_days = (!empty($_POST['poco_requery_days']) ? intval(trim($_POST['poco_requery_days'])) : 7); + $poco_discovery = (!empty($_POST['poco_discovery']) ? intval(trim($_POST['poco_discovery'])) : PortableContact::DISABLED); + $poco_discovery_since = (!empty($_POST['poco_discovery_since']) ? intval(trim($_POST['poco_discovery_since'])) : 30); + $poco_local_search = !empty($_POST['poco_local_search']); + $nodeinfo = !empty($_POST['nodeinfo']); + $dfrn_only = !empty($_POST['dfrn_only']); + $ostatus_disabled = !empty($_POST['ostatus_disabled']); + $ostatus_full_threads = !empty($_POST['ostatus_full_threads']); + $diaspora_enabled = !empty($_POST['diaspora_enabled']); + $ssl_policy = (!empty($_POST['ssl_policy']) ? intval($_POST['ssl_policy']) : 0); + $force_ssl = !empty($_POST['force_ssl']); + $hide_help = !empty($_POST['hide_help']); + $dbclean = !empty($_POST['dbclean']); + $dbclean_expire_days = (!empty($_POST['dbclean_expire_days']) ? intval($_POST['dbclean_expire_days']) : 0); + $dbclean_unclaimed = (!empty($_POST['dbclean_unclaimed']) ? intval($_POST['dbclean_unclaimed']) : 0); + $dbclean_expire_conv = (!empty($_POST['dbclean_expire_conv']) ? intval($_POST['dbclean_expire_conv']) : 0); + $suppress_tags = !empty($_POST['suppress_tags']); + $itemcache = (!empty($_POST['itemcache']) ? Strings::escapeTags(trim($_POST['itemcache'])) : ''); + $itemcache_duration = (!empty($_POST['itemcache_duration']) ? intval($_POST['itemcache_duration']) : 0); + $max_comments = (!empty($_POST['max_comments']) ? intval($_POST['max_comments']) : 0); + $temppath = (!empty($_POST['temppath']) ? Strings::escapeTags(trim($_POST['temppath'])) : ''); + $singleuser = (!empty($_POST['singleuser']) ? Strings::escapeTags(trim($_POST['singleuser'])) : ''); + $proxy_disabled = !empty($_POST['proxy_disabled']); + $only_tag_search = !empty($_POST['only_tag_search']); + $rino = (!empty($_POST['rino']) ? intval($_POST['rino']) : 0); + $check_new_version_url = (!empty($_POST['check_new_version_url']) ? Strings::escapeTags(trim($_POST['check_new_version_url'])) : 'none'); + + $worker_queues = (!empty($_POST['worker_queues']) ? intval($_POST['worker_queues']) : 10); + $worker_dont_fork = !empty($_POST['worker_dont_fork']); + $worker_fastlane = !empty($_POST['worker_fastlane']); + $worker_frontend = !empty($_POST['worker_frontend']); + + $relay_directly = !empty($_POST['relay_directly']); + $relay_server = (!empty($_POST['relay_server']) ? Strings::escapeTags(trim($_POST['relay_server'])) : ''); + $relay_subscribe = !empty($_POST['relay_subscribe']); + $relay_scope = (!empty($_POST['relay_scope']) ? Strings::escapeTags(trim($_POST['relay_scope'])) : ''); + $relay_server_tags = (!empty($_POST['relay_server_tags']) ? Strings::escapeTags(trim($_POST['relay_server_tags'])) : ''); + $relay_user_tags = !empty($_POST['relay_user_tags']); + $active_panel = (!empty($_POST['active_panel']) ? "#" . Strings::escapeTags(trim($_POST['active_panel'])) : ''); + + /** + * @var $storagebackend \Friendica\Model\Storage\IStorage + */ + $storagebackend = Strings::escapeTags(trim(defaults($_POST, 'storagebackend', ''))); + + // save storage backend form + if (!is_null($storagebackend) && $storagebackend != "") { + if (StorageManager::setBackend($storagebackend)) { + $storage_opts = $storagebackend::getOptions(); + $storage_form_prefix = preg_replace('|[^a-zA-Z0-9]|', '', $storagebackend); + $storage_opts_data = []; + foreach ($storage_opts as $name => $info) { + $fieldname = $storage_form_prefix . '_' . $name; + switch ($info[0]) { // type + case 'checkbox': + case 'yesno': + $value = !empty($_POST[$fieldname]); + break; + default: + $value = defaults($_POST, $fieldname, ''); + } + $storage_opts_data[$name] = $value; + } + unset($name); + unset($info); + + $storage_form_errors = $storagebackend::saveOptions($storage_opts_data); + if (count($storage_form_errors)) { + foreach ($storage_form_errors as $name => $err) { + notice('Storage backend, ' . $storage_opts[$name][1] . ': ' . $err); + } + $a->internalRedirect('admin/site' . $active_panel); + } + } else { + info(L10n::t('Invalid storage backend setting value.')); + } + } + + // Has the directory url changed? If yes, then resubmit the existing profiles there + if ($global_directory != Config::get('system', 'directory') && ($global_directory != '')) { + Config::set('system', 'directory', $global_directory); + Worker::add(PRIORITY_LOW, 'Directory'); + } + + if ($a->getURLPath() != "") { + $diaspora_enabled = false; + } + if ($ssl_policy != intval(Config::get('system', 'ssl_policy'))) { + if ($ssl_policy == BaseURL::SSL_POLICY_FULL) { + DBA::e("UPDATE `contact` SET + `url` = REPLACE(`url` , 'http:' , 'https:'), + `photo` = REPLACE(`photo` , 'http:' , 'https:'), + `thumb` = REPLACE(`thumb` , 'http:' , 'https:'), + `micro` = REPLACE(`micro` , 'http:' , 'https:'), + `request` = REPLACE(`request`, 'http:' , 'https:'), + `notify` = REPLACE(`notify` , 'http:' , 'https:'), + `poll` = REPLACE(`poll` , 'http:' , 'https:'), + `confirm` = REPLACE(`confirm`, 'http:' , 'https:'), + `poco` = REPLACE(`poco` , 'http:' , 'https:') + WHERE `self` = 1" + ); + DBA::e("UPDATE `profile` SET + `photo` = REPLACE(`photo` , 'http:' , 'https:'), + `thumb` = REPLACE(`thumb` , 'http:' , 'https:') + WHERE 1 " + ); + } elseif ($ssl_policy == BaseURL::SSL_POLICY_SELFSIGN) { + DBA::e("UPDATE `contact` SET + `url` = REPLACE(`url` , 'https:' , 'http:'), + `photo` = REPLACE(`photo` , 'https:' , 'http:'), + `thumb` = REPLACE(`thumb` , 'https:' , 'http:'), + `micro` = REPLACE(`micro` , 'https:' , 'http:'), + `request` = REPLACE(`request`, 'https:' , 'http:'), + `notify` = REPLACE(`notify` , 'https:' , 'http:'), + `poll` = REPLACE(`poll` , 'https:' , 'http:'), + `confirm` = REPLACE(`confirm`, 'https:' , 'http:'), + `poco` = REPLACE(`poco` , 'https:' , 'http:') + WHERE `self` = 1" + ); + DBA::e("UPDATE `profile` SET + `photo` = REPLACE(`photo` , 'https:' , 'http:'), + `thumb` = REPLACE(`thumb` , 'https:' , 'http:') + WHERE 1 " + ); + } + } + Config::set('system', 'ssl_policy' , $ssl_policy); + Config::set('system', 'maxloadavg' , $maxloadavg); + Config::set('system', 'maxloadavg_frontend' , $maxloadavg_frontend); + Config::set('system', 'min_memory' , $min_memory); + Config::set('system', 'optimize_max_tablesize', $optimize_max_tablesize); + Config::set('system', 'optimize_fragmentation', $optimize_fragmentation); + Config::set('system', 'poco_completion' , $poco_completion); + Config::set('system', 'poco_requery_days' , $poco_requery_days); + Config::set('system', 'poco_discovery' , $poco_discovery); + Config::set('system', 'poco_discovery_since' , $poco_discovery_since); + Config::set('system', 'poco_local_search' , $poco_local_search); + Config::set('system', 'nodeinfo' , $nodeinfo); + Config::set('config', 'sitename' , $sitename); + Config::set('config', 'sender_email' , $sender_email); + Config::set('system', 'suppress_tags' , $suppress_tags); + Config::set('system', 'shortcut_icon' , $shortcut_icon); + Config::set('system', 'touch_icon' , $touch_icon); + + if ($banner == "") { + Config::delete('system', 'banner'); + } else { + Config::set('system', 'banner', $banner); + } + + if (empty($additional_info)) { + Config::delete('config', 'info'); + } else { + Config::set('config', 'info', $additional_info); + } + Config::set('system', 'language', $language); + Config::set('system', 'theme', $theme); + Theme::install($theme); + + if ($theme_mobile == '---') { + Config::delete('system', 'mobile-theme'); + } else { + Config::set('system', 'mobile-theme', $theme_mobile); + } + if ($singleuser == '---') { + Config::delete('system', 'singleuser'); + } else { + Config::set('system', 'singleuser', $singleuser); + } + Config::set('system', 'maximagesize' , $maximagesize); + Config::set('system', 'max_image_length' , $maximagelength); + Config::set('system', 'jpeg_quality' , $jpegimagequality); + + Config::set('config', 'register_policy' , $register_policy); + Config::set('system', 'max_daily_registrations', $daily_registrations); + Config::set('system', 'account_abandon_days' , $abandon_days); + Config::set('config', 'register_text' , $register_text); + Config::set('system', 'allowed_sites' , $allowed_sites); + Config::set('system', 'allowed_email' , $allowed_email); + Config::set('system', 'forbidden_nicknames' , $forbidden_nicknames); + Config::set('system', 'no_oembed_rich_content' , $no_oembed_rich_content); + Config::set('system', 'allowed_oembed' , $allowed_oembed); + Config::set('system', 'block_public' , $block_public); + Config::set('system', 'publish_all' , $force_publish); + Config::set('system', 'newuser_private' , $newuser_private); + Config::set('system', 'enotify_no_content' , $enotify_no_content); + Config::set('system', 'disable_embedded' , $disable_embedded); + Config::set('system', 'allow_users_remote_self', $allow_users_remote_self); + Config::set('system', 'explicit_content' , $explicit_content); + Config::set('system', 'check_new_version_url' , $check_new_version_url); + + Config::set('system', 'block_extended_register', $no_multi_reg); + Config::set('system', 'no_openid' , $no_openid); + Config::set('system', 'no_regfullname' , $no_regfullname); + Config::set('system', 'community_page_style' , $community_page_style); + Config::set('system', 'max_author_posts_community_page', $max_author_posts_community_page); + Config::set('system', 'verifyssl' , $verifyssl); + Config::set('system', 'proxyuser' , $proxyuser); + Config::set('system', 'proxy' , $proxy); + Config::set('system', 'curl_timeout' , $timeout); + Config::set('system', 'dfrn_only' , $dfrn_only); + Config::set('system', 'ostatus_disabled' , $ostatus_disabled); + Config::set('system', 'ostatus_full_threads' , $ostatus_full_threads); + Config::set('system', 'diaspora_enabled' , $diaspora_enabled); + + Config::set('config', 'private_addons' , $private_addons); + + Config::set('system', 'force_ssl' , $force_ssl); + Config::set('system', 'hide_help' , $hide_help); + + Config::set('system', 'dbclean' , $dbclean); + Config::set('system', 'dbclean-expire-days' , $dbclean_expire_days); + Config::set('system', 'dbclean_expire_conversation', $dbclean_expire_conv); + + if ($dbclean_unclaimed == 0) { + $dbclean_unclaimed = $dbclean_expire_days; + } + + Config::set('system', 'dbclean-expire-unclaimed', $dbclean_unclaimed); + + if ($itemcache != '') { + $itemcache = BasePath::getRealPath($itemcache); + } + + Config::set('system', 'itemcache', $itemcache); + Config::set('system', 'itemcache_duration', $itemcache_duration); + Config::set('system', 'max_comments', $max_comments); + + if ($temppath != '') { + $temppath = BasePath::getRealPath($temppath); + } + + Config::set('system', 'temppath', $temppath); + + Config::set('system', 'proxy_disabled' , $proxy_disabled); + Config::set('system', 'only_tag_search' , $only_tag_search); + + Config::set('system', 'worker_queues' , $worker_queues); + Config::set('system', 'worker_dont_fork' , $worker_dont_fork); + Config::set('system', 'worker_fastlane' , $worker_fastlane); + Config::set('system', 'frontend_worker' , $worker_frontend); + + Config::set('system', 'relay_directly' , $relay_directly); + Config::set('system', 'relay_server' , $relay_server); + Config::set('system', 'relay_subscribe' , $relay_subscribe); + Config::set('system', 'relay_scope' , $relay_scope); + Config::set('system', 'relay_server_tags', $relay_server_tags); + Config::set('system', 'relay_user_tags' , $relay_user_tags); + + Config::set('system', 'rino_encrypt' , $rino); + + info(L10n::t('Site settings updated.') . EOL); + + $a->internalRedirect('admin/site' . $active_panel); + } + + public static function content() + { + parent::content(); + + $a = self::getApp(); + + /* Installed langs */ + $lang_choices = L10n::getAvailableLanguages(); + + if (strlen(Config::get('system', 'directory_submit_url')) && + !strlen(Config::get('system', 'directory'))) { + Config::set('system', 'directory', dirname(Config::get('system', 'directory_submit_url'))); + Config::delete('system', 'directory_submit_url'); + } + + /* Installed themes */ + $theme_choices = []; + $theme_choices_mobile = []; + $theme_choices_mobile['---'] = L10n::t('No special theme for mobile devices'); + $files = glob('view/theme/*'); + if (is_array($files)) { + $allowed_theme_list = Config::get('system', 'allowed_themes'); + + foreach ($files as $file) { + if (intval(file_exists($file . '/unsupported'))) { + continue; + } + + $f = basename($file); + + // Only show allowed themes here + if (($allowed_theme_list != '') && !strstr($allowed_theme_list, $f)) { + continue; + } + + $theme_name = ((file_exists($file . '/experimental')) ? L10n::t('%s - (Experimental)', $f) : $f); + + if (file_exists($file . '/mobile')) { + $theme_choices_mobile[$f] = $theme_name; + } else { + $theme_choices[$f] = $theme_name; + } + } + } + + /* Community page style */ + $community_page_style_choices = [ + CP_NO_INTERNAL_COMMUNITY => L10n::t('No community page for local users'), + CP_NO_COMMUNITY_PAGE => L10n::t('No community page'), + CP_USERS_ON_SERVER => L10n::t('Public postings from users of this site'), + CP_GLOBAL_COMMUNITY => L10n::t('Public postings from the federated network'), + CP_USERS_AND_GLOBAL => L10n::t('Public postings from local users and the federated network') + ]; + + $poco_discovery_choices = [ + PortableContact::DISABLED => L10n::t('Disabled'), + PortableContact::USERS => L10n::t('Users'), + PortableContact::USERS_GCONTACTS => L10n::t('Users, Global Contacts'), + PortableContact::USERS_GCONTACTS_FALLBACK => L10n::t('Users, Global Contacts/fallback'), + ]; + + $poco_discovery_since_choices = [ + '30' => L10n::t('One month'), + '91' => L10n::t('Three months'), + '182' => L10n::t('Half a year'), + '365' => L10n::t('One year'), + ]; + + /* get user names to make the install a personal install of X */ + $user_names = []; + $user_names['---'] = L10n::t('Multi user instance'); + + $usersStmt = DBA::select('user', ['username', 'nickname'], ['account_removed' => 0, 'account_expired' => 0]); + foreach (DBA::toArray($usersStmt) as $user) { + $user_names[$user['nickname']] = $user['username']; + } + + /* Banner */ + $banner = Config::get('system', 'banner'); + + if ($banner == false) { + $banner = 'logoFriendica'; + } + + $additional_info = Config::get('config', 'info'); + + // Automatically create temporary paths + get_temppath(); + get_itemcachepath(); + + /* Register policy */ + $register_choices = [ + Register::CLOSED => L10n::t('Closed'), + Register::APPROVE => L10n::t('Requires approval'), + Register::OPEN => L10n::t('Open') + ]; + + $ssl_choices = [ + BaseURL::SSL_POLICY_NONE => L10n::t('No SSL policy, links will track page SSL state'), + BaseURL::SSL_POLICY_FULL => L10n::t('Force all links to use SSL'), + BaseURL::SSL_POLICY_SELFSIGN => L10n::t('Self-signed certificate, use SSL for local links only (discouraged)') + ]; + + $check_git_version_choices = [ + 'none' => L10n::t('Don\'t check'), + 'master' => L10n::t('check the stable version'), + 'develop' => L10n::t('check the development version') + ]; + + $diaspora_able = ($a->getURLPath() == ''); + + $optimize_max_tablesize = Config::get('system', 'optimize_max_tablesize', -1); + + if ($optimize_max_tablesize <= 0) { + $optimize_max_tablesize = -1; + } + + $storage_backends = StorageManager::listBackends(); + /** @var $current_storage_backend \Friendica\Model\Storage\IStorage */ + $current_storage_backend = StorageManager::getBackend(); + + $available_storage_backends = []; + + // show legacy option only if it is the current backend: + // once changed can't be selected anymore + if ($current_storage_backend == '') { + $available_storage_backends[''] = L10n::t('Database (legacy)'); + } + + foreach ($storage_backends as $name => $class) { + $available_storage_backends[$class] = $name; + } + unset($storage_backends); + + // build storage config form, + $storage_form_prefix = preg_replace('|[^a-zA-Z0-9]|' ,'', $current_storage_backend); + + $storage_form = []; + if (!is_null($current_storage_backend) && $current_storage_backend != '') { + foreach ($current_storage_backend::getOptions() as $name => $info) { + $type = $info[0]; + $info[0] = $storage_form_prefix . '_' . $name; + $info['type'] = $type; + $info['field'] = 'field_' . $type . '.tpl'; + $storage_form[$name] = $info; + } + } + + $t = Renderer::getMarkupTemplate('admin/site.tpl'); + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Site'), + '$submit' => L10n::t('Save Settings'), + '$republish' => L10n::t('Republish users to directory'), + '$registration' => L10n::t('Registration'), + '$upload' => L10n::t('File upload'), + '$corporate' => L10n::t('Policies'), + '$advanced' => L10n::t('Advanced'), + '$portable_contacts' => L10n::t('Auto Discovered Contact Directory'), + '$performance' => L10n::t('Performance'), + '$worker_title' => L10n::t('Worker'), + '$relay_title' => L10n::t('Message Relay'), + '$relocate' => L10n::t('Relocate Instance'), + '$relocate_warning' => L10n::t('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'), Config::get('config', 'sitename'), ''], + '$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.')], + '$additional_info' => ['additional_info', L10n::t('Additional Info'), $additional_info, L10n::t('For public servers: you can add additional information here that will be listed at %s/servers.', get_server())], + '$language' => ['language', L10n::t('System language'), Config::get('system', 'language'), '', $lang_choices], + '$theme' => ['theme', L10n::t('System theme'), Config::get('system', 'theme'), L10n::t('Default system theme - may be over-ridden by user profiles - Change default theme settings'), $theme_choices], + '$theme_mobile' => ['theme_mobile', L10n::t('Mobile system theme'), Config::get('system', 'mobile-theme', '---'), L10n::t('Theme for mobile devices'), $theme_choices_mobile], + '$ssl_policy' => ['ssl_policy', L10n::t('SSL link policy'), (string)intval(Config::get('system', 'ssl_policy')), L10n::t('Determines whether generated links should be forced to use SSL'), $ssl_choices], + '$force_ssl' => ['force_ssl', L10n::t('Force SSL'), Config::get('system', 'force_ssl'), L10n::t('Force all Non-SSL requests to SSL - Attention: on some systems it could lead to endless loops.')], + '$hide_help' => ['hide_help', L10n::t('Hide help entry from navigation menu'), Config::get('system', 'hide_help'), L10n::t('Hides the menu entry for the Help pages from the navigation menu. You can still access it calling /help directly.')], + '$singleuser' => ['singleuser', L10n::t('Single user instance'), Config::get('system', 'singleuser', '---'), L10n::t('Make this instance multi-user or single-user for the named user'), $user_names], + + '$storagebackend' => ['storagebackend', L10n::t('File storage backend'), $current_storage_backend, L10n::t('The backend used to store uploaded data. If you change the storage backend, you can manually move the existing files. If you do not do so, the files uploaded before the change will still be available at the old backend. Please see the settings documentation for more information about the choices and the moving procedure.'), $available_storage_backends], + '$storageform' => $storage_form, + '$maximagesize' => ['maximagesize', L10n::t('Maximum image size'), Config::get('system', 'maximagesize'), L10n::t('Maximum size in bytes of uploaded images. Default is 0, which means no limits.')], + '$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'), 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'), 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')], + '$no_oembed_rich_content' => ['no_oembed_rich_content', L10n::t('No OEmbed rich content'), Config::get('system', 'no_oembed_rich_content'), L10n::t('Don\'t show the rich content (e.g. embedded PDF), except from the domains listed below.')], + '$allowed_oembed' => ['allowed_oembed', L10n::t('Allowed OEmbed domains'), Config::get('system', 'allowed_oembed'), L10n::t('Comma separated list of domains which oembed content is allowed to be displayed. Wildcards are accepted.')], + '$block_public' => ['block_public', L10n::t('Block public'), Config::get('system', 'block_public'), L10n::t('Check to block public access to all otherwise public personal pages on this site unless you are currently logged in.')], + '$force_publish' => ['publish_all', L10n::t('Force publish'), Config::get('system', 'publish_all'), L10n::t('Check to force all profiles on this site to be listed in the site directory.') . '' . L10n::t('Enabling this may violate privacy laws like the GDPR') . ''], + '$global_directory' => ['directory', L10n::t('Global directory URL'), Config::get('system', 'directory', 'https://dir.friendica.social'), L10n::t('URL to the global directory. If this is not set, the global directory is completely unavailable to the application.')], + '$newuser_private' => ['newuser_private', L10n::t('Private posts by default for new users'), Config::get('system', 'newuser_private'), L10n::t('Set default post permissions for all new members to the default privacy group rather than public.')], + '$enotify_no_content' => ['enotify_no_content', L10n::t('Don\'t include post content in email notifications'), Config::get('system', 'enotify_no_content'), L10n::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' => ['private_addons', L10n::t('Disallow public access to addons listed in the apps menu.'), Config::get('config', 'private_addons'), L10n::t('Checking this box will restrict addons listed in the apps menu to members only.')], + '$disable_embedded' => ['disable_embedded', L10n::t('Don\'t embed private images in posts'), Config::get('system', 'disable_embedded'), L10n::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.')], + '$explicit_content' => ['explicit_content', L10n::t('Explicit Content'), Config::get('system', 'explicit_content', false), L10n::t('Set this to announce that your node is used mostly for explicit content that might not be suited for minors. This information will be published in the node information and might be used, e.g. by the global directory, to filter your node from listings of nodes to join. Additionally a note about this will be shown at the user registration page.')], + '$allow_users_remote_self'=> ['allow_users_remote_self', L10n::t('Allow Users to set remote_self'), Config::get('system', 'allow_users_remote_self'), L10n::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' => ['no_multi_reg', L10n::t('Block multiple registrations'), Config::get('system', 'block_extended_register'), L10n::t('Disallow users to register additional accounts for use as pages.')], + '$no_openid' => ['no_openid', L10n::t('Disable OpenID'), Config::get('system', 'no_openid'), L10n::t('Disable OpenID support for registration and logins.')], + '$no_regfullname' => ['no_regfullname', L10n::t('No Fullname check'), Config::get('system', 'no_regfullname'), L10n::t('Allow users to register without a space between the first name and the last name in their full name.')], + '$community_page_style' => ['community_page_style', L10n::t('Community pages for visitors'), Config::get('system', 'community_page_style'), L10n::t('Which community pages should be available for visitors. Local users always see both pages.'), $community_page_style_choices], + '$max_author_posts_community_page' => ['max_author_posts_community_page', L10n::t('Posts per user on community page'), Config::get('system', 'max_author_posts_community_page'), L10n::t('The maximum number of posts per user on the community page. (Not valid for "Global Community")')], + '$ostatus_disabled' => ['ostatus_disabled', L10n::t('Disable OStatus support'), Config::get('system', 'ostatus_disabled'), L10n::t('Disable built-in OStatus (StatusNet, GNU Social etc.) compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.')], + '$ostatus_full_threads' => ['ostatus_full_threads', L10n::t('Only import OStatus/ActivityPub threads from our contacts'), Config::get('system', 'ostatus_full_threads'), L10n::t('Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system.')], + '$ostatus_not_able' => L10n::t('OStatus support can only be enabled if threading is enabled.'), + '$diaspora_able' => $diaspora_able, + '$diaspora_not_able' => L10n::t('Diaspora support can\'t be enabled because Friendica was installed into a sub directory.'), + '$diaspora_enabled' => ['diaspora_enabled', L10n::t('Enable Diaspora support'), Config::get('system', 'diaspora_enabled', $diaspora_able), L10n::t('Provide built-in Diaspora network compatibility.')], + '$dfrn_only' => ['dfrn_only', L10n::t('Only allow Friendica contacts'), Config::get('system', 'dfrn_only'), L10n::t('All contacts must use Friendica protocols. All other built-in communication protocols disabled.')], + '$verifyssl' => ['verifyssl', L10n::t('Verify SSL'), Config::get('system', 'verifyssl'), L10n::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' => ['proxyuser', L10n::t('Proxy user'), Config::get('system', 'proxyuser'), ''], + '$proxy' => ['proxy', L10n::t('Proxy URL'), Config::get('system', 'proxy'), ''], + '$timeout' => ['timeout', L10n::t('Network timeout'), Config::get('system', 'curl_timeout', 60), L10n::t('Value is in seconds. Set to 0 for unlimited (not recommended).')], + '$maxloadavg' => ['maxloadavg', L10n::t('Maximum Load Average'), Config::get('system', 'maxloadavg', 20), L10n::t('Maximum system load before delivery and poll processes are deferred - default %d.', 20)], + '$maxloadavg_frontend' => ['maxloadavg_frontend', L10n::t('Maximum Load Average (Frontend)'), Config::get('system', 'maxloadavg_frontend', 50), L10n::t('Maximum system load before the frontend quits service - default 50.')], + '$min_memory' => ['min_memory', L10n::t('Minimal Memory'), Config::get('system', 'min_memory', 0), L10n::t('Minimal free memory in MB for the worker. Needs access to /proc/meminfo - default 0 (deactivated).')], + '$optimize_max_tablesize' => ['optimize_max_tablesize', L10n::t('Maximum table size for optimization'), $optimize_max_tablesize, L10n::t('Maximum table size (in MB) for the automatic optimization. Enter -1 to disable it.')], + '$optimize_fragmentation' => ['optimize_fragmentation', L10n::t('Minimum level of fragmentation'), Config::get('system', 'optimize_fragmentation', 30), L10n::t('Minimum fragmenation level to start the automatic optimization - default value is 30%.')], + + '$poco_completion' => ['poco_completion', L10n::t('Periodical check of global contacts'), Config::get('system', 'poco_completion'), L10n::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' => ['poco_requery_days', L10n::t('Days between requery'), Config::get('system', 'poco_requery_days'), L10n::t('Number of days after which a server is requeried for his contacts.')], + '$poco_discovery' => ['poco_discovery', L10n::t('Discover contacts from other servers'), (string)intval(Config::get('system', 'poco_discovery')), L10n::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 recommended setting is "Users, Global Contacts".'), $poco_discovery_choices], + '$poco_discovery_since' => ['poco_discovery_since', L10n::t('Timeframe for fetching global contacts'), (string)intval(Config::get('system', 'poco_discovery_since')), L10n::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' => ['poco_local_search', L10n::t('Search the local directory'), Config::get('system', 'poco_local_search'), L10n::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' => ['nodeinfo', L10n::t('Publish server information'), Config::get('system', 'nodeinfo'), L10n::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 the-federation.info for details.')], + + '$check_new_version_url' => ['check_new_version_url', L10n::t('Check upstream version'), Config::get('system', 'check_new_version_url'), L10n::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' => ['suppress_tags', L10n::t('Suppress Tags'), Config::get('system', 'suppress_tags'), L10n::t('Suppress showing a list of hashtags at the end of the posting.')], + '$dbclean' => ['dbclean', L10n::t('Clean database'), Config::get('system', 'dbclean', false), L10n::t('Remove old remote items, orphaned database records and old content from some other helper tables.')], + '$dbclean_expire_days' => ['dbclean_expire_days', L10n::t('Lifespan of remote items'), Config::get('system', 'dbclean-expire-days', 0), L10n::t('When the database cleanup is enabled, this defines the days after which remote items will be deleted. Own items, and marked or filed items are always kept. 0 disables this behaviour.')], + '$dbclean_unclaimed' => ['dbclean_unclaimed', L10n::t('Lifespan of unclaimed items'), Config::get('system', 'dbclean-expire-unclaimed', 90), L10n::t('When the database cleanup is enabled, this defines the days after which unclaimed remote items (mostly content from the relay) will be deleted. Default value is 90 days. Defaults to the general lifespan value of remote items if set to 0.')], + '$dbclean_expire_conv' => ['dbclean_expire_conv', L10n::t('Lifespan of raw conversation data'), Config::get('system', 'dbclean_expire_conversation', 90), L10n::t('The conversation data is used for ActivityPub and OStatus, as well as for debug purposes. It should be safe to remove it after 14 days, default is 90 days.')], + '$itemcache' => ['itemcache', L10n::t('Path to item cache'), Config::get('system', 'itemcache'), L10n::t('The item caches buffers generated bbcode and external images.')], + '$itemcache_duration' => ['itemcache_duration', L10n::t('Cache duration in seconds'), Config::get('system', 'itemcache_duration'), L10n::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' => ['max_comments', L10n::t('Maximum numbers of comments per post'), Config::get('system', 'max_comments'), L10n::t('How much comments should be shown for each post? Default value is 100.')], + '$temppath' => ['temppath', L10n::t('Temp path'), Config::get('system', 'temppath'), L10n::t('If you have a restricted system where the webserver can\'t access the system temp path, enter another path here.')], + '$proxy_disabled' => ['proxy_disabled', L10n::t('Disable picture proxy'), Config::get('system', 'proxy_disabled'), L10n::t('The picture proxy increases performance and privacy. It shouldn\'t be used on systems with very low bandwidth.')], + '$only_tag_search' => ['only_tag_search', L10n::t('Only search in tags'), Config::get('system', 'only_tag_search'), L10n::t('On large systems the text search can slow down the system extremely.')], + + '$relocate_url' => ['relocate_url', L10n::t('New base url'), System::baseUrl(), L10n::t('Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.')], + + '$rino' => ['rino', L10n::t('RINO Encryption'), intval(Config::get('system', 'rino_encrypt')), L10n::t('Encryption layer between nodes.'), [0 => L10n::t('Disabled'), 1 => L10n::t('Enabled')]], + + '$worker_queues' => ['worker_queues', L10n::t('Maximum number of parallel workers'), Config::get('system', 'worker_queues'), L10n::t('On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.', 5, 20, 10)], + '$worker_dont_fork' => ['worker_dont_fork', L10n::t('Don\'t use "proc_open" with the worker'), Config::get('system', 'worker_dont_fork'), L10n::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 worker calls in your crontab.')], + '$worker_fastlane' => ['worker_fastlane', L10n::t('Enable fastlane'), Config::get('system', 'worker_fastlane'), L10n::t('When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.')], + '$worker_frontend' => ['worker_frontend', L10n::t('Enable frontend worker'), Config::get('system', 'frontend_worker'), L10n::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())], + + '$relay_subscribe' => ['relay_subscribe', L10n::t('Subscribe to relay'), Config::get('system', 'relay_subscribe'), L10n::t('Enables the receiving of public posts from the relay. They will be included in the search, subscribed tags and on the global community page.')], + '$relay_server' => ['relay_server', L10n::t('Relay server'), Config::get('system', 'relay_server', 'https://relay.diasp.org'), L10n::t('Address of the relay server where public posts should be send to. For example https://relay.diasp.org')], + '$relay_directly' => ['relay_directly', L10n::t('Direct relay transfer'), Config::get('system', 'relay_directly'), L10n::t('Enables the direct transfer to other servers without using the relay servers')], + '$relay_scope' => ['relay_scope', L10n::t('Relay scope'), Config::get('system', 'relay_scope'), L10n::t('Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts with selected tags should be received.'), ['' => L10n::t('Disabled'), 'all' => L10n::t('all'), 'tags' => L10n::t('tags')]], + '$relay_server_tags' => ['relay_server_tags', L10n::t('Server tags'), Config::get('system', 'relay_server_tags'), L10n::t('Comma separated list of tags for the "tags" subscription.')], + '$relay_user_tags' => ['relay_user_tags', L10n::t('Allow user tags'), Config::get('system', 'relay_user_tags', true), L10n::t('If enabled, the tags from the saved searches will used for the "tags" subscription in addition to the "relay_server_tags".')], + + '$form_security_token' => parent::getFormSecurityToken('admin_site'), + '$relocate_button' => L10n::t('Start Relocation'), + ]); + } +} diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php index c31ce8ca06..13d1b1f19b 100644 --- a/src/Module/BaseAdminModule.php +++ b/src/Module/BaseAdminModule.php @@ -53,6 +53,7 @@ abstract class BaseAdminModule extends BaseModule 'federation' => ['admin/federation' , L10n::t('Federation Statistics') , 'federation'] ]], 'configuration' => [L10n::t('Configuration'), [ + 'site' => ['admin/site' , L10n::t('Site') , 'site'], 'users' => ['admin/users' , L10n::t('Users') , 'users'], 'addons' => ['admin/addons' , L10n::t('Addons') , 'addons'], 'themes' => ['admin/themes' , L10n::t('Themes') , 'themes'], diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl index 6da3e35f56..a4df56279d 100644 --- a/view/templates/admin/site.tpl +++ b/view/templates/admin/site.tpl @@ -1,44 +1,3 @@ -

{{$title}} - {{$page}}

diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl index 504d395e89..2cebb620bc 100644 --- a/view/theme/frio/templates/admin/site.tpl +++ b/view/theme/frio/templates/admin/site.tpl @@ -1,44 +1,5 @@ +

{{$title}} - {{$page}}

diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl index 2cebb620bc..4c0a6ce066 100644 --- a/view/theme/frio/templates/admin/site.tpl +++ b/view/theme/frio/templates/admin/site.tpl @@ -11,6 +11,11 @@ $(element).addClass('in'); window.scroll(0, $(element).offset().top - 120); } + + $("#cnftheme").click(function(){ + document.location.assign("{{$baseurl}}/admin/themes/" + $("#id_theme :selected").val()); + return false; + }); }); From 9774c95b807eeae0a9f70ce6c75f3f20a5147673 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 27 Apr 2019 22:18:30 -0400 Subject: [PATCH 30/37] Remove duplicate $baseurl template variable - Remove unused $overwriteURL parameter in Renderer::replaceMacros --- mod/cal.php | 2 -- mod/editpost.php | 3 --- mod/events.php | 2 -- mod/fbrowser.php | 2 -- mod/lostpass.php | 1 - mod/opensearch.php | 2 -- mod/photos.php | 1 - mod/poke.php | 4 ---- mod/toggle_mobile.php | 1 - mod/uexport.php | 1 - mod/videos.php | 4 +--- src/App.php | 4 ---- src/Content/Nav.php | 1 - src/Content/OEmbed.php | 1 - src/Core/Renderer.php | 16 +++++++--------- src/Model/Item.php | 4 +--- src/Model/Profile.php | 2 -- src/Module/Admin/Addons/Index.php | 5 ++--- src/Module/Admin/Blocklist/Contact.php | 5 ++--- src/Module/Admin/Blocklist/Server.php | 7 ++++--- src/Module/Admin/DBSync.php | 8 +++----- src/Module/Admin/Federation.php | 2 -- src/Module/Admin/Item/Delete.php | 2 -- src/Module/Admin/Logs/Settings.php | 5 +++-- src/Module/Admin/Site.php | 7 +++---- src/Module/Admin/Summary.php | 4 +--- src/Module/Admin/Themes/Details.php | 4 +--- src/Module/Admin/Themes/Embed.php | 2 -- src/Module/Admin/Themes/Index.php | 6 ++---- src/Module/Admin/Users.php | 3 +-- src/Module/Contact.php | 5 +---- src/Module/Install.php | 10 +++------- src/Module/Manifest.php | 1 - src/Module/Register.php | 1 - src/Module/Xrd.php | 1 - view/templates/admin/dbsync/failed_updates.tpl | 4 ++-- view/templates/admin/dbsync/structure_check.tpl | 2 +- view/theme/duepuntozero/config.php | 1 - view/theme/frio/config.php | 1 - view/theme/quattro/config.php | 1 - view/theme/vier/config.php | 1 - 41 files changed, 38 insertions(+), 101 deletions(-) diff --git a/mod/cal.php b/mod/cal.php index 5baffec8a8..cba484344b 100644 --- a/mod/cal.php +++ b/mod/cal.php @@ -90,7 +90,6 @@ function cal_content(App $a) $htpl = Renderer::getMarkupTemplate('event_head.tpl'); $a->page['htmlhead'] .= Renderer::replaceMacros($htpl, [ - '$baseurl' => System::baseUrl(), '$module_url' => '/cal/' . $a->data['user']['nickname'], '$modparams' => 2, '$i18n' => $i18n, @@ -268,7 +267,6 @@ function cal_content(App $a) } $o = Renderer::replaceMacros($tpl, [ - '$baseurl' => System::baseUrl(), '$tabs' => $tabs, '$title' => L10n::t('Events'), '$view' => L10n::t('View'), diff --git a/mod/editpost.php b/mod/editpost.php index c1c0d16d7f..e14baffa28 100644 --- a/mod/editpost.php +++ b/mod/editpost.php @@ -8,7 +8,6 @@ use Friendica\Content\Feature; use Friendica\Core\Hook; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Model\FileTag; use Friendica\Model\Item; use Friendica\Database\DBA; @@ -48,7 +47,6 @@ function editpost_content(App $a) $tpl = Renderer::getMarkupTemplate('jot-header.tpl'); $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [ - '$baseurl' => System::baseUrl(), '$ispublic' => ' ', // L10n::t('Visible to everybody'), '$geotag' => $geotag, '$nickname' => $a->user['nickname'] @@ -91,7 +89,6 @@ function editpost_content(App $a) '$posttype' => $item['post-type'], '$content' => undo_post_tagging($item['body']), '$post_id' => $post_id, - '$baseurl' => System::baseUrl(), '$defloc' => $a->user['default-location'], '$visitor' => 'none', '$pvisit' => 'none', diff --git a/mod/events.php b/mod/events.php index 008cf643ce..6569653a06 100644 --- a/mod/events.php +++ b/mod/events.php @@ -237,7 +237,6 @@ function events_content(App $a) $htpl = Renderer::getMarkupTemplate('event_head.tpl'); $a->page['htmlhead'] .= Renderer::replaceMacros($htpl, [ - '$baseurl' => System::baseUrl(), '$module_url' => '/events', '$modparams' => 1, '$i18n' => $i18n, @@ -379,7 +378,6 @@ function events_content(App $a) } $o = Renderer::replaceMacros($tpl, [ - '$baseurl' => System::baseUrl(), '$tabs' => $tabs, '$title' => L10n::t('Events'), '$view' => L10n::t('View'), diff --git a/mod/fbrowser.php b/mod/fbrowser.php index faff17381b..f2bccb085a 100644 --- a/mod/fbrowser.php +++ b/mod/fbrowser.php @@ -104,7 +104,6 @@ function fbrowser_content(App $a) $o = Renderer::replaceMacros($tpl, [ '$type' => 'image', - '$baseurl' => System::baseUrl(), '$path' => $path, '$folders' => $albums, '$files' => $files, @@ -134,7 +133,6 @@ function fbrowser_content(App $a) $tpl = Renderer::getMarkupTemplate($template_file); $o = Renderer::replaceMacros($tpl, [ '$type' => 'file', - '$baseurl' => System::baseUrl(), '$path' => [ [ "", L10n::t("Files")] ], '$folders' => false, '$files' => $files, diff --git a/mod/lostpass.php b/mod/lostpass.php index 548cea185c..01e84268b4 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -139,7 +139,6 @@ function lostpass_generate_password($user) '$lbl5' => '' . L10n::t('click here to login') . '.', '$lbl6' => L10n::t('Your password may be changed from the Settings page after successful login.'), '$newpass' => $new_password, - '$baseurl' => System::baseUrl() ]); info("Your password has been reset." . EOL); diff --git a/mod/opensearch.php b/mod/opensearch.php index 2057f0b5d6..0744157e53 100644 --- a/mod/opensearch.php +++ b/mod/opensearch.php @@ -2,7 +2,6 @@ use Friendica\App; use Friendica\Core\Renderer; -use Friendica\Core\System; function opensearch_content(App $a) { @@ -11,7 +10,6 @@ function opensearch_content(App $a) { header("Content-type: application/opensearchdescription+xml"); $o = Renderer::replaceMacros($tpl, [ - '$baseurl' => System::baseUrl(), '$nodename' => $a->getHostName(), ]); diff --git a/mod/photos.php b/mod/photos.php index 137e0adb56..a8160bd4c6 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -115,7 +115,6 @@ function photos_init(App $a) { '$title' => L10n::t('Photo Albums'), '$recent' => L10n::t('Recent Photos'), '$albums' => $ret['albums'], - '$baseurl' => System::baseUrl(), '$upload' => [L10n::t('Upload New Photos'), 'photos/' . $a->data['user']['nickname'] . '/upload'], '$can_post' => $can_post ]); diff --git a/mod/poke.php b/mod/poke.php index b8a1ba7bfd..e8ddf86cd3 100644 --- a/mod/poke.php +++ b/mod/poke.php @@ -154,15 +154,11 @@ function poke_content(App $a) $name = $contact['name']; $id = $contact['id']; - $base = System::baseUrl(); - $head_tpl = Renderer::getMarkupTemplate('poke_head.tpl'); $a->page['htmlhead'] .= Renderer::replaceMacros($head_tpl,[ '$baseurl' => System::baseUrl(true), - '$base' => $base ]); - $parent = (!empty($_GET['parent']) ? intval($_GET['parent']) : '0'); diff --git a/mod/toggle_mobile.php b/mod/toggle_mobile.php index 2821e0a646..d1a26b3ca2 100644 --- a/mod/toggle_mobile.php +++ b/mod/toggle_mobile.php @@ -1,7 +1,6 @@ System::baseUrl(), '$title' => L10n::t('Export personal data'), '$options' => $options ]); diff --git a/mod/videos.php b/mod/videos.php index 4120c136f1..f45817c4e9 100644 --- a/mod/videos.php +++ b/mod/videos.php @@ -67,9 +67,7 @@ function videos_init(App $a) $a->page['aside'] .= $vcard_widget; $tpl = Renderer::getMarkupTemplate("videos_head.tpl"); - $a->page['htmlhead'] .= Renderer::replaceMacros($tpl,[ - '$baseurl' => System::baseUrl(), - ]); + $a->page['htmlhead'] .= Renderer::replaceMacros($tpl); } return; diff --git a/src/App.php b/src/App.php index 9cde124998..70089a7678 100644 --- a/src/App.php +++ b/src/App.php @@ -406,8 +406,6 @@ class App * @param bool $ssl Whether to append http or https under BaseURL::SSL_POLICY_SELFSIGN * * @return string Friendica server base URL - * - * @deprecated 2019.06 - use BaseURL->get($ssl) instead */ public function getBaseURL($ssl = false) { @@ -509,7 +507,6 @@ class App * being first */ $this->page['htmlhead'] = Core\Renderer::replaceMacros($tpl, [ - '$baseurl' => $this->getBaseURL(), '$local_user' => local_user(), '$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION, '$delitem' => Core\L10n::t('Delete this item?'), @@ -562,7 +559,6 @@ class App $tpl = Core\Renderer::getMarkupTemplate('footer.tpl'); $this->page['footer'] = Core\Renderer::replaceMacros($tpl, [ - '$baseurl' => $this->getBaseURL(), '$footerScripts' => $this->footerScripts, ]) . $this->page['footer']; } diff --git a/src/Content/Nav.php b/src/Content/Nav.php index 1eae2a3e3b..a63244e856 100644 --- a/src/Content/Nav.php +++ b/src/Content/Nav.php @@ -67,7 +67,6 @@ class Nav $tpl = Renderer::getMarkupTemplate('nav.tpl'); $nav .= Renderer::replaceMacros($tpl, [ - '$baseurl' => System::baseUrl(), '$sitelocation' => $nav_info['sitelocation'], '$nav' => $nav_info['nav'], '$banner' => $nav_info['banner'], diff --git a/src/Content/OEmbed.php b/src/Content/OEmbed.php index 0093ba11af..7190f1ce0e 100644 --- a/src/Content/OEmbed.php +++ b/src/Content/OEmbed.php @@ -181,7 +181,6 @@ class OEmbed $tw = $th * $tr; $tpl = Renderer::getMarkupTemplate('oembed_video.tpl'); $ret .= Renderer::replaceMacros($tpl, [ - '$baseurl' => System::baseUrl(), '$embedurl' => $oembed->embed_url, '$escapedhtml' => base64_encode($oembed->html), '$tw' => $tw, diff --git a/src/Core/Renderer.php b/src/Core/Renderer.php index 72073086ab..fd5e733025 100644 --- a/src/Core/Renderer.php +++ b/src/Core/Renderer.php @@ -52,22 +52,20 @@ class Renderer extends BaseObject /** * @brief This is our template processor * - * @param string|FriendicaSmarty $s The string requiring macro substitution or an instance of FriendicaSmarty - * @param array $vars key value pairs (search => replace) - * @param bool $overwriteURL Overwrite the base url with the system wide set base url + * @param string|FriendicaSmarty $s The string requiring macro substitution or an instance of FriendicaSmarty + * @param array $vars Key value pairs (search => replace) * * @return string substituted string - * @throws \Friendica\Network\HTTPException\InternalServerErrorException + * @throws Exception */ - public static function replaceMacros($s, $vars, $overwriteURL = true) + public static function replaceMacros($s, array $vars = []) { $stamp1 = microtime(true); $a = self::getApp(); - // pass $baseurl to all templates - if ($overwriteURL) { - $vars['$baseurl'] = System::baseUrl(); - } + // pass $baseurl to all templates if it isn't set + $vars = array_merge(['$baseurl' => $a->getBaseURL()], $vars); + $t = self::getTemplateEngine(); try { diff --git a/src/Model/Item.php b/src/Model/Item.php index c309da24ef..d85ed414fb 100644 --- a/src/Model/Item.php +++ b/src/Model/Item.php @@ -3466,9 +3466,7 @@ class Item extends BaseObject if (strpos($mime, 'video') !== false) { if (!$vhead) { $vhead = true; - $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('videos_head.tpl'), [ - '$baseurl' => System::baseUrl(), - ]); + $a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('videos_head.tpl')); } $url_parts = explode('/', $the_url); diff --git a/src/Model/Profile.php b/src/Model/Profile.php index 79971cd999..fb87bc5215 100644 --- a/src/Model/Profile.php +++ b/src/Model/Profile.php @@ -641,7 +641,6 @@ class Profile } $tpl = Renderer::getMarkupTemplate('birthdays_reminder.tpl'); return Renderer::replaceMacros($tpl, [ - '$baseurl' => System::baseUrl(), '$classtoday' => $classtoday, '$count' => $total, '$event_reminders' => L10n::t('Birthday Reminders'), @@ -730,7 +729,6 @@ class Profile } $tpl = Renderer::getMarkupTemplate('events_reminder.tpl'); return Renderer::replaceMacros($tpl, [ - '$baseurl' => System::baseUrl(), '$classtoday' => $classtoday, '$count' => count($r), '$event_reminders' => L10n::t('Event Reminders'), diff --git a/src/Module/Admin/Addons/Index.php b/src/Module/Admin/Addons/Index.php index 20d8ff196e..6c8d48dc49 100644 --- a/src/Module/Admin/Addons/Index.php +++ b/src/Module/Admin/Addons/Index.php @@ -7,7 +7,6 @@ use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Module\BaseAdminModule; @@ -61,7 +60,7 @@ class Index extends BaseAdminModule '$page' => L10n::t('Addons'), '$submit' => L10n::t('Save Settings'), '$reload' => L10n::t('Reload active addons'), - '$baseurl' => System::baseUrl(true), + '$baseurl' => $a->getBaseURL(true), '$function' => 'addons', '$addons' => $addons, '$pcount' => count($addons), @@ -69,4 +68,4 @@ class Index extends BaseAdminModule '$form_security_token' => parent::getFormSecurityToken('admin_addons'), ]); } -} \ No newline at end of file +} diff --git a/src/Module/Admin/Blocklist/Contact.php b/src/Module/Admin/Blocklist/Contact.php index 69aa0a4738..bebcf444b4 100644 --- a/src/Module/Admin/Blocklist/Contact.php +++ b/src/Module/Admin/Blocklist/Contact.php @@ -5,7 +5,6 @@ namespace Friendica\Module\Admin\Blocklist; use Friendica\Content\Pager; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Module\BaseAdminModule; use Friendica\Model; @@ -77,7 +76,7 @@ class Contact extends BaseAdminModule '$form_security_token' => parent::getFormSecurityToken("admin_contactblock"), // values // - '$baseurl' => System::baseUrl(true), + '$baseurl' => $a->getBaseURL(true), '$contacts' => $contacts, '$total_contacts' => L10n::tt('%s total blocked contact', '%s total blocked contacts', $total), @@ -86,4 +85,4 @@ class Contact extends BaseAdminModule ]); return $o; } -} \ No newline at end of file +} diff --git a/src/Module/Admin/Blocklist/Server.php b/src/Module/Admin/Blocklist/Server.php index 1d0dc1fb86..2d5f978937 100644 --- a/src/Module/Admin/Blocklist/Server.php +++ b/src/Module/Admin/Blocklist/Server.php @@ -5,7 +5,6 @@ namespace Friendica\Module\Admin\Blocklist; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Module\BaseAdminModule; use Friendica\Util\Strings; @@ -55,6 +54,8 @@ class Server extends BaseAdminModule { parent::content(); + $a = self::getApp(); + $blocklist = Config::get('system', 'blocklist'); $blocklistform = []; if (is_array($blocklist)) { @@ -83,9 +84,9 @@ class Server extends BaseAdminModule '$threason' => L10n::t('Reason for the block'), '$delentry' => L10n::t('Delete entry from blocklist'), '$entries' => $blocklistform, - '$baseurl' => System::baseUrl(true), + '$baseurl' => $a->getBaseURL(true), '$confirm_delete' => L10n::t('Delete entry from blocklist?'), '$form_security_token' => parent::getFormSecurityToken("admin_blocklist") ]); } -} \ No newline at end of file +} diff --git a/src/Module/Admin/DBSync.php b/src/Module/Admin/DBSync.php index c62fefe4c1..a9c2cb6dbb 100644 --- a/src/Module/Admin/DBSync.php +++ b/src/Module/Admin/DBSync.php @@ -5,12 +5,10 @@ namespace Friendica\Module\Admin; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Update; use Friendica\Database\DBA; use Friendica\Database\DBStructure; use Friendica\Module\BaseAdminModule; -use Friendica\Util\Strings; class DBSync extends BaseAdminModule { @@ -88,13 +86,13 @@ class DBSync extends BaseAdminModule if (!count($failed)) { $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/dbsync/structure_check.tpl'), [ - '$base' => System::baseUrl(true), + '$base' => $a->getBaseURL(true), '$banner' => L10n::t('No failed updates.'), '$check' => L10n::t('Check database structure'), ]); } else { $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/dbsync/failed_updates.tpl'), [ - '$base' => System::baseUrl(true), + '$base' => $a->getBaseURL(true), '$banner' => L10n::t('Failed Updates'), '$desc' => L10n::t('This does not include updates prior to 1139, which did not return a status.'), '$mark' => L10n::t("Mark success \x28if update was manually applied\x29"), @@ -105,4 +103,4 @@ class DBSync extends BaseAdminModule return $o; } -} \ No newline at end of file +} diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php index 7a1c09db68..ae7445d9e5 100644 --- a/src/Module/Admin/Federation.php +++ b/src/Module/Admin/Federation.php @@ -5,7 +5,6 @@ namespace Friendica\Module\Admin; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Module\BaseAdminModule; @@ -194,7 +193,6 @@ class Federation extends BaseAdminModule '$counts' => $counts, '$version' => FRIENDICA_VERSION, '$legendtext' => L10n::t('Currently this node is aware of %d nodes with %d registered users from the following platforms:', $total, $users), - '$baseurl' => System::baseUrl(), ]); } } diff --git a/src/Module/Admin/Item/Delete.php b/src/Module/Admin/Item/Delete.php index 94bab4eb3c..9a9c9209b6 100644 --- a/src/Module/Admin/Item/Delete.php +++ b/src/Module/Admin/Item/Delete.php @@ -4,7 +4,6 @@ namespace Friendica\Module\Admin\Item; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Model\Item; use Friendica\Module\BaseAdminModule; use Friendica\Util\Strings; @@ -50,7 +49,6 @@ class Delete extends BaseAdminModule '$intro1' => L10n::t('On this page you can delete an item from your node. If the item is a top level posting, the entire thread will be deleted.'), '$intro2' => L10n::t('You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456.'), '$deleteitemguid' => ['deleteitemguid', L10n::t("GUID"), '', L10n::t("The GUID of the item you want to delete."), 'required', 'autofocus'], - '$baseurl' => System::baseUrl(), '$form_security_token' => parent::getFormSecurityToken("admin_deleteitem") ]); } diff --git a/src/Module/Admin/Logs/Settings.php b/src/Module/Admin/Logs/Settings.php index 7a04fcbef0..c42c5402ca 100644 --- a/src/Module/Admin/Logs/Settings.php +++ b/src/Module/Admin/Logs/Settings.php @@ -5,7 +5,6 @@ namespace Friendica\Module\Admin\Logs; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Module\BaseAdminModule; use Friendica\Util\Strings; use Psr\Log\LogLevel; @@ -36,6 +35,8 @@ class Settings extends BaseAdminModule { parent::content(); + $a = self::getApp(); + $log_choices = [ LogLevel::ERROR => 'Error', LogLevel::WARNING => 'Warning', @@ -57,7 +58,7 @@ class Settings extends BaseAdminModule '$page' => L10n::t('Logs'), '$submit' => L10n::t('Save Settings'), '$clear' => L10n::t('Clear'), - '$baseurl' => System::baseUrl(true), + '$baseurl' => $a->getBaseURL(true), '$logname' => Config::get('system', 'logfile'), // see /help/smarty3-templates#1_1 on any Friendica node '$debugging' => ['debugging', L10n::t("Enable Debugging"), Config::get('system', 'debugging'), ""], diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index 1bafa9ab39..05ca16a16f 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -7,7 +7,6 @@ use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; use Friendica\Core\StorageManager; -use Friendica\Core\System; use Friendica\Core\Theme; use Friendica\Core\Worker; use Friendica\Database\DBA; @@ -578,7 +577,7 @@ class Site extends BaseAdminModule '$relay_title' => L10n::t('Message Relay'), '$relocate' => L10n::t('Relocate Instance'), '$relocate_warning' => L10n::t('Warning! Advanced function. Could make this server unreachable.'), - '$baseurl' => System::baseUrl(true), + '$baseurl' => $a->getBaseURL(true), // name, label, value, help string, extra data... '$sitename' => ['sitename', L10n::t('Site name'), Config::get('config', 'sitename'), ''], @@ -662,14 +661,14 @@ class Site extends BaseAdminModule '$proxy_disabled' => ['proxy_disabled', L10n::t('Disable picture proxy'), Config::get('system', 'proxy_disabled'), L10n::t('The picture proxy increases performance and privacy. It shouldn\'t be used on systems with very low bandwidth.')], '$only_tag_search' => ['only_tag_search', L10n::t('Only search in tags'), Config::get('system', 'only_tag_search'), L10n::t('On large systems the text search can slow down the system extremely.')], - '$relocate_url' => ['relocate_url', L10n::t('New base url'), System::baseUrl(), L10n::t('Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.')], + '$relocate_url' => ['relocate_url', L10n::t('New base url'), $a->getBaseURL(), L10n::t('Change base url for this server. Sends relocate message to all Friendica and Diaspora* contacts of all users.')], '$rino' => ['rino', L10n::t('RINO Encryption'), intval(Config::get('system', 'rino_encrypt')), L10n::t('Encryption layer between nodes.'), [0 => L10n::t('Disabled'), 1 => L10n::t('Enabled')]], '$worker_queues' => ['worker_queues', L10n::t('Maximum number of parallel workers'), Config::get('system', 'worker_queues'), L10n::t('On shared hosters set this to %d. On larger systems, values of %d are great. Default value is %d.', 5, 20, 10)], '$worker_dont_fork' => ['worker_dont_fork', L10n::t('Don\'t use "proc_open" with the worker'), Config::get('system', 'worker_dont_fork'), L10n::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 worker calls in your crontab.')], '$worker_fastlane' => ['worker_fastlane', L10n::t('Enable fastlane'), Config::get('system', 'worker_fastlane'), L10n::t('When enabed, the fastlane mechanism starts an additional worker if processes with higher priority are blocked by processes of lower priority.')], - '$worker_frontend' => ['worker_frontend', L10n::t('Enable frontend worker'), Config::get('system', 'frontend_worker'), L10n::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' => ['worker_frontend', L10n::t('Enable frontend worker'), Config::get('system', 'frontend_worker'), L10n::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.', $a->getBaseURL())], '$relay_subscribe' => ['relay_subscribe', L10n::t('Subscribe to relay'), Config::get('system', 'relay_subscribe'), L10n::t('Enables the receiving of public posts from the relay. They will be included in the search, subscribed tags and on the global community page.')], '$relay_server' => ['relay_server', L10n::t('Relay server'), Config::get('system', 'relay_server', 'https://relay.diasp.org'), L10n::t('Address of the relay server where public posts should be send to. For example https://relay.diasp.org')], diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php index 49ad59cdf6..8529c7142c 100644 --- a/src/Module/Admin/Summary.php +++ b/src/Module/Admin/Summary.php @@ -7,7 +7,6 @@ use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Logger; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Update; use Friendica\Database\DBA; use Friendica\Database\DBStructure; @@ -130,7 +129,6 @@ class Summary extends BaseAdminModule '$accounts' => $accounts, '$pending' => [L10n::t('Pending registrations'), $pending], '$version' => [L10n::t('Version'), FRIENDICA_VERSION], - '$baseurl' => System::baseUrl(), '$platform' => FRIENDICA_PLATFORM, '$codename' => FRIENDICA_CODENAME, '$build' => Config::get('system', 'build'), @@ -143,7 +141,7 @@ class Summary extends BaseAdminModule private static function checkSelfHostMeta() { // Fetch the host-meta to check if this really is a vital server - return Network::curl(System::baseUrl() . '/.well-known/host-meta')->isSuccess(); + return Network::curl(self::getApp()->getBaseURL() . '/.well-known/host-meta')->isSuccess(); } } \ No newline at end of file diff --git a/src/Module/Admin/Themes/Details.php b/src/Module/Admin/Themes/Details.php index 540083bb2f..d8a2d2139d 100644 --- a/src/Module/Admin/Themes/Details.php +++ b/src/Module/Admin/Themes/Details.php @@ -3,10 +3,8 @@ namespace Friendica\Module\Admin\Themes; use Friendica\Content\Text\Markdown; -use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Theme; use Friendica\Module\BaseAdminModule; use Friendica\Util\Strings; @@ -107,7 +105,7 @@ class Details extends BaseAdminModule '$page' => L10n::t('Themes'), '$toggle' => L10n::t('Toggle'), '$settings' => L10n::t('Settings'), - '$baseurl' => System::baseUrl(true), + '$baseurl' => $a->getBaseURL(true), '$addon' => $theme, '$status' => $status, '$action' => $action, diff --git a/src/Module/Admin/Themes/Embed.php b/src/Module/Admin/Themes/Embed.php index 0a309e23ce..4ca2a4e7ad 100644 --- a/src/Module/Admin/Themes/Embed.php +++ b/src/Module/Admin/Themes/Embed.php @@ -4,8 +4,6 @@ namespace Friendica\Module\Admin\Themes; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; -use Friendica\Core\Theme; use Friendica\Module\BaseAdminModule; use Friendica\Util\Strings; diff --git a/src/Module/Admin/Themes/Index.php b/src/Module/Admin/Themes/Index.php index 2b89c4e200..62c775bf04 100644 --- a/src/Module/Admin/Themes/Index.php +++ b/src/Module/Admin/Themes/Index.php @@ -2,11 +2,9 @@ namespace Friendica\Module\Admin\Themes; -use Friendica\Content\Text\Markdown; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Core\Theme; use Friendica\Module\BaseAdminModule; use Friendica\Util\Strings; @@ -23,7 +21,7 @@ class Index extends BaseAdminModule // reload active themes if (!empty($_GET['action'])) { - parent::checkFormSecurityTokenRedirectOnError(System::baseUrl() . '/admin/themes', 'admin_themes', 't'); + parent::checkFormSecurityTokenRedirectOnError($a->getBaseURL() . '/admin/themes', 'admin_themes', 't'); switch ($_GET['action']) { case 'reload': @@ -96,7 +94,7 @@ class Index extends BaseAdminModule '$page' => L10n::t('Themes'), '$submit' => L10n::t('Save Settings'), '$reload' => L10n::t('Reload active themes'), - '$baseurl' => System::baseUrl(true), + '$baseurl' => $a->getBaseURL(true), '$function' => 'themes', '$addons' => $addons, '$pcount' => count($themes), diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php index 85567fd2ab..4d25f4f893 100644 --- a/src/Module/Admin/Users.php +++ b/src/Module/Admin/Users.php @@ -6,7 +6,6 @@ use Friendica\Content\Pager; use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Core\System; use Friendica\Database\DBA; use Friendica\Model\Register; use Friendica\Model\User; @@ -78,7 +77,7 @@ class Users extends BaseAdminModule Thank you and welcome to %4$s.')); $preamble = sprintf($preamble, $user['username'], Config::get('config', 'sitename')); - $body = sprintf($body, System::baseUrl(), $user['nickname'], $result['password'], Config::get('config', 'sitename')); + $body = sprintf($body, $a->getBaseURL(), $user['nickname'], $result['password'], Config::get('config', 'sitename')); notification([ 'type' => SYSTEM_EMAIL, diff --git a/src/Module/Contact.php b/src/Module/Contact.php index 3074bf7d6b..ea3eecd4a2 100644 --- a/src/Module/Contact.php +++ b/src/Module/Contact.php @@ -120,11 +120,9 @@ class Contact extends BaseModule '$networks_widget' => $networks_widget ]); - $base = $a->getBaseURL(); $tpl = Renderer::getMarkupTemplate('contacts-head.tpl'); $a->page['htmlhead'] .= Renderer::replaceMacros($tpl, [ - '$baseurl' => System::baseUrl(true), - '$base' => $base + '$baseurl' => $a->getBaseURL(true), ]); } @@ -809,7 +807,6 @@ class Contact extends BaseModule $tpl = Renderer::getMarkupTemplate('contacts-template.tpl'); $o .= Renderer::replaceMacros($tpl, [ - '$baseurl' => System::baseUrl(), '$header' => L10n::t('Contacts') . (($nets) ? ' - ' . ContactSelector::networkToName($nets) : ''), '$tabs' => $t, '$total' => $total, diff --git a/src/Module/Install.php b/src/Module/Install.php index 1cef8fbafa..b19e69a324 100644 --- a/src/Module/Install.php +++ b/src/Module/Install.php @@ -173,15 +173,14 @@ class Install extends BaseModule '$next' => L10n::t('Next'), '$reload' => L10n::t('Check again'), '$php_path' => $php_path, - '$baseurl' => $a->getBaseURL() ]); break; case self::BASE_CONFIG: $ssl_choices = [ - BaseUrl::SSL_POLICY_NONE => L10n::t("No SSL policy, links will track page SSL state"), - BaseUrl::SSL_POLICY_FULL => L10n::t("Force all links to use SSL"), - BaseUrl::SSL_POLICY_SELFSIGN => L10n::t("Self-signed certificate, use SSL for local links only \x28discouraged\x29") + BaseURL::SSL_POLICY_NONE => L10n::t("No SSL policy, links will track page SSL state"), + BaseURL::SSL_POLICY_FULL => L10n::t("Force all links to use SSL"), + BaseURL::SSL_POLICY_SELFSIGN => L10n::t("Self-signed certificate, use SSL for local links only \x28discouraged\x29") ]; $tpl = Renderer::getMarkupTemplate('install_base.tpl'); @@ -208,7 +207,6 @@ class Install extends BaseModule $configCache->get('system', 'urlpath'), L10n::t('Overwrite this field in case the sub path determination isn\'t right, otherwise leave it as is. Leaving this field blank means the installation is at the base URL without sub path.'), ''], - '$baseurl' => $a->getBaseURL(), '$php_path' => $configCache->get('config', 'php_path'), '$submit' => L10n::t('Submit'), ]); @@ -249,7 +247,6 @@ class Install extends BaseModule '', 'required'], '$lbl_10' => L10n::t('Please select a default timezone for your website'), - '$baseurl' => $a->getBaseURL(), '$php_path' => $configCache->get('config', 'php_path'), '$submit' => L10n::t('Submit') ]); @@ -286,7 +283,6 @@ class Install extends BaseModule $configCache->get('system', 'language'), L10n::t('Set the default language for your Friendica installation interface and to send emails.'), $lang_choices], - '$baseurl' => $a->getBaseURL(), '$php_path' => $configCache->get('config', 'php_path'), '$submit' => L10n::t('Submit') ]); diff --git a/src/Module/Manifest.php b/src/Module/Manifest.php index 40ae53891e..9dadcf0f76 100644 --- a/src/Module/Manifest.php +++ b/src/Module/Manifest.php @@ -22,7 +22,6 @@ class Manifest extends BaseModule } $output = Renderer::replaceMacros($tpl, [ - '$baseurl' => $app->getBaseURL(), '$touch_icon' => $touch_icon, '$title' => $config->get('config', 'sitename', 'Friendica'), ]); diff --git a/src/Module/Register.php b/src/Module/Register.php index 202cf948e0..06b62783f6 100644 --- a/src/Module/Register.php +++ b/src/Module/Register.php @@ -144,7 +144,6 @@ class Register extends BaseModule '$tostext' => L10n::t('Terms of Service'), '$showprivstatement' => Config::get('system', 'tosprivstatement'), '$privstatement'=> $tos->privacy_complete, - '$baseurl' => System::baseurl(), '$form_security_token' => BaseModule::getFormSecurityToken('register'), '$explicit_content' => Config::get('system', 'explicit_content', false), '$explicit_content_note' => L10n::t('Note: This node explicitly contains adult content') diff --git a/src/Module/Xrd.php b/src/Module/Xrd.php index 38ce151ff8..f7e20c9dbd 100644 --- a/src/Module/Xrd.php +++ b/src/Module/Xrd.php @@ -178,7 +178,6 @@ class Xrd extends BaseModule '$atom' => $baseURL . '/dfrn_poll/' . $user['nickname'], '$poco_url' => $baseURL . '/poco/' . $user['nickname'], '$photo' => $baseURL . '/photo/profile/' . $user['uid'] . '.jpg', - '$baseurl' => $baseURL, '$salmon' => $baseURL . '/salmon/' . $user['nickname'], '$salmen' => $baseURL . '/salmon/' . $user['nickname'] . '/mention', '$subscribe' => $baseURL . '/follow?url={uri}', diff --git a/view/templates/admin/dbsync/failed_updates.tpl b/view/templates/admin/dbsync/failed_updates.tpl index 8a5e0c2fa0..f75f266c7d 100644 --- a/view/templates/admin/dbsync/failed_updates.tpl +++ b/view/templates/admin/dbsync/failed_updates.tpl @@ -9,8 +9,8 @@

{{$f}}

diff --git a/view/templates/admin/dbsync/structure_check.tpl b/view/templates/admin/dbsync/structure_check.tpl index 7193d38ee1..06d61a080c 100644 --- a/view/templates/admin/dbsync/structure_check.tpl +++ b/view/templates/admin/dbsync/structure_check.tpl @@ -2,7 +2,7 @@

{{$banner}}

-

{{$check}}

+

{{$check}}

diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php index 430fa7f60c..cd04455512 100644 --- a/view/theme/duepuntozero/config.php +++ b/view/theme/duepuntozero/config.php @@ -70,7 +70,6 @@ function clean_form(App $a, &$colorset, $user) $t = Renderer::getMarkupTemplate("theme_settings.tpl"); $o = Renderer::replaceMacros($t, [ '$submit' => L10n::t('Submit'), - '$baseurl' => System::baseUrl(), '$title' => L10n::t("Theme settings"), '$colorset' => ['duepuntozero_colorset', L10n::t('Variations'), $color, '', $colorset], ]); diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php index cd4d7b8948..d1591273fb 100644 --- a/view/theme/frio/config.php +++ b/view/theme/frio/config.php @@ -119,7 +119,6 @@ function frio_form($arr) $t = Renderer::getMarkupTemplate('theme_settings.tpl'); $ctx = [ '$submit' => L10n::t('Submit'), - '$baseurl' => System::baseUrl(), '$title' => L10n::t('Theme settings'), '$scheme' => ['frio_scheme', L10n::t('Select color scheme'), $arr['scheme'], '', $scheme_choices], '$share_string' => ['frio_share_string', L10n::t('Copy or paste schemestring'), $arr['share_string'], L10n::t('You can copy this string to share your theme with others. Pasting here applies the schemestring'), false, false], diff --git a/view/theme/quattro/config.php b/view/theme/quattro/config.php index cdef0eeaac..bbe33a1e14 100644 --- a/view/theme/quattro/config.php +++ b/view/theme/quattro/config.php @@ -72,7 +72,6 @@ function quattro_form(App $a, $align, $color, $tfs, $pfs) { $t = Renderer::getMarkupTemplate("theme_settings.tpl" ); $o = Renderer::replaceMacros($t, [ '$submit' => L10n::t('Submit'), - '$baseurl' => System::baseUrl(), '$title' => L10n::t("Theme settings"), '$align' => ['quattro_align', L10n::t('Alignment'), $align, '', ['left' => L10n::t('Left'), 'center' => L10n::t('Center')]], '$color' => ['quattro_color', L10n::t('Color scheme'), $color, '', $colors], diff --git a/view/theme/vier/config.php b/view/theme/vier/config.php index f709356535..d34a447d5e 100644 --- a/view/theme/vier/config.php +++ b/view/theme/vier/config.php @@ -118,7 +118,6 @@ function vier_form(App $a, $style, $show_pages, $show_profiles, $show_helpers, $ $t = Renderer::getMarkupTemplate("theme_settings.tpl"); $o = Renderer::replaceMacros($t, [ '$submit' => L10n::t('Submit'), - '$baseurl' => System::baseUrl(), '$title' => L10n::t("Theme settings"), '$style' => ['vier_style', L10n::t('Set style'), $style, '', $styles], '$show_pages' => ['vier_show_pages', L10n::t('Community Pages'), $show_pages, '', $show_or_not], From 9f4fb4906af351f56e4527ad8ba457b479c33281 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 27 Apr 2019 22:19:54 -0400 Subject: [PATCH 31/37] Move addon admin list generation to Core\Addon --- src/Core/Addon.php | 32 +++++++++++++++++++++++ src/Module/Admin/Addons/Details.php | 13 +++------ src/Module/Admin/Addons/Index.php | 9 ------- src/Module/BaseAdminModule.php | 9 ++----- view/theme/frio/templates/admin/aside.tpl | 6 ++--- 5 files changed, 40 insertions(+), 29 deletions(-) diff --git a/src/Core/Addon.php b/src/Core/Addon.php index 4dd34eb16f..b6f64ad742 100644 --- a/src/Core/Addon.php +++ b/src/Core/Addon.php @@ -27,6 +27,14 @@ class Addon extends BaseObject */ private static $addons = []; + /** + * Returns the list of available addons with their current status and info. + * This list is made from scanning the addon/ folder. + * Unsupported addons are excluded unless they already are enabled or system.show_unsupported_addon is set. + * + * @return array + * @throws \Exception + */ public static function getAvailableList() { $addons = []; @@ -50,6 +58,30 @@ class Addon extends BaseObject return $addons; } + /** + * Returns a list of addons that can be configured at the node level. + * The list is formatted for display in the admin panel aside. + * + * @return array + * @throws \Exception + */ + public static function getAdminList() + { + $addons_admin = []; + $addonsAdminStmt = DBA::select('addon', ['name'], ['plugin_admin' => 1], ['order' => ['name']]); + while ($addon = DBA::fetch($addonsAdminStmt)) { + $addons_admin[$addon['name']] = [ + 'url' => 'admin/addons/' . $addon['name'], + 'name' => $addon['name'], + 'class' => 'addon' + ]; + } + DBA::close($addonsAdminStmt); + + return $addons_admin; + } + + /** * @brief Synchronize addons: * diff --git a/src/Module/Admin/Addons/Details.php b/src/Module/Admin/Addons/Details.php index 9ef2035dec..25e538122c 100644 --- a/src/Module/Admin/Addons/Details.php +++ b/src/Module/Admin/Addons/Details.php @@ -6,7 +6,6 @@ use Friendica\Content\Text\Markdown; use Friendica\Core\Addon; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Database\DBA; use Friendica\Module\BaseAdminModule; use Friendica\Util\Strings; @@ -42,13 +41,7 @@ class Details extends BaseAdminModule $a = self::getApp(); - $addons_admin = []; - $addonsAdminStmt = DBA::select('addon', ['name'], ['plugin_admin' => 1], ['order' => ['name']]); - foreach (DBA::toArray($addonsAdminStmt) as $addon) { - $addonName = $addon['name']; - // temp addons with admin - $addons_admin[] = $addonName; - } + $addons_admin = Addon::getAdminList(); if ($a->argc > 2) { // @TODO: Replace with parameter from router @@ -93,7 +86,7 @@ class Details extends BaseAdminModule } $admin_form = ''; - if (in_array($addon, $addons_admin)) { + if (array_key_exists($addon, $addons_admin)) { require_once "addon/$addon/$addon.php"; $func = $addon . '_addon_admin'; $func($a, $admin_form); @@ -126,4 +119,4 @@ class Details extends BaseAdminModule $a->internalRedirect('admin/addons'); } -} \ No newline at end of file +} diff --git a/src/Module/Admin/Addons/Index.php b/src/Module/Admin/Addons/Index.php index 6c8d48dc49..9df486c10e 100644 --- a/src/Module/Admin/Addons/Index.php +++ b/src/Module/Admin/Addons/Index.php @@ -2,12 +2,9 @@ namespace Friendica\Module\Admin\Addons; -use Friendica\Content\Text\Markdown; use Friendica\Core\Addon; -use Friendica\Core\Config; use Friendica\Core\L10n; use Friendica\Core\Renderer; -use Friendica\Database\DBA; use Friendica\Module\BaseAdminModule; class Index extends BaseAdminModule @@ -46,12 +43,6 @@ class Index extends BaseAdminModule $a->internalRedirect('admin/addons'); } - $addons_admin = []; - $addonsAdminStmt = DBA::select('addon', ['name'], ['plugin_admin' => 1], ['order' => ['name']]); - foreach (DBA::toArray($addonsAdminStmt) as $addon) { - $addons_admin[] = $addon['name']; - } - $addons = Addon::getAvailableList(); $t = Renderer::getMarkupTemplate('admin/addons/index.tpl'); diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php index 140f1223ee..5e56bd8d71 100644 --- a/src/Module/BaseAdminModule.php +++ b/src/Module/BaseAdminModule.php @@ -3,6 +3,7 @@ namespace Friendica\Module; use Friendica\BaseModule; +use Friendica\Core\Addon; use Friendica\Core\L10n; use Friendica\Core\Renderer; use Friendica\Core\System; @@ -97,15 +98,9 @@ abstract class BaseAdminModule extends BaseModule ]], ]; - $addons_admin = []; - $addonsAdminStmt = DBA::select('addon', ['name'], ['plugin_admin' => 1], ['order' => ['name']]); - foreach (DBA::toArray($addonsAdminStmt) as $addon) { - $addons_admin[] = ['admin/addons/' . $addon['name'], $addon['name'], 'addon']; - } - $t = Renderer::getMarkupTemplate('admin/aside.tpl'); $a->page['aside'] .= Renderer::replaceMacros($t, [ - '$admin' => ['addons_admin' => $addons_admin], + '$admin' => ['addons_admin' => Addon::getAdminList()], '$subpages' => $aside_sub, '$admtxt' => L10n::t('Admin'), '$plugadmtxt' => L10n::t('Addon Features'), diff --git a/view/theme/frio/templates/admin/aside.tpl b/view/theme/frio/templates/admin/aside.tpl index 5da73e135d..0ba58e5aec 100644 --- a/view/theme/frio/templates/admin/aside.tpl +++ b/view/theme/frio/templates/admin/aside.tpl @@ -43,9 +43,9 @@

{{$plugadmtxt}}

    {{foreach $admin.addons_admin as $name => $item}} - {{/foreach}} From 71546705f8a0e301711da8f2730d833bd67404ed Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 27 Apr 2019 22:21:02 -0400 Subject: [PATCH 32/37] Add Model\Contact::select method --- src/Model/Contact.php | 14 ++++++++++++++ src/Module/Admin/Blocklist/Contact.php | 4 +--- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 85d1bfe9ad..beb91d11a0 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -110,6 +110,20 @@ class Contact extends BaseObject * @} */ + /** + * @param array $fields Array of selected fields, empty for all + * @param array $condition Array of fields for condition + * @param array $params Array of several parameters + * @return array + * @throws \Exception + */ + public static function select(array $fields = [], array $condition = [], array $params = []) + { + $statement = DBA::select('contact', $fields, $condition, $params); + + return DBA::toArray($statement); + } + /** * @param integer $id * @return array|boolean Contact record if it exists, false otherwise diff --git a/src/Module/Admin/Blocklist/Contact.php b/src/Module/Admin/Blocklist/Contact.php index bebcf444b4..214a30cff7 100644 --- a/src/Module/Admin/Blocklist/Contact.php +++ b/src/Module/Admin/Blocklist/Contact.php @@ -52,9 +52,7 @@ class Contact extends BaseAdminModule $pager = new Pager($a->query_string, 30); - $statement = DBA::select('contact', [], $condition, ['limit' => [$pager->getStart(), $pager->getItemsPerPage()]]); - - $contacts = DBA::toArray($statement); + $contacts = Model\Contact::select([], $condition, ['limit' => [$pager->getStart(), $pager->getItemsPerPage()]]); $t = Renderer::getMarkupTemplate('admin/blocklist/contact.tpl'); $o = Renderer::replaceMacros($t, [ From 6df37afb828f4deb5397d512d801427f24a068c9 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 27 Apr 2019 22:22:21 -0400 Subject: [PATCH 33/37] Various feedback items - Add logger call on theme install failure - Add todo in Module\Admin\DBSync --- src/Core/Theme.php | 1 + src/Module/Admin/DBSync.php | 1 + 2 files changed, 2 insertions(+) diff --git a/src/Core/Theme.php b/src/Core/Theme.php index 37e673e404..61798a3969 100644 --- a/src/Core/Theme.php +++ b/src/Core/Theme.php @@ -177,6 +177,7 @@ class Theme return true; } catch (\Exception $e) { + Logger::error('Theme installation failed', ['theme' => $theme, 'error' => $e->getMessage()]); return false; } } diff --git a/src/Module/Admin/DBSync.php b/src/Module/Admin/DBSync.php index a9c2cb6dbb..69001b9ce4 100644 --- a/src/Module/Admin/DBSync.php +++ b/src/Module/Admin/DBSync.php @@ -36,6 +36,7 @@ class DBSync extends BaseAdminModule if ($a->argc > 2) { if ($a->argv[2] === 'check') { + // @TODO Seems like a similar logic like Update::check() $retval = DBStructure::update($a->getBasePath(), false, true); if ($retval === '') { $o .= L10n::t("Database structure update %s was successfully applied.", DB_UPDATE_VERSION) . "
    "; From 451a06a597fcb1c62bfb2dd61353df15234a8d6b Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sat, 27 Apr 2019 22:23:29 -0400 Subject: [PATCH 34/37] Various code inspection items - Fix class extension in Module\Admin\Item\Source - Remove useless condition in Module\Admin\Features --- src/Module/Admin/Features.php | 47 ++++++++++++++------------------ src/Module/Admin/Item/Source.php | 9 +++--- 2 files changed, 26 insertions(+), 30 deletions(-) diff --git a/src/Module/Admin/Features.php b/src/Module/Admin/Features.php index e127b8c19f..cb9acf4eb1 100644 --- a/src/Module/Admin/Features.php +++ b/src/Module/Admin/Features.php @@ -5,7 +5,6 @@ namespace Friendica\Module\Admin; use Friendica\Content\Feature; use Friendica\Core\Config; use Friendica\Core\L10n; -use Friendica\Core\Logger; use Friendica\Core\Renderer; use Friendica\Module\BaseAdminModule; @@ -47,33 +46,29 @@ class Features extends BaseAdminModule { parent::content(); - $a = self::getApp(); + $arr = []; + $features = Feature::get(false); - if (($a->argc > 1) && ($a->getArgumentValue(1) === 'features')) { - $arr = []; - $features = Feature::get(false); - - foreach ($features as $fname => $fdata) { - $arr[$fname] = []; - $arr[$fname][0] = $fdata[0]; - foreach (array_slice($fdata, 1) as $f) { - $set = Config::get('feature', $f[0], $f[3]); - $arr[$fname][1][] = [ - ['feature_' . $f[0], $f[1], $set, $f[2], [L10n::t('Off'), L10n::t('On')]], - ['featurelock_' . $f[0], L10n::t('Lock feature %s', $f[1]), (($f[4] !== false) ? "1" : ''), '', [L10n::t('Off'), L10n::t('On')]] - ]; - } + foreach ($features as $fname => $fdata) { + $arr[$fname] = []; + $arr[$fname][0] = $fdata[0]; + foreach (array_slice($fdata, 1) as $f) { + $set = Config::get('feature', $f[0], $f[3]); + $arr[$fname][1][] = [ + ['feature_' . $f[0], $f[1], $set, $f[2], [L10n::t('Off'), L10n::t('On')]], + ['featurelock_' . $f[0], L10n::t('Lock feature %s', $f[1]), (($f[4] !== false) ? "1" : ''), '', [L10n::t('Off'), L10n::t('On')]] + ]; } - - $tpl = Renderer::getMarkupTemplate('admin/features.tpl'); - $o = Renderer::replaceMacros($tpl, [ - '$form_security_token' => parent::getFormSecurityToken("admin_manage_features"), - '$title' => L10n::t('Manage Additional Features'), - '$features' => $arr, - '$submit' => L10n::t('Save Settings'), - ]); - - return $o; } + + $tpl = Renderer::getMarkupTemplate('admin/features.tpl'); + $o = Renderer::replaceMacros($tpl, [ + '$form_security_token' => parent::getFormSecurityToken("admin_manage_features"), + '$title' => L10n::t('Manage Additional Features'), + '$features' => $arr, + '$submit' => L10n::t('Save Settings'), + ]); + + return $o; } } \ No newline at end of file diff --git a/src/Module/Admin/Item/Source.php b/src/Module/Admin/Item/Source.php index f5eb5afb68..1e85b7dc70 100644 --- a/src/Module/Admin/Item/Source.php +++ b/src/Module/Admin/Item/Source.php @@ -5,20 +5,21 @@ namespace Friendica\Module\Admin\Item; use Friendica\Core\L10n; use Friendica\Core\Renderer; use Friendica\Model; +use Friendica\Module\BaseAdminModule; /** * @author Hypolite Petovan */ -class Source extends \Friendica\BaseModule +class Source extends BaseAdminModule + { public static function content() { - if (!is_site_admin()) { - return; - } + parent::content(); $a = self::getApp(); + $guid = null; if (!empty($a->argv[1])) { $guid = $a->argv[1]; } From 2a035b9b2fe65bad28c7da831c708e1a20b44415 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 28 Apr 2019 09:48:26 -0400 Subject: [PATCH 35/37] Use DBA::fetchFirst instead of DBA::p for aggregate query in Module\Admin\Federation --- src/Module/Admin/Federation.php | 393 ++++++++++++++++---------------- 1 file changed, 195 insertions(+), 198 deletions(-) diff --git a/src/Module/Admin/Federation.php b/src/Module/Admin/Federation.php index ae7445d9e5..f32f0e2ccd 100644 --- a/src/Module/Admin/Federation.php +++ b/src/Module/Admin/Federation.php @@ -1,198 +1,195 @@ - '#ffc018', // orange from the logo - 'Diaspora' => '#a1a1a1', // logo is black and white, makes a gray - '%%red%%' => '#c50001', // fire red from the logo - 'Hubzilla' => '#43488a', // blue from the logo - 'BlaBlaNet' => '#3B5998', // blue from the navbar at blablanet-dot-com - 'GNU Social' => '#a22430', // dark red from the logo - 'StatusNet' => '#789240', // the green from the logo (red and blue have already others - 'Mastodon' => '#1a9df9', // blue from the Mastodon logo - 'Pleroma' => '#E46F0F', // Orange from the text that is used on Pleroma instances - 'socialhome' => '#52056b', // lilac from the Django Image used at the Socialhome homepage - 'ganggo' => '#69d7e2', // from the favicon - ]; - $counts = []; - $total = 0; - $users = 0; - - foreach ($platforms as $platform) { - // get a total count for the platform, the name and version of the - // highest version and the protocol tpe - $platformCountStmt = DBA::p('SELECT - COUNT(*) AS `total`, - SUM(`registered-users`) AS `users`, - ANY_VALUE(`platform`) AS `platform`, - ANY_VALUE(`network`) AS `network`, - MAX(`version`) AS `version` FROM `gserver` - WHERE `platform` LIKE ? - AND `last_contact` >= `last_failure` - ORDER BY `version` ASC', $platform); - $platformCount = DBA::fetch($platformCountStmt); - $total += $platformCount['total']; - $users += $platformCount['users']; - - DBA::close($platformCountStmt); - - // what versions for that platform do we know at all? - // again only the active nodes - $versionCountsStmt = DBA::p('SELECT - COUNT(*) AS `total`, - `version` FROM `gserver` - WHERE `last_contact` >= `last_failure` - AND `platform` LIKE ? - GROUP BY `version` - ORDER BY `version`;', $platform); - $versionCounts = DBA::toArray($versionCountsStmt); - - // - // clean up version numbers - // - // some platforms do not provide version information, add a unkown there - // to the version string for the displayed list. - foreach ($versionCounts as $key => $value) { - if ($versionCounts[$key]['version'] == '') { - $versionCounts[$key] = ['total' => $versionCounts[$key]['total'], 'version' => L10n::t('unknown')]; - } - } - - // Reformat and compact version numbers - if ($platform == 'Pleroma') { - $compacted = []; - foreach ($versionCounts as $key => $value) { - $version = $versionCounts[$key]['version']; - $parts = explode(' ', trim($version)); - do { - $part = array_pop($parts); - } while (!empty($parts) && ((strlen($part) >= 40) || (strlen($part) <= 3))); - // only take the x.x.x part of the version, not the "release" after the dash - $part = array_shift(explode('-', $part)); - if (!empty($part)) { - if (empty($compacted[$part])) { - $compacted[$part] = $versionCounts[$key]['total']; - } else { - $compacted[$part] += $versionCounts[$key]['total']; - } - } - } - - $versionCounts = []; - foreach ($compacted as $version => $pl_total) { - $versionCounts[] = ['version' => $version, 'total' => $pl_total]; - } - } - - // in the DB the Diaspora versions have the format x.x.x.x-xx the last - // part (-xx) should be removed to clean up the versions from the "head - // commit" information and combined into a single entry for x.x.x.x - if ($platform == 'Diaspora') { - $newV = []; - $newVv = []; - foreach ($versionCounts as $vv) { - $newVC = $vv['total']; - $newVV = $vv['version']; - $posDash = strpos($newVV, '-'); - if ($posDash) { - $newVV = substr($newVV, 0, $posDash); - } - if (isset($newV[$newVV])) { - $newV[$newVV] += $newVC; - } else { - $newV[$newVV] = $newVC; - } - } - foreach ($newV as $key => $value) { - array_push($newVv, ['total' => $value, 'version' => $key]); - } - $versionCounts = $newVv; - } - - // early friendica versions have the format x.x.xxxx where xxxx is the - // DB version stamp; those should be operated out and versions be - // conbined - if ($platform == 'Friendi%%a') { - $newV = []; - $newVv = []; - foreach ($versionCounts as $vv) { - $newVC = $vv['total']; - $newVV = $vv['version']; - $lastDot = strrpos($newVV, '.'); - $len = strlen($newVV) - 1; - if (($lastDot == $len - 4) && (!strrpos($newVV, '-rc') == $len - 3)) { - $newVV = substr($newVV, 0, $lastDot); - } - if (isset($newV[$newVV])) { - $newV[$newVV] += $newVC; - } else { - $newV[$newVV] = $newVC; - } - } - foreach ($newV as $key => $value) { - array_push($newVv, ['total' => $value, 'version' => $key]); - } - $versionCounts = $newVv; - } - - // Assure that the versions are sorted correctly - $v2 = []; - $versions = []; - foreach ($versionCounts as $vv) { - $version = trim(strip_tags($vv["version"])); - $v2[$version] = $vv; - $versions[] = $version; - } - - usort($versions, 'version_compare'); - - $versionCounts = []; - foreach ($versions as $version) { - $versionCounts[] = $v2[$version]; - } - - // the 3rd array item is needed for the JavaScript graphs as JS does - // not like some characters in the names of variables... - $counts[$platform] = [$platformCount, $versionCounts, str_replace([' ', '%'], '', $platform), $colors[$platform]]; - } - - // some helpful text - $intro = L10n::t('This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of.'); - $hint = L10n::t('The Auto Discovered Contact Directory feature is not enabled, it will improve the data displayed here.'); - - // load the template, replace the macros and return the page content - $t = Renderer::getMarkupTemplate('admin/federation.tpl'); - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Federation Statistics'), - '$intro' => $intro, - '$hint' => $hint, - '$autoactive' => Config::get('system', 'poco_completion'), - '$counts' => $counts, - '$version' => FRIENDICA_VERSION, - '$legendtext' => L10n::t('Currently this node is aware of %d nodes with %d registered users from the following platforms:', $total, $users), - ]); - } -} + '#ffc018', // orange from the logo + 'Diaspora' => '#a1a1a1', // logo is black and white, makes a gray + '%%red%%' => '#c50001', // fire red from the logo + 'Hubzilla' => '#43488a', // blue from the logo + 'BlaBlaNet' => '#3B5998', // blue from the navbar at blablanet-dot-com + 'GNU Social' => '#a22430', // dark red from the logo + 'StatusNet' => '#789240', // the green from the logo (red and blue have already others + 'Mastodon' => '#1a9df9', // blue from the Mastodon logo + 'Pleroma' => '#E46F0F', // Orange from the text that is used on Pleroma instances + 'socialhome' => '#52056b', // lilac from the Django Image used at the Socialhome homepage + 'ganggo' => '#69d7e2', // from the favicon + ]; + $counts = []; + $total = 0; + $users = 0; + + foreach ($platforms as $platform) { + // get a total count for the platform, the name and version of the + // highest version and the protocol tpe + $platformCount = DBA::fetchFirst('SELECT + COUNT(*) AS `total`, + SUM(`registered-users`) AS `users`, + ANY_VALUE(`platform`) AS `platform`, + ANY_VALUE(`network`) AS `network`, + MAX(`version`) AS `version` FROM `gserver` + WHERE `platform` LIKE ? + AND `last_contact` >= `last_failure` + ORDER BY `version` ASC', $platform); + $total += $platformCount['total']; + $users += $platformCount['users']; + + // what versions for that platform do we know at all? + // again only the active nodes + $versionCountsStmt = DBA::p('SELECT + COUNT(*) AS `total`, + `version` FROM `gserver` + WHERE `last_contact` >= `last_failure` + AND `platform` LIKE ? + GROUP BY `version` + ORDER BY `version`;', $platform); + $versionCounts = DBA::toArray($versionCountsStmt); + + // + // clean up version numbers + // + // some platforms do not provide version information, add a unkown there + // to the version string for the displayed list. + foreach ($versionCounts as $key => $value) { + if ($versionCounts[$key]['version'] == '') { + $versionCounts[$key] = ['total' => $versionCounts[$key]['total'], 'version' => L10n::t('unknown')]; + } + } + + // Reformat and compact version numbers + if ($platform == 'Pleroma') { + $compacted = []; + foreach ($versionCounts as $key => $value) { + $version = $versionCounts[$key]['version']; + $parts = explode(' ', trim($version)); + do { + $part = array_pop($parts); + } while (!empty($parts) && ((strlen($part) >= 40) || (strlen($part) <= 3))); + // only take the x.x.x part of the version, not the "release" after the dash + $part = array_shift(explode('-', $part)); + if (!empty($part)) { + if (empty($compacted[$part])) { + $compacted[$part] = $versionCounts[$key]['total']; + } else { + $compacted[$part] += $versionCounts[$key]['total']; + } + } + } + + $versionCounts = []; + foreach ($compacted as $version => $pl_total) { + $versionCounts[] = ['version' => $version, 'total' => $pl_total]; + } + } + + // in the DB the Diaspora versions have the format x.x.x.x-xx the last + // part (-xx) should be removed to clean up the versions from the "head + // commit" information and combined into a single entry for x.x.x.x + if ($platform == 'Diaspora') { + $newV = []; + $newVv = []; + foreach ($versionCounts as $vv) { + $newVC = $vv['total']; + $newVV = $vv['version']; + $posDash = strpos($newVV, '-'); + if ($posDash) { + $newVV = substr($newVV, 0, $posDash); + } + if (isset($newV[$newVV])) { + $newV[$newVV] += $newVC; + } else { + $newV[$newVV] = $newVC; + } + } + foreach ($newV as $key => $value) { + array_push($newVv, ['total' => $value, 'version' => $key]); + } + $versionCounts = $newVv; + } + + // early friendica versions have the format x.x.xxxx where xxxx is the + // DB version stamp; those should be operated out and versions be + // conbined + if ($platform == 'Friendi%%a') { + $newV = []; + $newVv = []; + foreach ($versionCounts as $vv) { + $newVC = $vv['total']; + $newVV = $vv['version']; + $lastDot = strrpos($newVV, '.'); + $len = strlen($newVV) - 1; + if (($lastDot == $len - 4) && (!strrpos($newVV, '-rc') == $len - 3)) { + $newVV = substr($newVV, 0, $lastDot); + } + if (isset($newV[$newVV])) { + $newV[$newVV] += $newVC; + } else { + $newV[$newVV] = $newVC; + } + } + foreach ($newV as $key => $value) { + array_push($newVv, ['total' => $value, 'version' => $key]); + } + $versionCounts = $newVv; + } + + // Assure that the versions are sorted correctly + $v2 = []; + $versions = []; + foreach ($versionCounts as $vv) { + $version = trim(strip_tags($vv["version"])); + $v2[$version] = $vv; + $versions[] = $version; + } + + usort($versions, 'version_compare'); + + $versionCounts = []; + foreach ($versions as $version) { + $versionCounts[] = $v2[$version]; + } + + // the 3rd array item is needed for the JavaScript graphs as JS does + // not like some characters in the names of variables... + $counts[$platform] = [$platformCount, $versionCounts, str_replace([' ', '%'], '', $platform), $colors[$platform]]; + } + + // some helpful text + $intro = L10n::t('This page offers you some numbers to the known part of the federated social network your Friendica node is part of. These numbers are not complete but only reflect the part of the network your node is aware of.'); + $hint = L10n::t('The Auto Discovered Contact Directory feature is not enabled, it will improve the data displayed here.'); + + // load the template, replace the macros and return the page content + $t = Renderer::getMarkupTemplate('admin/federation.tpl'); + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Federation Statistics'), + '$intro' => $intro, + '$hint' => $hint, + '$autoactive' => Config::get('system', 'poco_completion'), + '$counts' => $counts, + '$version' => FRIENDICA_VERSION, + '$legendtext' => L10n::t('Currently this node is aware of %d nodes with %d registered users from the following platforms:', $total, $users), + ]); + } +} From 92b415bc3619e4572e798fc1e0f91a945b2f6f78 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 2 May 2019 00:01:43 -0400 Subject: [PATCH 36/37] Fix EOL and EOF in Admin modules --- src/Module/Admin/Addons/Details.php | 244 +++++----- src/Module/Admin/Addons/Index.php | 124 ++--- src/Module/Admin/Blocklist/Contact.php | 172 +++---- src/Module/Admin/Blocklist/Server.php | 184 +++---- src/Module/Admin/DBSync.php | 214 ++++----- src/Module/Admin/Features.php | 148 +++--- src/Module/Admin/Item/Delete.php | 110 ++--- src/Module/Admin/Logs/Settings.php | 148 +++--- src/Module/Admin/Logs/View.php | 104 ++-- src/Module/Admin/PhpInfo.php | 32 +- src/Module/Admin/Queue.php | 132 ++--- src/Module/Admin/Site.php | 1 + src/Module/Admin/Summary.php | 294 ++++++------ src/Module/Admin/Themes/Details.php | 252 +++++----- src/Module/Admin/Themes/Embed.php | 180 +++---- src/Module/Admin/Themes/Index.php | 214 ++++----- src/Module/Admin/Tos.php | 106 ++--- src/Module/Admin/Users.php | 636 ++++++++++++------------- src/Module/BaseAdminModule.php | 235 ++++----- 19 files changed, 1770 insertions(+), 1760 deletions(-) diff --git a/src/Module/Admin/Addons/Details.php b/src/Module/Admin/Addons/Details.php index 25e538122c..33e7c7a00c 100644 --- a/src/Module/Admin/Addons/Details.php +++ b/src/Module/Admin/Addons/Details.php @@ -1,122 +1,122 @@ -argc > 2) { - // @TODO: Replace with parameter from router - $addon = $a->argv[2]; - $addon = Strings::sanitizeFilePathItem($addon); - if (is_file('addon/' . $addon . '/' . $addon . '.php')) { - include_once 'addon/' . $addon . '/' . $addon . '.php'; - if (function_exists($addon . '_addon_admin_post')) { - $func = $addon . '_addon_admin_post'; - $func($a); - } - - $a->internalRedirect('admin/addons/' . $addon); - } - } - - $a->internalRedirect('admin/addons'); - } - - public static function content() - { - parent::content(); - - $a = self::getApp(); - - $addons_admin = Addon::getAdminList(); - - if ($a->argc > 2) { - // @TODO: Replace with parameter from router - $addon = $a->argv[2]; - $addon = Strings::sanitizeFilePathItem($addon); - if (!is_file("addon/$addon/$addon.php")) { - notice(L10n::t('Item not found.')); - $a->internalRedirect('admin/addons'); - } - - if (defaults($_GET, 'action', '') == 'toggle') { - parent::checkFormSecurityTokenRedirectOnError('/admin/addons', 'admin_themes', 't'); - - // Toggle addon status - if (Addon::isEnabled($addon)) { - Addon::uninstall($addon); - info(L10n::t('Addon %s disabled.', $addon)); - } else { - Addon::install($addon); - info(L10n::t('Addon %s enabled.', $addon)); - } - - Addon::saveEnabledList(); - - $a->internalRedirect('admin/addons/' . $addon); - } - - // display addon details - if (Addon::isEnabled($addon)) { - $status = 'on'; - $action = L10n::t('Disable'); - } else { - $status = 'off'; - $action = L10n::t('Enable'); - } - - $readme = null; - if (is_file("addon/$addon/README.md")) { - $readme = Markdown::convert(file_get_contents("addon/$addon/README.md"), false); - } elseif (is_file("addon/$addon/README")) { - $readme = '
    ' . file_get_contents("addon/$addon/README") . '
    '; - } - - $admin_form = ''; - if (array_key_exists($addon, $addons_admin)) { - require_once "addon/$addon/$addon.php"; - $func = $addon . '_addon_admin'; - $func($a, $admin_form); - } - - $t = Renderer::getMarkupTemplate('admin/addons/details.tpl'); - - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Addons'), - '$toggle' => L10n::t('Toggle'), - '$settings' => L10n::t('Settings'), - '$baseurl' => $a->getBaseURL(true), - - '$addon' => $addon, - '$status' => $status, - '$action' => $action, - '$info' => Addon::getInfo($addon), - '$str_author' => L10n::t('Author: '), - '$str_maintainer' => L10n::t('Maintainer: '), - - '$admin_form' => $admin_form, - '$function' => 'addons', - '$screenshot' => '', - '$readme' => $readme, - - '$form_security_token' => parent::getFormSecurityToken('admin_themes'), - ]); - } - - $a->internalRedirect('admin/addons'); - } -} +argc > 2) { + // @TODO: Replace with parameter from router + $addon = $a->argv[2]; + $addon = Strings::sanitizeFilePathItem($addon); + if (is_file('addon/' . $addon . '/' . $addon . '.php')) { + include_once 'addon/' . $addon . '/' . $addon . '.php'; + if (function_exists($addon . '_addon_admin_post')) { + $func = $addon . '_addon_admin_post'; + $func($a); + } + + $a->internalRedirect('admin/addons/' . $addon); + } + } + + $a->internalRedirect('admin/addons'); + } + + public static function content() + { + parent::content(); + + $a = self::getApp(); + + $addons_admin = Addon::getAdminList(); + + if ($a->argc > 2) { + // @TODO: Replace with parameter from router + $addon = $a->argv[2]; + $addon = Strings::sanitizeFilePathItem($addon); + if (!is_file("addon/$addon/$addon.php")) { + notice(L10n::t('Item not found.')); + $a->internalRedirect('admin/addons'); + } + + if (defaults($_GET, 'action', '') == 'toggle') { + parent::checkFormSecurityTokenRedirectOnError('/admin/addons', 'admin_themes', 't'); + + // Toggle addon status + if (Addon::isEnabled($addon)) { + Addon::uninstall($addon); + info(L10n::t('Addon %s disabled.', $addon)); + } else { + Addon::install($addon); + info(L10n::t('Addon %s enabled.', $addon)); + } + + Addon::saveEnabledList(); + + $a->internalRedirect('admin/addons/' . $addon); + } + + // display addon details + if (Addon::isEnabled($addon)) { + $status = 'on'; + $action = L10n::t('Disable'); + } else { + $status = 'off'; + $action = L10n::t('Enable'); + } + + $readme = null; + if (is_file("addon/$addon/README.md")) { + $readme = Markdown::convert(file_get_contents("addon/$addon/README.md"), false); + } elseif (is_file("addon/$addon/README")) { + $readme = '
    ' . file_get_contents("addon/$addon/README") . '
    '; + } + + $admin_form = ''; + if (array_key_exists($addon, $addons_admin)) { + require_once "addon/$addon/$addon.php"; + $func = $addon . '_addon_admin'; + $func($a, $admin_form); + } + + $t = Renderer::getMarkupTemplate('admin/addons/details.tpl'); + + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Addons'), + '$toggle' => L10n::t('Toggle'), + '$settings' => L10n::t('Settings'), + '$baseurl' => $a->getBaseURL(true), + + '$addon' => $addon, + '$status' => $status, + '$action' => $action, + '$info' => Addon::getInfo($addon), + '$str_author' => L10n::t('Author: '), + '$str_maintainer' => L10n::t('Maintainer: '), + + '$admin_form' => $admin_form, + '$function' => 'addons', + '$screenshot' => '', + '$readme' => $readme, + + '$form_security_token' => parent::getFormSecurityToken('admin_themes'), + ]); + } + + $a->internalRedirect('admin/addons'); + } +} diff --git a/src/Module/Admin/Addons/Index.php b/src/Module/Admin/Addons/Index.php index 9df486c10e..2fa39d8e40 100644 --- a/src/Module/Admin/Addons/Index.php +++ b/src/Module/Admin/Addons/Index.php @@ -1,62 +1,62 @@ -internalRedirect('admin/addons'); - } - - $addons = Addon::getAvailableList(); - - $t = Renderer::getMarkupTemplate('admin/addons/index.tpl'); - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Addons'), - '$submit' => L10n::t('Save Settings'), - '$reload' => L10n::t('Reload active addons'), - '$baseurl' => $a->getBaseURL(true), - '$function' => 'addons', - '$addons' => $addons, - '$pcount' => count($addons), - '$noplugshint' => L10n::t('There are currently no addons available on your node. You can find the official addon repository at %1$s and might find other interesting addons in the open addon registry at %2$s', 'https://github.com/friendica/friendica-addons', 'http://addons.friendi.ca'), - '$form_security_token' => parent::getFormSecurityToken('admin_addons'), - ]); - } -} +internalRedirect('admin/addons'); + } + + $addons = Addon::getAvailableList(); + + $t = Renderer::getMarkupTemplate('admin/addons/index.tpl'); + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Addons'), + '$submit' => L10n::t('Save Settings'), + '$reload' => L10n::t('Reload active addons'), + '$baseurl' => $a->getBaseURL(true), + '$function' => 'addons', + '$addons' => $addons, + '$pcount' => count($addons), + '$noplugshint' => L10n::t('There are currently no addons available on your node. You can find the official addon repository at %1$s and might find other interesting addons in the open addon registry at %2$s', 'https://github.com/friendica/friendica-addons', 'http://addons.friendi.ca'), + '$form_security_token' => parent::getFormSecurityToken('admin_addons'), + ]); + } +} diff --git a/src/Module/Admin/Blocklist/Contact.php b/src/Module/Admin/Blocklist/Contact.php index 214a30cff7..1ec6e00df0 100644 --- a/src/Module/Admin/Blocklist/Contact.php +++ b/src/Module/Admin/Blocklist/Contact.php @@ -1,86 +1,86 @@ -internalRedirect('admin/blocklist/contact'); - } - - public static function content() - { - parent::content(); - - $a = self::getApp(); - - $condition = ['uid' => 0, 'blocked' => true]; - - $total = DBA::count('contact', $condition); - - $pager = new Pager($a->query_string, 30); - - $contacts = Model\Contact::select([], $condition, ['limit' => [$pager->getStart(), $pager->getItemsPerPage()]]); - - $t = Renderer::getMarkupTemplate('admin/blocklist/contact.tpl'); - $o = Renderer::replaceMacros($t, [ - // strings // - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Remote Contact Blocklist'), - '$description' => L10n::t('This page allows you to prevent any message from a remote contact to reach your node.'), - '$submit' => L10n::t('Block Remote Contact'), - '$select_all' => L10n::t('select all'), - '$select_none' => L10n::t('select none'), - '$block' => L10n::t('Block'), - '$unblock' => L10n::t('Unblock'), - '$no_data' => L10n::t('No remote contact is blocked from this node.'), - - '$h_contacts' => L10n::t('Blocked Remote Contacts'), - '$h_newblock' => L10n::t('Block New Remote Contact'), - '$th_contacts' => [L10n::t('Photo'), L10n::t('Name'), L10n::t('Address'), L10n::t('Profile URL')], - - '$form_security_token' => parent::getFormSecurityToken("admin_contactblock"), - - // values // - '$baseurl' => $a->getBaseURL(true), - - '$contacts' => $contacts, - '$total_contacts' => L10n::tt('%s total blocked contact', '%s total blocked contacts', $total), - '$paginate' => $pager->renderFull($total), - '$contacturl' => ['contact_url', L10n::t("Profile URL"), '', L10n::t("URL of the remote contact to block.")], - ]); - return $o; - } -} +internalRedirect('admin/blocklist/contact'); + } + + public static function content() + { + parent::content(); + + $a = self::getApp(); + + $condition = ['uid' => 0, 'blocked' => true]; + + $total = DBA::count('contact', $condition); + + $pager = new Pager($a->query_string, 30); + + $contacts = Model\Contact::select([], $condition, ['limit' => [$pager->getStart(), $pager->getItemsPerPage()]]); + + $t = Renderer::getMarkupTemplate('admin/blocklist/contact.tpl'); + $o = Renderer::replaceMacros($t, [ + // strings // + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Remote Contact Blocklist'), + '$description' => L10n::t('This page allows you to prevent any message from a remote contact to reach your node.'), + '$submit' => L10n::t('Block Remote Contact'), + '$select_all' => L10n::t('select all'), + '$select_none' => L10n::t('select none'), + '$block' => L10n::t('Block'), + '$unblock' => L10n::t('Unblock'), + '$no_data' => L10n::t('No remote contact is blocked from this node.'), + + '$h_contacts' => L10n::t('Blocked Remote Contacts'), + '$h_newblock' => L10n::t('Block New Remote Contact'), + '$th_contacts' => [L10n::t('Photo'), L10n::t('Name'), L10n::t('Address'), L10n::t('Profile URL')], + + '$form_security_token' => parent::getFormSecurityToken("admin_contactblock"), + + // values // + '$baseurl' => $a->getBaseURL(true), + + '$contacts' => $contacts, + '$total_contacts' => L10n::tt('%s total blocked contact', '%s total blocked contacts', $total), + '$paginate' => $pager->renderFull($total), + '$contacturl' => ['contact_url', L10n::t("Profile URL"), '', L10n::t("URL of the remote contact to block.")], + ]); + return $o; + } +} diff --git a/src/Module/Admin/Blocklist/Server.php b/src/Module/Admin/Blocklist/Server.php index 2d5f978937..754d1aad51 100644 --- a/src/Module/Admin/Blocklist/Server.php +++ b/src/Module/Admin/Blocklist/Server.php @@ -1,92 +1,92 @@ - Strings::escapeTags(trim($_POST['newentry_domain'])), - 'reason' => Strings::escapeTags(trim($_POST['newentry_reason'])) - ]; - Config::set('system', 'blocklist', $blocklist); - info(L10n::t('Server added to blocklist.') . EOL); - } else { - // Edit the entries from blocklist - $blocklist = []; - foreach ($_POST['domain'] as $id => $domain) { - // Trimming whitespaces as well as any lingering slashes - $domain = Strings::escapeTags(trim($domain, "\x00..\x1F/")); - $reason = Strings::escapeTags(trim($_POST['reason'][$id])); - if (empty($_POST['delete'][$id])) { - $blocklist[] = [ - 'domain' => $domain, - 'reason' => $reason - ]; - } - } - Config::set('system', 'blocklist', $blocklist); - info(L10n::t('Site blocklist updated.') . EOL); - } - - self::getApp()->internalRedirect('admin/blocklist/server'); - } - - public static function content() - { - parent::content(); - - $a = self::getApp(); - - $blocklist = Config::get('system', 'blocklist'); - $blocklistform = []; - if (is_array($blocklist)) { - foreach ($blocklist as $id => $b) { - $blocklistform[] = [ - 'domain' => ["domain[$id]", L10n::t('Blocked domain'), $b['domain'], '', L10n::t('The blocked domain'), 'required', '', ''], - 'reason' => ["reason[$id]", L10n::t("Reason for the block"), $b['reason'], L10n::t('The reason why you blocked this domain.') . '(' . $b['domain'] . ')', 'required', '', ''], - 'delete' => ["delete[$id]", L10n::t("Delete domain") . ' (' . $b['domain'] . ')', false, L10n::t("Check to delete this entry from the blocklist")] - ]; - } - } - - $t = Renderer::getMarkupTemplate('admin/blocklist/server.tpl'); - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Server Blocklist'), - '$intro' => L10n::t('This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server.'), - '$public' => L10n::t('The list of blocked servers will be made publically available on the /friendica page so that your users and people investigating communication problems can find the reason easily.'), - '$addtitle' => L10n::t('Add new entry to block list'), - '$newdomain' => ['newentry_domain', L10n::t('Server Domain'), '', L10n::t('The domain of the new server to add to the block list. Do not include the protocol.'), 'required', '', ''], - '$newreason' => ['newentry_reason', L10n::t('Block reason'), '', L10n::t('The reason why you blocked this domain.'), 'required', '', ''], - '$submit' => L10n::t('Add Entry'), - '$savechanges' => L10n::t('Save changes to the blocklist'), - '$currenttitle' => L10n::t('Current Entries in the Blocklist'), - '$thurl' => L10n::t('Blocked domain'), - '$threason' => L10n::t('Reason for the block'), - '$delentry' => L10n::t('Delete entry from blocklist'), - '$entries' => $blocklistform, - '$baseurl' => $a->getBaseURL(true), - '$confirm_delete' => L10n::t('Delete entry from blocklist?'), - '$form_security_token' => parent::getFormSecurityToken("admin_blocklist") - ]); - } -} + Strings::escapeTags(trim($_POST['newentry_domain'])), + 'reason' => Strings::escapeTags(trim($_POST['newentry_reason'])) + ]; + Config::set('system', 'blocklist', $blocklist); + info(L10n::t('Server added to blocklist.') . EOL); + } else { + // Edit the entries from blocklist + $blocklist = []; + foreach ($_POST['domain'] as $id => $domain) { + // Trimming whitespaces as well as any lingering slashes + $domain = Strings::escapeTags(trim($domain, "\x00..\x1F/")); + $reason = Strings::escapeTags(trim($_POST['reason'][$id])); + if (empty($_POST['delete'][$id])) { + $blocklist[] = [ + 'domain' => $domain, + 'reason' => $reason + ]; + } + } + Config::set('system', 'blocklist', $blocklist); + info(L10n::t('Site blocklist updated.') . EOL); + } + + self::getApp()->internalRedirect('admin/blocklist/server'); + } + + public static function content() + { + parent::content(); + + $a = self::getApp(); + + $blocklist = Config::get('system', 'blocklist'); + $blocklistform = []; + if (is_array($blocklist)) { + foreach ($blocklist as $id => $b) { + $blocklistform[] = [ + 'domain' => ["domain[$id]", L10n::t('Blocked domain'), $b['domain'], '', L10n::t('The blocked domain'), 'required', '', ''], + 'reason' => ["reason[$id]", L10n::t("Reason for the block"), $b['reason'], L10n::t('The reason why you blocked this domain.') . '(' . $b['domain'] . ')', 'required', '', ''], + 'delete' => ["delete[$id]", L10n::t("Delete domain") . ' (' . $b['domain'] . ')', false, L10n::t("Check to delete this entry from the blocklist")] + ]; + } + } + + $t = Renderer::getMarkupTemplate('admin/blocklist/server.tpl'); + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Server Blocklist'), + '$intro' => L10n::t('This page can be used to define a black list of servers from the federated network that are not allowed to interact with your node. For all entered domains you should also give a reason why you have blocked the remote server.'), + '$public' => L10n::t('The list of blocked servers will be made publically available on the /friendica page so that your users and people investigating communication problems can find the reason easily.'), + '$addtitle' => L10n::t('Add new entry to block list'), + '$newdomain' => ['newentry_domain', L10n::t('Server Domain'), '', L10n::t('The domain of the new server to add to the block list. Do not include the protocol.'), 'required', '', ''], + '$newreason' => ['newentry_reason', L10n::t('Block reason'), '', L10n::t('The reason why you blocked this domain.'), 'required', '', ''], + '$submit' => L10n::t('Add Entry'), + '$savechanges' => L10n::t('Save changes to the blocklist'), + '$currenttitle' => L10n::t('Current Entries in the Blocklist'), + '$thurl' => L10n::t('Blocked domain'), + '$threason' => L10n::t('Reason for the block'), + '$delentry' => L10n::t('Delete entry from blocklist'), + '$entries' => $blocklistform, + '$baseurl' => $a->getBaseURL(true), + '$confirm_delete' => L10n::t('Delete entry from blocklist?'), + '$form_security_token' => parent::getFormSecurityToken("admin_blocklist") + ]); + } +} diff --git a/src/Module/Admin/DBSync.php b/src/Module/Admin/DBSync.php index 69001b9ce4..4c29eea34f 100644 --- a/src/Module/Admin/DBSync.php +++ b/src/Module/Admin/DBSync.php @@ -1,107 +1,107 @@ -argc > 3 && $a->argv[2] === 'mark') { - // @TODO: Replace with parameter from router - $update = intval($a->argv[3]); - if ($update) { - Config::set('database', 'update_' . $update, 'success'); - $curr = Config::get('system', 'build'); - if (intval($curr) == $update) { - Config::set('system', 'build', intval($curr) + 1); - } - info(L10n::t('Update has been marked successful') . EOL); - } - $a->internalRedirect('admin/dbsync'); - } - - if ($a->argc > 2) { - if ($a->argv[2] === 'check') { - // @TODO Seems like a similar logic like Update::check() - $retval = DBStructure::update($a->getBasePath(), false, true); - if ($retval === '') { - $o .= L10n::t("Database structure update %s was successfully applied.", DB_UPDATE_VERSION) . "
    "; - Config::set('database', 'last_successful_update', DB_UPDATE_VERSION); - Config::set('database', 'last_successful_update_time', time()); - } else { - $o .= L10n::t("Executing of database structure update %s failed with error: %s", DB_UPDATE_VERSION, $retval) . "
    "; - } - if ($a->argv[2] === 'check') { - return $o; - } - } elseif (intval($a->argv[2])) { - require_once 'update.php'; - - // @TODO: Replace with parameter from router - $update = intval($a->argv[2]); - - $func = 'update_' . $update; - - if (function_exists($func)) { - $retval = $func(); - - if ($retval === Update::FAILED) { - $o .= L10n::t("Executing %s failed with error: %s", $func, $retval); - } elseif ($retval === Update::SUCCESS) { - $o .= L10n::t('Update %s was successfully applied.', $func); - Config::set('database', $func, 'success'); - } else { - $o .= L10n::t('Update %s did not return a status. Unknown if it succeeded.', $func); - } - } else { - $o .= L10n::t('There was no additional update function %s that needed to be called.', $func) . "
    "; - Config::set('database', $func, 'success'); - } - - return $o; - } - } - - $failed = []; - $configStmt = DBA::select('config', ['k', 'v'], ['cat' => 'database']); - while ($config = DBA::fetch($configStmt)) { - $upd = intval(substr($config['k'], 7)); - if ($upd >= 1139 && $config['v'] != 'success') { - $failed[] = $upd; - } - } - - if (!count($failed)) { - $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/dbsync/structure_check.tpl'), [ - '$base' => $a->getBaseURL(true), - '$banner' => L10n::t('No failed updates.'), - '$check' => L10n::t('Check database structure'), - ]); - } else { - $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/dbsync/failed_updates.tpl'), [ - '$base' => $a->getBaseURL(true), - '$banner' => L10n::t('Failed Updates'), - '$desc' => L10n::t('This does not include updates prior to 1139, which did not return a status.'), - '$mark' => L10n::t("Mark success \x28if update was manually applied\x29"), - '$apply' => L10n::t('Attempt to execute this update step automatically'), - '$failed' => $failed - ]); - } - - return $o; - } -} +argc > 3 && $a->argv[2] === 'mark') { + // @TODO: Replace with parameter from router + $update = intval($a->argv[3]); + if ($update) { + Config::set('database', 'update_' . $update, 'success'); + $curr = Config::get('system', 'build'); + if (intval($curr) == $update) { + Config::set('system', 'build', intval($curr) + 1); + } + info(L10n::t('Update has been marked successful') . EOL); + } + $a->internalRedirect('admin/dbsync'); + } + + if ($a->argc > 2) { + if ($a->argv[2] === 'check') { + // @TODO Seems like a similar logic like Update::check() + $retval = DBStructure::update($a->getBasePath(), false, true); + if ($retval === '') { + $o .= L10n::t("Database structure update %s was successfully applied.", DB_UPDATE_VERSION) . "
    "; + Config::set('database', 'last_successful_update', DB_UPDATE_VERSION); + Config::set('database', 'last_successful_update_time', time()); + } else { + $o .= L10n::t("Executing of database structure update %s failed with error: %s", DB_UPDATE_VERSION, $retval) . "
    "; + } + if ($a->argv[2] === 'check') { + return $o; + } + } elseif (intval($a->argv[2])) { + require_once 'update.php'; + + // @TODO: Replace with parameter from router + $update = intval($a->argv[2]); + + $func = 'update_' . $update; + + if (function_exists($func)) { + $retval = $func(); + + if ($retval === Update::FAILED) { + $o .= L10n::t("Executing %s failed with error: %s", $func, $retval); + } elseif ($retval === Update::SUCCESS) { + $o .= L10n::t('Update %s was successfully applied.', $func); + Config::set('database', $func, 'success'); + } else { + $o .= L10n::t('Update %s did not return a status. Unknown if it succeeded.', $func); + } + } else { + $o .= L10n::t('There was no additional update function %s that needed to be called.', $func) . "
    "; + Config::set('database', $func, 'success'); + } + + return $o; + } + } + + $failed = []; + $configStmt = DBA::select('config', ['k', 'v'], ['cat' => 'database']); + while ($config = DBA::fetch($configStmt)) { + $upd = intval(substr($config['k'], 7)); + if ($upd >= 1139 && $config['v'] != 'success') { + $failed[] = $upd; + } + } + + if (!count($failed)) { + $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/dbsync/structure_check.tpl'), [ + '$base' => $a->getBaseURL(true), + '$banner' => L10n::t('No failed updates.'), + '$check' => L10n::t('Check database structure'), + ]); + } else { + $o = Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/dbsync/failed_updates.tpl'), [ + '$base' => $a->getBaseURL(true), + '$banner' => L10n::t('Failed Updates'), + '$desc' => L10n::t('This does not include updates prior to 1139, which did not return a status.'), + '$mark' => L10n::t("Mark success \x28if update was manually applied\x29"), + '$apply' => L10n::t('Attempt to execute this update step automatically'), + '$failed' => $failed + ]); + } + + return $o; + } +} diff --git a/src/Module/Admin/Features.php b/src/Module/Admin/Features.php index cb9acf4eb1..328e7e68b5 100644 --- a/src/Module/Admin/Features.php +++ b/src/Module/Admin/Features.php @@ -1,74 +1,74 @@ - $fdata) { - foreach (array_slice($fdata, 1) as $f) { - $feature = $f[0]; - $feature_state = 'feature_' . $feature; - $featurelock = 'featurelock_' . $feature; - - if (!empty($_POST[$feature_state])) { - $val = intval($_POST[$feature_state]); - } else { - $val = 0; - } - Config::set('feature', $feature, $val); - - if (!empty($_POST[$featurelock])) { - Config::set('feature_lock', $feature, $val); - } else { - Config::delete('feature_lock', $feature); - } - } - } - - self::getApp()->internalRedirect('admin/features'); - } - - public static function content() - { - parent::content(); - - $arr = []; - $features = Feature::get(false); - - foreach ($features as $fname => $fdata) { - $arr[$fname] = []; - $arr[$fname][0] = $fdata[0]; - foreach (array_slice($fdata, 1) as $f) { - $set = Config::get('feature', $f[0], $f[3]); - $arr[$fname][1][] = [ - ['feature_' . $f[0], $f[1], $set, $f[2], [L10n::t('Off'), L10n::t('On')]], - ['featurelock_' . $f[0], L10n::t('Lock feature %s', $f[1]), (($f[4] !== false) ? "1" : ''), '', [L10n::t('Off'), L10n::t('On')]] - ]; - } - } - - $tpl = Renderer::getMarkupTemplate('admin/features.tpl'); - $o = Renderer::replaceMacros($tpl, [ - '$form_security_token' => parent::getFormSecurityToken("admin_manage_features"), - '$title' => L10n::t('Manage Additional Features'), - '$features' => $arr, - '$submit' => L10n::t('Save Settings'), - ]); - - return $o; - } -} \ No newline at end of file + $fdata) { + foreach (array_slice($fdata, 1) as $f) { + $feature = $f[0]; + $feature_state = 'feature_' . $feature; + $featurelock = 'featurelock_' . $feature; + + if (!empty($_POST[$feature_state])) { + $val = intval($_POST[$feature_state]); + } else { + $val = 0; + } + Config::set('feature', $feature, $val); + + if (!empty($_POST[$featurelock])) { + Config::set('feature_lock', $feature, $val); + } else { + Config::delete('feature_lock', $feature); + } + } + } + + self::getApp()->internalRedirect('admin/features'); + } + + public static function content() + { + parent::content(); + + $arr = []; + $features = Feature::get(false); + + foreach ($features as $fname => $fdata) { + $arr[$fname] = []; + $arr[$fname][0] = $fdata[0]; + foreach (array_slice($fdata, 1) as $f) { + $set = Config::get('feature', $f[0], $f[3]); + $arr[$fname][1][] = [ + ['feature_' . $f[0], $f[1], $set, $f[2], [L10n::t('Off'), L10n::t('On')]], + ['featurelock_' . $f[0], L10n::t('Lock feature %s', $f[1]), (($f[4] !== false) ? "1" : ''), '', [L10n::t('Off'), L10n::t('On')]] + ]; + } + } + + $tpl = Renderer::getMarkupTemplate('admin/features.tpl'); + $o = Renderer::replaceMacros($tpl, [ + '$form_security_token' => parent::getFormSecurityToken("admin_manage_features"), + '$title' => L10n::t('Manage Additional Features'), + '$features' => $arr, + '$submit' => L10n::t('Save Settings'), + ]); + + return $o; + } +} diff --git a/src/Module/Admin/Item/Delete.php b/src/Module/Admin/Item/Delete.php index 9a9c9209b6..766e65c9a0 100644 --- a/src/Module/Admin/Item/Delete.php +++ b/src/Module/Admin/Item/Delete.php @@ -1,55 +1,55 @@ - $guid]); - } - - info(L10n::t('Item marked for deletion.') . EOL); - self::getApp()->internalRedirect('admin/item/delete'); - } - - public static function content() - { - parent::content(); - - $t = Renderer::getMarkupTemplate('admin/item/delete.tpl'); - - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Delete Item'), - '$submit' => L10n::t('Delete this Item'), - '$intro1' => L10n::t('On this page you can delete an item from your node. If the item is a top level posting, the entire thread will be deleted.'), - '$intro2' => L10n::t('You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456.'), - '$deleteitemguid' => ['deleteitemguid', L10n::t("GUID"), '', L10n::t("The GUID of the item you want to delete."), 'required', 'autofocus'], - '$form_security_token' => parent::getFormSecurityToken("admin_deleteitem") - ]); - } -} \ No newline at end of file + $guid]); + } + + info(L10n::t('Item marked for deletion.') . EOL); + self::getApp()->internalRedirect('admin/item/delete'); + } + + public static function content() + { + parent::content(); + + $t = Renderer::getMarkupTemplate('admin/item/delete.tpl'); + + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Delete Item'), + '$submit' => L10n::t('Delete this Item'), + '$intro1' => L10n::t('On this page you can delete an item from your node. If the item is a top level posting, the entire thread will be deleted.'), + '$intro2' => L10n::t('You need to know the GUID of the item. You can find it e.g. by looking at the display URL. The last part of http://example.com/display/123456 is the GUID, here 123456.'), + '$deleteitemguid' => ['deleteitemguid', L10n::t("GUID"), '', L10n::t("The GUID of the item you want to delete."), 'required', 'autofocus'], + '$form_security_token' => parent::getFormSecurityToken("admin_deleteitem") + ]); + } +} diff --git a/src/Module/Admin/Logs/Settings.php b/src/Module/Admin/Logs/Settings.php index c42c5402ca..d55618454f 100644 --- a/src/Module/Admin/Logs/Settings.php +++ b/src/Module/Admin/Logs/Settings.php @@ -1,74 +1,74 @@ -internalRedirect('admin/logs'); - } - - public static function content() - { - parent::content(); - - $a = self::getApp(); - - $log_choices = [ - LogLevel::ERROR => 'Error', - LogLevel::WARNING => 'Warning', - LogLevel::NOTICE => 'Notice', - LogLevel::INFO => 'Info', - LogLevel::DEBUG => 'Debug', - ]; - - if (ini_get('log_errors')) { - $phplogenabled = L10n::t('PHP log currently enabled.'); - } else { - $phplogenabled = L10n::t('PHP log currently disabled.'); - } - - $t = Renderer::getMarkupTemplate('admin/logs/settings.tpl'); - - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Logs'), - '$submit' => L10n::t('Save Settings'), - '$clear' => L10n::t('Clear'), - '$baseurl' => $a->getBaseURL(true), - '$logname' => Config::get('system', 'logfile'), - // see /help/smarty3-templates#1_1 on any Friendica node - '$debugging' => ['debugging', L10n::t("Enable Debugging"), Config::get('system', 'debugging'), ""], - '$logfile' => ['logfile', L10n::t("Log file"), Config::get('system', 'logfile'), L10n::t("Must be writable by web server. Relative to your Friendica top-level directory.")], - '$loglevel' => ['loglevel', L10n::t("Log level"), Config::get('system', 'loglevel'), "", $log_choices], - '$form_security_token' => parent::getFormSecurityToken("admin_logs"), - '$phpheader' => L10n::t("PHP logging"), - '$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, - ]); - } -} +internalRedirect('admin/logs'); + } + + public static function content() + { + parent::content(); + + $a = self::getApp(); + + $log_choices = [ + LogLevel::ERROR => 'Error', + LogLevel::WARNING => 'Warning', + LogLevel::NOTICE => 'Notice', + LogLevel::INFO => 'Info', + LogLevel::DEBUG => 'Debug', + ]; + + if (ini_get('log_errors')) { + $phplogenabled = L10n::t('PHP log currently enabled.'); + } else { + $phplogenabled = L10n::t('PHP log currently disabled.'); + } + + $t = Renderer::getMarkupTemplate('admin/logs/settings.tpl'); + + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Logs'), + '$submit' => L10n::t('Save Settings'), + '$clear' => L10n::t('Clear'), + '$baseurl' => $a->getBaseURL(true), + '$logname' => Config::get('system', 'logfile'), + // see /help/smarty3-templates#1_1 on any Friendica node + '$debugging' => ['debugging', L10n::t("Enable Debugging"), Config::get('system', 'debugging'), ""], + '$logfile' => ['logfile', L10n::t("Log file"), Config::get('system', 'logfile'), L10n::t("Must be writable by web server. Relative to your Friendica top-level directory.")], + '$loglevel' => ['loglevel', L10n::t("Log level"), Config::get('system', 'loglevel'), "", $log_choices], + '$form_security_token' => parent::getFormSecurityToken("admin_logs"), + '$phpheader' => L10n::t("PHP logging"), + '$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, + ]); + } +} diff --git a/src/Module/Admin/Logs/View.php b/src/Module/Admin/Logs/View.php index 45b19bfacf..b66a6781e5 100644 --- a/src/Module/Admin/Logs/View.php +++ b/src/Module/Admin/Logs/View.php @@ -1,52 +1,52 @@ -%1$s log file.\r\n
    Check to see if file %1$s exist and is readable.', $f); - } else { - $fp = fopen($f, 'r'); - if (!$fp) { - $data = L10n::t('Couldn\'t open %1$s log file.\r\n
    Check to see if file %1$s is readable.', $f); - } else { - $fstat = fstat($fp); - $size = $fstat['size']; - if ($size != 0) { - if ($size > 5000000 || $size < 0) { - $size = 5000000; - } - $seek = fseek($fp, 0 - $size, SEEK_END); - if ($seek === 0) { - $data = Strings::escapeHtml(fread($fp, $size)); - while (!feof($fp)) { - $data .= Strings::escapeHtml(fread($fp, 4096)); - } - } - } - fclose($fp); - } - } - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('View Logs'), - '$data' => $data, - '$logname' => Config::get('system', 'logfile') - ]); - } -} +%1$s log file.\r\n
    Check to see if file %1$s exist and is readable.', $f); + } else { + $fp = fopen($f, 'r'); + if (!$fp) { + $data = L10n::t('Couldn\'t open %1$s log file.\r\n
    Check to see if file %1$s is readable.', $f); + } else { + $fstat = fstat($fp); + $size = $fstat['size']; + if ($size != 0) { + if ($size > 5000000 || $size < 0) { + $size = 5000000; + } + $seek = fseek($fp, 0 - $size, SEEK_END); + if ($seek === 0) { + $data = Strings::escapeHtml(fread($fp, $size)); + while (!feof($fp)) { + $data .= Strings::escapeHtml(fread($fp, 4096)); + } + } + } + fclose($fp); + } + } + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('View Logs'), + '$data' => $data, + '$logname' => Config::get('system', 'logfile') + ]); + } +} diff --git a/src/Module/Admin/PhpInfo.php b/src/Module/Admin/PhpInfo.php index 2d0e9c1d5a..b912117dc1 100644 --- a/src/Module/Admin/PhpInfo.php +++ b/src/Module/Admin/PhpInfo.php @@ -1,16 +1,16 @@ -argc > 2 && $a->argv[2] == 'deferred'; - - // get jobs from the workerqueue table - if ($deferred) { - $condition = ["NOT `done` AND `next_try` > ?", DateTimeFormat::utcNow()]; - $sub_title = L10n::t('Inspect Deferred Worker Queue'); - $info = L10n::t("This page lists the deferred worker jobs. This are jobs that couldn't be executed at the first time."); - } else { - $condition = ["NOT `done` AND `next_try` < ?", DateTimeFormat::utcNow()]; - $sub_title = L10n::t('Inspect Worker Queue'); - $info = L10n::t('This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you\'ve set up during install.'); - } - - $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['order' => ['priority']]); - - $r = []; - while ($entry = DBA::fetch($entries)) { - // fix GH-5469. ref: src/Core/Worker.php:217 - $entry['parameter'] = Arrays::recursiveImplode(json_decode($entry['parameter'], true), ': '); - $entry['created'] = DateTimeFormat::local($entry['created']); - $r[] = $entry; - } - DBA::close($entries); - - $t = Renderer::getMarkupTemplate('admin/queue.tpl'); - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => $sub_title, - '$count' => count($r), - '$id_header' => L10n::t('ID'), - '$param_header' => L10n::t('Job Parameters'), - '$created_header' => L10n::t('Created'), - '$prio_header' => L10n::t('Priority'), - '$info' => $info, - '$entries' => $r, - ]); - } -} +argc > 2 && $a->argv[2] == 'deferred'; + + // get jobs from the workerqueue table + if ($deferred) { + $condition = ["NOT `done` AND `next_try` > ?", DateTimeFormat::utcNow()]; + $sub_title = L10n::t('Inspect Deferred Worker Queue'); + $info = L10n::t("This page lists the deferred worker jobs. This are jobs that couldn't be executed at the first time."); + } else { + $condition = ["NOT `done` AND `next_try` < ?", DateTimeFormat::utcNow()]; + $sub_title = L10n::t('Inspect Worker Queue'); + $info = L10n::t('This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you\'ve set up during install.'); + } + + $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['order' => ['priority']]); + + $r = []; + while ($entry = DBA::fetch($entries)) { + // fix GH-5469. ref: src/Core/Worker.php:217 + $entry['parameter'] = Arrays::recursiveImplode(json_decode($entry['parameter'], true), ': '); + $entry['created'] = DateTimeFormat::local($entry['created']); + $r[] = $entry; + } + DBA::close($entries); + + $t = Renderer::getMarkupTemplate('admin/queue.tpl'); + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => $sub_title, + '$count' => count($r), + '$id_header' => L10n::t('ID'), + '$param_header' => L10n::t('Job Parameters'), + '$created_header' => L10n::t('Created'), + '$prio_header' => L10n::t('Priority'), + '$info' => $info, + '$entries' => $r, + ]); + } +} diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index 05ca16a16f..37507ca996 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -39,6 +39,7 @@ class Site extends BaseAdminModule } // relocate + // @TODO This file could benefit from moving this feature away in a Module\Admin\Relocate class for example if (!empty($_POST['relocate']) && !empty($_POST['relocate_url']) && $_POST['relocate_url'] != "") { $new_url = $_POST['relocate_url']; $new_url = rtrim($new_url, "/"); diff --git a/src/Module/Admin/Summary.php b/src/Module/Admin/Summary.php index 8529c7142c..a78a6b8d7c 100644 --- a/src/Module/Admin/Summary.php +++ b/src/Module/Admin/Summary.php @@ -1,147 +1,147 @@ - 'myisam', 'table_schema' => DBA::databaseName()])) { - $warningtext[] = L10n::t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See here for a guide that may be helpful converting the table engines. You may also use the command php bin/console.php dbstructure toinnodb of your Friendica installation for an automatic conversion.
    ', 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html'); - } - - // Check if github.com/friendica/master/VERSION is higher then - // the local version of Friendica. Check is opt-in, source may be master or devel branch - if (Config::get('system', 'check_new_version_url', 'none') != 'none') { - $gitversion = Config::get('system', 'git_friendica_version'); - if (version_compare(FRIENDICA_VERSION, $gitversion) < 0) { - $warningtext[] = L10n::t('There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s', FRIENDICA_VERSION, $gitversion); - } - } - - if (Config::get('system', 'dbupdate', DBStructure::UPDATE_NOT_CHECKED) == DBStructure::UPDATE_NOT_CHECKED) { - DBStructure::update($a->getBasePath(), false, true); - } - - if (Config::get('system', 'dbupdate') == DBStructure::UPDATE_FAILED) { - $warningtext[] = L10n::t('The database update failed. Please run "php bin/console.php dbstructure update" from the command line and have a look at the errors that might appear.'); - } - - if (Config::get('system', 'update') == Update::FAILED) { - $warningtext[] = L10n::t('The last update failed. Please run "php bin/console.php dbstructure update" from the command line and have a look at the errors that might appear. (Some of the errors are possibly inside the logfile.)'); - } - - $last_worker_call = Config::get('system', 'last_worker_execution', false); - if (!$last_worker_call) { - $warningtext[] = L10n::t('The worker was never executed. Please check your database structure!'); - } elseif ((strtotime(DateTimeFormat::utcNow()) - strtotime($last_worker_call)) > 60 * 60) { - $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')) { - $warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from .htconfig.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config'); - } - - if (file_exists('config/local.ini.php')) { - $warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from config/local.ini.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config'); - } - - // Check server vitality - if (!self::checkSelfHostMeta()) { - $well_known = $a->getBaseURL() . '/.well-known/host-meta'; - $warningtext[] = L10n::t('%s is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See the installation page for help.', - $well_known, $well_known, $a->getBaseURL() . '/help/Install'); - } - - $accounts = [ - [L10n::t('Normal Account'), 0], - [L10n::t('Automatic Follower Account'), 0], - [L10n::t('Public Forum Account'), 0], - [L10n::t('Automatic Friend Account'), 0], - [L10n::t('Blog Account'), 0], - [L10n::t('Private Forum Account'), 0] - ]; - - $users = 0; - $pageFlagsCountStmt = DBA::p('SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`'); - while ($pageFlagsCount = DBA::fetch($pageFlagsCountStmt)) { - $accounts[$pageFlagsCount['page-flags']][1] = $pageFlagsCount['count']; - $users += $pageFlagsCount['count']; - } - DBA::close($pageFlagsCountStmt); - - Logger::log('accounts: ' . print_r($accounts, true), Logger::DATA); - - $pending = Register::getPendingCount(); - - $queue = DBA::count('queue', []); - - $deferred = DBA::count('workerqueue', ['`executed` <= ? AND NOT `done` AND `next_try` > ?', - DBA::NULL_DATETIME, DateTimeFormat::utcNow()]); - - $workerqueue = DBA::count('workerqueue', ['`executed` <= ? AND NOT `done` AND `next_try` < ?', - DBA::NULL_DATETIME, DateTimeFormat::utcNow()]); - - // We can do better, but this is a quick queue status - $queues = ['label' => L10n::t('Message queues'), 'queue' => $queue, 'deferred' => $deferred, 'workerq' => $workerqueue]; - - $variables = DBA::toArray(DBA::p('SHOW variables LIKE "max_allowed_packet"')); - $max_allowed_packet = $variables ? $variables[0]['Value'] : 0; - - $server_settings = [ - 'label' => L10n::t('Server Settings'), - 'php' => [ - 'upload_max_filesize' => ini_get('upload_max_filesize'), - 'post_max_size' => ini_get('post_max_size'), - 'memory_limit' => ini_get('memory_limit') - ], - 'mysql' => [ - 'max_allowed_packet' => $max_allowed_packet - ] - ]; - - $t = Renderer::getMarkupTemplate('admin/summary.tpl'); - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Summary'), - '$queues' => $queues, - '$users' => [L10n::t('Registered users'), $users], - '$accounts' => $accounts, - '$pending' => [L10n::t('Pending registrations'), $pending], - '$version' => [L10n::t('Version'), FRIENDICA_VERSION], - '$platform' => FRIENDICA_PLATFORM, - '$codename' => FRIENDICA_CODENAME, - '$build' => Config::get('system', 'build'), - '$addons' => [L10n::t('Active addons'), Addon::getEnabledList()], - '$serversettings' => $server_settings, - '$warningtext' => $warningtext - ]); - } - - private static function checkSelfHostMeta() - { - // Fetch the host-meta to check if this really is a vital server - return Network::curl(self::getApp()->getBaseURL() . '/.well-known/host-meta')->isSuccess(); - } - -} \ No newline at end of file + 'myisam', 'table_schema' => DBA::databaseName()])) { + $warningtext[] = L10n::t('Your DB still runs with MyISAM tables. You should change the engine type to InnoDB. As Friendica will use InnoDB only features in the future, you should change this! See here for a guide that may be helpful converting the table engines. You may also use the command php bin/console.php dbstructure toinnodb of your Friendica installation for an automatic conversion.
    ', 'https://dev.mysql.com/doc/refman/5.7/en/converting-tables-to-innodb.html'); + } + + // Check if github.com/friendica/master/VERSION is higher then + // the local version of Friendica. Check is opt-in, source may be master or devel branch + if (Config::get('system', 'check_new_version_url', 'none') != 'none') { + $gitversion = Config::get('system', 'git_friendica_version'); + if (version_compare(FRIENDICA_VERSION, $gitversion) < 0) { + $warningtext[] = L10n::t('There is a new version of Friendica available for download. Your current version is %1$s, upstream version is %2$s', FRIENDICA_VERSION, $gitversion); + } + } + + if (Config::get('system', 'dbupdate', DBStructure::UPDATE_NOT_CHECKED) == DBStructure::UPDATE_NOT_CHECKED) { + DBStructure::update($a->getBasePath(), false, true); + } + + if (Config::get('system', 'dbupdate') == DBStructure::UPDATE_FAILED) { + $warningtext[] = L10n::t('The database update failed. Please run "php bin/console.php dbstructure update" from the command line and have a look at the errors that might appear.'); + } + + if (Config::get('system', 'update') == Update::FAILED) { + $warningtext[] = L10n::t('The last update failed. Please run "php bin/console.php dbstructure update" from the command line and have a look at the errors that might appear. (Some of the errors are possibly inside the logfile.)'); + } + + $last_worker_call = Config::get('system', 'last_worker_execution', false); + if (!$last_worker_call) { + $warningtext[] = L10n::t('The worker was never executed. Please check your database structure!'); + } elseif ((strtotime(DateTimeFormat::utcNow()) - strtotime($last_worker_call)) > 60 * 60) { + $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')) { + $warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from .htconfig.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config'); + } + + if (file_exists('config/local.ini.php')) { + $warningtext[] = L10n::t('Friendica\'s configuration now is stored in config/local.config.php, please copy config/local-sample.config.php and move your config from config/local.ini.php. See the Config help page for help with the transition.', $a->getBaseURL() . '/help/Config'); + } + + // Check server vitality + if (!self::checkSelfHostMeta()) { + $well_known = $a->getBaseURL() . '/.well-known/host-meta'; + $warningtext[] = L10n::t('%s is not reachable on your system. This is a severe configuration issue that prevents server to server communication. See the installation page for help.', + $well_known, $well_known, $a->getBaseURL() . '/help/Install'); + } + + $accounts = [ + [L10n::t('Normal Account'), 0], + [L10n::t('Automatic Follower Account'), 0], + [L10n::t('Public Forum Account'), 0], + [L10n::t('Automatic Friend Account'), 0], + [L10n::t('Blog Account'), 0], + [L10n::t('Private Forum Account'), 0] + ]; + + $users = 0; + $pageFlagsCountStmt = DBA::p('SELECT `page-flags`, COUNT(`uid`) AS `count` FROM `user` GROUP BY `page-flags`'); + while ($pageFlagsCount = DBA::fetch($pageFlagsCountStmt)) { + $accounts[$pageFlagsCount['page-flags']][1] = $pageFlagsCount['count']; + $users += $pageFlagsCount['count']; + } + DBA::close($pageFlagsCountStmt); + + Logger::log('accounts: ' . print_r($accounts, true), Logger::DATA); + + $pending = Register::getPendingCount(); + + $queue = DBA::count('queue', []); + + $deferred = DBA::count('workerqueue', ['`executed` <= ? AND NOT `done` AND `next_try` > ?', + DBA::NULL_DATETIME, DateTimeFormat::utcNow()]); + + $workerqueue = DBA::count('workerqueue', ['`executed` <= ? AND NOT `done` AND `next_try` < ?', + DBA::NULL_DATETIME, DateTimeFormat::utcNow()]); + + // We can do better, but this is a quick queue status + $queues = ['label' => L10n::t('Message queues'), 'queue' => $queue, 'deferred' => $deferred, 'workerq' => $workerqueue]; + + $variables = DBA::toArray(DBA::p('SHOW variables LIKE "max_allowed_packet"')); + $max_allowed_packet = $variables ? $variables[0]['Value'] : 0; + + $server_settings = [ + 'label' => L10n::t('Server Settings'), + 'php' => [ + 'upload_max_filesize' => ini_get('upload_max_filesize'), + 'post_max_size' => ini_get('post_max_size'), + 'memory_limit' => ini_get('memory_limit') + ], + 'mysql' => [ + 'max_allowed_packet' => $max_allowed_packet + ] + ]; + + $t = Renderer::getMarkupTemplate('admin/summary.tpl'); + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Summary'), + '$queues' => $queues, + '$users' => [L10n::t('Registered users'), $users], + '$accounts' => $accounts, + '$pending' => [L10n::t('Pending registrations'), $pending], + '$version' => [L10n::t('Version'), FRIENDICA_VERSION], + '$platform' => FRIENDICA_PLATFORM, + '$codename' => FRIENDICA_CODENAME, + '$build' => Config::get('system', 'build'), + '$addons' => [L10n::t('Active addons'), Addon::getEnabledList()], + '$serversettings' => $server_settings, + '$warningtext' => $warningtext + ]); + } + + private static function checkSelfHostMeta() + { + // Fetch the host-meta to check if this really is a vital server + return Network::curl(self::getApp()->getBaseURL() . '/.well-known/host-meta')->isSuccess(); + } + +} diff --git a/src/Module/Admin/Themes/Details.php b/src/Module/Admin/Themes/Details.php index d8a2d2139d..3750e96070 100644 --- a/src/Module/Admin/Themes/Details.php +++ b/src/Module/Admin/Themes/Details.php @@ -1,126 +1,126 @@ -argc > 2) { - // @TODO: Replace with parameter from router - $theme = $a->argv[2]; - $theme = Strings::sanitizeFilePathItem($theme); - if (is_file("view/theme/$theme/config.php")) { - require_once "view/theme/$theme/config.php"; - - if (function_exists('theme_admin_post')) { - theme_admin_post($a); - } - } - - info(L10n::t('Theme settings updated.')); - - if ($a->isAjax()) { - return; - } - - $a->internalRedirect('admin/themes/' . $theme); - } - } - - public static function content() - { - parent::content(); - - $a = self::getApp(); - - if ($a->argc > 2) { - // @TODO: Replace with parameter from router - $theme = $a->argv[2]; - $theme = Strings::sanitizeFilePathItem($theme); - if (!is_dir("view/theme/$theme")) { - notice(L10n::t("Item not found.")); - return ''; - } - - $isEnabled = in_array($theme, Theme::getAllowedList()); - if ($isEnabled) { - $status = "on"; - $action = L10n::t("Disable"); - } else { - $status = "off"; - $action = L10n::t("Enable"); - } - - if (!empty($_GET['action']) && $_GET['action'] == 'toggle') { - parent::checkFormSecurityTokenRedirectOnError('/admin/themes', 'admin_themes', 't'); - - if ($isEnabled) { - Theme::uninstall($theme); - info(L10n::t('Theme %s disabled.', $theme)); - } elseif (Theme::install($theme)) { - info(L10n::t('Theme %s successfully enabled.', $theme)); - } else { - info(L10n::t('Theme %s failed to install.', $theme)); - } - - $a->internalRedirect('admin/themes/' . $theme); - } - - $readme = null; - if (is_file("view/theme/$theme/README.md")) { - $readme = Markdown::convert(file_get_contents("view/theme/$theme/README.md"), false); - } elseif (is_file("view/theme/$theme/README")) { - $readme = "
    " . file_get_contents("view/theme/$theme/README") . "
    "; - } - - $admin_form = ''; - if (is_file("view/theme/$theme/config.php")) { - require_once "view/theme/$theme/config.php"; - - if (function_exists('theme_admin')) { - $admin_form = ''; - } - } - - $screenshot = [Theme::getScreenshot($theme), L10n::t('Screenshot')]; - if (!stristr($screenshot[0], $theme)) { - $screenshot = null; - } - - $t = Renderer::getMarkupTemplate('admin/addons/details.tpl'); - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Themes'), - '$toggle' => L10n::t('Toggle'), - '$settings' => L10n::t('Settings'), - '$baseurl' => $a->getBaseURL(true), - '$addon' => $theme, - '$status' => $status, - '$action' => $action, - '$info' => Theme::getInfo($theme), - '$function' => 'themes', - '$admin_form' => $admin_form, - '$str_author' => L10n::t('Author: '), - '$str_maintainer' => L10n::t('Maintainer: '), - '$screenshot' => $screenshot, - '$readme' => $readme, - - '$form_security_token' => parent::getFormSecurityToken("admin_themes"), - ]); - } - - $a->internalRedirect('admin/themes'); - } -} \ No newline at end of file +argc > 2) { + // @TODO: Replace with parameter from router + $theme = $a->argv[2]; + $theme = Strings::sanitizeFilePathItem($theme); + if (is_file("view/theme/$theme/config.php")) { + require_once "view/theme/$theme/config.php"; + + if (function_exists('theme_admin_post')) { + theme_admin_post($a); + } + } + + info(L10n::t('Theme settings updated.')); + + if ($a->isAjax()) { + return; + } + + $a->internalRedirect('admin/themes/' . $theme); + } + } + + public static function content() + { + parent::content(); + + $a = self::getApp(); + + if ($a->argc > 2) { + // @TODO: Replace with parameter from router + $theme = $a->argv[2]; + $theme = Strings::sanitizeFilePathItem($theme); + if (!is_dir("view/theme/$theme")) { + notice(L10n::t("Item not found.")); + return ''; + } + + $isEnabled = in_array($theme, Theme::getAllowedList()); + if ($isEnabled) { + $status = "on"; + $action = L10n::t("Disable"); + } else { + $status = "off"; + $action = L10n::t("Enable"); + } + + if (!empty($_GET['action']) && $_GET['action'] == 'toggle') { + parent::checkFormSecurityTokenRedirectOnError('/admin/themes', 'admin_themes', 't'); + + if ($isEnabled) { + Theme::uninstall($theme); + info(L10n::t('Theme %s disabled.', $theme)); + } elseif (Theme::install($theme)) { + info(L10n::t('Theme %s successfully enabled.', $theme)); + } else { + info(L10n::t('Theme %s failed to install.', $theme)); + } + + $a->internalRedirect('admin/themes/' . $theme); + } + + $readme = null; + if (is_file("view/theme/$theme/README.md")) { + $readme = Markdown::convert(file_get_contents("view/theme/$theme/README.md"), false); + } elseif (is_file("view/theme/$theme/README")) { + $readme = "
    " . file_get_contents("view/theme/$theme/README") . "
    "; + } + + $admin_form = ''; + if (is_file("view/theme/$theme/config.php")) { + require_once "view/theme/$theme/config.php"; + + if (function_exists('theme_admin')) { + $admin_form = ''; + } + } + + $screenshot = [Theme::getScreenshot($theme), L10n::t('Screenshot')]; + if (!stristr($screenshot[0], $theme)) { + $screenshot = null; + } + + $t = Renderer::getMarkupTemplate('admin/addons/details.tpl'); + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Themes'), + '$toggle' => L10n::t('Toggle'), + '$settings' => L10n::t('Settings'), + '$baseurl' => $a->getBaseURL(true), + '$addon' => $theme, + '$status' => $status, + '$action' => $action, + '$info' => Theme::getInfo($theme), + '$function' => 'themes', + '$admin_form' => $admin_form, + '$str_author' => L10n::t('Author: '), + '$str_maintainer' => L10n::t('Maintainer: '), + '$screenshot' => $screenshot, + '$readme' => $readme, + + '$form_security_token' => parent::getFormSecurityToken("admin_themes"), + ]); + } + + $a->internalRedirect('admin/themes'); + } +} diff --git a/src/Module/Admin/Themes/Embed.php b/src/Module/Admin/Themes/Embed.php index 4ca2a4e7ad..dc41d11a48 100644 --- a/src/Module/Admin/Themes/Embed.php +++ b/src/Module/Admin/Themes/Embed.php @@ -1,90 +1,90 @@ -argc > 2) { - // @TODO: Replace with parameter from router - $theme = $a->argv[2]; - $theme = Strings::sanitizeFilePathItem($theme); - if (is_file("view/theme/$theme/config.php")) { - $a->setCurrentTheme($theme); - } - } - } - - public static function post() - { - parent::post(); - - $a = self::getApp(); - - if ($a->argc > 2) { - // @TODO: Replace with parameter from router - $theme = $a->argv[2]; - $theme = Strings::sanitizeFilePathItem($theme); - if (is_file("view/theme/$theme/config.php")) { - self::checkFormSecurityTokenRedirectOnError('/admin/themes/' . $theme . '/embed?mode=minimal', 'admin_theme_settings'); - - require_once "view/theme/$theme/config.php"; - - if (function_exists('theme_admin_post')) { - theme_admin_post($a); - } - } - - info(L10n::t('Theme settings updated.')); - - if ($a->isAjax()) { - return; - } - - $a->internalRedirect('admin/themes/' . $theme . '/embed?mode=minimal'); - } - } - - public static function content() - { - parent::content(); - - $a = self::getApp(); - - if ($a->argc > 2) { - // @TODO: Replace with parameter from router - $theme = $a->argv[2]; - $theme = Strings::sanitizeFilePathItem($theme); - if (!is_dir("view/theme/$theme")) { - notice(L10n::t('Unknown theme.')); - return ''; - } - - $admin_form = ''; - if (is_file("view/theme/$theme/config.php")) { - require_once "view/theme/$theme/config.php"; - - if (function_exists('theme_admin')) { - $admin_form = theme_admin($a); - } - } - - $t = Renderer::getMarkupTemplate('admin/addons/embed.tpl'); - return Renderer::replaceMacros($t, [ - '$action' => '/admin/themes/' . $theme . '/embed?mode=minimal', - '$form' => $admin_form, - '$form_security_token' => parent::getFormSecurityToken("admin_theme_settings"), - ]); - } - - return ''; - } -} \ No newline at end of file +argc > 2) { + // @TODO: Replace with parameter from router + $theme = $a->argv[2]; + $theme = Strings::sanitizeFilePathItem($theme); + if (is_file("view/theme/$theme/config.php")) { + $a->setCurrentTheme($theme); + } + } + } + + public static function post() + { + parent::post(); + + $a = self::getApp(); + + if ($a->argc > 2) { + // @TODO: Replace with parameter from router + $theme = $a->argv[2]; + $theme = Strings::sanitizeFilePathItem($theme); + if (is_file("view/theme/$theme/config.php")) { + self::checkFormSecurityTokenRedirectOnError('/admin/themes/' . $theme . '/embed?mode=minimal', 'admin_theme_settings'); + + require_once "view/theme/$theme/config.php"; + + if (function_exists('theme_admin_post')) { + theme_admin_post($a); + } + } + + info(L10n::t('Theme settings updated.')); + + if ($a->isAjax()) { + return; + } + + $a->internalRedirect('admin/themes/' . $theme . '/embed?mode=minimal'); + } + } + + public static function content() + { + parent::content(); + + $a = self::getApp(); + + if ($a->argc > 2) { + // @TODO: Replace with parameter from router + $theme = $a->argv[2]; + $theme = Strings::sanitizeFilePathItem($theme); + if (!is_dir("view/theme/$theme")) { + notice(L10n::t('Unknown theme.')); + return ''; + } + + $admin_form = ''; + if (is_file("view/theme/$theme/config.php")) { + require_once "view/theme/$theme/config.php"; + + if (function_exists('theme_admin')) { + $admin_form = theme_admin($a); + } + } + + $t = Renderer::getMarkupTemplate('admin/addons/embed.tpl'); + return Renderer::replaceMacros($t, [ + '$action' => '/admin/themes/' . $theme . '/embed?mode=minimal', + '$form' => $admin_form, + '$form_security_token' => parent::getFormSecurityToken("admin_theme_settings"), + ]); + } + + return ''; + } +} diff --git a/src/Module/Admin/Themes/Index.php b/src/Module/Admin/Themes/Index.php index 62c775bf04..71a91919bd 100644 --- a/src/Module/Admin/Themes/Index.php +++ b/src/Module/Admin/Themes/Index.php @@ -1,107 +1,107 @@ -getBaseURL() . '/admin/themes', 'admin_themes', 't'); - - switch ($_GET['action']) { - case 'reload': - foreach ($allowed_themes as $theme) { - Theme::uninstall($theme['name']); - Theme::install($theme['name']); - } - - info('Themes reloaded'); - break; - - case 'toggle' : - $theme = defaults($_GET, 'addon', ''); - if ($theme) { - $theme = Strings::sanitizeFilePathItem($theme); - if (!is_dir("view/theme/$theme")) { - notice(L10n::t('Item not found.')); - return ''; - } - - if (in_array($theme, Theme::getAllowedList())) { - Theme::uninstall($theme); - info(L10n::t('Theme %s disabled.', $theme)); - } elseif (Theme::install($theme)) { - info(L10n::t('Theme %s successfully enabled.', $theme)); - } else { - info(L10n::t('Theme %s failed to install.', $theme)); - } - } - - break; - - } - - $a->internalRedirect('admin/themes'); - } - - $themes = []; - $files = glob('view/theme/*'); - if (is_array($files)) { - foreach ($files as $file) { - $theme = basename($file); - - // Is there a style file? - $theme_files = glob('view/theme/' . $theme . '/style.*'); - - // If not then quit - if (count($theme_files) == 0) { - continue; - } - - $is_experimental = intval(file_exists($file . '/experimental')); - $is_supported = 1 - (intval(file_exists($file . '/unsupported'))); - $is_allowed = intval(in_array($theme, $allowed_themes)); - - if ($is_allowed || $is_supported || Config::get('system', 'show_unsupported_themes')) { - $themes[] = ['name' => $theme, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed]; - } - } - } - - $addons = []; - foreach ($themes as $theme) { - $addons[] = [$theme['name'], (($theme['allowed']) ? 'on' : 'off'), Theme::getInfo($theme['name'])]; - } - - $t = Renderer::getMarkupTemplate('admin/addons/index.tpl'); - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Themes'), - '$submit' => L10n::t('Save Settings'), - '$reload' => L10n::t('Reload active themes'), - '$baseurl' => $a->getBaseURL(true), - '$function' => 'themes', - '$addons' => $addons, - '$pcount' => count($themes), - '$noplugshint' => L10n::t('No themes found on the system. They should be placed in %1$s', '/view/themes'), - '$experimental' => L10n::t('[Experimental]'), - '$unsupported' => L10n::t('[Unsupported]'), - '$form_security_token' => parent::getFormSecurityToken('admin_themes'), - ]); - } -} \ No newline at end of file +getBaseURL() . '/admin/themes', 'admin_themes', 't'); + + switch ($_GET['action']) { + case 'reload': + foreach ($allowed_themes as $theme) { + Theme::uninstall($theme['name']); + Theme::install($theme['name']); + } + + info('Themes reloaded'); + break; + + case 'toggle' : + $theme = defaults($_GET, 'addon', ''); + if ($theme) { + $theme = Strings::sanitizeFilePathItem($theme); + if (!is_dir("view/theme/$theme")) { + notice(L10n::t('Item not found.')); + return ''; + } + + if (in_array($theme, Theme::getAllowedList())) { + Theme::uninstall($theme); + info(L10n::t('Theme %s disabled.', $theme)); + } elseif (Theme::install($theme)) { + info(L10n::t('Theme %s successfully enabled.', $theme)); + } else { + info(L10n::t('Theme %s failed to install.', $theme)); + } + } + + break; + + } + + $a->internalRedirect('admin/themes'); + } + + $themes = []; + $files = glob('view/theme/*'); + if (is_array($files)) { + foreach ($files as $file) { + $theme = basename($file); + + // Is there a style file? + $theme_files = glob('view/theme/' . $theme . '/style.*'); + + // If not then quit + if (count($theme_files) == 0) { + continue; + } + + $is_experimental = intval(file_exists($file . '/experimental')); + $is_supported = 1 - (intval(file_exists($file . '/unsupported'))); + $is_allowed = intval(in_array($theme, $allowed_themes)); + + if ($is_allowed || $is_supported || Config::get('system', 'show_unsupported_themes')) { + $themes[] = ['name' => $theme, 'experimental' => $is_experimental, 'supported' => $is_supported, 'allowed' => $is_allowed]; + } + } + } + + $addons = []; + foreach ($themes as $theme) { + $addons[] = [$theme['name'], (($theme['allowed']) ? 'on' : 'off'), Theme::getInfo($theme['name'])]; + } + + $t = Renderer::getMarkupTemplate('admin/addons/index.tpl'); + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Themes'), + '$submit' => L10n::t('Save Settings'), + '$reload' => L10n::t('Reload active themes'), + '$baseurl' => $a->getBaseURL(true), + '$function' => 'themes', + '$addons' => $addons, + '$pcount' => count($themes), + '$noplugshint' => L10n::t('No themes found on the system. They should be placed in %1$s', '/view/themes'), + '$experimental' => L10n::t('[Experimental]'), + '$unsupported' => L10n::t('[Unsupported]'), + '$form_security_token' => parent::getFormSecurityToken('admin_themes'), + ]); + } +} diff --git a/src/Module/Admin/Tos.php b/src/Module/Admin/Tos.php index efab22f8ef..4eb6e3426c 100644 --- a/src/Module/Admin/Tos.php +++ b/src/Module/Admin/Tos.php @@ -1,53 +1,53 @@ -internalRedirect('admin/tos'); - } - - public static function content() - { - parent::content(); - - $tos = new \Friendica\Module\Tos(); - $t = Renderer::getMarkupTemplate('admin/tos.tpl'); - return Renderer::replaceMacros($t, [ - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Terms of Service'), - '$displaytos' => ['displaytos', L10n::t('Display Terms of Service'), Config::get('system', 'tosdisplay'), L10n::t('Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page.')], - '$displayprivstatement' => ['displayprivstatement', L10n::t('Display Privacy Statement'), Config::get('system', 'tosprivstatement'), L10n::t('Show some informations regarding the needed information to operate the node according e.g. to EU-GDPR.', 'https://en.wikipedia.org/wiki/General_Data_Protection_Regulation')], - '$preview' => L10n::t('Privacy Statement Preview'), - '$privtext' => $tos->privacy_complete, - '$tostext' => ['tostext', L10n::t('The Terms of Service'), Config::get('system', 'tostext'), L10n::t('Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below.')], - '$form_security_token' => parent::getFormSecurityToken('admin_tos'), - '$submit' => L10n::t('Save Settings'), - ]); - } -} \ No newline at end of file +internalRedirect('admin/tos'); + } + + public static function content() + { + parent::content(); + + $tos = new \Friendica\Module\Tos(); + $t = Renderer::getMarkupTemplate('admin/tos.tpl'); + return Renderer::replaceMacros($t, [ + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Terms of Service'), + '$displaytos' => ['displaytos', L10n::t('Display Terms of Service'), Config::get('system', 'tosdisplay'), L10n::t('Enable the Terms of Service page. If this is enabled a link to the terms will be added to the registration form and the general information page.')], + '$displayprivstatement' => ['displayprivstatement', L10n::t('Display Privacy Statement'), Config::get('system', 'tosprivstatement'), L10n::t('Show some informations regarding the needed information to operate the node according e.g. to EU-GDPR.', 'https://en.wikipedia.org/wiki/General_Data_Protection_Regulation')], + '$preview' => L10n::t('Privacy Statement Preview'), + '$privtext' => $tos->privacy_complete, + '$tostext' => ['tostext', L10n::t('The Terms of Service'), Config::get('system', 'tostext'), L10n::t('Enter the Terms of Service for your node here. You can use BBCode. Headers of sections should be [h2] and below.')], + '$form_security_token' => parent::getFormSecurityToken('admin_tos'), + '$submit' => L10n::t('Save Settings'), + ]); + } +} diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php index 4d25f4f893..d9852e98d0 100644 --- a/src/Module/Admin/Users.php +++ b/src/Module/Admin/Users.php @@ -1,318 +1,318 @@ - $nu_name, - 'email' => $nu_email, - 'nickname' => $nu_nickname, - 'verified' => 1, - 'language' => $nu_language - ]); - } catch (\Exception $ex) { - notice($ex->getMessage()); - return; - } - - $user = $result['user']; - $preamble = Strings::deindent(L10n::t(' - Dear %1$s, - the administrator of %2$s has set up an account for you.')); - $body = Strings::deindent(L10n::t(' - The login details are as follows: - - Site Location: %1$s - Login Name: %2$s - Password: %3$s - - You may change your password from your account "Settings" page after logging - in. - - Please take a few moments to review the other account settings on that page. - - You may also wish to add some basic information to your default profile - (on the "Profiles" page) so that other people can easily find you. - - We recommend setting your full name, adding a profile photo, - adding some profile "keywords" (very useful in making new friends) - and - perhaps what country you live in; if you do not wish to be more specific - than that. - - We fully respect your right to privacy, and none of these items are necessary. - If you are new and do not know anybody here, they may help - you to make some new and interesting friends. - - If you ever want to delete your account, you can do so at %1$s/removeme - - Thank you and welcome to %4$s.')); - - $preamble = sprintf($preamble, $user['username'], Config::get('config', 'sitename')); - $body = sprintf($body, $a->getBaseURL(), $user['nickname'], $result['password'], Config::get('config', 'sitename')); - - notification([ - 'type' => SYSTEM_EMAIL, - 'language' => $user['language'], - 'to_name' => $user['username'], - 'to_email' => $user['email'], - 'uid' => $user['uid'], - 'subject' => L10n::t('Registration details for %s', Config::get('config', 'sitename')), - 'preamble' => $preamble, - 'body' => $body]); - } - - if (!empty($_POST['page_users_block'])) { - DBA::update('user', ['blocked' => 1], ['uid' => $users]); - notice(L10n::tt('%s user blocked', '%s users blocked', count($users))); - } - - if (!empty($_POST['page_users_unblock'])) { - DBA::update('user', ['blocked' => 0], ['uid' => $users]); - notice(L10n::tt('%s user unblocked', '%s users unblocked', count($users))); - } - - if (!empty($_POST['page_users_delete'])) { - foreach ($users as $uid) { - if (local_user() != $uid) { - User::remove($uid); - } else { - notice(L10n::t('You can\'t remove yourself')); - } - } - - notice(L10n::tt('%s user deleted', '%s users deleted', count($users))); - } - - if (!empty($_POST['page_users_approve'])) { - require_once 'mod/regmod.php'; - foreach ($pending as $hash) { - user_allow($hash); - } - } - - if (!empty($_POST['page_users_deny'])) { - require_once 'mod/regmod.php'; - foreach ($pending as $hash) { - user_deny($hash); - } - } - - $a->internalRedirect('admin/users'); - } - - public static function content() - { - parent::content(); - - $a = self::getApp(); - - if ($a->argc > 3) { - // @TODO: Replace with parameter from router - $action = $a->argv[2]; - $uid = $a->argv[3]; - $user = DBA::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]); - if (!DBA::isResult($user)) { - notice('User not found' . EOL); - $a->internalRedirect('admin/users'); - return ''; // NOTREACHED - } - - switch ($action) { - case 'delete': - if (local_user() != $uid) { - parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); - // delete user - User::remove($uid); - - notice(L10n::t('User "%s" deleted', $user['username'])); - } else { - notice(L10n::t('You can\'t remove yourself')); - } - break; - case 'block': - parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); - DBA::update('user', ['blocked' => 1], ['uid' => $uid]); - notice(L10n::t('User "%s" blocked', $user['username'])); - break; - case 'unblock': - parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); - DBA::update('user', ['blocked' => 0], ['uid' => $uid]); - notice(L10n::t('User "%s" unblocked', $user['username'])); - break; - } - - $a->internalRedirect('admin/users'); - } - - /* get pending */ - $pending = Register::getPending(); - - $pager = new Pager($a->query_string, 100); - - /* ordering */ - $valid_orders = [ - 'contact.name', - 'user.email', - 'user.register_date', - 'user.login_date', - 'lastitem_date', - 'user.page-flags' - ]; - - $order = 'contact.name'; - $order_direction = '+'; - if (!empty($_GET['o'])) { - $new_order = $_GET['o']; - if ($new_order[0] === '-') { - $order_direction = '-'; - $new_order = substr($new_order, 1); - } - - if (in_array($new_order, $valid_orders)) { - $order = $new_order; - } - } - $sql_order = '`' . str_replace('.', '`.`', $order) . '`'; - $sql_order_direction = ($order_direction === '+') ? 'ASC' : 'DESC'; - - $usersStmt = DBA::p("SELECT `user`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`account_expired`, `contact`.`last-item` AS `lastitem_date` - FROM `user` - INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self` - WHERE `user`.`verified` - ORDER BY $sql_order $sql_order_direction LIMIT ?, ?", $pager->getStart(), $pager->getItemsPerPage() - ); - $users = DBA::toArray($usersStmt); - - $adminlist = explode(',', str_replace(' ', '', Config::get('config', 'admin_email'))); - $_setup_users = function ($e) use ($adminlist) { - $page_types = [ - User::PAGE_FLAGS_NORMAL => L10n::t('Normal Account Page'), - User::PAGE_FLAGS_SOAPBOX => L10n::t('Soapbox Page'), - User::PAGE_FLAGS_COMMUNITY => L10n::t('Public Forum'), - User::PAGE_FLAGS_FREELOVE => L10n::t('Automatic Friend Page'), - User::PAGE_FLAGS_PRVGROUP => L10n::t('Private Forum') - ]; - $account_types = [ - User::ACCOUNT_TYPE_PERSON => L10n::t('Personal Page'), - User::ACCOUNT_TYPE_ORGANISATION => L10n::t('Organisation Page'), - User::ACCOUNT_TYPE_NEWS => L10n::t('News Page'), - User::ACCOUNT_TYPE_COMMUNITY => L10n::t('Community Forum'), - User::ACCOUNT_TYPE_RELAY => L10n::t('Relay'), - ]; - - $e['page_flags_raw'] = $e['page-flags']; - $e['page-flags'] = $page_types[$e['page-flags']]; - - $e['account_type_raw'] = ($e['page_flags_raw'] == 0) ? $e['account-type'] : -1; - $e['account-type'] = ($e['page_flags_raw'] == 0) ? $account_types[$e['account-type']] : ''; - - $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'] = 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); - - return $e; - }; - - $tmp_users = array_map($_setup_users, $users); - - // Get rid of dashes in key names, Smarty3 can't handle them - // and extracting deleted users - - $deleted = []; - $users = []; - foreach ($tmp_users as $user) { - foreach ($user as $k => $v) { - $newkey = str_replace('-', '_', $k); - $user[$newkey] = $v; - } - - if ($user['deleted']) { - $deleted[] = $user; - } else { - $users[] = $user; - } - } - - $th_users = array_map(null, [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Type')], $valid_orders); - - $t = Renderer::getMarkupTemplate('admin/users.tpl'); - $o = Renderer::replaceMacros($t, [ - // strings // - '$title' => L10n::t('Administration'), - '$page' => L10n::t('Users'), - '$submit' => L10n::t('Add User'), - '$select_all' => L10n::t('select all'), - '$h_pending' => L10n::t('User registrations waiting for confirm'), - '$h_deleted' => L10n::t('User waiting for permanent deletion'), - '$th_pending' => [L10n::t('Request date'), L10n::t('Name'), L10n::t('Email')], - '$no_pending' => L10n::t('No registrations.'), - '$pendingnotetext' => L10n::t('Note from the user'), - '$approve' => L10n::t('Approve'), - '$deny' => L10n::t('Deny'), - '$delete' => L10n::t('Delete'), - '$block' => L10n::t('Block'), - '$blocked' => L10n::t('User blocked'), - '$unblock' => L10n::t('Unblock'), - '$siteadmin' => L10n::t('Site admin'), - '$accountexpired' => L10n::t('Account expired'), - - '$h_users' => L10n::t('Users'), - '$h_newuser' => L10n::t('New User'), - '$th_deleted' => [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Permanent deletion')], - '$th_users' => $th_users, - '$order_users' => $order, - '$order_direction_users' => $order_direction, - - '$confirm_delete_multi' => L10n::t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'), - '$confirm_delete' => L10n::t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'), - - '$form_security_token' => parent::getFormSecurityToken('admin_users'), - - // values // - '$baseurl' => $a->getBaseURL(true), - - '$pending' => $pending, - 'deleted' => $deleted, - '$users' => $users, - '$newusername' => ['new_user_name', L10n::t('Name'), '', L10n::t('Name of the new user.')], - '$newusernickname' => ['new_user_nickname', L10n::t('Nickname'), '', L10n::t('Nickname of the new user.')], - '$newuseremail' => ['new_user_email', L10n::t('Email'), '', L10n::t('Email address of the new user.'), '', '', 'email'], - ]); - - $o .= $pager->renderFull(DBA::count('user')); - - return $o; - } -} \ No newline at end of file + $nu_name, + 'email' => $nu_email, + 'nickname' => $nu_nickname, + 'verified' => 1, + 'language' => $nu_language + ]); + } catch (\Exception $ex) { + notice($ex->getMessage()); + return; + } + + $user = $result['user']; + $preamble = Strings::deindent(L10n::t(' + Dear %1$s, + the administrator of %2$s has set up an account for you.')); + $body = Strings::deindent(L10n::t(' + The login details are as follows: + + Site Location: %1$s + Login Name: %2$s + Password: %3$s + + You may change your password from your account "Settings" page after logging + in. + + Please take a few moments to review the other account settings on that page. + + You may also wish to add some basic information to your default profile + (on the "Profiles" page) so that other people can easily find you. + + We recommend setting your full name, adding a profile photo, + adding some profile "keywords" (very useful in making new friends) - and + perhaps what country you live in; if you do not wish to be more specific + than that. + + We fully respect your right to privacy, and none of these items are necessary. + If you are new and do not know anybody here, they may help + you to make some new and interesting friends. + + If you ever want to delete your account, you can do so at %1$s/removeme + + Thank you and welcome to %4$s.')); + + $preamble = sprintf($preamble, $user['username'], Config::get('config', 'sitename')); + $body = sprintf($body, $a->getBaseURL(), $user['nickname'], $result['password'], Config::get('config', 'sitename')); + + notification([ + 'type' => SYSTEM_EMAIL, + 'language' => $user['language'], + 'to_name' => $user['username'], + 'to_email' => $user['email'], + 'uid' => $user['uid'], + 'subject' => L10n::t('Registration details for %s', Config::get('config', 'sitename')), + 'preamble' => $preamble, + 'body' => $body]); + } + + if (!empty($_POST['page_users_block'])) { + DBA::update('user', ['blocked' => 1], ['uid' => $users]); + notice(L10n::tt('%s user blocked', '%s users blocked', count($users))); + } + + if (!empty($_POST['page_users_unblock'])) { + DBA::update('user', ['blocked' => 0], ['uid' => $users]); + notice(L10n::tt('%s user unblocked', '%s users unblocked', count($users))); + } + + if (!empty($_POST['page_users_delete'])) { + foreach ($users as $uid) { + if (local_user() != $uid) { + User::remove($uid); + } else { + notice(L10n::t('You can\'t remove yourself')); + } + } + + notice(L10n::tt('%s user deleted', '%s users deleted', count($users))); + } + + if (!empty($_POST['page_users_approve'])) { + require_once 'mod/regmod.php'; + foreach ($pending as $hash) { + user_allow($hash); + } + } + + if (!empty($_POST['page_users_deny'])) { + require_once 'mod/regmod.php'; + foreach ($pending as $hash) { + user_deny($hash); + } + } + + $a->internalRedirect('admin/users'); + } + + public static function content() + { + parent::content(); + + $a = self::getApp(); + + if ($a->argc > 3) { + // @TODO: Replace with parameter from router + $action = $a->argv[2]; + $uid = $a->argv[3]; + $user = DBA::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]); + if (!DBA::isResult($user)) { + notice('User not found' . EOL); + $a->internalRedirect('admin/users'); + return ''; // NOTREACHED + } + + switch ($action) { + case 'delete': + if (local_user() != $uid) { + parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); + // delete user + User::remove($uid); + + notice(L10n::t('User "%s" deleted', $user['username'])); + } else { + notice(L10n::t('You can\'t remove yourself')); + } + break; + case 'block': + parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); + DBA::update('user', ['blocked' => 1], ['uid' => $uid]); + notice(L10n::t('User "%s" blocked', $user['username'])); + break; + case 'unblock': + parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); + DBA::update('user', ['blocked' => 0], ['uid' => $uid]); + notice(L10n::t('User "%s" unblocked', $user['username'])); + break; + } + + $a->internalRedirect('admin/users'); + } + + /* get pending */ + $pending = Register::getPending(); + + $pager = new Pager($a->query_string, 100); + + /* ordering */ + $valid_orders = [ + 'contact.name', + 'user.email', + 'user.register_date', + 'user.login_date', + 'lastitem_date', + 'user.page-flags' + ]; + + $order = 'contact.name'; + $order_direction = '+'; + if (!empty($_GET['o'])) { + $new_order = $_GET['o']; + if ($new_order[0] === '-') { + $order_direction = '-'; + $new_order = substr($new_order, 1); + } + + if (in_array($new_order, $valid_orders)) { + $order = $new_order; + } + } + $sql_order = '`' . str_replace('.', '`.`', $order) . '`'; + $sql_order_direction = ($order_direction === '+') ? 'ASC' : 'DESC'; + + $usersStmt = DBA::p("SELECT `user`.*, `contact`.`name`, `contact`.`url`, `contact`.`micro`, `user`.`account_expired`, `contact`.`last-item` AS `lastitem_date` + FROM `user` + INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self` + WHERE `user`.`verified` + ORDER BY $sql_order $sql_order_direction LIMIT ?, ?", $pager->getStart(), $pager->getItemsPerPage() + ); + $users = DBA::toArray($usersStmt); + + $adminlist = explode(',', str_replace(' ', '', Config::get('config', 'admin_email'))); + $_setup_users = function ($e) use ($adminlist) { + $page_types = [ + User::PAGE_FLAGS_NORMAL => L10n::t('Normal Account Page'), + User::PAGE_FLAGS_SOAPBOX => L10n::t('Soapbox Page'), + User::PAGE_FLAGS_COMMUNITY => L10n::t('Public Forum'), + User::PAGE_FLAGS_FREELOVE => L10n::t('Automatic Friend Page'), + User::PAGE_FLAGS_PRVGROUP => L10n::t('Private Forum') + ]; + $account_types = [ + User::ACCOUNT_TYPE_PERSON => L10n::t('Personal Page'), + User::ACCOUNT_TYPE_ORGANISATION => L10n::t('Organisation Page'), + User::ACCOUNT_TYPE_NEWS => L10n::t('News Page'), + User::ACCOUNT_TYPE_COMMUNITY => L10n::t('Community Forum'), + User::ACCOUNT_TYPE_RELAY => L10n::t('Relay'), + ]; + + $e['page_flags_raw'] = $e['page-flags']; + $e['page-flags'] = $page_types[$e['page-flags']]; + + $e['account_type_raw'] = ($e['page_flags_raw'] == 0) ? $e['account-type'] : -1; + $e['account-type'] = ($e['page_flags_raw'] == 0) ? $account_types[$e['account-type']] : ''; + + $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'] = 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); + + return $e; + }; + + $tmp_users = array_map($_setup_users, $users); + + // Get rid of dashes in key names, Smarty3 can't handle them + // and extracting deleted users + + $deleted = []; + $users = []; + foreach ($tmp_users as $user) { + foreach ($user as $k => $v) { + $newkey = str_replace('-', '_', $k); + $user[$newkey] = $v; + } + + if ($user['deleted']) { + $deleted[] = $user; + } else { + $users[] = $user; + } + } + + $th_users = array_map(null, [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Type')], $valid_orders); + + $t = Renderer::getMarkupTemplate('admin/users.tpl'); + $o = Renderer::replaceMacros($t, [ + // strings // + '$title' => L10n::t('Administration'), + '$page' => L10n::t('Users'), + '$submit' => L10n::t('Add User'), + '$select_all' => L10n::t('select all'), + '$h_pending' => L10n::t('User registrations waiting for confirm'), + '$h_deleted' => L10n::t('User waiting for permanent deletion'), + '$th_pending' => [L10n::t('Request date'), L10n::t('Name'), L10n::t('Email')], + '$no_pending' => L10n::t('No registrations.'), + '$pendingnotetext' => L10n::t('Note from the user'), + '$approve' => L10n::t('Approve'), + '$deny' => L10n::t('Deny'), + '$delete' => L10n::t('Delete'), + '$block' => L10n::t('Block'), + '$blocked' => L10n::t('User blocked'), + '$unblock' => L10n::t('Unblock'), + '$siteadmin' => L10n::t('Site admin'), + '$accountexpired' => L10n::t('Account expired'), + + '$h_users' => L10n::t('Users'), + '$h_newuser' => L10n::t('New User'), + '$th_deleted' => [L10n::t('Name'), L10n::t('Email'), L10n::t('Register date'), L10n::t('Last login'), L10n::t('Last item'), L10n::t('Permanent deletion')], + '$th_users' => $th_users, + '$order_users' => $order, + '$order_direction_users' => $order_direction, + + '$confirm_delete_multi' => L10n::t('Selected users will be deleted!\n\nEverything these users had posted on this site will be permanently deleted!\n\nAre you sure?'), + '$confirm_delete' => L10n::t('The user {0} will be deleted!\n\nEverything this user has posted on this site will be permanently deleted!\n\nAre you sure?'), + + '$form_security_token' => parent::getFormSecurityToken('admin_users'), + + // values // + '$baseurl' => $a->getBaseURL(true), + + '$pending' => $pending, + 'deleted' => $deleted, + '$users' => $users, + '$newusername' => ['new_user_name', L10n::t('Name'), '', L10n::t('Name of the new user.')], + '$newusernickname' => ['new_user_nickname', L10n::t('Nickname'), '', L10n::t('Nickname of the new user.')], + '$newuseremail' => ['new_user_email', L10n::t('Email'), '', L10n::t('Email address of the new user.'), '', '', 'email'], + ]); + + $o .= $pager->renderFull(DBA::count('user')); + + return $o; + } +} diff --git a/src/Module/BaseAdminModule.php b/src/Module/BaseAdminModule.php index 5e56bd8d71..dd89bcb6c7 100644 --- a/src/Module/BaseAdminModule.php +++ b/src/Module/BaseAdminModule.php @@ -1,113 +1,122 @@ -page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/settings_head.tpl'), []); - - /* - * Side bar links - */ - - // array(url, name, extra css classes) - // not part of $aside to make the template more adjustable - $aside_sub = [ - 'information' => [L10n::t('Information'), [ - 'overview' => ['admin' , L10n::t('Overview') , 'overview'], - 'federation' => ['admin/federation' , L10n::t('Federation Statistics') , 'federation'] - ]], - 'configuration' => [L10n::t('Configuration'), [ - 'site' => ['admin/site' , L10n::t('Site') , 'site'], - 'users' => ['admin/users' , L10n::t('Users') , 'users'], - 'addons' => ['admin/addons' , L10n::t('Addons') , 'addons'], - 'themes' => ['admin/themes' , L10n::t('Themes') , 'themes'], - 'features' => ['admin/features' , L10n::t('Additional features') , 'features'], - 'tos' => ['admin/tos' , L10n::t('Terms of Service') , 'tos'], - ]], - 'database' => [L10n::t('Database'), [ - 'dbsync' => ['admin/dbsync' , L10n::t('DB updates') , 'dbsync'], - 'deferred' => ['admin/queue/deferred', L10n::t('Inspect Deferred Workers'), 'deferred'], - 'workerqueue' => ['admin/queue' , L10n::t('Inspect worker Queue') , 'workerqueue'], - ]], - 'tools' => [L10n::t('Tools'), [ - 'contactblock' => ['admin/blocklist/contact', L10n::t('Contact Blocklist') , 'contactblock'], - 'blocklist' => ['admin/blocklist/server' , L10n::t('Server Blocklist') , 'blocklist'], - 'deleteitem' => ['admin/item/delete' , L10n::t('Delete Item') , 'deleteitem'], - ]], - 'logs' => [L10n::t('Logs'), [ - 'logsconfig' => ['admin/logs/', L10n::t('Logs') , 'logs'], - 'logsview' => ['admin/logs/view' , L10n::t('View Logs') , 'viewlogs'], - ]], - 'diagnostics' => [L10n::t('Diagnostics'), [ - 'phpinfo' => ['admin/phpinfo' , L10n::t('PHP Info') , 'phpinfo'], - 'probe' => ['probe' , L10n::t('probe address') , 'probe'], - 'webfinger' => ['webfinger' , L10n::t('check webfinger') , 'webfinger'], - 'itemsource' => ['admin/item/source' , L10n::t('Item Source') , 'itemsource'], - 'babel' => ['babel' , L10n::t('Babel') , 'babel'], - ]], - ]; - - $t = Renderer::getMarkupTemplate('admin/aside.tpl'); - $a->page['aside'] .= Renderer::replaceMacros($t, [ - '$admin' => ['addons_admin' => Addon::getAdminList()], - '$subpages' => $aside_sub, - '$admtxt' => L10n::t('Admin'), - '$plugadmtxt' => L10n::t('Addon Features'), - '$h_pending' => L10n::t('User registrations waiting for confirmation'), - '$admurl' => 'admin/' - ]); - - return ''; - } -} +page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('admin/settings_head.tpl'), []); + + /* + * Side bar links + */ + + // array(url, name, extra css classes) + // not part of $aside to make the template more adjustable + $aside_sub = [ + 'information' => [L10n::t('Information'), [ + 'overview' => ['admin' , L10n::t('Overview') , 'overview'], + 'federation' => ['admin/federation' , L10n::t('Federation Statistics') , 'federation'] + ]], + 'configuration' => [L10n::t('Configuration'), [ + 'site' => ['admin/site' , L10n::t('Site') , 'site'], + 'users' => ['admin/users' , L10n::t('Users') , 'users'], + 'addons' => ['admin/addons' , L10n::t('Addons') , 'addons'], + 'themes' => ['admin/themes' , L10n::t('Themes') , 'themes'], + 'features' => ['admin/features' , L10n::t('Additional features') , 'features'], + 'tos' => ['admin/tos' , L10n::t('Terms of Service') , 'tos'], + ]], + 'database' => [L10n::t('Database'), [ + 'dbsync' => ['admin/dbsync' , L10n::t('DB updates') , 'dbsync'], + 'deferred' => ['admin/queue/deferred', L10n::t('Inspect Deferred Workers'), 'deferred'], + 'workerqueue' => ['admin/queue' , L10n::t('Inspect worker Queue') , 'workerqueue'], + ]], + 'tools' => [L10n::t('Tools'), [ + 'contactblock' => ['admin/blocklist/contact', L10n::t('Contact Blocklist') , 'contactblock'], + 'blocklist' => ['admin/blocklist/server' , L10n::t('Server Blocklist') , 'blocklist'], + 'deleteitem' => ['admin/item/delete' , L10n::t('Delete Item') , 'deleteitem'], + ]], + 'logs' => [L10n::t('Logs'), [ + 'logsconfig' => ['admin/logs/', L10n::t('Logs') , 'logs'], + 'logsview' => ['admin/logs/view' , L10n::t('View Logs') , 'viewlogs'], + ]], + 'diagnostics' => [L10n::t('Diagnostics'), [ + 'phpinfo' => ['admin/phpinfo' , L10n::t('PHP Info') , 'phpinfo'], + 'probe' => ['probe' , L10n::t('probe address') , 'probe'], + 'webfinger' => ['webfinger' , L10n::t('check webfinger') , 'webfinger'], + 'itemsource' => ['admin/item/source' , L10n::t('Item Source') , 'itemsource'], + 'babel' => ['babel' , L10n::t('Babel') , 'babel'], + ]], + ]; + + $t = Renderer::getMarkupTemplate('admin/aside.tpl'); + $a->page['aside'] .= Renderer::replaceMacros($t, [ + '$admin' => ['addons_admin' => Addon::getAdminList()], + '$subpages' => $aside_sub, + '$admtxt' => L10n::t('Admin'), + '$plugadmtxt' => L10n::t('Addon Features'), + '$h_pending' => L10n::t('User registrations waiting for confirmation'), + '$admurl' => 'admin/' + ]); + + return ''; + } +} From b4b8c61daf75fc16f2c51baf10c15792f6ace788 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 2 May 2019 10:20:02 -0400 Subject: [PATCH 37/37] Add @TODO comments per @nupplaphil review in various Admin modules --- src/Module/Admin/Queue.php | 1 + src/Module/Admin/Site.php | 1 + src/Module/Admin/Users.php | 8 ++++++-- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Module/Admin/Queue.php b/src/Module/Admin/Queue.php index 748a12a6a6..e89aa53c62 100644 --- a/src/Module/Admin/Queue.php +++ b/src/Module/Admin/Queue.php @@ -39,6 +39,7 @@ class Queue extends BaseAdminModule $info = L10n::t('This page lists the currently queued worker jobs. These jobs are handled by the worker cronjob you\'ve set up during install.'); } + // @TODO Move to Model\WorkerQueue::getEntries() $entries = DBA::select('workerqueue', ['id', 'parameter', 'created', 'priority'], $condition, ['order' => ['priority']]); $r = []; diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php index 37507ca996..5d2004ca5f 100644 --- a/src/Module/Admin/Site.php +++ b/src/Module/Admin/Site.php @@ -483,6 +483,7 @@ class Site extends BaseAdminModule ]; /* get user names to make the install a personal install of X */ + // @TODO Move to Model\User::getNames() $user_names = []; $user_names['---'] = L10n::t('Multi user instance'); diff --git a/src/Module/Admin/Users.php b/src/Module/Admin/Users.php index d9852e98d0..92dddd9f73 100644 --- a/src/Module/Admin/Users.php +++ b/src/Module/Admin/Users.php @@ -91,11 +91,13 @@ class Users extends BaseAdminModule } if (!empty($_POST['page_users_block'])) { + // @TODO Move this to Model\User:block($users); DBA::update('user', ['blocked' => 1], ['uid' => $users]); notice(L10n::tt('%s user blocked', '%s users blocked', count($users))); } if (!empty($_POST['page_users_unblock'])) { + // @TODO Move this to Model\User:unblock($users); DBA::update('user', ['blocked' => 0], ['uid' => $users]); notice(L10n::tt('%s user unblocked', '%s users unblocked', count($users))); } @@ -139,7 +141,7 @@ class Users extends BaseAdminModule // @TODO: Replace with parameter from router $action = $a->argv[2]; $uid = $a->argv[3]; - $user = DBA::selectFirst('user', ['username', 'blocked'], ['uid' => $uid]); + $user = User::getById($uid, ['username', 'blocked']); if (!DBA::isResult($user)) { notice('User not found' . EOL); $a->internalRedirect('admin/users'); @@ -160,11 +162,13 @@ class Users extends BaseAdminModule break; case 'block': parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); + // @TODO Move this to Model\User:block([$uid]); DBA::update('user', ['blocked' => 1], ['uid' => $uid]); notice(L10n::t('User "%s" blocked', $user['username'])); break; case 'unblock': parent::checkFormSecurityTokenRedirectOnError('/admin/users', 'admin_users', 't'); + // @TODO Move this to Model\User:unblock([$uid]); DBA::update('user', ['blocked' => 0], ['uid' => $uid]); notice(L10n::t('User "%s" unblocked', $user['username'])); break; @@ -178,7 +182,7 @@ class Users extends BaseAdminModule $pager = new Pager($a->query_string, 100); - /* ordering */ + // @TODO Move below block to Model\User::getUsers($start, $count, $order = 'contact.name', $order_direction = '+') $valid_orders = [ 'contact.name', 'user.email',