diff options
63 files changed, 398 insertions, 175 deletions
diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 11dd0d174..8e8a1ed24 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -215,6 +215,7 @@ class Display extends \Zotlabs\Web\Controller { $pager_sql = sprintf(" LIMIT %d OFFSET %d ", intval(\App::$pager['itemspage']),intval(\App::$pager['start'])); if($load || ($checkjs->disabled()) || ($module_format !== 'html')) { + $r = null; require_once('include/channel.php'); @@ -235,7 +236,7 @@ class Display extends \Zotlabs\Web\Controller { } } - if($r === null) { + if(! $r) { // in case somebody turned off public access to sys channel content using permissions // make that content unsearchable by ensuring the owner uid can't match @@ -281,7 +282,7 @@ class Display extends \Zotlabs\Web\Controller { } } - if($r === null) { + if(! $r) { // in case somebody turned off public access to sys channel content using permissions // make that content unsearchable by ensuring the owner_xchan can't match if(! perm_is_allowed($sysid,$observer_hash,'view_stream')) diff --git a/Zotlabs/Module/Email_validation.php b/Zotlabs/Module/Email_validation.php index b8bb720cd..c1ba9a01a 100644 --- a/Zotlabs/Module/Email_validation.php +++ b/Zotlabs/Module/Email_validation.php @@ -7,12 +7,11 @@ class Email_validation extends \Zotlabs\Web\Controller { function post() { + $success = false; if($_POST['token']) { // This will redirect internally on success unless the channel is auto_created - if(! account_approve(trim(basename($_POST['token'])))) { - notice('Token verification failed.'); - } - else { + if(account_approve(trim(basename($_POST['token'])))) { + $success = true; if(get_config('system','auto_channel_create')) { $next_page = get_config('system', 'workflow_channel_next', 'profiles'); } @@ -21,7 +20,9 @@ class Email_validation extends \Zotlabs\Web\Controller { } } } - + if(! $success) { + notice( t('Token verification failed.') . EOL); + } } diff --git a/Zotlabs/Module/Go.php b/Zotlabs/Module/Go.php index d23e940c3..d33136d9e 100644 --- a/Zotlabs/Module/Go.php +++ b/Zotlabs/Module/Go.php @@ -36,7 +36,7 @@ class Go extends \Zotlabs\Web\Controller { 'cover_photo' => t('Upload a cover photo'), 'profiles' => t('Edit your default profile'), 'suggest' => t('View friend suggestions'), - 'directory' => t('View the directory to find other interesting channels'), + 'directory' => t('View the channel directory'), 'settings' => t('View/edit your channel settings'), 'help' => t('View the site or project documentation'), 'channel/' . $channel['channel_address'] => t('Visit your channel homepage'), diff --git a/Zotlabs/Module/Register.php b/Zotlabs/Module/Register.php index c7fa1cee8..5356669e9 100644 --- a/Zotlabs/Module/Register.php +++ b/Zotlabs/Module/Register.php @@ -123,9 +123,6 @@ class Register extends \Zotlabs\Web\Controller { if($policy == REGISTER_OPEN ) { if($email_verify) { $res = verify_email_address($result); - if($res) { - info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ; - } } else { $res = send_register_success_email($result['email'],$result['password']); @@ -133,7 +130,8 @@ class Register extends \Zotlabs\Web\Controller { if($res) { if($invite_code) { info( t('Registration successful. Continue to create your first channel...') . EOL ) ; - } else { + } + else { info( t('Registration successful. Please check your email for validation instructions.') . EOL ) ; } } diff --git a/Zotlabs/Widget/Newmember.php b/Zotlabs/Widget/Newmember.php new file mode 100644 index 000000000..898942ccc --- /dev/null +++ b/Zotlabs/Widget/Newmember.php @@ -0,0 +1,83 @@ +<?php + +namespace Zotlabs\Widget; + +class Newmember { + + function widget($arr) { + + if(! local_channel()) + return EMPTY_STR; + + $c = \App::get_channel(); + if(! $c) + return EMPTY_STR; + + + $a = \App::get_account(); + if(! $a) + return EMPTY_STR; + + + if(datetime_convert('UTC','UTC',$a['account_created']) < datetime_convert('UTC','UTC', 'now - 60 days')) + return EMPTY_STR; + + // This could be a new account that was used to clone a very old channel + + $ob = \App::get_observer(); + if($ob && array_key_exists('xchan_name_date',$ob) && $ob['xchan_name_date'] < datetime_convert('UTC','UTC','now - 60 days')) + return EMPTY_STR; + + + $options = [ + t('Profile Creation'), + [ + 'profile_photo' => t('Upload profile photo'), + 'cover_photo' => t('Upload cover photo'), + 'profiles' => t('Edit your profile'), + ], + + t('Find and Connect with others'), + [ + 'directory' => t('View the channel directory'), + 'suggest' => t('View friend suggestions'), + 'connections' => t('Manage your connections'), + ], + + t('Communicate'), + [ + 'channel/' . $channel['channel_address'] => t('View your channel homepage'), + 'network' => t('View your network stream'), + ], + + t('Miscellaneous'), + [ + 'settings' => t('Settings'), + 'help' => t('Documentation'), + ] + ]; + + $site_firehose = ((intval(get_config('system','site_firehose',0))) ? true : false); + $net_firehose = ((get_config('system','disable_discover_tab',1)) ? false : true); + + + // hack to put this in the correct spot of the array + + if($site_firehose || $net_firehose) { + $options[5]['pubstream'] = t('View public stream. Warning: not moderated'); + } + + $o = replace_macros(get_markup_template('new_member.tpl'), [ + '$title' => t('New Member Links'), + '$options' => $options + + ]); + + return $o; + + } + +} + + + @@ -50,7 +50,7 @@ require_once('include/attach.php'); require_once('include/bbcode.php'); define ( 'PLATFORM_NAME', 'hubzilla' ); -define ( 'STD_VERSION', '3.3' ); +define ( 'STD_VERSION', '3.3.1' ); define ( 'ZOT_REVISION', '1.3' ); define ( 'DB_UPDATE_VERSION', 1206 ); diff --git a/include/account.php b/include/account.php index 3ac485974..40cf281c3 100644 --- a/include/account.php +++ b/include/account.php @@ -530,7 +530,7 @@ function account_deny($hash) { function account_approve($hash) { - $ret = array('success' => false); + $ret = false; // Note: when the password in the register table is 'verify', the uid actually contains the account_id diff --git a/include/datetime.php b/include/datetime.php index 1e9a1fa51..766c90d16 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -125,7 +125,7 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d */ function dob($dob) { - if ($dob === '0000-00-00') + if ($dob === '0000-00-00' || $dob === '') $value = ''; else $value = (($year) ? datetime_convert('UTC','UTC',$dob,'Y-m-d') : datetime_convert('UTC','UTC',$dob,'m-d')); diff --git a/util/hmessages.po b/util/hmessages.po index 98091a368..ee7266010 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.3\n" +"Project-Id-Version: 3.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-02-28 08:31+0100\n" +"POT-Creation-Date: 2018-03-01 08:51+0100\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" @@ -149,7 +149,7 @@ msgstr "" #: ../../Zotlabs/Module/Cdav.php:1182 ../../Zotlabs/Module/New_channel.php:130 #: ../../Zotlabs/Module/Settings/Channel.php:473 #: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:798 -#: ../../Zotlabs/Module/Register.php:226 ../../include/selectors.php:49 +#: ../../Zotlabs/Module/Register.php:224 ../../include/selectors.php:49 #: ../../include/selectors.php:66 ../../include/selectors.php:104 #: ../../include/selectors.php:140 ../../include/event.php:1315 #: ../../include/event.php:1322 ../../include/connections.php:689 @@ -216,7 +216,7 @@ msgstr "" #: ../../Zotlabs/Module/Register.php:77 #: ../../Zotlabs/Module/Cover_photo.php:281 #: ../../Zotlabs/Module/Cover_photo.php:294 -#: ../../Zotlabs/Module/Display.php:405 ../../Zotlabs/Module/Network.php:15 +#: ../../Zotlabs/Module/Display.php:406 ../../Zotlabs/Module/Network.php:15 #: ../../Zotlabs/Module/Filestorage.php:15 #: ../../Zotlabs/Module/Filestorage.php:70 #: ../../Zotlabs/Module/Filestorage.php:85 @@ -426,7 +426,7 @@ msgstr "" #: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Module/Pdledit.php:98 #: ../../Zotlabs/Module/Poke.php:200 ../../Zotlabs/Module/Connedit.php:887 #: ../../Zotlabs/Module/Chat.php:196 ../../Zotlabs/Module/Chat.php:242 -#: ../../Zotlabs/Module/Email_validation.php:39 +#: ../../Zotlabs/Module/Email_validation.php:40 #: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:249 #: ../../Zotlabs/Module/Group.php:87 ../../Zotlabs/Module/Profiles.php:726 #: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 @@ -454,7 +454,7 @@ msgstr "" #: ../../addon/rtof/rtof.php:101 ../../addon/jappixmini/jappixmini.php:371 #: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 #: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 -#: ../../addon/frphotos/frphotos.php:96 ../../addon/pubcrawl/pubcrawl.php:1054 +#: ../../addon/frphotos/frphotos.php:96 ../../addon/pubcrawl/pubcrawl.php:1053 #: ../../addon/chords/Mod_Chords.php:60 ../../addon/libertree/libertree.php:85 #: ../../addon/flattrwidget/flattrwidget.php:124 #: ../../addon/statusnet/statusnet.php:322 @@ -471,7 +471,7 @@ msgid "Submit" msgstr "" #: ../../Zotlabs/Module/Articles.php:38 ../../Zotlabs/Module/Articles.php:179 -#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:132 +#: ../../Zotlabs/Lib/Apps.php:229 ../../include/features.php:124 #: ../../include/nav.php:469 msgid "Articles" msgstr "" @@ -1523,24 +1523,24 @@ msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" #: ../../Zotlabs/Module/New_channel.php:132 -#: ../../Zotlabs/Module/Register.php:256 +#: ../../Zotlabs/Module/Register.php:254 msgid "Name or caption" msgstr "" #: ../../Zotlabs/Module/New_channel.php:132 -#: ../../Zotlabs/Module/Register.php:256 +#: ../../Zotlabs/Module/Register.php:254 msgid "" "Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation " "Group\"" msgstr "" #: ../../Zotlabs/Module/New_channel.php:134 -#: ../../Zotlabs/Module/Register.php:258 +#: ../../Zotlabs/Module/Register.php:256 msgid "Choose a short nickname" msgstr "" #: ../../Zotlabs/Module/New_channel.php:134 -#: ../../Zotlabs/Module/Register.php:258 +#: ../../Zotlabs/Module/Register.php:256 #, php-format msgid "" "Your nickname will be used to create an easy to remember channel address e." @@ -1548,17 +1548,17 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/New_channel.php:135 -#: ../../Zotlabs/Module/Register.php:259 +#: ../../Zotlabs/Module/Register.php:257 msgid "Channel role and privacy" msgstr "" #: ../../Zotlabs/Module/New_channel.php:135 -#: ../../Zotlabs/Module/Register.php:259 +#: ../../Zotlabs/Module/Register.php:257 msgid "Select a channel role with your privacy requirements." msgstr "" #: ../../Zotlabs/Module/New_channel.php:135 -#: ../../Zotlabs/Module/Register.php:259 +#: ../../Zotlabs/Module/Register.php:257 msgid "Read more about roles" msgstr "" @@ -2228,7 +2228,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:259 #: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:46 -#: ../../Zotlabs/Module/Display.php:409 ../../Zotlabs/Module/Filestorage.php:24 +#: ../../Zotlabs/Module/Display.php:410 ../../Zotlabs/Module/Filestorage.php:24 #: ../../Zotlabs/Module/Admin.php:62 ../../include/items.php:3569 msgid "Item not found." msgstr "" @@ -2278,6 +2278,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:344 #: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:242 +#: ../../Zotlabs/Widget/Newmember.php:55 #: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:105 #: ../../include/nav.php:192 msgid "Settings" @@ -2704,7 +2705,7 @@ msgid "Site" msgstr "" #: ../../Zotlabs/Module/Admin/Site.php:290 -#: ../../Zotlabs/Module/Register.php:271 +#: ../../Zotlabs/Module/Register.php:269 msgid "Registration" msgstr "" @@ -3964,7 +3965,11 @@ msgid "Affinity Slider Settings" msgstr "" #: ../../Zotlabs/Module/Settings/Featured.php:64 -msgid "Feature/Addon Settings" +msgid "Addon Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Featured.php:65 +msgid "Please save/submit changes to any panel before opening another." msgstr "" #: ../../Zotlabs/Module/Settings/Display.php:139 @@ -5844,11 +5849,16 @@ msgstr "" msgid "Unknown error" msgstr "" -#: ../../Zotlabs/Module/Email_validation.php:35 -msgid "Email Verification Required" +#: ../../Zotlabs/Module/Email_validation.php:24 +#: ../../Zotlabs/Module/Email_resend.php:12 +msgid "Token verification failed." msgstr "" #: ../../Zotlabs/Module/Email_validation.php:36 +msgid "Email Verification Required" +msgstr "" + +#: ../../Zotlabs/Module/Email_validation.php:37 #, php-format msgid "" "A verification token was sent to your email address [%s]. Enter that token " @@ -5856,11 +5866,11 @@ msgid "" "for delivery, and check your spam folder if you do not see the message." msgstr "" -#: ../../Zotlabs/Module/Email_validation.php:37 +#: ../../Zotlabs/Module/Email_validation.php:38 msgid "Resend Email" msgstr "" -#: ../../Zotlabs/Module/Email_validation.php:40 +#: ../../Zotlabs/Module/Email_validation.php:41 msgid "Validation token" msgstr "" @@ -6097,7 +6107,8 @@ msgstr "" msgid "Relation" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:739 ../../include/datetime.php:58 +#: ../../Zotlabs/Module/Profiles.php:739 ../../Zotlabs/Widget/Newmember.php:53 +#: ../../include/datetime.php:58 msgid "Miscellaneous" msgstr "" @@ -6272,12 +6283,12 @@ msgstr "" msgid "Edit your default profile" msgstr "" -#: ../../Zotlabs/Module/Go.php:38 +#: ../../Zotlabs/Module/Go.php:38 ../../Zotlabs/Widget/Newmember.php:43 msgid "View friend suggestions" msgstr "" -#: ../../Zotlabs/Module/Go.php:39 -msgid "View the directory to find other interesting channels" +#: ../../Zotlabs/Module/Go.php:39 ../../Zotlabs/Widget/Newmember.php:42 +msgid "View the channel directory" msgstr "" #: ../../Zotlabs/Module/Go.php:40 @@ -6355,7 +6366,7 @@ msgstr "" #: ../../Zotlabs/Module/Cards.php:42 ../../Zotlabs/Module/Cards.php:181 #: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1890 -#: ../../include/features.php:122 ../../include/nav.php:458 +#: ../../include/features.php:114 ../../include/nav.php:458 msgid "Cards" msgstr "" @@ -6379,7 +6390,7 @@ msgstr "" msgid "Administrator" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:25 ../../Zotlabs/Module/Register.php:234 +#: ../../Zotlabs/Module/Siteinfo.php:25 ../../Zotlabs/Module/Register.php:232 msgid "Terms of Service" msgstr "" @@ -6607,7 +6618,7 @@ msgid "*" msgstr "" #: ../../Zotlabs/Module/Sources.php:96 -#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:238 +#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:274 msgid "Channel Sources" msgstr "" @@ -7096,85 +7107,85 @@ msgstr "" msgid "Passwords do not match." msgstr "" -#: ../../Zotlabs/Module/Register.php:127 ../../Zotlabs/Module/Register.php:137 -msgid "" -"Registration successful. Please check your email for validation instructions." +#: ../../Zotlabs/Module/Register.php:132 +msgid "Registration successful. Continue to create your first channel..." msgstr "" #: ../../Zotlabs/Module/Register.php:135 -msgid "Registration successful. Continue to create your first channel..." +msgid "" +"Registration successful. Please check your email for validation instructions." msgstr "" -#: ../../Zotlabs/Module/Register.php:144 +#: ../../Zotlabs/Module/Register.php:142 msgid "Your registration is pending approval by the site owner." msgstr "" -#: ../../Zotlabs/Module/Register.php:147 +#: ../../Zotlabs/Module/Register.php:145 msgid "Your registration can not be processed." msgstr "" -#: ../../Zotlabs/Module/Register.php:194 +#: ../../Zotlabs/Module/Register.php:192 msgid "Registration on this hub is disabled." msgstr "" -#: ../../Zotlabs/Module/Register.php:203 +#: ../../Zotlabs/Module/Register.php:201 msgid "Registration on this hub is by approval only." msgstr "" -#: ../../Zotlabs/Module/Register.php:204 +#: ../../Zotlabs/Module/Register.php:202 msgid "<a href=\"pubsites\">Register at another affiliated hub.</a>" msgstr "" -#: ../../Zotlabs/Module/Register.php:214 +#: ../../Zotlabs/Module/Register.php:212 msgid "" "This site has exceeded the number of allowed daily account registrations. " "Please try again tomorrow." msgstr "" -#: ../../Zotlabs/Module/Register.php:240 +#: ../../Zotlabs/Module/Register.php:238 #, php-format msgid "I accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:247 +#: ../../Zotlabs/Module/Register.php:245 #, php-format msgid "I am over %s years of age and accept the %s for this website" msgstr "" -#: ../../Zotlabs/Module/Register.php:252 +#: ../../Zotlabs/Module/Register.php:250 msgid "Your email address" msgstr "" -#: ../../Zotlabs/Module/Register.php:253 +#: ../../Zotlabs/Module/Register.php:251 msgid "Choose a password" msgstr "" -#: ../../Zotlabs/Module/Register.php:254 +#: ../../Zotlabs/Module/Register.php:252 msgid "Please re-enter your password" msgstr "" -#: ../../Zotlabs/Module/Register.php:255 +#: ../../Zotlabs/Module/Register.php:253 msgid "Please enter your invitation code" msgstr "" -#: ../../Zotlabs/Module/Register.php:260 +#: ../../Zotlabs/Module/Register.php:258 msgid "no" msgstr "" -#: ../../Zotlabs/Module/Register.php:260 +#: ../../Zotlabs/Module/Register.php:258 msgid "yes" msgstr "" -#: ../../Zotlabs/Module/Register.php:276 +#: ../../Zotlabs/Module/Register.php:274 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../Zotlabs/Module/Register.php:288 ../../boot.php:1563 +#: ../../Zotlabs/Module/Register.php:286 ../../boot.php:1563 #: ../../include/nav.php:164 msgid "Register" msgstr "" -#: ../../Zotlabs/Module/Register.php:289 +#: ../../Zotlabs/Module/Register.php:287 msgid "" "This site requires email verification. After completing this form, please " "check your email for further instructions." @@ -7245,11 +7256,11 @@ msgstr "" msgid "Contents" msgstr "" -#: ../../Zotlabs/Module/Display.php:350 +#: ../../Zotlabs/Module/Display.php:351 msgid "Article" msgstr "" -#: ../../Zotlabs/Module/Display.php:402 +#: ../../Zotlabs/Module/Display.php:403 msgid "Item has been removed." msgstr "" @@ -7368,10 +7379,6 @@ msgstr "" msgid "View Common Connections" msgstr "" -#: ../../Zotlabs/Module/Email_resend.php:12 -msgid "Token verification failed." -msgstr "" - #: ../../Zotlabs/Module/Email_resend.php:30 msgid "Email verification resent" msgstr "" @@ -7596,7 +7603,7 @@ msgstr "" msgid "Remote Diagnostics" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:362 +#: ../../Zotlabs/Lib/Apps.php:238 ../../include/features.php:390 msgid "Suggest Channels" msgstr "" @@ -7610,7 +7617,7 @@ msgid "Activity" msgstr "" #: ../../Zotlabs/Lib/Apps.php:245 ../../include/conversation.php:1928 -#: ../../include/features.php:95 ../../include/nav.php:497 +#: ../../include/features.php:87 ../../include/nav.php:497 msgid "Wiki" msgstr "" @@ -8654,7 +8661,7 @@ msgstr "" msgid "Remove term" msgstr "" -#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:326 +#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:354 msgid "Saved Searches" msgstr "" @@ -8696,7 +8703,7 @@ msgid "See more..." msgstr "" #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:415 +#: ../../include/features.php:443 msgid "Saved Folders" msgstr "" @@ -8704,6 +8711,54 @@ msgstr "" msgid "Click to show more" msgstr "" +#: ../../Zotlabs/Widget/Newmember.php:33 +msgid "Profile Creation" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:35 +msgid "Upload profile photo" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:36 +msgid "Upload cover photo" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:37 ../../include/nav.php:119 +msgid "Edit your profile" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:40 +msgid "Find and Connect with others" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:44 +msgid "Manage your connections" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:47 +msgid "Communicate" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:49 +msgid "View your channel homepage" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:50 +msgid "View your network stream" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:56 +msgid "Documentation" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:67 +msgid "View public stream. Warning: not moderated" +msgstr "" + +#: ../../Zotlabs/Widget/Newmember.php:71 +msgid "New Member Links" +msgstr "" + #: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60 msgid "Member registrations waiting for confirmation" msgstr "" @@ -8737,7 +8792,7 @@ msgid "Additional features" msgstr "" #: ../../Zotlabs/Widget/Settings_menu.php:57 -msgid "Feature/Addon settings" +msgid "Addon settings" msgstr "" #: ../../Zotlabs/Widget/Settings_menu.php:63 @@ -8756,7 +8811,7 @@ msgstr "" msgid "Connected apps" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:168 +#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:231 msgid "Permission Groups" msgstr "" @@ -10457,7 +10512,7 @@ msgstr "" msgid "Not supported by some microblog services such as Mastodon" msgstr "" -#: ../../addon/pubcrawl/pubcrawl.php:1054 +#: ../../addon/pubcrawl/pubcrawl.php:1053 msgid "ActivityPub Protocol Settings" msgstr "" @@ -13281,312 +13336,332 @@ msgstr "" msgid "General Features" msgstr "" -#: ../../include/features.php:59 -msgid "Multiple Profiles" -msgstr "" - #: ../../include/features.php:60 -msgid "Ability to create multiple profiles" -msgstr "" - -#: ../../include/features.php:68 msgid "Advanced Profiles" msgstr "" -#: ../../include/features.php:69 +#: ../../include/features.php:61 msgid "Additional profile sections and selections" msgstr "" -#: ../../include/features.php:77 +#: ../../include/features.php:69 msgid "Profile Import/Export" msgstr "" -#: ../../include/features.php:78 +#: ../../include/features.php:70 msgid "Save and load profile details across sites/channels" msgstr "" -#: ../../include/features.php:86 +#: ../../include/features.php:78 msgid "Web Pages" msgstr "" -#: ../../include/features.php:87 +#: ../../include/features.php:79 msgid "Provide managed web pages on your channel" msgstr "" -#: ../../include/features.php:96 +#: ../../include/features.php:88 msgid "Provide a wiki for your channel" msgstr "" -#: ../../include/features.php:113 +#: ../../include/features.php:105 msgid "Private Notes" msgstr "" -#: ../../include/features.php:114 +#: ../../include/features.php:106 msgid "Enables a tool to store notes and reminders (note: not encrypted)" msgstr "" -#: ../../include/features.php:123 +#: ../../include/features.php:115 msgid "Create personal planning cards" msgstr "" -#: ../../include/features.php:133 +#: ../../include/features.php:125 msgid "Create interactive articles" msgstr "" -#: ../../include/features.php:141 +#: ../../include/features.php:133 msgid "Navigation Channel Select" msgstr "" -#: ../../include/features.php:142 +#: ../../include/features.php:134 msgid "Change channels directly from within the navigation dropdown menu" msgstr "" -#: ../../include/features.php:150 +#: ../../include/features.php:142 msgid "Photo Location" msgstr "" -#: ../../include/features.php:151 +#: ../../include/features.php:143 msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -#: ../../include/features.php:159 +#: ../../include/features.php:151 msgid "Access Controlled Chatrooms" msgstr "" -#: ../../include/features.php:160 +#: ../../include/features.php:152 msgid "Provide chatrooms and chat services with access control." msgstr "" -#: ../../include/features.php:169 -msgid "Provide alternate connection permission roles." -msgstr "" - -#: ../../include/features.php:177 +#: ../../include/features.php:161 msgid "Smart Birthdays" msgstr "" -#: ../../include/features.php:178 +#: ../../include/features.php:162 msgid "" "Make birthday events timezone aware in case your friends are scattered " "across the planet." msgstr "" -#: ../../include/features.php:186 +#: ../../include/features.php:170 msgid "Event Timezone Selection" msgstr "" -#: ../../include/features.php:187 +#: ../../include/features.php:171 msgid "Allow event creation in timezones other than your own." msgstr "" -#: ../../include/features.php:196 +#: ../../include/features.php:180 msgid "Premium Channel" msgstr "" -#: ../../include/features.php:197 +#: ../../include/features.php:181 msgid "" "Allows you to set restrictions and terms on those that connect with your " "channel" msgstr "" -#: ../../include/features.php:205 +#: ../../include/features.php:189 msgid "Advanced Directory Search" msgstr "" -#: ../../include/features.php:206 +#: ../../include/features.php:190 msgid "Allows creation of complex directory search queries" msgstr "" -#: ../../include/features.php:214 +#: ../../include/features.php:198 msgid "Advanced Theme and Layout Settings" msgstr "" -#: ../../include/features.php:215 +#: ../../include/features.php:199 msgid "Allows fine tuning of themes and page layouts" msgstr "" -#: ../../include/features.php:225 +#: ../../include/features.php:208 +msgid "Access Control and Permissions" +msgstr "" + +#: ../../include/features.php:212 ../../include/group.php:328 +msgid "Privacy Groups" +msgstr "" + +#: ../../include/features.php:213 +msgid "Enable management and selection of privacy groups" +msgstr "" + +#: ../../include/features.php:221 +msgid "Multiple Profiles" +msgstr "" + +#: ../../include/features.php:222 +msgid "Ability to create multiple profiles" +msgstr "" + +#: ../../include/features.php:232 +msgid "Provide alternate connection permission roles." +msgstr "" + +#: ../../include/features.php:240 +msgid "OAuth Clients" +msgstr "" + +#: ../../include/features.php:241 +msgid "Manage authenticatication tokens for mobile and remote apps." +msgstr "" + +#: ../../include/features.php:249 +msgid "Access Tokens" +msgstr "" + +#: ../../include/features.php:250 +msgid "Create access tokens so that non-members can access private content." +msgstr "" + +#: ../../include/features.php:261 msgid "Post Composition Features" msgstr "" -#: ../../include/features.php:229 +#: ../../include/features.php:265 msgid "Large Photos" msgstr "" -#: ../../include/features.php:230 +#: ../../include/features.php:266 msgid "" "Include large (1024px) photo thumbnails in posts. If not enabled, use small " "(640px) photo thumbnails" msgstr "" -#: ../../include/features.php:239 +#: ../../include/features.php:275 msgid "Automatically import channel content from other channels or feeds" msgstr "" -#: ../../include/features.php:247 +#: ../../include/features.php:283 msgid "Even More Encryption" msgstr "" -#: ../../include/features.php:248 +#: ../../include/features.php:284 msgid "" "Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/features.php:256 +#: ../../include/features.php:292 msgid "Enable Voting Tools" msgstr "" -#: ../../include/features.php:257 +#: ../../include/features.php:293 msgid "Provide a class of post which others can vote on" msgstr "" -#: ../../include/features.php:265 +#: ../../include/features.php:301 msgid "Disable Comments" msgstr "" -#: ../../include/features.php:266 +#: ../../include/features.php:302 msgid "Provide the option to disable comments for a post" msgstr "" -#: ../../include/features.php:274 +#: ../../include/features.php:310 msgid "Delayed Posting" msgstr "" -#: ../../include/features.php:275 +#: ../../include/features.php:311 msgid "Allow posts to be published at a later date" msgstr "" -#: ../../include/features.php:283 +#: ../../include/features.php:319 msgid "Content Expiration" msgstr "" -#: ../../include/features.php:284 +#: ../../include/features.php:320 msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/features.php:292 +#: ../../include/features.php:328 msgid "Suppress Duplicate Posts/Comments" msgstr "" -#: ../../include/features.php:293 +#: ../../include/features.php:329 msgid "" "Prevent posts with identical content to be published with less than two " "minutes in between submissions." msgstr "" -#: ../../include/features.php:304 +#: ../../include/features.php:340 msgid "Network and Stream Filtering" msgstr "" -#: ../../include/features.php:308 +#: ../../include/features.php:344 msgid "Search by Date" msgstr "" -#: ../../include/features.php:309 +#: ../../include/features.php:345 msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/features.php:317 ../../include/group.php:328 -msgid "Privacy Groups" -msgstr "" - -#: ../../include/features.php:318 -msgid "Enable management and selection of privacy groups" -msgstr "" - -#: ../../include/features.php:327 +#: ../../include/features.php:355 msgid "Save search terms for re-use" msgstr "" -#: ../../include/features.php:335 +#: ../../include/features.php:363 msgid "Network Personal Tab" msgstr "" -#: ../../include/features.php:336 +#: ../../include/features.php:364 msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/features.php:344 +#: ../../include/features.php:372 msgid "Network New Tab" msgstr "" -#: ../../include/features.php:345 +#: ../../include/features.php:373 msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/features.php:353 +#: ../../include/features.php:381 msgid "Affinity Tool" msgstr "" -#: ../../include/features.php:354 +#: ../../include/features.php:382 msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/features.php:363 +#: ../../include/features.php:391 msgid "Show friend and connection suggestions" msgstr "" -#: ../../include/features.php:371 +#: ../../include/features.php:399 msgid "Connection Filtering" msgstr "" -#: ../../include/features.php:372 +#: ../../include/features.php:400 msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: ../../include/features.php:384 +#: ../../include/features.php:412 msgid "Post/Comment Tools" msgstr "" -#: ../../include/features.php:388 +#: ../../include/features.php:416 msgid "Community Tagging" msgstr "" -#: ../../include/features.php:389 +#: ../../include/features.php:417 msgid "Ability to tag existing posts" msgstr "" -#: ../../include/features.php:397 +#: ../../include/features.php:425 msgid "Post Categories" msgstr "" -#: ../../include/features.php:398 +#: ../../include/features.php:426 msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:406 +#: ../../include/features.php:434 msgid "Emoji Reactions" msgstr "" -#: ../../include/features.php:407 +#: ../../include/features.php:435 msgid "Add emoji reaction ability to posts" msgstr "" -#: ../../include/features.php:416 +#: ../../include/features.php:444 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:424 +#: ../../include/features.php:452 msgid "Dislike Posts" msgstr "" -#: ../../include/features.php:425 +#: ../../include/features.php:453 msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/features.php:433 +#: ../../include/features.php:461 msgid "Star Posts" msgstr "" -#: ../../include/features.php:434 +#: ../../include/features.php:462 msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/features.php:442 +#: ../../include/features.php:470 msgid "Tag Cloud" msgstr "" -#: ../../include/features.php:443 +#: ../../include/features.php:471 msgid "Provide a personal tag cloud on your channel page" msgstr "" @@ -13799,10 +13874,6 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:119 -msgid "Edit your profile" -msgstr "" - #: ../../include/nav.php:126 ../../include/nav.php:130 msgid "Sign in" msgstr "" diff --git a/view/pdl/mod_admin.pdl b/view/pdl/mod_admin.pdl index deee4551b..1cf49750d 100644 --- a/view/pdl/mod_admin.pdl +++ b/view/pdl/mod_admin.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_appman.pdl b/view/pdl/mod_appman.pdl index d2b1379a5..8bd407372 100644 --- a/view/pdl/mod_appman.pdl +++ b/view/pdl/mod_appman.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_apps.pdl b/view/pdl/mod_apps.pdl index d2b1379a5..8bd407372 100644 --- a/view/pdl/mod_apps.pdl +++ b/view/pdl/mod_apps.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_articles.pdl b/view/pdl/mod_articles.pdl index c7599a008..b823787f4 100644 --- a/view/pdl/mod_articles.pdl +++ b/view/pdl/mod_articles.pdl @@ -5,4 +5,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_blocks.pdl b/view/pdl/mod_blocks.pdl index 6ef7993b5..4a90a4f36 100644 --- a/view/pdl/mod_blocks.pdl +++ b/view/pdl/mod_blocks.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_cal.pdl b/view/pdl/mod_cal.pdl index c34898dd5..7e15fc869 100644 --- a/view/pdl/mod_cal.pdl +++ b/view/pdl/mod_cal.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_cards.pdl b/view/pdl/mod_cards.pdl index f5606dcb8..f0403e380 100644 --- a/view/pdl/mod_cards.pdl +++ b/view/pdl/mod_cards.pdl @@ -5,4 +5,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_cdav.pdl b/view/pdl/mod_cdav.pdl index d31308d90..c0f9a511f 100644 --- a/view/pdl/mod_cdav.pdl +++ b/view/pdl/mod_cdav.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_channel.pdl b/view/pdl/mod_channel.pdl index f7ac0b4ef..5857fca95 100644 --- a/view/pdl/mod_channel.pdl +++ b/view/pdl/mod_channel.pdl @@ -10,4 +10,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_chanview.pdl b/view/pdl/mod_chanview.pdl index 5c8ca77d5..a5461df50 100644 --- a/view/pdl/mod_chanview.pdl +++ b/view/pdl/mod_chanview.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_chat.pdl b/view/pdl/mod_chat.pdl index 2f1f5c8d1..808ba3d5a 100644 --- a/view/pdl/mod_chat.pdl +++ b/view/pdl/mod_chat.pdl @@ -7,4 +7,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_cloud.pdl b/view/pdl/mod_cloud.pdl index 5c8ca77d5..a5461df50 100644 --- a/view/pdl/mod_cloud.pdl +++ b/view/pdl/mod_cloud.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_common.pdl b/view/pdl/mod_common.pdl index c34898dd5..7e15fc869 100644 --- a/view/pdl/mod_common.pdl +++ b/view/pdl/mod_common.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_connect.pdl b/view/pdl/mod_connect.pdl index 23b8d9f71..d7e5d29f3 100644 --- a/view/pdl/mod_connect.pdl +++ b/view/pdl/mod_connect.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_connections.pdl b/view/pdl/mod_connections.pdl index 7cead4fe8..b777cada5 100644 --- a/view/pdl/mod_connections.pdl +++ b/view/pdl/mod_connections.pdl @@ -6,4 +6,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_connedit.pdl b/view/pdl/mod_connedit.pdl index 3f57ed87b..4bdadb5e8 100644 --- a/view/pdl/mod_connedit.pdl +++ b/view/pdl/mod_connedit.pdl @@ -6,4 +6,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_defperms.pdl b/view/pdl/mod_defperms.pdl index 53a3ac9e5..37c85c765 100644 --- a/view/pdl/mod_defperms.pdl +++ b/view/pdl/mod_defperms.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_directory.pdl b/view/pdl/mod_directory.pdl index 7b430738b..2e408c29f 100644 --- a/view/pdl/mod_directory.pdl +++ b/view/pdl/mod_directory.pdl @@ -6,4 +6,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_display.pdl b/view/pdl/mod_display.pdl index e657fa88b..95f069031 100644 --- a/view/pdl/mod_display.pdl +++ b/view/pdl/mod_display.pdl @@ -1,3 +1,4 @@ [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_editblock.pdl b/view/pdl/mod_editblock.pdl index 6ef7993b5..4a90a4f36 100644 --- a/view/pdl/mod_editblock.pdl +++ b/view/pdl/mod_editblock.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_editlayout.pdl b/view/pdl/mod_editlayout.pdl index 6ef7993b5..4a90a4f36 100644 --- a/view/pdl/mod_editlayout.pdl +++ b/view/pdl/mod_editlayout.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_editwebpage.pdl b/view/pdl/mod_editwebpage.pdl index 6ef7993b5..4a90a4f36 100644 --- a/view/pdl/mod_editwebpage.pdl +++ b/view/pdl/mod_editwebpage.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_events.pdl b/view/pdl/mod_events.pdl index b26f3b0d0..e9a91e219 100644 --- a/view/pdl/mod_events.pdl +++ b/view/pdl/mod_events.pdl @@ -4,4 +4,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_go.pdl b/view/pdl/mod_go.pdl index c34898dd5..7e15fc869 100644 --- a/view/pdl/mod_go.pdl +++ b/view/pdl/mod_go.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_group.pdl b/view/pdl/mod_group.pdl index 0a31e17d9..34eb7ddd1 100644 --- a/view/pdl/mod_group.pdl +++ b/view/pdl/mod_group.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_help.pdl b/view/pdl/mod_help.pdl index 2eab7aa63..4bb380cc9 100644 --- a/view/pdl/mod_help.pdl +++ b/view/pdl/mod_help.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_hq.pdl b/view/pdl/mod_hq.pdl index 450fcb9a7..1bcdb2c65 100644 --- a/view/pdl/mod_hq.pdl +++ b/view/pdl/mod_hq.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_id.pdl b/view/pdl/mod_id.pdl index c34898dd5..7e15fc869 100644 --- a/view/pdl/mod_id.pdl +++ b/view/pdl/mod_id.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_layouts.pdl b/view/pdl/mod_layouts.pdl index 6ef7993b5..4a90a4f36 100644 --- a/view/pdl/mod_layouts.pdl +++ b/view/pdl/mod_layouts.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_locs.pdl b/view/pdl/mod_locs.pdl index 53a3ac9e5..37c85c765 100644 --- a/view/pdl/mod_locs.pdl +++ b/view/pdl/mod_locs.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_mail.pdl b/view/pdl/mod_mail.pdl index 52f908919..d572b7244 100644 --- a/view/pdl/mod_mail.pdl +++ b/view/pdl/mod_mail.pdl @@ -4,4 +4,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_menu.pdl b/view/pdl/mod_menu.pdl index 6ef7993b5..4a90a4f36 100644 --- a/view/pdl/mod_menu.pdl +++ b/view/pdl/mod_menu.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_message.pdl b/view/pdl/mod_message.pdl index f9dd8f623..3f1dd594f 100644 --- a/view/pdl/mod_message.pdl +++ b/view/pdl/mod_message.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_mitem.pdl b/view/pdl/mod_mitem.pdl index 4db06cb49..0cca7fd85 100644 --- a/view/pdl/mod_mitem.pdl +++ b/view/pdl/mod_mitem.pdl @@ -4,4 +4,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_network.pdl b/view/pdl/mod_network.pdl index 44e29ffbd..09fdba573 100644 --- a/view/pdl/mod_network.pdl +++ b/view/pdl/mod_network.pdl @@ -14,4 +14,5 @@ $content [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_photos.pdl b/view/pdl/mod_photos.pdl index 4d1a5b2ea..6a3d30b1c 100644 --- a/view/pdl/mod_photos.pdl +++ b/view/pdl/mod_photos.pdl @@ -4,4 +4,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_profile.pdl b/view/pdl/mod_profile.pdl index c34898dd5..7e15fc869 100644 --- a/view/pdl/mod_profile.pdl +++ b/view/pdl/mod_profile.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_profile_photo.pdl b/view/pdl/mod_profile_photo.pdl index c34898dd5..7e15fc869 100644 --- a/view/pdl/mod_profile_photo.pdl +++ b/view/pdl/mod_profile_photo.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_profiles.pdl b/view/pdl/mod_profiles.pdl index c34898dd5..7e15fc869 100644 --- a/view/pdl/mod_profiles.pdl +++ b/view/pdl/mod_profiles.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_profperm.pdl b/view/pdl/mod_profperm.pdl index c34898dd5..7e15fc869 100644 --- a/view/pdl/mod_profperm.pdl +++ b/view/pdl/mod_profperm.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_pubstream.pdl b/view/pdl/mod_pubstream.pdl index e657fa88b..95f069031 100644 --- a/view/pdl/mod_pubstream.pdl +++ b/view/pdl/mod_pubstream.pdl @@ -1,3 +1,4 @@ [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_rate.pdl b/view/pdl/mod_rate.pdl index 5c8ca77d5..a5461df50 100644 --- a/view/pdl/mod_rate.pdl +++ b/view/pdl/mod_rate.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_ratings.pdl b/view/pdl/mod_ratings.pdl index cfa39e408..f6e87cb7c 100644 --- a/view/pdl/mod_ratings.pdl +++ b/view/pdl/mod_ratings.pdl @@ -7,4 +7,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_search.pdl b/view/pdl/mod_search.pdl index e69657dac..ed1f77c5a 100644 --- a/view/pdl/mod_search.pdl +++ b/view/pdl/mod_search.pdl @@ -2,4 +2,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_settings.pdl b/view/pdl/mod_settings.pdl index 53a3ac9e5..37c85c765 100644 --- a/view/pdl/mod_settings.pdl +++ b/view/pdl/mod_settings.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_sharedwithme.pdl b/view/pdl/mod_sharedwithme.pdl index e657fa88b..95f069031 100644 --- a/view/pdl/mod_sharedwithme.pdl +++ b/view/pdl/mod_sharedwithme.pdl @@ -1,3 +1,4 @@ [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_sources.pdl b/view/pdl/mod_sources.pdl index 53a3ac9e5..37c85c765 100644 --- a/view/pdl/mod_sources.pdl +++ b/view/pdl/mod_sources.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_suggest.pdl b/view/pdl/mod_suggest.pdl index 392a36dd6..b74391cba 100644 --- a/view/pdl/mod_suggest.pdl +++ b/view/pdl/mod_suggest.pdl @@ -4,4 +4,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_uexport.pdl b/view/pdl/mod_uexport.pdl index 53a3ac9e5..37c85c765 100644 --- a/view/pdl/mod_uexport.pdl +++ b/view/pdl/mod_uexport.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_viewconnections.pdl b/view/pdl/mod_viewconnections.pdl index c34898dd5..7e15fc869 100644 --- a/view/pdl/mod_viewconnections.pdl +++ b/view/pdl/mod_viewconnections.pdl @@ -3,4 +3,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_webpages.pdl b/view/pdl/mod_webpages.pdl index 4e60dc2a7..d13bf8862 100644 --- a/view/pdl/mod_webpages.pdl +++ b/view/pdl/mod_webpages.pdl @@ -4,4 +4,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/pdl/mod_wiki.pdl b/view/pdl/mod_wiki.pdl index 1b98b6379..be86be7e3 100644 --- a/view/pdl/mod_wiki.pdl +++ b/view/pdl/mod_wiki.pdl @@ -4,4 +4,5 @@ [/region] [region=right_aside] [widget=notifications][/widget] +[widget=newmember][/widget] [/region] diff --git a/view/tpl/email_validation.tpl b/view/tpl/email_validation.tpl index f049a040f..9913e0971 100644 --- a/view/tpl/email_validation.tpl +++ b/view/tpl/email_validation.tpl @@ -2,15 +2,15 @@ <div class="descriptive-paragraph" style="font-size: 1.2em;"><p>{{$desc}}</p></div> -<form action="email_validation" method="post"> +<form action="email_validation/{{$email}}" method="post"> {{include file="field_input.tpl" field=$token}} -<div class="pull-right"> - <a href="email_resend/{{$email}}" class="btn btn-warning">{{$resend}}</a> -</div> -<div class="submit-wrapper" > +<div class="pull-right submit-wrapper"> <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button> </div> +<div class="resend-email" > + <a href="email_resend/{{$email}}" class="btn btn-warning">{{$resend}}</a> +</div> </form> <div class="clear"></div> diff --git a/view/tpl/new_member.tpl b/view/tpl/new_member.tpl new file mode 100644 index 000000000..60e347ab3 --- /dev/null +++ b/view/tpl/new_member.tpl @@ -0,0 +1,17 @@ +<div class="widget"> +<h3>{{$title}}</h3> +{{if $options}} +<ul class="nav nav-pills flex-column"> +{{foreach $options as $x}} + {{if is_array($x) }} + {{foreach $x as $y => $z}} + <li class="nav-item"><a href="{{$y}}" class="nav-link">{{$z}}</a></li> + {{/foreach}} + {{else}} + <div><strong>{{$x}}</strong></div> + {{/if}} +{{/foreach}} +</ul> +{{/if}} +</div> + |