From 0b7365e2db5fea2f2aaa312087caeeb495d0e289 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 12 Aug 2015 22:37:24 -0700 Subject: revert 36b5f6ac --- include/zot.php | 26 ++++++++++++++------------ version.inc | 2 +- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/include/zot.php b/include/zot.php index b88bf72c3..17554a490 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1560,18 +1560,20 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ $tag_delivery = tgroup_check($channel['channel_id'],$arr); - if ($arr['mid'] == $arr['parent_mid']){ - $perm = 'send_stream'; - } - else{ - $r = q("select item_owner from item where item.mid == '%s' limit 1", - dbesc($arr['parent_mid'])); - if($channel['channel_hash'] == $r[0]['item_owner']) - $perm = 'post_comments'; - else - $perm = 'send_stream'; - } - + $perm = (($arr['mid'] == $arr['parent_mid']) ? 'send_stream' : 'post_comments'); + +// if ($arr['mid'] == $arr['parent_mid']){ +// $perm = 'send_stream'; +// } +// else{ +// $r = q("select item_owner from item where item.mid = '%s' limit 1", +// dbesc($arr['parent_mid'])); +// if($channel['channel_hash'] == $r[0]['item_owner']) +// $perm = 'post_comments'; +// else +// $perm = 'send_stream'; +// } +// // This is our own post, possibly coming from a channel clone diff --git a/version.inc b/version.inc index 3eb040d29..730c6d9c6 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-08-11.1121 +2015-08-12.1122 -- cgit v1.2.3 From 7a8d0a03f6ae9d892ee9a7e7196a4cec8f36cfaa Mon Sep 17 00:00:00 2001 From: jeroenpraat Date: Fri, 14 Aug 2015 15:57:05 +0200 Subject: update spanish --- view/es/messages.po | 18 +++++++++--------- view/es/strings.php | 16 ++++++++-------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/view/es/messages.po b/view/es/messages.po index a5313a9fd..048aa20aa 100644 --- a/view/es/messages.po +++ b/view/es/messages.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-07 00:03-0700\n" -"PO-Revision-Date: 2015-08-12 17:17+0000\n" +"PO-Revision-Date: 2015-08-14 07:27+0000\n" "Last-Translator: Manuel Jiménez Friaza \n" "Language-Team: Spanish (http://www.transifex.com/Friendica/red-matrix/language/es/)\n" "MIME-Version: 1.0\n" @@ -154,7 +154,7 @@ msgstr "editar" #: ../../include/group.php:298 msgid "Collections" -msgstr "Coleciones" +msgstr "Colecciones" #: ../../include/group.php:299 msgid "Edit collection" @@ -1429,7 +1429,7 @@ msgstr "Todo" #: ../../include/widgets.php:349 msgid "Archives" -msgstr "Ficheros" +msgstr "Hemeroteca" #: ../../include/widgets.php:429 ../../mod/connedit.php:571 msgid "Me" @@ -2167,7 +2167,7 @@ msgstr "Iniciar sesión" #: ../../include/nav.php:117 msgid "Sign in" -msgstr "Regístrese" +msgstr "Acceder" #: ../../include/nav.php:134 #, php-format @@ -2192,7 +2192,7 @@ msgstr "Registrarse" #: ../../include/nav.php:155 msgid "Create an account" -msgstr "Crea una cuenta" +msgstr "Crear una cuenta" #: ../../include/nav.php:160 ../../include/apps.php:142 ../../mod/help.php:67 #: ../../mod/help.php:72 ../../mod/layouts.php:176 @@ -2881,7 +2881,7 @@ msgstr "Flujos públicos importados" #: ../../include/conversation.php:1489 msgid "Commented Order" -msgstr "Orden de comentados" +msgstr "Comentarios recientes" #: ../../include/conversation.php:1492 msgid "Sort by Comment Date" @@ -4768,7 +4768,7 @@ msgstr "Sugerir nuevas conexiones" #: ../../mod/connections.php:274 msgid "New Connections" -msgstr "Nuevas conecciones" +msgstr "Nuevas conexiones" #: ../../mod/connections.php:277 msgid "Show pending (new) connections" @@ -7822,7 +7822,7 @@ msgstr "Publicar tu perfil predeterminado en el directorio de la red" #: ../../mod/settings.php:991 msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "¿Nos permite sugierirle como amigo potencial a los nuevos miembros?" +msgstr "¿Nos permite sugerirle como amigo potencial a los nuevos miembros?" #: ../../mod/settings.php:1000 msgid "Your channel address is" @@ -9047,7 +9047,7 @@ msgstr "Contraseña" #: ../../boot.php:1555 msgid "Remember me" -msgstr "Recuérdame" +msgstr "Recuérdeme" #: ../../boot.php:1558 msgid "Forgot your password?" diff --git a/view/es/strings.php b/view/es/strings.php index 0ae82713b..ae56403bd 100644 --- a/view/es/strings.php +++ b/view/es/strings.php @@ -33,7 +33,7 @@ $a->strings["A deleted group with this name was revived. Existing item permissio $a->strings["Default privacy group for new contacts"] = "Grupo de privacidad por defecto para nuevos contactos "; $a->strings["All Channels"] = "Todos los canales"; $a->strings["edit"] = "editar"; -$a->strings["Collections"] = "Coleciones"; +$a->strings["Collections"] = "Colecciones"; $a->strings["Edit collection"] = "Editar colección"; $a->strings["Add new collection"] = "Añadir nueva colección"; $a->strings["Channels not in any collection"] = "El canal no se encuentra en ninguna colección"; @@ -326,7 +326,7 @@ $a->strings["Example: bob@example.com, http://example.com/barbara"] = "Ejemplo: $a->strings["Notes"] = "Notas"; $a->strings["Remove term"] = "Eliminar término"; $a->strings["Everything"] = "Todo"; -$a->strings["Archives"] = "Ficheros"; +$a->strings["Archives"] = "Hemeroteca"; $a->strings["Me"] = "Yo"; $a->strings["Family"] = "Familia"; $a->strings["Friends"] = "Amigos"; @@ -497,13 +497,13 @@ $a->strings["Your bookmarks"] = "Sus marcadores"; $a->strings["Webpages"] = "Páginas web"; $a->strings["Your webpages"] = "Sus páginas web"; $a->strings["Login"] = "Iniciar sesión"; -$a->strings["Sign in"] = "Regístrese"; +$a->strings["Sign in"] = "Acceder"; $a->strings["%s - click to logout"] = "%s - pulsar para cerrar sesión"; $a->strings["Remote authentication"] = "Autenticación remota"; $a->strings["Click to authenticate to your home hub"] = "Pulsar para identificarse en su servidor"; $a->strings["Home Page"] = "Página de inicio"; $a->strings["Register"] = "Registrarse"; -$a->strings["Create an account"] = "Crea una cuenta"; +$a->strings["Create an account"] = "Crear una cuenta"; $a->strings["Help"] = "Ayuda"; $a->strings["Help and documentation"] = "Ayuda y documentación"; $a->strings["Applications, utilities, links, games"] = "Aplicaciones, utilidades, enlaces, juegos"; @@ -667,7 +667,7 @@ $a->strings["OK"] = "OK"; $a->strings["Cancel"] = "Cancelar"; $a->strings["Discover"] = "Descubrir"; $a->strings["Imported public streams"] = "Flujos públicos importados"; -$a->strings["Commented Order"] = "Orden de comentados"; +$a->strings["Commented Order"] = "Comentarios recientes"; $a->strings["Sort by Comment Date"] = "Ordenar por fecha de comentario"; $a->strings["Posted Order"] = "Recientemente publicados"; $a->strings["Sort by Post Date"] = "Ordenar por fecha de publicación"; @@ -1124,7 +1124,7 @@ $a->strings["Ignored"] = "Ignorados"; $a->strings["Hidden"] = "Ocultos"; $a->strings["Archived"] = "Archivados"; $a->strings["Suggest new connections"] = "Sugerir nuevas conexiones"; -$a->strings["New Connections"] = "Nuevas conecciones"; +$a->strings["New Connections"] = "Nuevas conexiones"; $a->strings["Show pending (new) connections"] = "Mostrar conexiones (nuevas) pendientes"; $a->strings["All Connections"] = "Todas las conexiones"; $a->strings["Show all connections"] = "Mostrar todas las conexiones"; @@ -1848,7 +1848,7 @@ $a->strings["Anybody in this network"] = "Cualquiera en esta red"; $a->strings["Anybody authenticated"] = "Cualquiera autenticado"; $a->strings["Anybody on the internet"] = "Cualquiera en internet"; $a->strings["Publish your default profile in the network directory"] = "Publicar tu perfil predeterminado en el directorio de la red"; -$a->strings["Allow us to suggest you as a potential friend to new members?"] = "¿Nos permite sugierirle como amigo potencial a los nuevos miembros?"; +$a->strings["Allow us to suggest you as a potential friend to new members?"] = "¿Nos permite sugerirle como amigo potencial a los nuevos miembros?"; $a->strings["Your channel address is"] = "Su dirección de canal es"; $a->strings["Channel Settings"] = "Configuración de canal"; $a->strings["Basic Settings"] = "Configuración básica"; @@ -2139,7 +2139,7 @@ $a->strings["Update %s failed. See error logs."] = "La actualización %s ha fall $a->strings["Update Error at %s"] = "Error de Actualización en %s"; $a->strings["Create an account to access services and applications within the Red Matrix"] = "Crea una cuenta para acceder a los servicios y aplicaciones dentro de Red Matrix"; $a->strings["Password"] = "Contraseña"; -$a->strings["Remember me"] = "Recuérdame"; +$a->strings["Remember me"] = "Recuérdeme"; $a->strings["Forgot your password?"] = "¿Olvidó su contraseña?"; $a->strings["toggle mobile"] = "cambiar a móvil"; $a->strings["Website SSL certificate is not valid. Please correct."] = "El certificado SSL del sitio web no es válido. Por favor, corríjalo."; -- cgit v1.2.3 From 73b30de9cb22732f51ccca26695eced54683a895 Mon Sep 17 00:00:00 2001 From: Alexandre Hannud Abdo Date: Fri, 14 Aug 2015 12:21:05 -0300 Subject: Properly fix which perms get checked for comments, Mike's solution --- include/zot.php | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/include/zot.php b/include/zot.php index 17554a490..19bacfa4f 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1560,20 +1560,9 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ $tag_delivery = tgroup_check($channel['channel_id'],$arr); - $perm = (($arr['mid'] == $arr['parent_mid']) ? 'send_stream' : 'post_comments'); - -// if ($arr['mid'] == $arr['parent_mid']){ -// $perm = 'send_stream'; -// } -// else{ -// $r = q("select item_owner from item where item.mid = '%s' limit 1", -// dbesc($arr['parent_mid'])); -// if($channel['channel_hash'] == $r[0]['item_owner']) -// $perm = 'post_comments'; -// else -// $perm = 'send_stream'; -// } -// + $perm = 'send_stream'; + if(($arr['mid'] !== $arr['parent_mid']) && ($relay)) + $perm = 'post_comments'; // This is our own post, possibly coming from a channel clone -- cgit v1.2.3 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