From 0d84c77c6c09f1e73e1ce1c5516ccf881b1dcdde Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 14 Aug 2015 22:19:15 -0700 Subject: set email verified if lost password workflow is completed to avoid the situation where they can reset the password but still not be able to login because the original email verification was lost. --- mod/lostpass.php | 5 +++-- util/messages.po | 66 ++++++++++++++++++++++++++++---------------------------- version.inc | 2 +- 3 files changed, 37 insertions(+), 36 deletions(-) diff --git a/mod/lostpass.php b/mod/lostpass.php index 3269128f1..3dbc2fe7d 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -72,10 +72,11 @@ function lostpass_content(&$a) { $salt = random_string(32); $password_encoded = hash('whirlpool', $salt . $new_password); - - $r = q("UPDATE account SET account_salt = '%s', account_password = '%s', account_reset = '' where account_id = %d", + + $r = q("UPDATE account SET account_salt = '%s', account_password = '%s', account_reset = '', account_flags = (account_flags & ~%d) where account_id = %d", dbesc($salt), dbesc($password_encoded), + intval(ACCOUNT_UNVERIFIED), intval($aid) ); diff --git a/util/messages.po b/util/messages.po index 949158f6d..edfde8e5f 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-08-07.1117\n" +"Project-Id-Version: 2015-08-14.1124\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-08-07 00:03-0700\n" +"POT-Creation-Date: 2015-08-14 00:04-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -123,7 +123,7 @@ msgstr "" msgid "Unable to create a unique channel address. Import failed." msgstr "" -#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504 +#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:530 msgid "Import completed." msgstr "" @@ -500,7 +500,7 @@ msgstr "" #: ../../mod/thing.php:318 ../../mod/events.php:494 ../../mod/events.php:670 #: ../../mod/group.php:81 ../../mod/photos.php:577 ../../mod/photos.php:654 #: ../../mod/photos.php:941 ../../mod/photos.php:981 ../../mod/photos.php:1099 -#: ../../mod/pdledit.php:58 ../../mod/import.php:534 ../../mod/chat.php:177 +#: ../../mod/pdledit.php:58 ../../mod/import.php:560 ../../mod/chat.php:177 #: ../../mod/chat.php:211 ../../mod/mitem.php:232 ../../mod/rate.php:167 #: ../../mod/invite.php:142 ../../mod/locs.php:105 ../../mod/sources.php:104 #: ../../mod/sources.php:138 ../../mod/filestorage.php:156 @@ -3000,51 +3000,51 @@ msgstr[1] "" msgid "Permission denied" msgstr "" -#: ../../include/items.php:1035 ../../include/items.php:1081 +#: ../../include/items.php:1038 ../../include/items.php:1084 msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1307 +#: ../../include/items.php:1310 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1309 +#: ../../include/items.php:1312 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1311 +#: ../../include/items.php:1314 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1313 +#: ../../include/items.php:1316 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1315 +#: ../../include/items.php:1318 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1317 +#: ../../include/items.php:1320 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1319 +#: ../../include/items.php:1322 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1321 +#: ../../include/items.php:1324 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4215 ../../mod/thing.php:74 +#: ../../include/items.php:4218 ../../mod/thing.php:74 #: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20 #: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225 #: ../../mod/display.php:36 msgid "Item not found." msgstr "" -#: ../../include/items.php:4288 ../../include/attach.php:137 +#: ../../include/items.php:4291 ../../include/attach.php:137 #: ../../include/attach.php:184 ../../include/attach.php:247 #: ../../include/attach.php:261 ../../include/attach.php:305 #: ../../include/attach.php:319 ../../include/attach.php:350 @@ -3087,26 +3087,26 @@ msgstr "" msgid "Permission denied." msgstr "" -#: ../../include/items.php:4690 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4693 ../../mod/group.php:38 ../../mod/group.php:140 #: ../../mod/bulksetclose.php:51 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4706 +#: ../../include/items.php:4709 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4713 +#: ../../include/items.php:4716 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4723 ../../mod/connedit.php:662 +#: ../../include/items.php:4726 ../../mod/connedit.php:662 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4725 +#: ../../include/items.php:4728 msgid "Connection not found." msgstr "" @@ -3118,7 +3118,7 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2132 +#: ../../include/zot.php:2144 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -5127,42 +5127,42 @@ msgstr "" msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:516 +#: ../../mod/import.php:542 msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/import.php:521 +#: ../../mod/import.php:547 msgid "Import Channel" msgstr "" -#: ../../mod/import.php:522 +#: ../../mod/import.php:548 msgid "" "Use this form to import an existing channel from a different server/hub. You " "may retrieve the channel identity from the old server/hub via the network or " "provide an export file." msgstr "" -#: ../../mod/import.php:523 +#: ../../mod/import.php:549 msgid "File to Upload" msgstr "" -#: ../../mod/import.php:524 +#: ../../mod/import.php:550 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:525 +#: ../../mod/import.php:551 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:526 +#: ../../mod/import.php:552 msgid "Your old login email address" msgstr "" -#: ../../mod/import.php:527 +#: ../../mod/import.php:553 msgid "Your old login password" msgstr "" -#: ../../mod/import.php:528 +#: ../../mod/import.php:554 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be " @@ -5170,16 +5170,16 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../mod/import.php:529 +#: ../../mod/import.php:555 msgid "Make this hub my primary location" msgstr "" -#: ../../mod/import.php:530 +#: ../../mod/import.php:556 msgid "" "Import existing posts if possible (experimental - limited by available memory" msgstr "" -#: ../../mod/import.php:531 +#: ../../mod/import.php:557 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." diff --git a/version.inc b/version.inc index 730c6d9c6..70a3aa358 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-08-12.1122 +2015-08-14.1124 -- cgit v1.2.3