[DATABASE] Fix 'relation config doesn't exist'

src/Core/DefaultSettings.php

@@ -30,28 +30,27 @@
 
 namespace App\Core;
 
+use App\Entity\Config;
+use Symfony\Component\Config\Definition\Exception\Exception;
+
 abstract class DefaultSettings
 {
     public static array $defaults;
     public static function setDefaults()
     {
-        self::$defaults = ['site' => ['name' => 'Just another GNU social node',
+        self::$defaults =
-                'nickname'                   => 'gnusocial',
+            ['site' =>
-                'wildcard'                   => null,
+                 ['name'                        => $_ENV['SOCIAL_SITENAME'],
                   'theme'                       => 'neo-gnu',
-                'logfile'                    => null,
-                'logdebug'                   => false,
                   'logo'                        => null,
                   'ssllogo'                     => null,
-                'logperf'                    => false, // Enable to dump performance counters to syslog
+                  'fancy'                       => true,
-                'logperf_detail'             => false, // Enable to dump every counter hit
+                  'locale_path'                 => INSTALLDIR . '/translations',
-                'fancy'                      => false,
-                'locale_path'                => INSTALLDIR . '/locale',
                   'language'                    => 'en',
                   'langdetect'                  => true,
-                'languages'                  => get_all_languages(),
+                  'languages'                   => I18n::get_all_languages(),
-                'email'                      => array_key_exists('SERVER_ADMIN', $_SERVER) ? $_SERVER['SERVER_ADMIN'] : null,
+                  'email'                       => $_ENV['SERVER_ADMIN'] ?? $_ENV['SOCIAL_ADMIN_EMAIL'] ?? null,
-                'fakeaddressrecovery'        => true,
+                  'recovery_hide_address_known' => true, // Whether to not say that we found the email in the database, when asking for recovery
                   'broughtby'                   => null,
                   'timezone'                    => 'UTC',
                   'broughtbyurl'                => null,
@@ -69,7 +68,8 @@ abstract class DefaultSettings
                   'build'                       => 1,     // build number, for code-dependent cache
                  ],
              'security' => ['hash_algos' => ['sha1', 'sha256', 'sha512']],   // set to null for anything that hash_hmac() can handle (and is in hash_algos())
-                'db'       => ['database'  => null, // must be set
+             'db' =>
+                 ['database'             => null, // must be set
                   'schema_location'      => INSTALLDIR . '/classes',
                   'class_location'       => INSTALLDIR . '/classes',
                   'require_prefix'       => 'classes/',
@@ -85,17 +85,20 @@ abstract class DefaultSettings
                   'log_queries'          => false,     // true to log all DB queries
                   'log_slow_queries'     => 0,         // if set, log queries taking over N seconds
                   'mysql_foreign_keys'   => false, ],  // if set, enables experimental foreign key support on MySQL
-                'fix' => ['fancyurls'      => true,   // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs
+             'fix' =>
+                 ['fancyurls'   => true,   // makes sure aliases in WebFinger etc. are not f'd by index.php/ URLs
                   'legacy_http' => false,  // set this to true if you have upgraded your site from http=>https
                  ],
              'log' => [
                  'debugtrace' => false,  // index.php handleError function, whether to include exception backtrace in log
              ],
-                'syslog' => ['appname' => 'statusnet', // for syslog
+             'syslog' =>
+                 ['appname'  => 'statusnet', // for syslog
                   'priority' => 'debug',     // XXX: currently ignored
                   'facility' => LOG_USER,
                  ],
-                'queue' => ['enabled'       => true,
+             'queue' =>
+                 ['enabled'               => true,
                   'daemon'                => false, // Use queuedaemon. Default to false
                   'threads'               => null,  // an empty value here uses processor count to determine
                   'subsystem'             => 'db',  // default to database, or 'stomp'
@@ -122,20 +125,24 @@ abstract class DefaultSettings
                   'max_retries'           => 10,    // drop messages after N failed attempts to process (Stomp)
                   'dead_letter_dir'       => false, // set to directory to save dropped messages into (Stomp)
                  ],
-                'license' => ['type' => 'cc',  // can be 'cc', 'allrightsreserved', 'private'
+             'license' =>
+                 ['type'  => 'cc',  // can be 'cc', 'allrightsreserved', 'private'
                   'owner' => null,  // can be name of content owner e.g. for enterprise
                   'url'   => 'https://creativecommons.org/licenses/by/3.0/',
                   'title' => 'Creative Commons Attribution 3.0',
                   // 'image' => $_path . '/theme/licenses/cc_by_3.0_80x15.png',
                  ],
-                'mail' => ['backend' => 'mail',
+             'mail' =>
+                 ['backend'      => 'mail',
                   'params'       => null,
                   'domain_check' => true,
                  ],
-                'nickname' => ['blacklist' => [],
+             'nickname' =>
+                 ['blacklist' => [],
                   'featured'  => [],
                  ],
-                'profile' => ['banned' => [],
+             'profile' =>
+                 ['banned'       => [],
                   'biolimit'     => null,
                   'changenick'   => false,
                   'allowprivate' => false,  // whether to allow setting stream to private ("only followers can read")
@@ -145,27 +152,32 @@ abstract class DefaultSettings
                   'move'         => true,
                  ],
              'image'  => ['jpegquality' => 85],
-                'avatar' => ['server' => null,
+             'avatar' =>
+                 ['server'   => null,
                   'dir'      => INSTALLDIR . '/file/avatar/',
                   // 'url_base' => $_path . '/avatar/',
                   'ssl'      => null,
                   'maxsize'  => 300,
                  ],
              'foaf' => ['mbox_sha1sum' => false],
-                'public' => ['localonly' => false,
+             'public' =>
+                 ['localonly'  => false,
                   'blacklist'  => [],
                   'autosource' => [],
                  ],
-                'theme' => ['server' => null,
+             'theme' =>
+                 ['server' => null,
                   'dir'    => null,
                   'path'   => null,
                   'ssl'    => null,
                  ],
-                'usertheme' => ['linkcolor' => 'black',
+             'usertheme' =>
+                 ['linkcolor'       => 'black',
                   'backgroundcolor' => 'black',
                  ],
              'theme_upload' => ['enabled' => extension_loaded('zip')],
-                'javascript'   => ['server' => null,
+             'javascript'   =>
+                  ['server'     => null,
                    'path'       => null,
                    'ssl'        => null,
                    'bustframes' => true,
@@ -176,37 +188,45 @@ abstract class DefaultSettings
                   'path'   => null,
                   'ssl'    => null,
                  ],
-                'throttle' => ['enabled' => false, // whether to throttle edits; false by default
+             'throttle' =>
+                 ['enabled'  => false, // whether to throttle edits; false by default
                   'count'    => 20,    // number of allowed messages in timespan
                   'timespan' => 600,   // timespan for throttling
                  ],
              'invite' => ['enabled' => true],
-                'tag'    => ['dropoff' => 864000.0,   // controls weighting based on age
+             'tag' =>
+                 ['dropoff' => 864000.0,   // controls weighting based on age
                   'cutoff'  => 86400 * 90, // only look at notices posted in last 90 days
                  ],
-                'popular' => ['dropoff' => 864000.0,   // controls weighting based on age
+             'popular' =>
+                 ['dropoff' => 864000.0,   // controls weighting based on age
                   'cutoff'  => 86400 * 90, // only look at notices favorited in last 90 days
                  ],
-                'daemon' => ['piddir' => sys_get_temp_dir(),
+             'daemon' =>
+                 ['piddir' => sys_get_temp_dir(),
                   'user'   => false,
                   'group'  => false,
                  ],
              'emailpost' => ['enabled' => false],
              'sms' => ['enabled' => false],
              'twitterimport' => ['enabled' => false],
-                'integration'   => ['source' => 'StatusNet', // source attribute for Twitter
+             'integration' =>
+                 ['source' => 'StatusNet', // source attribute for Twitter
                   'taguri' => null,        // base for tag URIs
                  ],
-                'twitter' => ['signin' => true,
+             'twitter' =>
+                 ['signin'          => true,
                   'consumer_key'    => null,
                   'consumer_secret' => null,
                  ],
              'cache' => ['base' => null],
-                'ping'  => ['notify' => [],
+             'ping'  =>
+                 ['notify'  => [],
                   'timeout' => 2,
                  ],
              'inboxes' => ['enabled' => true], // ignored after 0.9.x
-                'newuser' => ['default' => null,
+             'newuser' =>
+                ['default' => null,
                  'welcome' => null,
                 ],
              'linkify' => // "bare" below means "without schema", like domain.com vs. https://domain.com
@@ -214,13 +234,15 @@ abstract class DefaultSettings
                   'bare_ipv4'    => false, // convert IPv4 addresses to hyperlinks?
                   'bare_ipv6'    => false, // convert IPv6 addresses to hyperlinks?
                  ],
-                'attachments' => ['server' => null,
+             'attachments' =>
+                 ['server'    => null,
                   'dir'       => INSTALLDIR . '/file/',
                   // 'path'      => $_path . '/file/',
                   'sslserver' => null,
                   'sslpath'   => null,
                   'ssl'       => null,
-                    'supported' => ['application/vnd.oasis.opendocument.chart'     => 'odc',
+                  'supported' =>
+                      ['application/vnd.oasis.opendocument.chart'                 => 'odc',
                        'application/vnd.oasis.opendocument.formula'               => 'odf',
                        'application/vnd.oasis.opendocument.graphics'              => 'odg',
                        'application/vnd.oasis.opendocument.graphics-template'     => 'otg',
@@ -265,7 +287,8 @@ abstract class DefaultSettings
                   'extblacklist'  => [],
                   'memory_limit'  => '1024M', // PHP's memory limit to use temporarily when handling images
                  ],
-                'thumbnail' => ['dir' => null,  // falls back to File::path('thumb') (equivalent to ['attachments']['dir'] .  '/thumb/')
+             'thumbnail' =>
+                 ['dir'      => null,  // falls back to File::path('thumb') (equivalent to ['attachments']['dir'] .  '/thumb/')
                   'path'     => null,  // falls back to generating a URL with File::url('thumb/$filename') (equivalent to ['attachments']['path'] . '/thumb/')
                   'server'   => null,  // Only used if ['thumbnail']['path'] is NOT empty, and then it falls back to ['site']['server'], schema is decided from GNUsocial::useHTTPS()
                   'crop'     => false, // overridden to true if thumb height === null
@@ -276,17 +299,20 @@ abstract class DefaultSettings
                   'animated' => false, // null="UseFileAsThumbnail", false="can use still frame". true requires ImageMagickPlugin
                  ],
              'application' => ['desclimit' => null],
-                'group'       => ['maxaliases' => 3,
+             'group'       =>
+                 ['maxaliases' => 3,
                   'desclimit'                => null,
                   'addtag'                   => true,
                  ],
-                'peopletag' => ['maxtags' => 100,             // maximum number of tags a user can create.
+             'peopletag' =>
+                 ['maxtags'       => 100,             // maximum number of tags a user can create.
                   'maxpeople'     => 500,             // maximum no. of people with the same tag by the same user
                   'allow_tagging' => ['all' => true], // equivalent to array('local' => true, 'remote' => true)
                   'desclimit'     => null,
                  ],
              'search'   => ['type' => 'like'],
-                'sessions' => ['handle' => false, // whether to handle sessions ourselves
+             'sessions' =>
+                 ['handle'   => false, // whether to handle sessions ourselves
                   'debug'    => false, // debugging output for sessions
                   'gc_limit' => 1000,  // max sessions to expire at a time
                  ],
@@ -299,16 +325,20 @@ abstract class DefaultSettings
                  ['Cache.DefinitionImpl' => 'Serializer',
                   'Cache.SerializerPath' => implode(DIRECTORY_SEPARATOR, [sys_get_temp_dir(), 'gnusocial']),
                  ],
-                'notice' => ['contentlimit' => null,
+             'notice' =>
+                 ['contentlimit' => null,
                   'allowprivate' => false, // whether to allow users to "check the padlock" to publish notices available for their subscribers.
                   'defaultscope' => null,  // null means 1 if site/private, 0 otherwise
                   'hidespam'     => true,  // Whether to hide silenced users from timelines
                  ],
              'message'  => ['contentlimit' => null],
-                'location' => ['share' => 'user', // whether to share location; 'always', 'user', 'never'
+             'location' =>
+                 ['share'        => 'user', // whether to share location; 'always', 'user', 'never'
                   'sharedefault' => false, ],
              'logincommand' => ['disabled' => true],
-                'plugins'      => ['core' => ['Activity' => [],
+             'plugins'      =>
+                 ['core' =>
+                     ['Activity'            => [],
                       'ActivityModeration'  => [],
                       'ActivityVerb'        => [],
                       'ActivityVerbPost'    => [],
@@ -320,7 +350,8 @@ abstract class DefaultSettings
                           'protocols' => ['ActivityPub' => 'Activitypub_profile', 'OStatus' => 'Ostatus_profile'],
                       ],
                      ],
-                    'default' => ['AccountManager' => [],
+                  'default' =>
+                      ['AccountManager'      => [],
                        'AntiBrute'           => [],
                        'Blacklist'           => [],
                        'Bookmark'            => [],
@@ -352,22 +383,28 @@ abstract class DefaultSettings
                   'path'        => null,
                   'sslpath'     => null,
                  ],
-                'admin' => ['panels' => ['site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins',
+             'admin'      =>
+                 ['panels' =>
+                      ['site', 'user', 'paths', 'access', 'sessions', 'sitenotice', 'license', 'plugins',
+                      ]
                  ],
-                ],
+             'singleuser' =>
-                'singleuser' => ['enabled' => false,
+                 ['enabled'  => false,
                   'nickname' => null,
                  ],
-                'robotstxt' => ['crawldelay' => 0,
+             'robotstxt' =>
+                 ['crawldelay' => 0,
                   'disallow'   => ['main', 'settings', 'admin', 'search', 'message'],
                  ],
              'api'      => ['realm' => null],
-                'nofollow' => ['subscribers' => true,
+             'nofollow' =>
+                 ['subscribers' => true,
                   'members'     => true,
                   'peopletag'   => true,
                   'external'    => 'sometimes', // Options: 'sometimes', 'never', default = 'sometimes'
                  ],
-                'url' => ['shortener' => 'internal',
+             'url' =>
+                 ['shortener'        => 'internal',
                   'maxurllength'     => 100,
                   'maxnoticelength'  => -1,
                  ],
@@ -389,8 +426,25 @@ abstract class DefaultSettings
             ];
 
         if ($_ENV['APP_DEBUG']) {
-            $config = DB::getRepository('\App\Entity\Config')->findAll();
+            self::loadDefaults();
-            if (count($config) < count(self::$defaults)) {
+        }
+    }
+
+    public static function loadDefaults(bool $optimize = false) {
+        $schemaManager = DB::getConnection()->getSchemaManager();
+        if (!$schemaManager->tablesExist(['config'])) {
+            if (!isset($_SERVER['TERM'])) {
+                throw new Exception("Table config doesn't exist, make sure the schema " .
+                                    "is correctly created with `bin/console doctrine:schema:create`");
+            } else {
+                return; // We seem to be running form the command line, probably running the above command
+            }
+        }
+
+        $repo = DB::getRepository('\App\Entity\Config');
+        if (!empty($repo)) {
+            $config = $repo->findAll();
+            if (!$optimize || count($config) < count(self::$defaults)) {
                 foreach (self::$defaults as $section => $def) {
                     foreach ($def as $setting => $value) {
                         if (!isset($config[$section][$setting])) {

src/Core/I18n.php

@@ -92,62 +92,6 @@ abstract class I18n
         }
         return $cached[$path] ?? '';
     }
-}
-
-/**
- * Wrapper for symfony translation with smart domain detection.
- *
- * If calling from a plugin, this function checks which plugin it was
- * being called from and uses that as text domain, which will have
- * been set up during plugin initialization.
- *
- * Also handles plurals and contexts depending on what parameters
- * are passed to it:
- *
- * _m($msg)                   -- simple message
- * _m($ctx, $msg)             -- message with context
- * _m($msg1, $msg2, $n)       -- message that can be singular or plural
- * _m($ctx, $msg1, $msg2, $n) -- combination of the previous two
- *
- * @param string $msg
- * @param extra params as described above
- *
- * @throws InvalidArgumentException
- *
- * @return string
- *
- */
-function _m(string $msg /*, ...*/): string
-{
-    $domain = I18n::_mdomain(debug_backtrace());
-    $args   = func_get_args();
-    switch (count($args)) {
-        case 1:
-            // Empty parameters
-            return I18n::$translator->trans($msg, [], $domain);
-        case 2:
-            $context    = $args[0];
-            $msg_single = $args[1];
-            // ASCII 4 is EOT, used to separate context from string
-            return I18n::$translator->trans($context . '\004' . $msg_single, [], $domain);
-        case 3:
-            // '|' separates the singular from the plural version
-            $msg_single = $args[0];
-            $msg_plural = $args[1];
-            $n          = $args[2];
-            return I18n::$translator->trans($msg_single . '|' . $msg_plural, ['%d' => $n], $domain);
-        case 4:
-            // Combine both
-            $context    = $args[0];
-            $msg_single = $args[1];
-            $msg_plural = $args[2];
-            $n          = $args[3];
-            return I18n::$translator->trans($context . '\004' . $msg_single . '|' . $msg_plural,
-                ['%d' => $n], $domain);
-        default:
-            throw new InvalidArgumentException('Bad parameter count to _m()');
-    }
-}
 
     /**
      * Content negotiation for language codes
@@ -156,7 +100,7 @@ function _m(string $msg /*, ...*/): string
      *
      * @return string language code for best language match, false otherwise
      */
-function client_preferred_language(string $http_accept_lang_header): string
+    public static function client_preferred_language(string $http_accept_lang_header): string
     {
         $client_langs  = [];
         $all_languages = Common::config('site', 'languages');
@@ -190,7 +134,7 @@ function client_preferred_language(string $http_accept_lang_header): string
      *
      * @return array map of available languages by code to language name.
      */
-function get_nice_language_list(): array
+    public static function get_nice_language_list(): array
     {
         $nice_lang     = [];
         $all_languages = Common::config('site', 'languages');
@@ -208,7 +152,7 @@ function get_nice_language_list(): array
      *
      * @return bool true if language is rtl
      */
-function is_rtl(string $lang_value): bool
+    public static function is_rtl(string $lang_value): bool
     {
         foreach (Common::config('site', 'languages') as $code => $info) {
             if ($lang_value == $info['lang']) {
@@ -223,7 +167,7 @@ function is_rtl(string $lang_value): bool
      *
      * @return array mapping of language codes to language info
      */
-function get_all_languages(): array
+    public static function get_all_languages(): array
     {
         return [
             'af'        => ['q' => 0.8, 'lang' => 'af', 'name' => 'Afrikaans', 'direction' => 'ltr'],
@@ -292,3 +236,59 @@ function get_all_languages(): array
             'vi'        => ['q' => 0.8, 'lang' => 'vi', 'name' => 'Vietnamese', 'direction' => 'ltr'],
         ];
     }
+
+    /**
+     * Wrapper for symfony translation with smart domain detection.
+     *
+     * If calling from a plugin, this function checks which plugin it was
+     * being called from and uses that as text domain, which will have
+     * been set up during plugin initialization.
+     *
+     * Also handles plurals and contexts depending on what parameters
+     * are passed to it:
+     *
+     * _m($msg)                   -- simple message
+     * _m($ctx, $msg)             -- message with context
+     * _m($msg1, $msg2, $n)       -- message that can be singular or plural
+     * _m($ctx, $msg1, $msg2, $n) -- combination of the previous two
+     *
+     * @param string $msg
+     * @param extra params as described above
+     *
+     * @throws InvalidArgumentException
+     *
+     * @return string
+     *
+     */
+    public static function _m(string $msg /*, ...*/): string
+    {
+        $domain = self::_mdomain(debug_backtrace());
+        $args   = func_get_args();
+        switch (count($args)) {
+        case 1:
+            // Empty parameters
+            return self::$translator->trans($msg, [], $domain);
+        case 2:
+            $context    = $args[0];
+            $msg_single = $args[1];
+            // ASCII 4 is EOT, used to separate context from string
+            return self::$translator->trans($context . '\004' . $msg_single, [], $domain);
+        case 3:
+            // '|' separates the singular from the plural version
+            $msg_single = $args[0];
+            $msg_plural = $args[1];
+            $n          = $args[2];
+            return self::$translator->trans($msg_single . '|' . $msg_plural, ['%d' => $n], $domain);
+        case 4:
+            // Combine both
+            $context    = $args[0];
+            $msg_single = $args[1];
+            $msg_plural = $args[2];
+            $n          = $args[3];
+            return self::$translator->trans($context . '\004' . $msg_single . '|' . $msg_plural,
+                                            ['%d' => $n], $domain);
+        default:
+            throw new InvalidArgumentException('Bad parameter count to _m()');
+        }
+    }
+}

src/Util/Common.php

@@ -36,14 +36,20 @@ abstract class Common
 {
     /**
      * Access sysadmin's configuration preferences for GNU social
-     *
-     * @param string $section
-     * @param string $field
-     *
-     * @return mixed
      */
     public static function config(string $section, string $setting)
     {
         return DB::find('\App\Entity\Config', ['section' => $section, 'setting' => $setting]);
     }
+
+    /**
+     * Set sysadmin's configuration preferences for GNU social
+     */
+    public static function set_config(string $section, string $setting, mixed $value): void
+    {
+        $ojb = DB::getPatialReference('\App\Entity\Config', ['section' => $section, 'setting' => $setting]);
+        $obj->setValue(serialize($value));
+        DB::persist($obj);
+        DB::flush();
+    }
 }