Merge branch 'dev' of codeberg.org:streams/streams into dev

Code/Lib/Apps.php

@@ -73,7 +73,6 @@ class Apps
 
         $default_apps = [
             'Access Lists',
-            'Admin',
             'Channel Home',
             'Connections',
             'Directory',
@@ -84,6 +83,7 @@ class Apps
             'Profile Photo',
             'Search',
             'Settings',
+            'Site Admin',
             'Stream',
             'Suggest Channels',
             'View Profile'
@@ -941,8 +941,10 @@ class Apps
         }
 
         $conf = (($menu === 'nav_featured_app') ? 'app_order' : 'app_pin_order');
-
-        $x = (($uid) ? get_pconfig($uid, 'system', $conf) : get_config('system', $conf));
+        $x = (($uid) ? PConfig::Get($uid, 'system', $conf) : get_config('system', $conf));
+//        if (!$x) {
+//            $x = self::app_system_order($uid, $conf);
+//        }
         if (($x) && (!is_array($x))) {
             $y = explode(',', $x);
             $x = $y;
@@ -967,6 +969,66 @@ class Apps
         return $ret;
     }
 
+    public static function app_system_order($uid, $conf)
+    {
+        $returnValue = [];
+        $apps = [];
+        $applist = self::app_list($uid);
+        if ($applist) {
+            foreach ($applist as $app) {
+                if ($app['term']) {
+                    for ($x = 0; $x < count($app['term']); $x++) {
+                        if (in_array($app['term'][$x]['term'], ['nav_pinned_app', 'nav_featured_app'])) {
+                            unset($app['term'][$x]);
+                        }
+                    }
+                }
+                $encoded = self::app_encode($app);
+                $apps[] = $encoded;
+            }
+        }
+        if ($conf === 'app_pin_order' && file_exists('app/app_order')) {
+            $list = file('app/app_order', FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
+            if ($list) {
+                $ids = [];
+                foreach ($list as $entry) {
+                    $found = self::find_app_by_name(trim($entry), $apps);
+                    if (empty($found['term'])) {
+                        $found['term'] = 'nav_featured_app';
+                    }
+                    elseif (! str_contains($found['term'], 'nav_featured_app')) {
+                        $found['term'] .= ',nav_featured_app';
+                    }
+                    self::app_update($found);
+                    $returnValue[] = $found;
+                    $ids[]= $found['guid'];
+                }
+                PConfig::Set($uid,'system', $conf, implode(',', $ids));
+            }
+        }
+        if ($conf === 'app_order' && file_exists('app/nav_order')) {
+            $list = file('app/nav_order', FILE_IGNORE_NEW_LINES|FILE_SKIP_EMPTY_LINES);
+            if ($list) {
+                $ids = [];
+                foreach ($list as $entry) {
+                    $found = self::find_app_by_name(trim($entry), $apps);
+                    if (empty($found['term'])) {
+                        $found['term'] = 'nav_pinned_app';
+                    }
+                    elseif (! str_contains($found['term'], 'nav_pinned_app')) {
+                        $found['term'] .= ',nav_pinned_app';
+                    }
+                    self::app_update($found);
+                    $returnValue[] = $found;
+                    $ids[]= $found['guid'];
+                }
+                PConfig::Set($uid,'system', $conf, implode(',', $ids));
+            }
+        }
+
+        return $returnValue;
+    }
+
     public static function find_app_in_array($guid, $arr)
     {
         if (!$arr) {
@@ -980,6 +1042,21 @@ class Apps
         return false;
     }
 
+    public static function find_app_by_name($name, $arr)
+    {
+        if (!$arr) {
+            return false;
+        }
+
+        foreach ($arr as $x) {
+            if ($x['guid'] === hash('whirlpool', $name)) {
+                return $x;
+            }
+        }
+        return false;
+
+    }
+
     public static function moveup($uid, $guid, $menu)
     {
         $syslist = [];

Code/Lib/Navbar.php

@@ -213,8 +213,6 @@ class Navbar {
 
             $pinned_list = Apps::app_order(local_channel(), $pinned_list, 'nav_pinned_app');
 
-
-            $syslist = [];
             $list = Apps::app_list(local_channel(), false, [ 'nav_featured_app' ]);
 
             if ($list) {

Code/Update/_1270.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace Code\Update;
+
+class _1270
+{
+
+    public function run()
+    {
+        // remove deprecated apps from system list
+        $access = 'b8e7b73ffc8b5533de4a37ed8dd133abc2f5f6cac4af0e55d83c8da104e1fa58df3ae2f01ce87e429a1dd71581a39d3c18959eddbf2ae535f174b8bdcec768df';
+
+        q("delete from app where app_id = '$access' ");
+        return UPDATE_SUCCESS;
+    }
+
+    public function verify()
+    {
+        return true;
+    }
+}

app/bookmarks.apx

@@ -1,6 +0,0 @@
-version: 1
-url: $baseurl/bookmarks
-requires: local_channel
-name: View Bookmarks
-photo: icon:bookmark
-categories: Productivity

app/calendar.apx

@@ -1,6 +0,0 @@
-version: 1
-url: $baseurl/cdav/calendar
-requires: local_channel
-name: Calendar
-photo: icon:calendar
-categories: Productivity, nav_featured_app

app/carddav.apx

@@ -1,6 +0,0 @@
-version: 1
-url: $baseurl/cdav/addressbook
-requires: local_channel
-name: CardDAV
-photo: icon:vcard-o
-categories: Productivity, Personal

app/invite.apx

@@ -1,6 +0,0 @@
-version: 1
-url: $baseurl/invite
-requires: local_channel
-name: Invite
-photo: icon:user-plus
-categories: Networking

app/mood.apx

@@ -1,6 +0,0 @@
-version: 1
-url: $baseurl/mood
-requires: local_channel
-name: Mood
-photo: icon:smile-o
-categories: Social

app/probe.apx

@@ -1,6 +0,0 @@
-version: 1
-url: $baseurl/probe
-requires: local_channel
-name: Remote Diagnostics
-photo: icon:user-md
-categories: System

app/randprof.apx

@@ -1,6 +0,0 @@
-version: 1
-url: $baseurl/randprof
-name: Random Channel
-target: randprof
-photo: icon:random
-categories: Networking

boot.php

@@ -26,7 +26,7 @@ use Code\Lib\Url;
  */
 
 const REPOSITORY_ID = 'streams';
-const DB_UPDATE_VERSION = 1269;
+const DB_UPDATE_VERSION = 1270;
 const PROJECT_BASE = __DIR__;
 const ACTIVITYPUB_ENABLED = true;
 const NOMAD_PROTOCOL_VERSION = '12.0';

util/messages.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 23.09.21\n"
+"Project-Id-Version: 23.09.27\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-20 15:27-0700\n"
+"POT-Creation-Date: 2023-09-26 13:49-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -35,7 +35,7 @@ msgstr ""
 msgid "Visible to your default audience"
 msgstr ""
 
-#: Code/Lib/Libacl.php:87 Code/Lib/Apps.php:359 Code/Module/Connedit.php:699
+#: Code/Lib/Libacl.php:87 Code/Lib/Apps.php:358 Code/Module/Connedit.php:699
 #: Code/Module/Connections.php:391 Code/Module/Stream.php:150
 #: Code/Module/Lists.php:30 Code/Module/Affinity.php:68
 #: Code/Widget/Affinity.php:33 include/connections.php:969
@@ -80,7 +80,7 @@ msgstr ""
 msgid "Don't show"
 msgstr ""
 
-#: Code/Lib/Libacl.php:140 Code/Lib/Apps.php:406 Code/Lib/Navbar.php:169
+#: Code/Lib/Libacl.php:140 Code/Lib/Apps.php:405 Code/Lib/Navbar.php:169
 #: Code/Module/Connections.php:398 Code/Module/Search.php:121
 #: Code/Widget/Sitesearch.php:35 include/misc.php:1023 include/misc.php:1035
 msgid "Search"
@@ -139,36 +139,32 @@ msgstr ""
 msgid "Access Lists"
 msgstr ""
 
-#: Code/Lib/Apps.php:343
-msgid "Site Admin"
-msgstr ""
-
-#: Code/Lib/Apps.php:344 Code/Lib/Navbar.php:296
+#: Code/Lib/Apps.php:343 Code/Lib/Navbar.php:294
 msgid "Apps"
 msgstr ""
 
-#: Code/Lib/Apps.php:345
+#: Code/Lib/Apps.php:344
 msgid "Articles"
 msgstr ""
 
-#: Code/Lib/Apps.php:346
+#: Code/Lib/Apps.php:345
 msgid "CalDAV"
 msgstr ""
 
-#: Code/Lib/Apps.php:347
+#: Code/Lib/Apps.php:346
 msgid "CardDAV"
 msgstr ""
 
-#: Code/Lib/Apps.php:348 Code/Module/Cards.php:211
+#: Code/Lib/Apps.php:347 Code/Module/Cards.php:211
 msgid "Cards"
 msgstr ""
 
-#: Code/Lib/Apps.php:349 Code/Lib/Navbar.php:410 Code/Lib/Navbar.php:413
+#: Code/Lib/Apps.php:348 Code/Lib/Navbar.php:408 Code/Lib/Navbar.php:411
 #: Code/Storage/Browser.php:157
 msgid "Calendar"
 msgstr ""
 
-#: Code/Lib/Apps.php:350 Code/Module/Cdav.php:1091
+#: Code/Lib/Apps.php:349 Code/Module/Cdav.php:1091
 #: Code/Widget/Appcategories.php:52 Code/Widget/Categories.php:87
 #: Code/Widget/Categories.php:135 Code/Widget/Categories.php:186
 #: include/taxonomy.php:478 include/taxonomy.php:572 include/taxonomy.php:594
@@ -176,242 +172,246 @@ msgstr ""
 msgid "Categories"
 msgstr ""
 
-#: Code/Lib/Apps.php:351
+#: Code/Lib/Apps.php:350
 msgid "Channel Home"
 msgstr ""
 
-#: Code/Lib/Apps.php:352
+#: Code/Lib/Apps.php:351
 msgid "Channel Manager"
 msgstr ""
 
-#: Code/Lib/Apps.php:353 Code/Module/Sources.php:107
+#: Code/Lib/Apps.php:352 Code/Module/Sources.php:107
 #: Code/Widget/Settings_menu.php:117
 msgid "Channel Sources"
 msgstr ""
 
-#: Code/Lib/Apps.php:354
+#: Code/Lib/Apps.php:353
 msgid "Chat"
 msgstr ""
 
-#: Code/Lib/Apps.php:355 Code/Lib/Navbar.php:424 Code/Lib/Navbar.php:427
+#: Code/Lib/Apps.php:354 Code/Lib/Navbar.php:422 Code/Lib/Navbar.php:425
 #: Code/Widget/Chatroom_list.php:23
 msgid "Chatrooms"
 msgstr ""
 
-#: Code/Lib/Apps.php:356
+#: Code/Lib/Apps.php:355
 msgid "Clients"
 msgstr ""
 
-#: Code/Lib/Apps.php:357 include/conversation.php:1320
+#: Code/Lib/Apps.php:356 include/conversation.php:1320
 msgid "Comment Control"
 msgstr ""
 
-#: Code/Lib/Apps.php:358 Code/Module/Communities.php:164
+#: Code/Lib/Apps.php:357 Code/Module/Communities.php:164
 #: Code/Widget/Findpeople.php:40
 msgid "Communities"
 msgstr ""
 
-#: Code/Lib/Apps.php:360
+#: Code/Lib/Apps.php:359
 msgid "Content Filter"
 msgstr ""
 
-#: Code/Lib/Apps.php:361
+#: Code/Lib/Apps.php:360
 #: extend/addon/a/content_import/Mod_content_import.php:147
 msgid "Content Import"
 msgstr ""
 
-#: Code/Lib/Apps.php:362
+#: Code/Lib/Apps.php:361
 msgid "Custom SQL"
 msgstr ""
 
-#: Code/Lib/Apps.php:363 Code/Module/Directory.php:517
+#: Code/Lib/Apps.php:362 Code/Module/Directory.php:517
 msgid "Directory"
 msgstr ""
 
-#: Code/Lib/Apps.php:364 Code/Widget/Activity_filter.php:82
+#: Code/Lib/Apps.php:363 Code/Widget/Activity_filter.php:82
 msgid "Drafts"
 msgstr ""
 
-#: Code/Lib/Apps.php:365 Code/Widget/Activity_filter.php:110
+#: Code/Lib/Apps.php:364 Code/Widget/Activity_filter.php:110
 msgid "Events"
 msgstr ""
 
-#: Code/Lib/Apps.php:366
+#: Code/Lib/Apps.php:365
 msgid "Expire Posts"
 msgstr ""
 
-#: Code/Lib/Apps.php:367
+#: Code/Lib/Apps.php:366
 msgid "Features"
 msgstr ""
 
-#: Code/Lib/Apps.php:368 Code/Lib/Navbar.php:399 Code/Module/Fbrowser.php:95
+#: Code/Lib/Apps.php:367 Code/Lib/Navbar.php:397 Code/Module/Fbrowser.php:95
 #: Code/Storage/Browser.php:298
 msgid "Files"
 msgstr ""
 
-#: Code/Lib/Apps.php:369 extend/addon/a/followlist/Mod_followlist.php:123
+#: Code/Lib/Apps.php:368 extend/addon/a/followlist/Mod_followlist.php:123
 msgid "Followlist"
 msgstr ""
 
-#: Code/Lib/Apps.php:370 Code/Module/Connedit.php:688
+#: Code/Lib/Apps.php:369 Code/Module/Connedit.php:688
 msgid "Friend Zoom"
 msgstr ""
 
-#: Code/Lib/Apps.php:371
+#: Code/Lib/Apps.php:370
 msgid "Future Posting"
 msgstr ""
 
-#: Code/Lib/Apps.php:372 extend/addon/a/gallery/gallery.php:49
+#: Code/Lib/Apps.php:371 extend/addon/a/gallery/gallery.php:49
 #: extend/addon/a/gallery/Mod_Gallery.php:138
 msgid "Gallery"
 msgstr ""
 
-#: Code/Lib/Apps.php:373
+#: Code/Lib/Apps.php:372
 msgid "Guest Pass"
 msgstr ""
 
-#: Code/Lib/Apps.php:374 Code/Lib/Navbar.php:278 include/help.php:62
+#: Code/Lib/Apps.php:373 Code/Lib/Navbar.php:276 include/help.php:62
 msgid "Help"
 msgstr ""
 
-#: Code/Lib/Apps.php:375
+#: Code/Lib/Apps.php:374
 msgid "Invite"
 msgstr ""
 
-#: Code/Lib/Apps.php:376
+#: Code/Lib/Apps.php:375
 msgid "Language"
 msgstr ""
 
-#: Code/Lib/Apps.php:377
+#: Code/Lib/Apps.php:376
 msgid "Legal"
 msgstr ""
 
-#: Code/Lib/Apps.php:378 Code/Lib/Navbar.php:128 Code/Lib/Navbar.php:131
+#: Code/Lib/Apps.php:377 Code/Lib/Navbar.php:128 Code/Lib/Navbar.php:131
 #: boot.php:1117
 msgid "Login"
 msgstr ""
 
-#: Code/Lib/Apps.php:379
+#: Code/Lib/Apps.php:378
 msgid "Mail"
 msgstr ""
 
-#: Code/Lib/Apps.php:380
+#: Code/Lib/Apps.php:379
 msgid "Markup"
 msgstr ""
 
-#: Code/Lib/Apps.php:381 Code/Module/Connedit.php:601
+#: Code/Lib/Apps.php:380 Code/Module/Connedit.php:601
 msgid "Moderate"
 msgstr ""
 
-#: Code/Lib/Apps.php:382 Code/Module/Mood.php:166
+#: Code/Lib/Apps.php:381 Code/Module/Mood.php:166
 msgid "Mood"
 msgstr ""
 
-#: Code/Lib/Apps.php:383
+#: Code/Lib/Apps.php:382
 msgid "My Chatrooms"
 msgstr ""
 
-#: Code/Lib/Apps.php:384
+#: Code/Lib/Apps.php:383
 msgid "No Comment"
 msgstr ""
 
-#: Code/Lib/Apps.php:385 Code/Widget/Notes.php:24
+#: Code/Lib/Apps.php:384 Code/Widget/Notes.php:24
 msgid "Notes"
 msgstr ""
 
-#: Code/Lib/Apps.php:386 Code/Lib/Navbar.php:300
+#: Code/Lib/Apps.php:385 Code/Lib/Navbar.php:298
 #: Code/Module/Settings/Channel.php:485 Code/Widget/Notifications.php:165
 msgid "Notifications"
 msgstr ""
 
-#: Code/Lib/Apps.php:387
+#: Code/Lib/Apps.php:386
 msgid "OAuth Apps Manager"
 msgstr ""
 
-#: Code/Lib/Apps.php:388
+#: Code/Lib/Apps.php:387
 msgid "OAuth2 Apps Manager"
 msgstr ""
 
-#: Code/Lib/Apps.php:389
+#: Code/Lib/Apps.php:388
 msgid "Order Apps"
 msgstr ""
 
-#: Code/Lib/Apps.php:390
+#: Code/Lib/Apps.php:389
 msgid "PDL Editor"
 msgstr ""
 
-#: Code/Lib/Apps.php:391 Code/Lib/Features.php:158
+#: Code/Lib/Apps.php:390 Code/Lib/Features.php:158
 msgid "Permission Categories"
 msgstr ""
 
-#: Code/Lib/Apps.php:392 Code/Lib/Navbar.php:391 Code/Module/Fbrowser.php:37
+#: Code/Lib/Apps.php:391 Code/Lib/Navbar.php:389 Code/Module/Fbrowser.php:37
 msgid "Photos"
 msgstr ""
 
-#: Code/Lib/Apps.php:393
+#: Code/Lib/Apps.php:392
 msgid "Photomap"
 msgstr ""
 
-#: Code/Lib/Apps.php:394
+#: Code/Lib/Apps.php:393
 msgid "Poke"
 msgstr ""
 
-#: Code/Lib/Apps.php:395
+#: Code/Lib/Apps.php:394
 msgid "Post"
 msgstr ""
 
-#: Code/Lib/Apps.php:396
+#: Code/Lib/Apps.php:395
 msgid "Premium Channel"
 msgstr ""
 
-#: Code/Lib/Apps.php:397
+#: Code/Lib/Apps.php:396
 msgid "Probe"
 msgstr ""
 
-#: Code/Lib/Apps.php:398 Code/Lib/Activity.php:3040 Code/Lib/Libprofile.php:753
+#: Code/Lib/Apps.php:397 Code/Lib/Activity.php:3040 Code/Lib/Libprofile.php:753
 #: Code/Module/Profperm.php:131
 msgid "Profile"
 msgstr ""
 
-#: Code/Lib/Apps.php:399
+#: Code/Lib/Apps.php:398
 msgid "Profile Photo"
 msgstr ""
 
-#: Code/Lib/Apps.php:400
+#: Code/Lib/Apps.php:399
 msgid "Profiles"
 msgstr ""
 
-#: Code/Lib/Apps.php:401 Code/Module/Pubstream.php:97
+#: Code/Lib/Apps.php:400 Code/Module/Pubstream.php:97
 #: Code/Widget/Notifications.php:147
 msgid "Public Stream"
 msgstr ""
 
-#: Code/Lib/Apps.php:402
+#: Code/Lib/Apps.php:401
 msgid "Random Channel"
 msgstr ""
 
-#: Code/Lib/Apps.php:403
+#: Code/Lib/Apps.php:402
 msgid "Remote Diagnostics"
 msgstr ""
 
-#: Code/Lib/Apps.php:404
+#: Code/Lib/Apps.php:403
 msgid "Report Bug"
 msgstr ""
 
-#: Code/Lib/Apps.php:405
+#: Code/Lib/Apps.php:404
 msgid "Roles"
 msgstr ""
 
-#: Code/Lib/Apps.php:407
+#: Code/Lib/Apps.php:406
 msgid "Secrets"
 msgstr ""
 
-#: Code/Lib/Apps.php:408 Code/Module/Admin/Themes.php:128
+#: Code/Lib/Apps.php:407 Code/Module/Admin/Themes.php:128
 #: Code/Module/Admin/Addons.php:344 Code/Widget/Newmember.php:57
 #: Code/Widget/Settings_menu.php:124
 msgid "Settings"
 msgstr ""
 
+#: Code/Lib/Apps.php:408
+msgid "Site Admin"
+msgstr ""
+
 #: Code/Lib/Apps.php:409
 msgid "Sites"
 msgstr ""
@@ -522,7 +522,7 @@ msgstr ""
 msgid "Unpin from navbar"
 msgstr ""
 
-#: Code/Lib/Apps.php:1136 Code/Lib/Apps.php:1227 Code/Lib/Activity.php:2295
+#: Code/Lib/Apps.php:1213 Code/Lib/Apps.php:1304 Code/Lib/Activity.php:2295
 #: Code/Module/Cdav.php:876 Code/Module/Cdav.php:877 Code/Module/Cdav.php:883
 #: Code/Module/Embedphotos.php:339 Code/Module/Photos.php:854
 #: Code/Module/Photos.php:1322 Code/Widget/Album.php:100
@@ -585,8 +585,8 @@ msgstr ""
 msgid "&#x1f501; Repeated %1$s's %2$s"
 msgstr ""
 
-#: Code/Lib/Activity.php:3650 include/misc.php:1668 include/misc.php:3129
-#: include/items.php:3004
+#: Code/Lib/Activity.php:3650 include/items.php:3004 include/misc.php:1668
+#: include/misc.php:3129
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
@@ -787,61 +787,61 @@ msgstr ""
 msgid "Site Setup and Configuration"
 msgstr ""
 
-#: Code/Lib/Navbar.php:282 Code/Module/Connedit.php:812
+#: Code/Lib/Navbar.php:280 Code/Module/Connedit.php:812
 #: Code/Module/Defperms.php:246 Code/Module/New_channel.php:170
 #: Code/Module/New_channel.php:177 Code/Widget/Notifications.php:167
 msgid "Loading"
 msgstr ""
 
-#: Code/Lib/Navbar.php:287
+#: Code/Lib/Navbar.php:285
 msgid "Side Panel"
 msgstr ""
 
-#: Code/Lib/Navbar.php:288
+#: Code/Lib/Navbar.php:286
 msgid "@name, #tag, ?doc, content"
 msgstr ""
 
-#: Code/Lib/Navbar.php:289
+#: Code/Lib/Navbar.php:287
 msgid "Please wait..."
 msgstr ""
 
-#: Code/Lib/Navbar.php:295 Code/Module/Apps.php:59 Code/Widget/Appstore.php:17
+#: Code/Lib/Navbar.php:293 Code/Module/Apps.php:59 Code/Widget/Appstore.php:17
 msgid "Installed Apps"
 msgstr ""
 
-#: Code/Lib/Navbar.php:297 Code/Module/Apps.php:59 Code/Widget/Appstore.php:18
+#: Code/Lib/Navbar.php:295 Code/Module/Apps.php:59 Code/Widget/Appstore.php:18
 msgid "Available Apps"
 msgstr ""
 
-#: Code/Lib/Navbar.php:298 Code/Module/Apporder.php:51
+#: Code/Lib/Navbar.php:296 Code/Module/Apporder.php:51
 msgid "Arrange Apps"
 msgstr ""
 
-#: Code/Lib/Navbar.php:299
+#: Code/Lib/Navbar.php:297
 msgid "Toggle System Apps"
 msgstr ""
 
-#: Code/Lib/Navbar.php:368 Code/Module/Admin/Channels.php:150
+#: Code/Lib/Navbar.php:366 Code/Module/Admin/Channels.php:150
 msgid "Channel"
 msgstr ""
 
-#: Code/Lib/Navbar.php:371
+#: Code/Lib/Navbar.php:369
 msgid "Status Messages and Posts"
 msgstr ""
 
-#: Code/Lib/Navbar.php:381
+#: Code/Lib/Navbar.php:379
 msgid "About"
 msgstr ""
 
-#: Code/Lib/Navbar.php:384
+#: Code/Lib/Navbar.php:382
 msgid "Profile Details"
 msgstr ""
 
-#: Code/Lib/Navbar.php:394 include/photos.php:745
+#: Code/Lib/Navbar.php:392 include/photos.php:745
 msgid "Photo Albums"
 msgstr ""
 
-#: Code/Lib/Navbar.php:402
+#: Code/Lib/Navbar.php:400
 msgid "Files and Storage"
 msgstr ""
 
@@ -2053,15 +2053,15 @@ msgstr ""
 msgid "Channel discovery failed."
 msgstr ""
 
-#: Code/Lib/Connect.php:186
+#: Code/Lib/Connect.php:185
 msgid "Protocol not supported"
 msgstr ""
 
-#: Code/Lib/Connect.php:199
+#: Code/Lib/Connect.php:198
 msgid "Cannot connect to yourself."
 msgstr ""
 
-#: Code/Lib/Connect.php:277
+#: Code/Lib/Connect.php:276
 msgid "error saving data"
 msgstr ""
 
@@ -2456,22 +2456,26 @@ msgid "A public group where members are allowed to upload media by default"
 msgstr ""
 
 #: Code/Lib/Stringsjs.php:116
-msgid "A private group only accessible to approved members"
+msgid "A public group where members are not allowed to upload media"
 msgstr ""
 
 #: Code/Lib/Stringsjs.php:117
+msgid "A private group only accessible to approved members"
+msgstr ""
+
+#: Code/Lib/Stringsjs.php:118
 msgid ""
 "A public group where posts are moderated by the owner. The [moderated] "
 "permission may be removed from any group member once trust is established"
 msgstr ""
 
-#: Code/Lib/Stringsjs.php:118
+#: Code/Lib/Stringsjs.php:119
 msgid ""
 "A sub-channel of your main channel - often devoted to a specific language or "
 "topic. Replies are sent back to your main channel"
 msgstr ""
 
-#: Code/Lib/Stringsjs.php:119
+#: Code/Lib/Stringsjs.php:120
 msgid ""
 "A private sub-channel of your main channel - often devoted to a specific "
 "language or topic. Replies are sent back to your main channel"
@@ -9585,11 +9589,11 @@ msgid "the channel display name [example: @Barbara Jenkins]"
 msgstr ""
 
 #: Code/Module/Settings/Channel.php:553
-msgid "the channel nickname [example: @barbara1976]"
+msgid "the channel address [example: @barbara1976@example.com]"
 msgstr ""
 
 #: Code/Module/Settings/Channel.php:554
-msgid "combined [example: @Barbara Jenkins (barbara1976)]"
+msgid "combined [example: @Barbara Jenkins (barbara1976@example.com)]"
 msgstr ""
 
 #: Code/Module/Settings/Channel.php:555
@@ -10587,34 +10591,6 @@ msgstr ""
 msgid "Enter channel address or URL"
 msgstr ""
 
-#: Code/Access/PermissionRoles.php:138
-msgid "Social Networking"
-msgstr ""
-
-#: Code/Access/PermissionRoles.php:139
-msgid "Social - Normal"
-msgstr ""
-
-#: Code/Access/PermissionRoles.php:140
-msgid "Social - Restricted"
-msgstr ""
-
-#: Code/Access/PermissionRoles.php:143
-msgid "Community Group"
-msgstr ""
-
-#: Code/Access/PermissionRoles.php:144
-msgid "Group - Normal"
-msgstr ""
-
-#: Code/Access/PermissionRoles.php:145
-msgid "Group - Restricted"
-msgstr ""
-
-#: Code/Access/PermissionRoles.php:146
-msgid "Group - Moderated"
-msgstr ""
-
 #: Code/Access/Permissions.php:62
 msgid "Grant viewing access to your channel stream and posts"
 msgstr ""
@@ -10671,6 +10647,38 @@ msgstr ""
 msgid "Grant channel administration (delegation) permission"
 msgstr ""
 
+#: Code/Access/PermissionRoles.php:151
+msgid "Social Networking"
+msgstr ""
+
+#: Code/Access/PermissionRoles.php:152
+msgid "Social - Normal"
+msgstr ""
+
+#: Code/Access/PermissionRoles.php:153
+msgid "Social - Restricted"
+msgstr ""
+
+#: Code/Access/PermissionRoles.php:156
+msgid "Community Group"
+msgstr ""
+
+#: Code/Access/PermissionRoles.php:157
+msgid "Group - Normal"
+msgstr ""
+
+#: Code/Access/PermissionRoles.php:158
+msgid "Group - Limited"
+msgstr ""
+
+#: Code/Access/PermissionRoles.php:159
+msgid "Group - Moderated"
+msgstr ""
+
+#: Code/Access/PermissionRoles.php:160
+msgid "Group - Restricted"
+msgstr ""
+
 #: Code/Storage/Browser.php:120 Code/Storage/Browser.php:317
 msgid "parent"
 msgstr ""
@@ -11682,6 +11690,71 @@ msgid_plural "Abstains"
 msgstr[0] ""
 msgstr[1] ""
 
+#: include/items.php:869
+msgid "(Unknown)"
+msgstr ""
+
+#: include/items.php:1040
+msgid "Visible to anybody on the internet."
+msgstr ""
+
+#: include/items.php:1042
+msgid "Visible to you only."
+msgstr ""
+
+#: include/items.php:1044
+msgid "Visible to anybody in this network."
+msgstr ""
+
+#: include/items.php:1046
+msgid "Visible to anybody authenticated."
+msgstr ""
+
+#: include/items.php:1048
+#, php-format
+msgid "Visible to anybody on %s."
+msgstr ""
+
+#: include/items.php:1050
+msgid "Visible to all connections."
+msgstr ""
+
+#: include/items.php:1052
+msgid "Visible to approved connections."
+msgstr ""
+
+#: include/items.php:1054
+msgid "Visible to specific connections."
+msgstr ""
+
+#: include/items.php:4117
+msgid "Privacy group is empty."
+msgstr ""
+
+#: include/items.php:4494
+msgid "profile photo"
+msgstr ""
+
+#: include/items.php:4710
+#, php-format
+msgid "[Edited %s]"
+msgstr ""
+
+#: include/items.php:4710
+msgctxt "edit_activity"
+msgid "Post"
+msgstr ""
+
+#: include/items.php:4710
+msgctxt "edit_activity"
+msgid "Comment"
+msgstr ""
+
+#: include/zid.php:406
+#, php-format
+msgid "OpenWebAuth: %1$s welcomes %2$s"
+msgstr ""
+
 #: include/misc.php:531
 msgid "prev"
 msgstr ""
@@ -12011,83 +12084,6 @@ msgstr ""
 msgid "Specify folder"
 msgstr ""
 
-#: include/items.php:869
-msgid "(Unknown)"
-msgstr ""
-
-#: include/items.php:1040
-msgid "Visible to anybody on the internet."
-msgstr ""
-
-#: include/items.php:1042
-msgid "Visible to you only."
-msgstr ""
-
-#: include/items.php:1044
-msgid "Visible to anybody in this network."
-msgstr ""
-
-#: include/items.php:1046
-msgid "Visible to anybody authenticated."
-msgstr ""
-
-#: include/items.php:1048
-#, php-format
-msgid "Visible to anybody on %s."
-msgstr ""
-
-#: include/items.php:1050
-msgid "Visible to all connections."
-msgstr ""
-
-#: include/items.php:1052
-msgid "Visible to approved connections."
-msgstr ""
-
-#: include/items.php:1054
-msgid "Visible to specific connections."
-msgstr ""
-
-#: include/items.php:4117
-msgid "Privacy group is empty."
-msgstr ""
-
-#: include/items.php:4494
-msgid "profile photo"
-msgstr ""
-
-#: include/items.php:4710
-#, php-format
-msgid "[Edited %s]"
-msgstr ""
-
-#: include/items.php:4710
-msgctxt "edit_activity"
-msgid "Post"
-msgstr ""
-
-#: include/items.php:4710
-msgctxt "edit_activity"
-msgid "Comment"
-msgstr ""
-
-#: include/zid.php:406
-#, php-format
-msgid "OpenWebAuth: %1$s welcomes %2$s"
-msgstr ""
-
-#: include/network.php:1115
-msgid "RSS/Atom"
-msgstr ""
-
-#: include/network.php:1117
-msgid "Diaspora"
-msgstr ""
-
-#: include/network.php:1119
-msgid "Zot6"
-msgstr ""
-
 #: include/language.php:377
 msgid "Select an alternate language"
 msgstr ""
@@ -12144,6 +12140,18 @@ msgstr ""
 msgid "Work, Fax"
 msgstr ""
 
+#: include/network.php:1115
+msgid "RSS/Atom"
+msgstr ""
+
+#: include/network.php:1117
+msgid "Diaspora"
+msgstr ""
+
+#: include/network.php:1119
+msgid "Zot6"
+msgstr ""
+
 #: include/datetime.php:166
 msgid "Birthday"
 msgstr ""

version.php

@@ -1,2 +1,2 @@
 <?php
-define ('STD_VERSION', '23.09.21');
+define ('STD_VERSION', '23.09.27');

view/tpl/identity.tpl

@@ -1,8 +1,8 @@
 <tr>
     <td class="identity-name-td">
         <div class="identity-name-outer">
-            <div class="identity-name-inner">
-                {{$identity.0}}
+            <div class="identity-name-inner" title="{{$identity.0}}">
+                <span title="{{$identity.0}}">{{$identity.0}}</span>
             </div>
         </div>
     </td>