From 802a7ff3a8005641bae3a82bbe2a32a15c9ad7eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20Jim=C3=A9nez=20Friaza?= Date: Thu, 25 Oct 2018 11:37:06 +0200 Subject: New strings in Spanish translation --- view/es-es/hmessages.po | 916 +++++++++++++++++++++++++----------------------- view/es-es/hstrings.php | 43 ++- 2 files changed, 516 insertions(+), 443 deletions(-) diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po index 54a1f3bed..f2c1ccf79 100644 --- a/view/es-es/hmessages.po +++ b/view/es-es/hmessages.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the hubzilla package. # # Translators: -# alfonsomthd , 2015 +# Alfonso Martínez , 2015 # inboxwall , 2015 # jeroenpraat , 2015 # Manuel Jiménez Friaza , 2017-2018 @@ -14,8 +14,8 @@ msgid "" msgstr "" "Project-Id-Version: hubzilla\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-10-06 17:07+0200\n" -"PO-Revision-Date: 2018-10-11 10:13+0000\n" +"POT-Creation-Date: 2018-10-19 11:04+0200\n" +"PO-Revision-Date: 2018-10-24 11:35+0000\n" "Last-Translator: Manuel Jiménez Friaza \n" "Language-Team: Spanish (Spain) (http://www.transifex.com/Friendica/hubzilla/language/es_ES/)\n" "MIME-Version: 1.0\n" @@ -158,9 +158,9 @@ msgstr "Especial - Repositorio de grupo" #: ../../Zotlabs/Access/PermissionRoles.php:306 #: ../../Zotlabs/Module/Cdav.php:1227 ../../Zotlabs/Module/Connedit.php:919 -#: ../../Zotlabs/Module/Profiles.php:795 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/selectors.php:104 -#: ../../include/selectors.php:140 ../../include/event.php:1315 +#: ../../Zotlabs/Module/Profiles.php:795 ../../include/selectors.php:60 +#: ../../include/selectors.php:77 ../../include/selectors.php:115 +#: ../../include/selectors.php:151 ../../include/event.php:1315 #: ../../include/event.php:1322 ../../include/connections.php:703 #: ../../include/connections.php:710 msgid "Other" @@ -202,7 +202,7 @@ msgstr "El perfil solicitado no está disponible." #: ../../Zotlabs/Module/Mood.php:124 ../../Zotlabs/Module/Connections.php:32 #: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:70 #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:59 -#: ../../Zotlabs/Module/Wiki.php:282 ../../Zotlabs/Module/Wiki.php:415 +#: ../../Zotlabs/Module/Wiki.php:285 ../../Zotlabs/Module/Wiki.php:428 #: ../../Zotlabs/Module/Pdledit.php:34 ../../Zotlabs/Module/Poke.php:157 #: ../../Zotlabs/Module/Profile_photo.php:302 #: ../../Zotlabs/Module/Profile_photo.php:315 @@ -229,7 +229,7 @@ msgstr "El perfil solicitado no está disponible." #: ../../Zotlabs/Module/Register.php:77 #: ../../Zotlabs/Module/Cover_photo.php:313 #: ../../Zotlabs/Module/Cover_photo.php:326 -#: ../../Zotlabs/Module/Display.php:449 ../../Zotlabs/Module/Network.php:17 +#: ../../Zotlabs/Module/Display.php:448 ../../Zotlabs/Module/Network.php:17 #: ../../Zotlabs/Module/Filestorage.php:15 #: ../../Zotlabs/Module/Filestorage.php:70 #: ../../Zotlabs/Module/Filestorage.php:96 @@ -291,7 +291,7 @@ msgstr "Crear" #: ../../Zotlabs/Module/Connections.php:284 #: ../../Zotlabs/Module/Connections.php:322 #: ../../Zotlabs/Module/Connections.php:342 ../../Zotlabs/Module/Wiki.php:211 -#: ../../Zotlabs/Module/Wiki.php:371 ../../Zotlabs/Module/Menu.php:175 +#: ../../Zotlabs/Module/Wiki.php:384 ../../Zotlabs/Module/Menu.php:175 #: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Group.php:235 #: ../../Zotlabs/Module/Editwebpage.php:142 #: ../../Zotlabs/Module/Webpages.php:255 ../../Zotlabs/Module/Card_edit.php:99 @@ -304,7 +304,7 @@ msgid "Edit" msgstr "Editar" #: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1104 -#: ../../Zotlabs/Module/Wiki.php:296 ../../Zotlabs/Module/Layouts.php:194 +#: ../../Zotlabs/Module/Wiki.php:301 ../../Zotlabs/Module/Layouts.php:194 #: ../../Zotlabs/Module/Webpages.php:256 ../../Zotlabs/Widget/Cdav.php:124 #: ../../addon/hsse/hsse.php:186 ../../include/conversation.php:1389 msgid "Share" @@ -330,7 +330,7 @@ msgid "Delete" msgstr "Eliminar" #: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:695 -#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:396 +#: ../../Zotlabs/Module/Wiki.php:213 ../../Zotlabs/Module/Wiki.php:409 #: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Webpages.php:261 #: ../../Zotlabs/Module/Pubsites.php:60 msgid "View" @@ -448,7 +448,7 @@ msgstr "3. Pulse [conectar]" #: ../../Zotlabs/Module/Admin/Profs.php:178 #: ../../Zotlabs/Module/Admin/Account_edit.php:73 #: ../../Zotlabs/Module/Admin/Security.php:112 -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:493 #: ../../Zotlabs/Module/Settings/Features.php:46 #: ../../Zotlabs/Module/Settings/Events.php:41 #: ../../Zotlabs/Module/Settings/Calendar.php:41 @@ -456,10 +456,10 @@ msgstr "3. Pulse [conectar]" #: ../../Zotlabs/Module/Settings/Connections.php:41 #: ../../Zotlabs/Module/Settings/Photos.php:41 #: ../../Zotlabs/Module/Settings/Account.php:103 -#: ../../Zotlabs/Module/Settings/Profiles.php:41 +#: ../../Zotlabs/Module/Settings/Profiles.php:50 #: ../../Zotlabs/Module/Settings/Manage.php:41 #: ../../Zotlabs/Module/Settings/Featured.php:54 -#: ../../Zotlabs/Module/Settings/Channel_home.php:61 +#: ../../Zotlabs/Module/Settings/Channel_home.php:89 #: ../../Zotlabs/Module/Settings/Directory.php:41 #: ../../Zotlabs/Module/Settings/Editor.php:41 #: ../../Zotlabs/Module/Settings/Display.php:189 @@ -473,7 +473,7 @@ msgstr "3. Pulse [conectar]" #: ../../Zotlabs/Module/Poke.php:217 ../../Zotlabs/Module/Connedit.php:888 #: ../../Zotlabs/Module/Chat.php:211 ../../Zotlabs/Module/Chat.php:250 #: ../../Zotlabs/Module/Email_validation.php:40 -#: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Defperms.php:265 +#: ../../Zotlabs/Module/Pconfig.php:111 ../../Zotlabs/Module/Defperms.php:265 #: ../../Zotlabs/Module/Group.php:140 ../../Zotlabs/Module/Group.php:156 #: ../../Zotlabs/Module/Profiles.php:723 ../../Zotlabs/Module/Editpost.php:85 #: ../../Zotlabs/Module/Sources.php:125 ../../Zotlabs/Module/Sources.php:162 @@ -481,8 +481,8 @@ msgstr "3. Pulse [conectar]" #: ../../Zotlabs/Module/Filestorage.php:183 ../../Zotlabs/Module/Rate.php:166 #: ../../Zotlabs/Module/Oauth.php:111 ../../Zotlabs/Lib/ThreadItem.php:767 #: ../../Zotlabs/Widget/Eventstools.php:16 -#: ../../Zotlabs/Widget/Wiki_pages.php:40 -#: ../../Zotlabs/Widget/Wiki_pages.php:97 +#: ../../Zotlabs/Widget/Wiki_pages.php:42 +#: ../../Zotlabs/Widget/Wiki_pages.php:99 #: ../../view/theme/redbasic_c/php/config.php:95 #: ../../view/theme/redbasic/php/config.php:94 #: ../../addon/skeleton/skeleton.php:65 ../../addon/planets/planets.php:153 @@ -513,7 +513,7 @@ msgstr "3. Pulse [conectar]" #: ../../addon/cart/Settings/Cart.php:114 ../../addon/cart/cart.php:1263 #: ../../addon/cart/submodules/manualcat.php:248 #: ../../addon/cart/submodules/hzservices.php:640 -#: ../../addon/cart/submodules/subscriptions.php:401 +#: ../../addon/cart/submodules/subscriptions.php:410 #: ../../addon/piwik/piwik.php:95 ../../addon/pageheader/pageheader.php:48 #: ../../addon/xmpp/xmpp.php:69 ../../addon/pumpio/pumpio.php:237 #: ../../addon/redfiles/redfiles.php:124 ../../addon/hubwall/hubwall.php:95 @@ -534,7 +534,7 @@ msgid "Add Article" msgstr "Añadir un artículo" #: ../../Zotlabs/Module/Articles.php:214 ../../Zotlabs/Lib/Apps.php:302 -#: ../../include/nav.php:477 +#: ../../include/nav.php:482 msgid "Articles" msgstr "Artículos" @@ -567,8 +567,8 @@ msgstr "Modificar la plantilla" #: ../../Zotlabs/Module/Article_edit.php:131 #: ../../Zotlabs/Module/Admin/Addons.php:423 #: ../../Zotlabs/Module/Oauth2.php:117 ../../Zotlabs/Module/Oauth2.php:145 -#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:356 -#: ../../Zotlabs/Module/Wiki.php:388 +#: ../../Zotlabs/Module/Editblock.php:141 ../../Zotlabs/Module/Wiki.php:368 +#: ../../Zotlabs/Module/Wiki.php:401 #: ../../Zotlabs/Module/Profile_photo.php:465 #: ../../Zotlabs/Module/Connedit.php:925 ../../Zotlabs/Module/Fbrowser.php:66 #: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:801 @@ -633,7 +633,7 @@ msgstr "Resumen: " #: ../../Zotlabs/Lib/Activity.php:858 ../../Zotlabs/Lib/Apps.php:994 #: ../../Zotlabs/Lib/Apps.php:1078 ../../Zotlabs/Storage/Browser.php:164 #: ../../Zotlabs/Widget/Portfolio.php:95 ../../Zotlabs/Widget/Album.php:84 -#: ../../addon/pubcrawl/as.php:964 ../../include/conversation.php:1166 +#: ../../addon/pubcrawl/as.php:963 ../../include/conversation.php:1166 msgid "Unknown" msgstr "Desconocido" @@ -769,7 +769,7 @@ msgstr "¡Disculpas! La edición de eventos recurrentes aún no se ha implementa #: ../../Zotlabs/Module/Wiki.php:218 ../../Zotlabs/Module/Connedit.php:907 #: ../../Zotlabs/Module/Chat.php:259 ../../Zotlabs/Module/Group.php:144 #: ../../Zotlabs/Module/Oauth.php:113 ../../Zotlabs/Module/Oauth.php:139 -#: ../../Zotlabs/Lib/NativeWikiPage.php:558 +#: ../../Zotlabs/Lib/NativeWikiPage.php:561 #: ../../Zotlabs/Storage/Browser.php:285 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 #: ../../addon/rendezvous/rendezvous.php:172 @@ -795,7 +795,7 @@ msgstr "Teléfono" #: ../../Zotlabs/Module/Connedit.php:911 ../../Zotlabs/Module/Profiles.php:787 #: ../../addon/openid/MysqlProvider.php:56 #: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:1769 +#: ../../addon/redred/redred.php:107 ../../include/network.php:1779 msgid "Email" msgstr "Correo electrónico" @@ -983,7 +983,7 @@ msgstr "Buscar resultados para:" msgid "Reset form" msgstr "Reiniciar el formulario" -#: ../../Zotlabs/Module/Channel.php:424 ../../Zotlabs/Module/Display.php:375 +#: ../../Zotlabs/Module/Channel.php:424 ../../Zotlabs/Module/Display.php:374 msgid "" "You must enable javascript for your browser to be able to view this content." msgstr "Debe habilitar javascript para poder ver este contenido en su navegador." @@ -1204,7 +1204,7 @@ msgid "Menu Item Permissions" msgstr "Permisos del elemento del menú" #: ../../Zotlabs/Module/Mitem.php:168 ../../Zotlabs/Module/Mitem.php:247 -#: ../../Zotlabs/Module/Settings/Channel.php:544 +#: ../../Zotlabs/Module/Settings/Channel.php:526 msgid "(click to open/close)" msgstr "(pulsar para abrir o cerrar)" @@ -1229,7 +1229,7 @@ msgstr "Usar la autenticación mágica si está disponible" #: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Events.php:473 #: ../../Zotlabs/Module/Removeme.php:63 #: ../../Zotlabs/Module/Admin/Site.php:255 -#: ../../Zotlabs/Module/Settings/Channel.php:315 +#: ../../Zotlabs/Module/Settings/Channel.php:309 #: ../../Zotlabs/Module/Settings/Display.php:89 #: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 #: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:99 @@ -1284,7 +1284,7 @@ msgstr "Usar la autenticación mágica si está disponible" #: ../../addon/cart/submodules/hzservices.php:646 #: ../../addon/cart/submodules/hzservices.php:650 #: ../../addon/cart/submodules/subscriptions.php:153 -#: ../../addon/cart/submodules/subscriptions.php:416 +#: ../../addon/cart/submodules/subscriptions.php:425 #: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 #: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 #: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 @@ -1297,7 +1297,7 @@ msgstr "No" #: ../../Zotlabs/Module/Events.php:472 ../../Zotlabs/Module/Events.php:473 #: ../../Zotlabs/Module/Removeme.php:63 #: ../../Zotlabs/Module/Admin/Site.php:257 -#: ../../Zotlabs/Module/Settings/Channel.php:315 +#: ../../Zotlabs/Module/Settings/Channel.php:309 #: ../../Zotlabs/Module/Settings/Display.php:89 #: ../../Zotlabs/Module/Import.php:554 ../../Zotlabs/Module/Import.php:558 #: ../../Zotlabs/Module/Import.php:559 ../../Zotlabs/Module/Api.php:98 @@ -1351,7 +1351,7 @@ msgstr "No" #: ../../addon/cart/submodules/hzservices.php:646 #: ../../addon/cart/submodules/hzservices.php:650 #: ../../addon/cart/submodules/subscriptions.php:153 -#: ../../addon/cart/submodules/subscriptions.php:416 +#: ../../addon/cart/submodules/subscriptions.php:425 #: ../../addon/xmpp/xmpp.php:53 ../../addon/pumpio/pumpio.php:219 #: ../../addon/pumpio/pumpio.php:223 ../../addon/pumpio/pumpio.php:227 #: ../../addon/pumpio/pumpio.php:231 ../../include/dir_fns.php:143 @@ -1651,14 +1651,14 @@ msgstr "Servidor no encontrado" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Tagger.php:69 #: ../../Zotlabs/Module/Like.php:384 ../../Zotlabs/Lib/Activity.php:1570 #: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/Receiver.php:1539 ../../addon/pubcrawl/as.php:1512 +#: ../../addon/diaspora/Receiver.php:1539 ../../addon/pubcrawl/as.php:1511 #: ../../include/conversation.php:116 ../../include/text.php:2028 msgid "photo" msgstr "foto" #: ../../Zotlabs/Module/Subthread.php:111 ../../Zotlabs/Module/Like.php:384 #: ../../Zotlabs/Lib/Activity.php:1570 ../../addon/diaspora/Receiver.php:1539 -#: ../../addon/pubcrawl/as.php:1512 ../../include/conversation.php:144 +#: ../../addon/pubcrawl/as.php:1511 ../../include/conversation.php:144 #: ../../include/text.php:2034 msgid "status" msgstr "el mensaje de estado " @@ -1745,7 +1745,7 @@ msgstr "Ha creado %1$.0f de %2$.0f canales permitidos." #: ../../Zotlabs/Module/New_channel.php:157 #: ../../Zotlabs/Module/New_channel.php:164 #: ../../Zotlabs/Module/Connedit.php:853 ../../Zotlabs/Module/Defperms.php:256 -#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:288 +#: ../../Zotlabs/Widget/Notifications.php:162 ../../include/nav.php:293 msgid "Loading" msgstr "Cargando" @@ -1777,7 +1777,7 @@ msgid "Choose a short nickname" msgstr "Elija un alias corto" #: ../../Zotlabs/Module/New_channel.php:178 -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:535 #: ../../Zotlabs/Module/Register.php:261 msgid "Channel role and privacy" msgstr "Clase de canal y privacidad" @@ -1855,7 +1855,7 @@ msgid "" msgstr "Por defecto, solo la instancia del canal alojado en este servidor será eliminado de la red" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:617 +#: ../../Zotlabs/Module/Settings/Channel.php:594 msgid "Remove Channel" msgstr "Eliminar el canal" @@ -2694,7 +2694,7 @@ msgstr "Permitir código" msgid "Disallow Code" msgstr "No permitir código" -#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:386 +#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:391 msgid "Channel" msgstr "Canal" @@ -2725,7 +2725,7 @@ msgstr "No se han encontrado temas." #: ../../Zotlabs/Module/Admin/Themes.php:72 #: ../../Zotlabs/Module/Admin/Addons.php:259 ../../Zotlabs/Module/Thing.php:94 #: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:45 -#: ../../Zotlabs/Module/Display.php:453 +#: ../../Zotlabs/Module/Display.php:452 #: ../../Zotlabs/Module/Filestorage.php:24 ../../Zotlabs/Module/Admin.php:62 #: ../../include/items.php:3587 msgid "Item not found." @@ -2786,7 +2786,7 @@ msgstr "Ajustes del sitio actualizados." #: ../../Zotlabs/Module/Admin/Site.php:187 #: ../../view/theme/redbasic_c/php/config.php:15 -#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3085 +#: ../../view/theme/redbasic/php/config.php:15 ../../include/text.php:3087 msgid "Default" msgstr "Predeterminado" @@ -2969,9 +2969,9 @@ msgstr "Página personal que se mostrará a los visitantes (por defecto: la pág #: ../../Zotlabs/Module/Admin/Site.php:314 msgid "" -"example: 'public' to show public stream, 'page/sys/home' to show a system " -"webpage called 'home' or 'include:home.html' to include a file." -msgstr "ejemplo: 'public' para mostrar contenido público, 'page/sys/home' para mostrar la página web definida como \"home\" o 'include:home.html' para mostrar el contenido de un fichero." +"example: 'pubstream' to show public stream, 'page/sys/home' to show a system" +" webpage called 'home' or 'include:home.html' to include a file." +msgstr "ejemplo: 'pubstream' para mostrar el stream público, 'page/sys/home' para mostrar una página web del sistema llamada 'home' o 'include:home.html' para incluir un archivo." #: ../../Zotlabs/Module/Admin/Site.php:315 msgid "Preserve site homepage URL" @@ -3592,12 +3592,12 @@ msgstr "Se ha eliminado el comentario" #: ../../Zotlabs/Module/Settings/Channel.php:78 #: ../../Zotlabs/Module/Settings/Channel.php:89 #: ../../Zotlabs/Module/Connedit.php:712 ../../Zotlabs/Widget/Affinity.php:24 -#: ../../include/selectors.php:123 ../../include/channel.php:444 +#: ../../include/selectors.php:134 ../../include/channel.php:444 #: ../../include/channel.php:445 ../../include/channel.php:452 msgid "Friends" msgstr "Amigos/as" -#: ../../Zotlabs/Module/Settings/Channel.php:272 +#: ../../Zotlabs/Module/Settings/Channel.php:266 #: ../../Zotlabs/Module/Defperms.php:111 #: ../../addon/rendezvous/rendezvous.php:82 #: ../../addon/openstreetmap/openstreetmap.php:184 @@ -3607,414 +3607,402 @@ msgstr "Amigos/as" msgid "Settings updated." msgstr "Ajustes actualizados." -#: ../../Zotlabs/Module/Settings/Channel.php:333 +#: ../../Zotlabs/Module/Settings/Channel.php:327 msgid "Nobody except yourself" msgstr "Nadie excepto usted" -#: ../../Zotlabs/Module/Settings/Channel.php:334 +#: ../../Zotlabs/Module/Settings/Channel.php:328 msgid "Only those you specifically allow" msgstr "Solo aquellos a los que usted permita explícitamente" -#: ../../Zotlabs/Module/Settings/Channel.php:335 +#: ../../Zotlabs/Module/Settings/Channel.php:329 msgid "Approved connections" msgstr "Conexiones aprobadas" -#: ../../Zotlabs/Module/Settings/Channel.php:336 +#: ../../Zotlabs/Module/Settings/Channel.php:330 msgid "Any connections" msgstr "Cualquier conexión" -#: ../../Zotlabs/Module/Settings/Channel.php:337 +#: ../../Zotlabs/Module/Settings/Channel.php:331 msgid "Anybody on this website" msgstr "Cualquiera en este sitio web" -#: ../../Zotlabs/Module/Settings/Channel.php:338 +#: ../../Zotlabs/Module/Settings/Channel.php:332 msgid "Anybody in this network" msgstr "Cualquiera en esta red" -#: ../../Zotlabs/Module/Settings/Channel.php:339 +#: ../../Zotlabs/Module/Settings/Channel.php:333 msgid "Anybody authenticated" msgstr "Cualquiera que esté autenticado" -#: ../../Zotlabs/Module/Settings/Channel.php:340 +#: ../../Zotlabs/Module/Settings/Channel.php:334 msgid "Anybody on the internet" msgstr "Cualquiera en internet" -#: ../../Zotlabs/Module/Settings/Channel.php:415 +#: ../../Zotlabs/Module/Settings/Channel.php:409 msgid "Publish your default profile in the network directory" msgstr "Publicar su perfil principal en el directorio de la red" -#: ../../Zotlabs/Module/Settings/Channel.php:420 +#: ../../Zotlabs/Module/Settings/Channel.php:414 msgid "Allow us to suggest you as a potential friend to new members?" msgstr "¿Nos permite sugerirle como amigo potencial a los nuevos miembros?" -#: ../../Zotlabs/Module/Settings/Channel.php:424 +#: ../../Zotlabs/Module/Settings/Channel.php:418 msgid "or" msgstr "o" -#: ../../Zotlabs/Module/Settings/Channel.php:433 +#: ../../Zotlabs/Module/Settings/Channel.php:427 msgid "Your channel address is" msgstr "Su dirección de canal es" -#: ../../Zotlabs/Module/Settings/Channel.php:436 +#: ../../Zotlabs/Module/Settings/Channel.php:430 msgid "Your files/photos are accessible via WebDAV at" msgstr "Sus archivos y fotos son accesibles a través de WebDAV en " -#: ../../Zotlabs/Module/Settings/Channel.php:488 +#: ../../Zotlabs/Module/Settings/Channel.php:470 msgid "Automatic membership approval" msgstr "Aprobación automática de nuevos miembros" -#: ../../Zotlabs/Module/Settings/Channel.php:488 +#: ../../Zotlabs/Module/Settings/Channel.php:470 #: ../../Zotlabs/Module/Defperms.php:255 msgid "" "If enabled, connection requests will be approved without your interaction" msgstr "Si está habilitado, las solicitudes de conexión serán aprobadas sin su intervención." -#: ../../Zotlabs/Module/Settings/Channel.php:509 +#: ../../Zotlabs/Module/Settings/Channel.php:491 msgid "Channel Settings" msgstr "Ajustes del canal" -#: ../../Zotlabs/Module/Settings/Channel.php:516 +#: ../../Zotlabs/Module/Settings/Channel.php:498 msgid "Basic Settings" msgstr "Configuración básica" -#: ../../Zotlabs/Module/Settings/Channel.php:517 +#: ../../Zotlabs/Module/Settings/Channel.php:499 #: ../../include/channel.php:1528 msgid "Full Name:" msgstr "Nombre completo:" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:500 #: ../../Zotlabs/Module/Settings/Account.php:104 msgid "Email Address:" msgstr "Dirección de correo electrónico:" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:501 msgid "Your Timezone:" msgstr "Su huso horario:" -#: ../../Zotlabs/Module/Settings/Channel.php:520 +#: ../../Zotlabs/Module/Settings/Channel.php:502 msgid "Default Post Location:" msgstr "Localización geográfica predeterminada para sus publicaciones:" -#: ../../Zotlabs/Module/Settings/Channel.php:520 +#: ../../Zotlabs/Module/Settings/Channel.php:502 msgid "Geographical location to display on your posts" msgstr "Localización geográfica que debe mostrarse en sus publicaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:521 +#: ../../Zotlabs/Module/Settings/Channel.php:503 msgid "Use Browser Location:" msgstr "Usar la localización geográfica del navegador:" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:505 msgid "Adult Content" msgstr "Contenido solo para adultos" -#: ../../Zotlabs/Module/Settings/Channel.php:523 +#: ../../Zotlabs/Module/Settings/Channel.php:505 msgid "" "This channel frequently or regularly publishes adult content. (Please tag " "any adult material and/or nudity with #NSFW)" msgstr "Este canal publica contenido solo para adultos con frecuencia o regularmente. (Por favor etiquete cualquier material para adultos con la etiqueta #NSFW)" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:507 msgid "Security and Privacy Settings" msgstr "Configuración de seguridad y privacidad" -#: ../../Zotlabs/Module/Settings/Channel.php:527 +#: ../../Zotlabs/Module/Settings/Channel.php:509 msgid "Your permissions are already configured. Click to view/adjust" msgstr "Sus permisos ya están configurados. Pulse para ver/ajustar" -#: ../../Zotlabs/Module/Settings/Channel.php:529 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "Hide my online presence" msgstr "Ocultar mi presencia en línea" -#: ../../Zotlabs/Module/Settings/Channel.php:529 +#: ../../Zotlabs/Module/Settings/Channel.php:511 msgid "Prevents displaying in your profile that you are online" msgstr "Evitar mostrar en su perfil que está en línea" -#: ../../Zotlabs/Module/Settings/Channel.php:531 +#: ../../Zotlabs/Module/Settings/Channel.php:513 msgid "Simple Privacy Settings:" msgstr "Configuración de privacidad sencilla:" -#: ../../Zotlabs/Module/Settings/Channel.php:532 +#: ../../Zotlabs/Module/Settings/Channel.php:514 msgid "" "Very Public - extremely permissive (should be used with caution)" msgstr "Muy Público - extremadamente permisivo (debería ser usado con precaución)" -#: ../../Zotlabs/Module/Settings/Channel.php:533 +#: ../../Zotlabs/Module/Settings/Channel.php:515 msgid "" "Typical - default public, privacy when desired (similar to social " "network permissions but with improved privacy)" msgstr "Típico - por defecto público, privado cuando se desee (similar a los permisos de una red social pero con privacidad mejorada)" -#: ../../Zotlabs/Module/Settings/Channel.php:534 +#: ../../Zotlabs/Module/Settings/Channel.php:516 msgid "Private - default private, never open or public" msgstr "Privado - por defecto, privado, nunca abierto o público" -#: ../../Zotlabs/Module/Settings/Channel.php:535 +#: ../../Zotlabs/Module/Settings/Channel.php:517 msgid "Blocked - default blocked to/from everybody" msgstr "Bloqueado - por defecto, bloqueado/a para cualquiera" -#: ../../Zotlabs/Module/Settings/Channel.php:537 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "Allow others to tag your posts" msgstr "Permitir a otros etiquetar sus publicaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:537 +#: ../../Zotlabs/Module/Settings/Channel.php:519 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "A menudo usado por la comunidad para marcar contenido inapropiado de forma retroactiva." -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:521 msgid "Channel Permission Limits" msgstr "Límites de los permisos del canal" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "Expire other channel content after this many days" msgstr "Caducar contenido de otros canales después de este número de días" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "0 or blank to use the website limit." msgstr "0 o en blanco para usar el límite del sitio web." -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 #, php-format msgid "This website expires after %d days." msgstr "Este sitio web caduca después de %d días." -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "This website does not expire imported content." msgstr "Este sitio web no caduca el contenido importado." -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:523 msgid "The website limit takes precedence if lower than your limit." msgstr "El límite del sitio web tiene prioridad si es inferior a su propio límite." -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "Maximum Friend Requests/Day:" msgstr "Máximo de solicitudes de amistad por día:" -#: ../../Zotlabs/Module/Settings/Channel.php:542 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "May reduce spam activity" msgstr "Podría reducir la actividad de spam" -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:525 msgid "Default Privacy Group" msgstr "Grupo de canales predeterminado" -#: ../../Zotlabs/Module/Settings/Channel.php:545 +#: ../../Zotlabs/Module/Settings/Channel.php:527 msgid "Use my default audience setting for the type of object published" msgstr "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación" -#: ../../Zotlabs/Module/Settings/Channel.php:546 -msgid "Profile to assign new connections" -msgstr "Perfil para asignar a las nuevas conexiones" - -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:536 msgid "Default permissions category" msgstr "Categoría de permisos por defecto" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "Maximum private messages per day from unknown people:" msgstr "Máximo de mensajes privados por día de gente desconocida:" -#: ../../Zotlabs/Module/Settings/Channel.php:562 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "Useful to reduce spamming" msgstr "Útil para reducir el envío de correo no deseado" -#: ../../Zotlabs/Module/Settings/Channel.php:565 +#: ../../Zotlabs/Module/Settings/Channel.php:545 #: ../../Zotlabs/Lib/Enotify.php:68 msgid "Notification Settings" msgstr "Configuración de las notificaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:566 +#: ../../Zotlabs/Module/Settings/Channel.php:546 msgid "By default post a status message when:" msgstr "Por defecto, enviar un mensaje de estado cuando:" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "accepting a friend request" msgstr "Acepte una solicitud de amistad" -#: ../../Zotlabs/Module/Settings/Channel.php:568 +#: ../../Zotlabs/Module/Settings/Channel.php:548 msgid "joining a forum/community" msgstr "al unirse a un foro o comunidad" -#: ../../Zotlabs/Module/Settings/Channel.php:569 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "making an interesting profile change" msgstr "Realice un cambio interesante en su perfil" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "Send a notification email when:" msgstr "Enviar una notificación por correo electrónico cuando:" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "You receive a connection request" msgstr "Reciba una solicitud de conexión" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "Your connections are confirmed" msgstr "Sus conexiones hayan sido confirmadas" -#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:553 msgid "Someone writes on your profile wall" msgstr "Alguien escriba en la página de su perfil (\"muro\")" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:554 msgid "Someone writes a followup comment" msgstr "Alguien escriba un comentario sobre sus publicaciones" -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "You receive a private message" msgstr "Reciba un mensaje privado" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "You receive a friend suggestion" msgstr "Reciba una sugerencia de amistad" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:557 msgid "You are tagged in a post" msgstr "Usted sea etiquetado en una publicación" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:558 msgid "You are poked/prodded/etc. in a post" msgstr "Reciba un toque o incitación en una publicación" -#: ../../Zotlabs/Module/Settings/Channel.php:580 +#: ../../Zotlabs/Module/Settings/Channel.php:560 msgid "Someone likes your post/comment" msgstr "Alguien muestre agrado por su entrada o comentario" -#: ../../Zotlabs/Module/Settings/Channel.php:583 +#: ../../Zotlabs/Module/Settings/Channel.php:563 msgid "Show visual notifications including:" msgstr "Mostrar notificaciones visuales que incluyan:" -#: ../../Zotlabs/Module/Settings/Channel.php:585 +#: ../../Zotlabs/Module/Settings/Channel.php:565 msgid "Unseen stream activity" msgstr "Actividad del stream no vista" -#: ../../Zotlabs/Module/Settings/Channel.php:586 +#: ../../Zotlabs/Module/Settings/Channel.php:566 msgid "Unseen channel activity" msgstr "Actividad no vista en el canal" -#: ../../Zotlabs/Module/Settings/Channel.php:587 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Unseen private messages" msgstr "Mensajes privados no leídos" -#: ../../Zotlabs/Module/Settings/Channel.php:587 -#: ../../Zotlabs/Module/Settings/Channel.php:592 -#: ../../Zotlabs/Module/Settings/Channel.php:593 -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:573 +#: ../../Zotlabs/Module/Settings/Channel.php:574 #: ../../addon/jappixmini/jappixmini.php:343 msgid "Recommended" msgstr "Recomendado" -#: ../../Zotlabs/Module/Settings/Channel.php:588 +#: ../../Zotlabs/Module/Settings/Channel.php:568 msgid "Upcoming events" msgstr "Próximos eventos" -#: ../../Zotlabs/Module/Settings/Channel.php:589 +#: ../../Zotlabs/Module/Settings/Channel.php:569 msgid "Events today" msgstr "Eventos de hoy" -#: ../../Zotlabs/Module/Settings/Channel.php:590 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Upcoming birthdays" msgstr "Próximos cumpleaños" -#: ../../Zotlabs/Module/Settings/Channel.php:590 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Not available in all themes" msgstr "No disponible en todos los temas" -#: ../../Zotlabs/Module/Settings/Channel.php:591 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "System (personal) notifications" msgstr "Notificaciones del sistema (personales)" -#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "System info messages" msgstr "Mensajes de información del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:593 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "System critical alerts" msgstr "Alertas críticas del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:594 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "New connections" msgstr "Nuevas conexiones" -#: ../../Zotlabs/Module/Settings/Channel.php:595 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "System Registrations" msgstr "Registros del sistema" -#: ../../Zotlabs/Module/Settings/Channel.php:596 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "Unseen shared files" msgstr "Ficheros compartidos no vistos" -#: ../../Zotlabs/Module/Settings/Channel.php:597 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "Unseen public stream activity" msgstr "Actividad del stream público no vista" -#: ../../Zotlabs/Module/Settings/Channel.php:598 +#: ../../Zotlabs/Module/Settings/Channel.php:578 msgid "Unseen likes and dislikes" msgstr "Los \"me gusta\" y \"no me gusta\" no vistos" -#: ../../Zotlabs/Module/Settings/Channel.php:599 +#: ../../Zotlabs/Module/Settings/Channel.php:579 msgid "Unseen forum posts" msgstr "Entradas no vistas en el foro" -#: ../../Zotlabs/Module/Settings/Channel.php:600 +#: ../../Zotlabs/Module/Settings/Channel.php:580 msgid "Email notification hub (hostname)" msgstr "Email de notificación del hub (nombre del host)" -#: ../../Zotlabs/Module/Settings/Channel.php:600 +#: ../../Zotlabs/Module/Settings/Channel.php:580 #, php-format msgid "" "If your channel is mirrored to multiple hubs, set this to your preferred " "location. This will prevent duplicate email notifications. Example: %s" msgstr "Si su canal está replicado en múltiples hubs, colóquelo en su ubicación preferida. Esto evitará la duplicación de notificaciones por correo electrónico. Ejemplo: %s" -#: ../../Zotlabs/Module/Settings/Channel.php:601 +#: ../../Zotlabs/Module/Settings/Channel.php:581 msgid "Show new wall posts, private messages and connections under Notices" msgstr "Mostrar nuevos mensajes en el muro, mensajes privados y conexiones en Avisos" -#: ../../Zotlabs/Module/Settings/Channel.php:603 +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "Notify me of events this many days in advance" msgstr "Avisarme de los eventos con algunos días de antelación" -#: ../../Zotlabs/Module/Settings/Channel.php:603 +#: ../../Zotlabs/Module/Settings/Channel.php:583 msgid "Must be greater than 0" msgstr "Debe ser mayor que 0" -#: ../../Zotlabs/Module/Settings/Channel.php:609 +#: ../../Zotlabs/Module/Settings/Channel.php:588 msgid "Advanced Account/Page Type Settings" msgstr "Ajustes avanzados de la cuenta y de los tipos de página" -#: ../../Zotlabs/Module/Settings/Channel.php:610 +#: ../../Zotlabs/Module/Settings/Channel.php:589 msgid "Change the behaviour of this account for special situations" msgstr "Cambiar el comportamiento de esta cuenta en situaciones especiales" -#: ../../Zotlabs/Module/Settings/Channel.php:612 +#: ../../Zotlabs/Module/Settings/Channel.php:591 msgid "Miscellaneous Settings" msgstr "Ajustes diversos" -#: ../../Zotlabs/Module/Settings/Channel.php:613 +#: ../../Zotlabs/Module/Settings/Channel.php:592 msgid "Default photo upload folder" msgstr "Carpeta por defecto de las fotos subidas" -#: ../../Zotlabs/Module/Settings/Channel.php:613 -#: ../../Zotlabs/Module/Settings/Channel.php:614 +#: ../../Zotlabs/Module/Settings/Channel.php:592 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "%Y - current year, %m - current month" msgstr "%Y - año en curso, %m - mes actual" -#: ../../Zotlabs/Module/Settings/Channel.php:614 +#: ../../Zotlabs/Module/Settings/Channel.php:593 msgid "Default file upload folder" msgstr "Carpeta por defecto de los ficheros subidos" -#: ../../Zotlabs/Module/Settings/Channel.php:616 -msgid "Personal menu to display in your channel pages" -msgstr "Menú personal que debe mostrarse en las páginas de su canal" - -#: ../../Zotlabs/Module/Settings/Channel.php:618 +#: ../../Zotlabs/Module/Settings/Channel.php:595 msgid "Remove this channel." msgstr "Eliminar este canal." -#: ../../Zotlabs/Module/Settings/Channel.php:619 -msgid "Firefox Share $Projectname provider" -msgstr "Servicio de compartición de Firefox: proveedor $Projectname" - #: ../../Zotlabs/Module/Settings/Features.php:43 msgid "Additional Features" msgstr "Funcionalidades" @@ -4108,7 +4096,7 @@ msgstr "Eliminar cuenta" msgid "Remove this account including all its channels" msgstr "Eliminar esta cuenta incluyendo todos sus canales" -#: ../../Zotlabs/Module/Settings/Profiles.php:39 +#: ../../Zotlabs/Module/Settings/Profiles.php:47 msgid "Profiles Settings" msgstr "Gestión de los perfiles" @@ -4152,17 +4140,21 @@ msgstr "Ajustes de los complementos" msgid "Please save/submit changes to any panel before opening another." msgstr "Guarde o envíe los cambios a cualquier panel antes de abrir otro." -#: ../../Zotlabs/Module/Settings/Channel_home.php:41 +#: ../../Zotlabs/Module/Settings/Channel_home.php:44 #: ../../Zotlabs/Module/Settings/Network.php:41 msgid "Max height of content (in pixels)" msgstr "Altura máxima del contenido (en píxeles)" -#: ../../Zotlabs/Module/Settings/Channel_home.php:43 +#: ../../Zotlabs/Module/Settings/Channel_home.php:46 #: ../../Zotlabs/Module/Settings/Network.php:43 msgid "Click to expand content exceeding this height" msgstr "Haga clic para expandir el contenido que exceda esta altura" -#: ../../Zotlabs/Module/Settings/Channel_home.php:58 +#: ../../Zotlabs/Module/Settings/Channel_home.php:59 +msgid "Personal menu to display in your channel pages" +msgstr "Menú personal que debe mostrarse en las páginas de su canal" + +#: ../../Zotlabs/Module/Settings/Channel_home.php:86 msgid "Channel Home Settings" msgstr "Ajustes del canal" @@ -4258,7 +4250,7 @@ msgid "Link post titles to source" msgstr "Enlazar título de la publicación a la fuente original" #: ../../Zotlabs/Module/Settings/Display.php:205 -#: ../../Zotlabs/Widget/Newmember.php:69 +#: ../../Zotlabs/Widget/Newmember.php:75 msgid "New Member Links" msgstr "Enlaces para nuevos miembros" @@ -5164,7 +5156,7 @@ msgstr "Proporcionar un wiki para su canal" #: ../../Zotlabs/Module/Wiki.php:77 ../../addon/cart/myshop.php:37 #: ../../addon/cart/cart.php:1440 #: ../../addon/cart/submodules/paypalbutton.php:456 -#: ../../addon/cart/manual_payments.php:63 +#: ../../addon/cart/manual_payments.php:93 msgid "Invalid channel" msgstr "Canal no válido" @@ -5181,7 +5173,7 @@ msgid "Error downloading wiki: " msgstr "Error al descargar el wiki: " #: ../../Zotlabs/Module/Wiki.php:206 ../../Zotlabs/Widget/Wiki_list.php:19 -#: ../../include/nav.php:501 +#: ../../include/nav.php:506 msgid "Wikis" msgstr "Wikis" @@ -5202,21 +5194,21 @@ msgstr "Nombre del wiki" msgid "Content type" msgstr "Tipo de contenido" -#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:359 -#: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../addon/mdpost/mdpost.php:41 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../addon/mdpost/mdpost.php:41 #: ../../include/text.php:1892 msgid "Markdown" msgstr "Markdown" -#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:359 -#: ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1890 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1890 msgid "BBcode" msgstr "BBcode" -#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Widget/Wiki_pages.php:36 -#: ../../Zotlabs/Widget/Wiki_pages.php:93 ../../include/text.php:1893 +#: ../../Zotlabs/Module/Wiki.php:217 ../../Zotlabs/Widget/Wiki_pages.php:38 +#: ../../Zotlabs/Widget/Wiki_pages.php:95 ../../include/text.php:1893 msgid "Text" msgstr "Texto" @@ -5240,53 +5232,53 @@ msgstr "Crear un mensaje de estado para este wiki" msgid "Edit Wiki Name" msgstr "Editar el nombre del wiki" -#: ../../Zotlabs/Module/Wiki.php:271 +#: ../../Zotlabs/Module/Wiki.php:274 msgid "Wiki not found" msgstr "Wiki no encontrado" -#: ../../Zotlabs/Module/Wiki.php:295 +#: ../../Zotlabs/Module/Wiki.php:300 msgid "Rename page" msgstr "Renombrar la página" -#: ../../Zotlabs/Module/Wiki.php:316 +#: ../../Zotlabs/Module/Wiki.php:321 msgid "Error retrieving page content" msgstr "Error al recuperar el contenido de la página" -#: ../../Zotlabs/Module/Wiki.php:324 ../../Zotlabs/Module/Wiki.php:326 +#: ../../Zotlabs/Module/Wiki.php:329 ../../Zotlabs/Module/Wiki.php:331 msgid "New page" msgstr "Nueva página" -#: ../../Zotlabs/Module/Wiki.php:354 +#: ../../Zotlabs/Module/Wiki.php:366 msgid "Revision Comparison" msgstr "Comparación de revisiones" -#: ../../Zotlabs/Module/Wiki.php:355 ../../Zotlabs/Lib/NativeWikiPage.php:561 +#: ../../Zotlabs/Module/Wiki.php:367 ../../Zotlabs/Lib/NativeWikiPage.php:564 #: ../../Zotlabs/Widget/Wiki_page_history.php:25 msgid "Revert" msgstr "Revertir" -#: ../../Zotlabs/Module/Wiki.php:362 +#: ../../Zotlabs/Module/Wiki.php:374 msgid "Short description of your changes (optional)" msgstr "Breve descripción de sus cambios (opcional)" -#: ../../Zotlabs/Module/Wiki.php:371 +#: ../../Zotlabs/Module/Wiki.php:384 msgid "Source" msgstr "Fuente" -#: ../../Zotlabs/Module/Wiki.php:381 +#: ../../Zotlabs/Module/Wiki.php:394 msgid "New page name" msgstr "Nombre de la nueva página" -#: ../../Zotlabs/Module/Wiki.php:386 +#: ../../Zotlabs/Module/Wiki.php:399 msgid "Embed image from photo albums" msgstr "Incluir una imagen de los álbumes de fotos" -#: ../../Zotlabs/Module/Wiki.php:387 ../../addon/hsse/hsse.php:208 +#: ../../Zotlabs/Module/Wiki.php:400 ../../addon/hsse/hsse.php:208 #: ../../include/conversation.php:1411 msgid "Embed an image from your albums" msgstr "Incluir una imagen de sus álbumes" -#: ../../Zotlabs/Module/Wiki.php:389 +#: ../../Zotlabs/Module/Wiki.php:402 #: ../../Zotlabs/Module/Profile_photo.php:466 #: ../../Zotlabs/Module/Cover_photo.php:400 ../../addon/hsse/hsse.php:210 #: ../../addon/hsse/hsse.php:257 ../../include/conversation.php:1413 @@ -5294,100 +5286,100 @@ msgstr "Incluir una imagen de sus álbumes" msgid "OK" msgstr "OK" -#: ../../Zotlabs/Module/Wiki.php:390 +#: ../../Zotlabs/Module/Wiki.php:403 #: ../../Zotlabs/Module/Profile_photo.php:467 #: ../../Zotlabs/Module/Cover_photo.php:401 ../../addon/hsse/hsse.php:139 #: ../../include/conversation.php:1342 msgid "Choose images to embed" msgstr "Elegir imágenes para incluir" -#: ../../Zotlabs/Module/Wiki.php:391 +#: ../../Zotlabs/Module/Wiki.php:404 #: ../../Zotlabs/Module/Profile_photo.php:468 #: ../../Zotlabs/Module/Cover_photo.php:402 ../../addon/hsse/hsse.php:140 #: ../../include/conversation.php:1343 msgid "Choose an album" msgstr "Elegir un álbum" -#: ../../Zotlabs/Module/Wiki.php:392 +#: ../../Zotlabs/Module/Wiki.php:405 #: ../../Zotlabs/Module/Profile_photo.php:469 #: ../../Zotlabs/Module/Cover_photo.php:403 msgid "Choose a different album" msgstr "Elegir un álbum diferente..." -#: ../../Zotlabs/Module/Wiki.php:393 +#: ../../Zotlabs/Module/Wiki.php:406 #: ../../Zotlabs/Module/Profile_photo.php:470 #: ../../Zotlabs/Module/Cover_photo.php:404 ../../addon/hsse/hsse.php:142 #: ../../include/conversation.php:1345 msgid "Error getting album list" msgstr "Error al obtener la lista de álbumes" -#: ../../Zotlabs/Module/Wiki.php:394 +#: ../../Zotlabs/Module/Wiki.php:407 #: ../../Zotlabs/Module/Profile_photo.php:471 #: ../../Zotlabs/Module/Cover_photo.php:405 ../../addon/hsse/hsse.php:143 #: ../../include/conversation.php:1346 msgid "Error getting photo link" msgstr "Error al obtener el enlace de la foto" -#: ../../Zotlabs/Module/Wiki.php:395 +#: ../../Zotlabs/Module/Wiki.php:408 #: ../../Zotlabs/Module/Profile_photo.php:472 #: ../../Zotlabs/Module/Cover_photo.php:406 ../../addon/hsse/hsse.php:144 #: ../../include/conversation.php:1347 msgid "Error getting album" msgstr "Error al obtener el álbum" -#: ../../Zotlabs/Module/Wiki.php:397 +#: ../../Zotlabs/Module/Wiki.php:410 msgid "History" msgstr "Historial" -#: ../../Zotlabs/Module/Wiki.php:473 +#: ../../Zotlabs/Module/Wiki.php:488 msgid "Error creating wiki. Invalid name." msgstr "Error al crear el wiki: el nombre no es válido." -#: ../../Zotlabs/Module/Wiki.php:480 +#: ../../Zotlabs/Module/Wiki.php:495 msgid "A wiki with this name already exists." msgstr "Ya hay un wiki con este nombre." -#: ../../Zotlabs/Module/Wiki.php:493 +#: ../../Zotlabs/Module/Wiki.php:508 msgid "Wiki created, but error creating Home page." msgstr "Se ha creado el wiki, pero se ha producido un error al crear la página de inicio." -#: ../../Zotlabs/Module/Wiki.php:500 +#: ../../Zotlabs/Module/Wiki.php:515 msgid "Error creating wiki" msgstr "Error al crear el wiki" -#: ../../Zotlabs/Module/Wiki.php:523 +#: ../../Zotlabs/Module/Wiki.php:539 msgid "Error updating wiki. Invalid name." msgstr "Error al actualizar el wiki. Nombre no válido." -#: ../../Zotlabs/Module/Wiki.php:543 +#: ../../Zotlabs/Module/Wiki.php:559 msgid "Error updating wiki" msgstr "Error al actualizar el wiki" -#: ../../Zotlabs/Module/Wiki.php:558 +#: ../../Zotlabs/Module/Wiki.php:574 msgid "Wiki delete permission denied." msgstr "Se ha denegado el permiso para eliminar el wiki." -#: ../../Zotlabs/Module/Wiki.php:568 +#: ../../Zotlabs/Module/Wiki.php:584 msgid "Error deleting wiki" msgstr "Se ha producido un error al eliminar el wiki" -#: ../../Zotlabs/Module/Wiki.php:601 +#: ../../Zotlabs/Module/Wiki.php:617 msgid "New page created" msgstr "Se ha creado la nueva página" -#: ../../Zotlabs/Module/Wiki.php:722 +#: ../../Zotlabs/Module/Wiki.php:739 msgid "Cannot delete Home" msgstr "No se puede eliminar la página principal" -#: ../../Zotlabs/Module/Wiki.php:786 +#: ../../Zotlabs/Module/Wiki.php:803 msgid "Current Revision" msgstr "Revisión actual" -#: ../../Zotlabs/Module/Wiki.php:786 +#: ../../Zotlabs/Module/Wiki.php:803 msgid "Selected Revision" msgstr "Revisión seleccionada" -#: ../../Zotlabs/Module/Wiki.php:836 +#: ../../Zotlabs/Module/Wiki.php:853 msgid "You must be authenticated." msgstr "Debe estar autenticado." @@ -5667,7 +5659,7 @@ msgstr "Elemento no válido." #: ../../Zotlabs/Module/Page.php:136 ../../Zotlabs/Module/Block.php:77 #: ../../Zotlabs/Module/Display.php:140 ../../Zotlabs/Module/Display.php:157 #: ../../Zotlabs/Module/Display.php:174 -#: ../../Zotlabs/Lib/NativeWikiPage.php:519 ../../Zotlabs/Web/Router.php:185 +#: ../../Zotlabs/Lib/NativeWikiPage.php:521 ../../Zotlabs/Web/Router.php:185 #: ../../include/help.php:132 msgid "Page not found." msgstr "Página no encontrada." @@ -6067,12 +6059,12 @@ msgid "min" msgstr "min" #: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:320 -#: ../../include/features.php:391 ../../include/nav.php:409 +#: ../../include/features.php:391 ../../include/nav.php:414 msgid "Photos" msgstr "Fotos" #: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:315 -#: ../../Zotlabs/Storage/Browser.php:272 ../../include/nav.php:417 +#: ../../Zotlabs/Storage/Browser.php:272 ../../include/nav.php:422 msgid "Files" msgstr "Ficheros" @@ -6169,7 +6161,7 @@ msgid "Layouts" msgstr "Plantillas" #: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:323 -#: ../../include/nav.php:168 ../../include/nav.php:284 +#: ../../include/nav.php:168 ../../include/nav.php:289 #: ../../include/help.php:117 ../../include/help.php:125 msgid "Help" msgstr "Ayuda" @@ -6250,15 +6242,15 @@ msgstr "el comentario" msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "%1$s ha etiquetado %3$s de %2$s con %4$s" -#: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59 +#: ../../Zotlabs/Module/Pconfig.php:27 ../../Zotlabs/Module/Pconfig.php:63 msgid "This setting requires special processing and editing has been blocked." msgstr "Este ajuste necesita de un proceso especial y la edición ha sido bloqueada." -#: ../../Zotlabs/Module/Pconfig.php:48 +#: ../../Zotlabs/Module/Pconfig.php:52 msgid "Configuration Editor" msgstr "Editor de configuración" -#: ../../Zotlabs/Module/Pconfig.php:49 +#: ../../Zotlabs/Module/Pconfig.php:53 msgid "" "Warning: Changing some settings could render your channel inoperable. Please" " leave this page unless you are comfortable with and knowledgeable about how" @@ -6782,7 +6774,7 @@ msgid "Add Card" msgstr "Añadir una ficha" #: ../../Zotlabs/Module/Cards.php:203 ../../Zotlabs/Lib/Apps.php:303 -#: ../../include/nav.php:466 +#: ../../include/nav.php:471 msgid "Cards" msgstr "Fichas" @@ -6882,7 +6874,7 @@ msgid "Export selected" msgstr "Exportar los elementos seleccionados" #: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Lib/Apps.php:316 -#: ../../include/nav.php:489 +#: ../../include/nav.php:494 msgid "Webpages" msgstr "Páginas web" @@ -7016,8 +7008,8 @@ msgstr "correo enviado" msgid "Delivery report for %1$s" msgstr "Informe de entrega para %1$s" -#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:39 -#: ../../Zotlabs/Widget/Wiki_pages.php:96 +#: ../../Zotlabs/Module/Dreport.php:151 ../../Zotlabs/Widget/Wiki_pages.php:41 +#: ../../Zotlabs/Widget/Wiki_pages.php:98 msgid "Options" msgstr "Opciones" @@ -7154,14 +7146,14 @@ msgid "Previous action reversed." msgstr "Acción anterior revocada." #: ../../Zotlabs/Module/Like.php:438 ../../Zotlabs/Lib/Activity.php:1605 -#: ../../addon/diaspora/Receiver.php:1568 ../../addon/pubcrawl/as.php:1547 +#: ../../addon/diaspora/Receiver.php:1568 ../../addon/pubcrawl/as.php:1546 #: ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "A %1$s le gusta %3$s de %2$s" #: ../../Zotlabs/Module/Like.php:440 ../../Zotlabs/Lib/Activity.php:1607 -#: ../../addon/pubcrawl/as.php:1549 ../../include/conversation.php:163 +#: ../../addon/pubcrawl/as.php:1548 ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "A %1$s no le gusta %3$s de %2$s" @@ -7718,7 +7710,7 @@ msgstr "Cambiar la foto de portada del perfil" msgid "Documentation Search" msgstr "Búsqueda de Documentación" -#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:399 +#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:404 msgid "About" msgstr "Mi perfil" @@ -7742,11 +7734,11 @@ msgstr "Documentación de $Projectname" msgid "Contents" msgstr "Contenidos" -#: ../../Zotlabs/Module/Display.php:394 +#: ../../Zotlabs/Module/Display.php:393 msgid "Article" msgstr "Artículo" -#: ../../Zotlabs/Module/Display.php:446 +#: ../../Zotlabs/Module/Display.php:445 msgid "Item has been removed." msgstr "Se ha eliminado el elemento." @@ -8063,9 +8055,9 @@ msgid "Mark all seen" msgstr "Marcar todo como visto" #: ../../Zotlabs/Lib/Activity.php:1417 ../../Zotlabs/Lib/Activity.php:1614 -#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1222 -#: ../../addon/pubcrawl/as.php:1377 ../../addon/pubcrawl/as.php:1556 -#: ../../include/network.php:1768 +#: ../../widget/Netselect/Netselect.php:42 ../../addon/pubcrawl/as.php:1221 +#: ../../addon/pubcrawl/as.php:1376 ../../addon/pubcrawl/as.php:1555 +#: ../../include/network.php:1778 msgid "ActivityPub" msgstr "ActivityPub" @@ -8109,12 +8101,12 @@ msgstr "Administrador del sitio" msgid "Report Bug" msgstr "Informe de errores" -#: ../../Zotlabs/Lib/Apps.php:306 ../../include/nav.php:455 +#: ../../Zotlabs/Lib/Apps.php:306 ../../include/nav.php:460 msgid "Bookmarks" msgstr "Marcadores" #: ../../Zotlabs/Lib/Apps.php:307 ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/nav.php:442 ../../include/nav.php:445 +#: ../../include/nav.php:447 ../../include/nav.php:450 msgid "Chatrooms" msgstr "Salas de chat" @@ -8135,7 +8127,7 @@ msgstr "Iniciar sesión" msgid "Stream" msgstr "Stream" -#: ../../Zotlabs/Lib/Apps.php:317 ../../include/nav.php:504 +#: ../../Zotlabs/Lib/Apps.php:317 ../../include/nav.php:509 msgid "Wiki" msgstr "Wiki" @@ -8290,79 +8282,79 @@ msgid "publisher" msgstr "editor" #: ../../Zotlabs/Lib/NativeWikiPage.php:42 -#: ../../Zotlabs/Lib/NativeWikiPage.php:93 +#: ../../Zotlabs/Lib/NativeWikiPage.php:94 msgid "(No Title)" msgstr "(Sin título)" -#: ../../Zotlabs/Lib/NativeWikiPage.php:107 +#: ../../Zotlabs/Lib/NativeWikiPage.php:109 msgid "Wiki page create failed." msgstr "Se ha producido un error en la creación de la página wiki." -#: ../../Zotlabs/Lib/NativeWikiPage.php:120 +#: ../../Zotlabs/Lib/NativeWikiPage.php:122 msgid "Wiki not found." msgstr "No se ha encontrado el wiki." -#: ../../Zotlabs/Lib/NativeWikiPage.php:131 +#: ../../Zotlabs/Lib/NativeWikiPage.php:133 msgid "Destination name already exists" msgstr "El nombre de destino ya existe" -#: ../../Zotlabs/Lib/NativeWikiPage.php:163 -#: ../../Zotlabs/Lib/NativeWikiPage.php:359 +#: ../../Zotlabs/Lib/NativeWikiPage.php:166 +#: ../../Zotlabs/Lib/NativeWikiPage.php:362 msgid "Page not found" msgstr "No se ha encontrado la página" -#: ../../Zotlabs/Lib/NativeWikiPage.php:194 +#: ../../Zotlabs/Lib/NativeWikiPage.php:197 msgid "Error reading page content" msgstr "Se ha producido un error al leer el contenido de la página" -#: ../../Zotlabs/Lib/NativeWikiPage.php:350 -#: ../../Zotlabs/Lib/NativeWikiPage.php:400 -#: ../../Zotlabs/Lib/NativeWikiPage.php:467 -#: ../../Zotlabs/Lib/NativeWikiPage.php:508 +#: ../../Zotlabs/Lib/NativeWikiPage.php:353 +#: ../../Zotlabs/Lib/NativeWikiPage.php:402 +#: ../../Zotlabs/Lib/NativeWikiPage.php:469 +#: ../../Zotlabs/Lib/NativeWikiPage.php:510 msgid "Error reading wiki" msgstr "Se ha producido un error al leer el wiki" -#: ../../Zotlabs/Lib/NativeWikiPage.php:388 +#: ../../Zotlabs/Lib/NativeWikiPage.php:390 msgid "Page update failed." msgstr "Se ha producido un error al actualizar la página." -#: ../../Zotlabs/Lib/NativeWikiPage.php:422 +#: ../../Zotlabs/Lib/NativeWikiPage.php:424 msgid "Nothing deleted" msgstr "No se ha eliminado nada" -#: ../../Zotlabs/Lib/NativeWikiPage.php:488 +#: ../../Zotlabs/Lib/NativeWikiPage.php:490 msgid "Compare: object not found." msgstr "No se ha encontrado un objeto para comparar." -#: ../../Zotlabs/Lib/NativeWikiPage.php:494 +#: ../../Zotlabs/Lib/NativeWikiPage.php:496 msgid "Page updated" msgstr "Se ha actualizado la página" -#: ../../Zotlabs/Lib/NativeWikiPage.php:497 +#: ../../Zotlabs/Lib/NativeWikiPage.php:499 msgid "Untitled" msgstr "Sin título" -#: ../../Zotlabs/Lib/NativeWikiPage.php:503 +#: ../../Zotlabs/Lib/NativeWikiPage.php:505 msgid "Wiki resource_id required for git commit" msgstr "Se necesita Wiki resource_id para el git commit" -#: ../../Zotlabs/Lib/NativeWikiPage.php:559 +#: ../../Zotlabs/Lib/NativeWikiPage.php:562 #: ../../Zotlabs/Widget/Wiki_page_history.php:23 msgctxt "wiki_history" msgid "Message" msgstr "Mensaje" -#: ../../Zotlabs/Lib/NativeWikiPage.php:560 +#: ../../Zotlabs/Lib/NativeWikiPage.php:563 #: ../../Zotlabs/Widget/Wiki_page_history.php:24 msgid "Date" msgstr "Fecha" -#: ../../Zotlabs/Lib/NativeWikiPage.php:562 +#: ../../Zotlabs/Lib/NativeWikiPage.php:565 #: ../../Zotlabs/Widget/Wiki_page_history.php:26 msgid "Compare" msgstr "Comparar" -#: ../../Zotlabs/Lib/NativeWikiPage.php:600 ../../include/bbcode.php:746 +#: ../../Zotlabs/Lib/NativeWikiPage.php:603 ../../include/bbcode.php:746 #: ../../include/bbcode.php:916 msgid "Different viewers will see this text differently" msgstr "Visitantes diferentes verán este texto de forma distinta" @@ -8771,11 +8763,11 @@ msgstr "ha editado una entrada fechada el %s" msgid "edited a comment dated %s" msgstr "ha editado un comentario fechado el %s" -#: ../../Zotlabs/Lib/NativeWiki.php:151 +#: ../../Zotlabs/Lib/NativeWiki.php:152 msgid "Wiki updated successfully" msgstr "El wiki se ha actualizado con éxito" -#: ../../Zotlabs/Lib/NativeWiki.php:205 +#: ../../Zotlabs/Lib/NativeWiki.php:206 msgid "Wiki files deleted successfully" msgstr "Se han borrado con éxito los ficheros del wiki" @@ -9024,8 +9016,8 @@ msgstr "Principal" msgid "Addressbook" msgstr "Libreta de direcciones" -#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:428 -#: ../../include/nav.php:431 +#: ../../Zotlabs/Storage/Browser.php:140 ../../include/nav.php:433 +#: ../../include/nav.php:436 msgid "Calendar" msgstr "Calendario" @@ -9363,16 +9355,16 @@ msgstr "Eliminar término" msgid "Saved Searches" msgstr "Búsquedas guardadas" -#: ../../Zotlabs/Widget/Wiki_pages.php:32 -#: ../../Zotlabs/Widget/Wiki_pages.php:89 +#: ../../Zotlabs/Widget/Wiki_pages.php:34 +#: ../../Zotlabs/Widget/Wiki_pages.php:91 msgid "Add new page" msgstr "Añadir una nueva página" -#: ../../Zotlabs/Widget/Wiki_pages.php:83 +#: ../../Zotlabs/Widget/Wiki_pages.php:85 msgid "Wiki Pages" msgstr "Páginas del wiki" -#: ../../Zotlabs/Widget/Wiki_pages.php:94 +#: ../../Zotlabs/Widget/Wiki_pages.php:96 msgid "Page name" msgstr "Nombre de la página" @@ -9481,7 +9473,19 @@ msgstr "Ver el \"stream\" de su red" msgid "Documentation" msgstr "Documentación" -#: ../../Zotlabs/Widget/Newmember.php:65 +#: ../../Zotlabs/Widget/Newmember.php:57 +msgid "Missing Features?" +msgstr "¿Faltan Características?" + +#: ../../Zotlabs/Widget/Newmember.php:59 +msgid "Pin apps to navigation bar" +msgstr "Fijar apps a la barra de navegación" + +#: ../../Zotlabs/Widget/Newmember.php:60 +msgid "Install more apps" +msgstr "Instalar más apps" + +#: ../../Zotlabs/Widget/Newmember.php:71 msgid "View public stream" msgstr "Ver el \"stream\" público" @@ -9657,20 +9661,20 @@ msgstr "No se ha encontrado el canal de origen." msgid "Network/Protocol" msgstr "Red / Protocolo" -#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1772 +#: ../../widget/Netselect/Netselect.php:28 ../../include/network.php:1782 msgid "Zot" msgstr "Zot" -#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1770 +#: ../../widget/Netselect/Netselect.php:31 ../../include/network.php:1780 msgid "Diaspora" msgstr "Diaspora" -#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1763 -#: ../../include/network.php:1764 +#: ../../widget/Netselect/Netselect.php:33 ../../include/network.php:1773 +#: ../../include/network.php:1774 msgid "Friendica" msgstr "Friendica" -#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1765 +#: ../../widget/Netselect/Netselect.php:38 ../../include/network.php:1775 msgid "OStatus" msgstr "OStatus" @@ -10549,13 +10553,13 @@ msgstr "Error de protocolo OpenID. No se recuperó ninguna ID." msgid "Login failed." msgstr "El acceso ha fallado." -#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1487 +#: ../../addon/openid/Mod_Id.php:85 ../../include/selectors.php:60 +#: ../../include/selectors.php:77 ../../include/channel.php:1487 msgid "Male" msgstr "Hombre" -#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:49 -#: ../../include/selectors.php:66 ../../include/channel.php:1485 +#: ../../addon/openid/Mod_Id.php:87 ../../include/selectors.php:60 +#: ../../include/selectors.php:77 ../../include/channel.php:1485 msgid "Female" msgstr "Mujer" @@ -11129,6 +11133,36 @@ msgstr "Ayuda para los ajustes" msgid "Jappix Mini Settings" msgstr "Ajustes de Jappix Mini" +#: ../../addon/upgrade_info/upgrade_info.php:43 +msgid "Your channel has been upgraded to the latest $Projectname version." +msgstr "Su canal ha sido actualizado a la última versión de $Projectname." + +#: ../../addon/upgrade_info/upgrade_info.php:44 +msgid "" +"To improve usability, we have converted some features into installable " +"stand-alone apps." +msgstr "Para mejorar la usabilidad, hemos convertido algunas características en aplicaciones independientes instalables." + +#: ../../addon/upgrade_info/upgrade_info.php:45 +msgid "Please visit the $Projectname" +msgstr "Por favor visite el sitio web de $Projectname" + +#: ../../addon/upgrade_info/upgrade_info.php:46 +msgid "app store" +msgstr "depósito de apps" + +#: ../../addon/upgrade_info/upgrade_info.php:47 +msgid "and install possibly missing apps." +msgstr "e instalar aplicaciones que posiblemente falten." + +#: ../../addon/upgrade_info/upgrade_info.php:52 +msgid "Upgrade Info" +msgstr "Información de actualización" + +#: ../../addon/upgrade_info/upgrade_info.php:56 +msgid "Do not show this again" +msgstr "No mostrar esto de nuevo" + #: ../../addon/channelreputation/channelreputation.php:101 #: ../../addon/channelreputation/channelreputation.php:102 #: ../../addon/cart/myshop.php:141 ../../addon/cart/myshop.php:177 @@ -11957,7 +11991,7 @@ msgstr "Debe iniciar sesión en la red para comprar." #: ../../addon/cart/cart.php:1462 #: ../../addon/cart/submodules/paypalbutton.php:392 -#: ../../addon/cart/manual_payments.php:38 +#: ../../addon/cart/manual_payments.php:68 msgid "Order not found." msgstr "El pedido no se ha encontrado." @@ -12097,39 +12131,39 @@ msgid "" "Cannot include subscription items with different terms in the same order." msgstr "No se pueden incluir artículos de suscripción con términos diferentes en el mismo orden." -#: ../../addon/cart/submodules/subscriptions.php:365 +#: ../../addon/cart/submodules/subscriptions.php:372 msgid "Select Subscription to Edit" msgstr "Seleccione suscripción a editar" -#: ../../addon/cart/submodules/subscriptions.php:371 +#: ../../addon/cart/submodules/subscriptions.php:380 msgid "Edit Subscriptions" msgstr "Editar suscripciones" -#: ../../addon/cart/submodules/subscriptions.php:405 +#: ../../addon/cart/submodules/subscriptions.php:414 msgid "Subscription SKU" msgstr "SKU de la suscripción" -#: ../../addon/cart/submodules/subscriptions.php:410 +#: ../../addon/cart/submodules/subscriptions.php:419 msgid "Catalog Description" msgstr "Descripción del catálogo" -#: ../../addon/cart/submodules/subscriptions.php:414 +#: ../../addon/cart/submodules/subscriptions.php:423 msgid "Subscription available for purchase." msgstr "Suscripción disponible para la compra." -#: ../../addon/cart/submodules/subscriptions.php:419 +#: ../../addon/cart/submodules/subscriptions.php:428 msgid "Maximum active subscriptions to this item per account." msgstr "Máximo de suscripciones activas a este artículo por cuenta." -#: ../../addon/cart/submodules/subscriptions.php:422 +#: ../../addon/cart/submodules/subscriptions.php:431 msgid "Subscription price." msgstr "Precio de la suscripción." -#: ../../addon/cart/submodules/subscriptions.php:426 +#: ../../addon/cart/submodules/subscriptions.php:435 msgid "Quantity" msgstr "Cuantía" -#: ../../addon/cart/submodules/subscriptions.php:430 +#: ../../addon/cart/submodules/subscriptions.php:439 msgid "Term" msgstr "Condición" @@ -12137,11 +12171,11 @@ msgstr "Condición" msgid "Error: order mismatch. Please try again." msgstr "Error: desajuste de pedidos. Por favor, inténtelo de nuevo." -#: ../../addon/cart/manual_payments.php:31 +#: ../../addon/cart/manual_payments.php:61 msgid "Manual payments are not enabled." msgstr "Los pagos manuales no están habilitados." -#: ../../addon/cart/manual_payments.php:47 +#: ../../addon/cart/manual_payments.php:77 msgid "Finished" msgstr "Terminado" @@ -12672,243 +12706,247 @@ msgstr "Dirección de correo electrónico del remitente" msgid "Test mode (only send to hub administrator)" msgstr "Modo de prueba (enviar sólo al administrador del hub)" -#: ../../include/selectors.php:30 +#: ../../include/selectors.php:18 +msgid "Profile to assign new connections" +msgstr "Perfil para asignar a las nuevas conexiones" + +#: ../../include/selectors.php:41 msgid "Frequently" msgstr "Frecuentemente" -#: ../../include/selectors.php:31 +#: ../../include/selectors.php:42 msgid "Hourly" msgstr "Cada hora" -#: ../../include/selectors.php:32 +#: ../../include/selectors.php:43 msgid "Twice daily" msgstr "Dos veces al día" -#: ../../include/selectors.php:33 +#: ../../include/selectors.php:44 msgid "Daily" msgstr "Diariamente" -#: ../../include/selectors.php:34 +#: ../../include/selectors.php:45 msgid "Weekly" msgstr "Semanalmente" -#: ../../include/selectors.php:35 +#: ../../include/selectors.php:46 msgid "Monthly" msgstr "Mensualmente" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Currently Male" msgstr "Actualmente hombre" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Currently Female" msgstr "Actualmente mujer" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Mostly Male" msgstr "Generalmente hombre" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Mostly Female" msgstr "Generalmente mujer" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Transgender" msgstr "Transgénero" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Intersex" msgstr "Intersexual" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Transsexual" msgstr "Transexual" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Hermaphrodite" msgstr "Hermafrodita" -#: ../../include/selectors.php:49 ../../include/channel.php:1491 +#: ../../include/selectors.php:60 ../../include/channel.php:1491 msgid "Neuter" msgstr "Neutral" -#: ../../include/selectors.php:49 ../../include/channel.php:1493 +#: ../../include/selectors.php:60 ../../include/channel.php:1493 msgid "Non-specific" msgstr "No especificado" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:60 msgid "Undecided" msgstr "Indeciso/a" -#: ../../include/selectors.php:85 ../../include/selectors.php:104 +#: ../../include/selectors.php:96 ../../include/selectors.php:115 msgid "Males" msgstr "Hombres" -#: ../../include/selectors.php:85 ../../include/selectors.php:104 +#: ../../include/selectors.php:96 ../../include/selectors.php:115 msgid "Females" msgstr "Mujeres" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Gay" msgstr "Homosexual" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Lesbian" msgstr "Lesbiana" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "No Preference" msgstr "Sin preferencias" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Bisexual" msgstr "Bisexual" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Autosexual" msgstr "Autosexual" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Abstinent" msgstr "Casto/a" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Virgin" msgstr "Virgen" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Deviant" msgstr "Fuera de lo común" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Fetish" msgstr "Fetichista" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Oodles" msgstr "Orgías" -#: ../../include/selectors.php:85 +#: ../../include/selectors.php:96 msgid "Nonsexual" msgstr "Asexual" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Single" msgstr "Soltero/a" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Lonely" msgstr "Solo/a" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Available" msgstr "Disponible" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Unavailable" msgstr "No disponible" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Has crush" msgstr "Enamorado/a" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Infatuated" msgstr "Apasionado/a" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Dating" msgstr "Saliendo con alguien" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Unfaithful" msgstr "Infiel" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Sex Addict" msgstr "Con adicción al sexo" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Friends/Benefits" msgstr "Amigos con algo extra" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Casual" msgstr "Casual" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Engaged" msgstr "Prometido/a" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Married" msgstr "Casado/a" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Imaginarily married" msgstr "Casado/a en sueños" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Partners" msgstr "Pareja" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Cohabiting" msgstr "Cohabitando" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Common law" msgstr "Matrimonio tradicional" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Happy" msgstr "Felíz" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Not looking" msgstr "No estoy buscando" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Swinger" msgstr "Libertino" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Betrayed" msgstr "Engañado/a" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Separated" msgstr "Separado/a" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Unstable" msgstr "Inestable" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Divorced" msgstr "Divorciado/a" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Imaginarily divorced" msgstr "Divorciado/a en sueños" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "Widowed" msgstr "Viudo/a" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Uncertain" msgstr "Indeterminado" -#: ../../include/selectors.php:123 ../../include/selectors.php:140 +#: ../../include/selectors.php:134 ../../include/selectors.php:151 msgid "It's complicated" msgstr "Es complicado" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Don't care" msgstr "No me importa" -#: ../../include/selectors.php:123 +#: ../../include/selectors.php:134 msgid "Ask me" msgstr "Pregúnteme" @@ -13257,47 +13295,47 @@ msgstr "relajado/a" msgid "surprised" msgstr "sorprendido/a" -#: ../../include/text.php:1377 ../../include/js_strings.php:86 +#: ../../include/text.php:1377 ../../include/js_strings.php:95 msgid "Monday" msgstr "lunes" -#: ../../include/text.php:1377 ../../include/js_strings.php:87 +#: ../../include/text.php:1377 ../../include/js_strings.php:96 msgid "Tuesday" msgstr "martes" -#: ../../include/text.php:1377 ../../include/js_strings.php:88 +#: ../../include/text.php:1377 ../../include/js_strings.php:97 msgid "Wednesday" msgstr "miércoles" -#: ../../include/text.php:1377 ../../include/js_strings.php:89 +#: ../../include/text.php:1377 ../../include/js_strings.php:98 msgid "Thursday" msgstr "jueves" -#: ../../include/text.php:1377 ../../include/js_strings.php:90 +#: ../../include/text.php:1377 ../../include/js_strings.php:99 msgid "Friday" msgstr "viernes" -#: ../../include/text.php:1377 ../../include/js_strings.php:91 +#: ../../include/text.php:1377 ../../include/js_strings.php:100 msgid "Saturday" msgstr "sábado" -#: ../../include/text.php:1377 ../../include/js_strings.php:85 +#: ../../include/text.php:1377 ../../include/js_strings.php:94 msgid "Sunday" msgstr "domingo" -#: ../../include/text.php:1381 ../../include/js_strings.php:61 +#: ../../include/text.php:1381 ../../include/js_strings.php:70 msgid "January" msgstr "enero" -#: ../../include/text.php:1381 ../../include/js_strings.php:62 +#: ../../include/text.php:1381 ../../include/js_strings.php:71 msgid "February" msgstr "febrero" -#: ../../include/text.php:1381 ../../include/js_strings.php:63 +#: ../../include/text.php:1381 ../../include/js_strings.php:72 msgid "March" msgstr "marzo" -#: ../../include/text.php:1381 ../../include/js_strings.php:64 +#: ../../include/text.php:1381 ../../include/js_strings.php:73 msgid "April" msgstr "abril" @@ -13305,31 +13343,31 @@ msgstr "abril" msgid "May" msgstr "mayo" -#: ../../include/text.php:1381 ../../include/js_strings.php:66 +#: ../../include/text.php:1381 ../../include/js_strings.php:75 msgid "June" msgstr "junio" -#: ../../include/text.php:1381 ../../include/js_strings.php:67 +#: ../../include/text.php:1381 ../../include/js_strings.php:76 msgid "July" msgstr "julio" -#: ../../include/text.php:1381 ../../include/js_strings.php:68 +#: ../../include/text.php:1381 ../../include/js_strings.php:77 msgid "August" msgstr "agosto" -#: ../../include/text.php:1381 ../../include/js_strings.php:69 +#: ../../include/text.php:1381 ../../include/js_strings.php:78 msgid "September" msgstr "septiembre" -#: ../../include/text.php:1381 ../../include/js_strings.php:70 +#: ../../include/text.php:1381 ../../include/js_strings.php:79 msgid "October" msgstr "octubre" -#: ../../include/text.php:1381 ../../include/js_strings.php:71 +#: ../../include/text.php:1381 ../../include/js_strings.php:80 msgid "November" msgstr "noviembre" -#: ../../include/text.php:1381 ../../include/js_strings.php:72 +#: ../../include/text.php:1381 ../../include/js_strings.php:81 msgid "December" msgstr "diciembre" @@ -13353,7 +13391,7 @@ msgstr "eliminar del fichero" msgid "Download binary/encrypted content" msgstr "Descargar contenido binario o cifrado" -#: ../../include/text.php:1872 ../../include/language.php:397 +#: ../../include/text.php:1872 ../../include/language.php:423 msgid "default" msgstr "por defecto" @@ -13652,181 +13690,191 @@ msgid " channel name" msgstr "nombre de canal" #: ../../include/js_strings.php:41 +#, php-format +msgid "%d minutes" +msgid_plural "%d minutes" +msgstr[0] "%d minutos" +msgstr[1] "%d minutos" + +#: ../../include/js_strings.php:42 +#, php-format +msgid "about %d hours" +msgid_plural "about %d hours" +msgstr[0] "alrededor de %d horas" +msgstr[1] "alrededor de %d horas" + +#: ../../include/js_strings.php:43 +#, php-format +msgid "%d days" +msgid_plural "%d days" +msgstr[0] "%d días" +msgstr[1] "%d días" + +#: ../../include/js_strings.php:44 +#, php-format +msgid "%d months" +msgid_plural "%d months" +msgstr[0] "%d meses" +msgstr[1] "%d meses" + +#: ../../include/js_strings.php:45 +#, php-format +msgid "%d years" +msgid_plural "%d years" +msgstr[0] "%d años" +msgstr[1] "%d años" + +#: ../../include/js_strings.php:50 msgid "timeago.prefixAgo" msgstr "hace " -#: ../../include/js_strings.php:42 +#: ../../include/js_strings.php:51 msgid "timeago.prefixFromNow" msgstr "en " -#: ../../include/js_strings.php:43 +#: ../../include/js_strings.php:52 msgid "timeago.suffixAgo" msgstr "NONE" -#: ../../include/js_strings.php:44 +#: ../../include/js_strings.php:53 msgid "timeago.suffixFromNow" msgstr "NONE" -#: ../../include/js_strings.php:47 +#: ../../include/js_strings.php:56 msgid "less than a minute" msgstr "menos de un minuto" -#: ../../include/js_strings.php:48 +#: ../../include/js_strings.php:57 msgid "about a minute" msgstr "alrededor de un minuto" -#: ../../include/js_strings.php:49 -#, php-format -msgid "%d minutes" -msgstr "%d minutos" - -#: ../../include/js_strings.php:50 +#: ../../include/js_strings.php:59 msgid "about an hour" msgstr "alrededor de una hora" -#: ../../include/js_strings.php:51 -#, php-format -msgid "about %d hours" -msgstr "alrededor de %d horas" - -#: ../../include/js_strings.php:52 +#: ../../include/js_strings.php:61 msgid "a day" msgstr "un día" -#: ../../include/js_strings.php:53 -#, php-format -msgid "%d days" -msgstr "%d días" - -#: ../../include/js_strings.php:54 +#: ../../include/js_strings.php:63 msgid "about a month" msgstr "alrededor de un mes" -#: ../../include/js_strings.php:55 -#, php-format -msgid "%d months" -msgstr "%d meses" - -#: ../../include/js_strings.php:56 +#: ../../include/js_strings.php:65 msgid "about a year" msgstr "alrededor de un año" -#: ../../include/js_strings.php:57 -#, php-format -msgid "%d years" -msgstr "%d años" - -#: ../../include/js_strings.php:58 +#: ../../include/js_strings.php:67 msgid " " msgstr " " -#: ../../include/js_strings.php:59 +#: ../../include/js_strings.php:68 msgid "timeago.numbers" msgstr "timeago.numbers" -#: ../../include/js_strings.php:65 +#: ../../include/js_strings.php:74 msgctxt "long" msgid "May" msgstr "mayo" -#: ../../include/js_strings.php:73 +#: ../../include/js_strings.php:82 msgid "Jan" msgstr "ene" -#: ../../include/js_strings.php:74 +#: ../../include/js_strings.php:83 msgid "Feb" msgstr "feb" -#: ../../include/js_strings.php:75 +#: ../../include/js_strings.php:84 msgid "Mar" msgstr "mar" -#: ../../include/js_strings.php:76 +#: ../../include/js_strings.php:85 msgid "Apr" msgstr "abr" -#: ../../include/js_strings.php:77 +#: ../../include/js_strings.php:86 msgctxt "short" msgid "May" msgstr "may" -#: ../../include/js_strings.php:78 +#: ../../include/js_strings.php:87 msgid "Jun" msgstr "jun" -#: ../../include/js_strings.php:79 +#: ../../include/js_strings.php:88 msgid "Jul" msgstr "jul" -#: ../../include/js_strings.php:80 +#: ../../include/js_strings.php:89 msgid "Aug" msgstr "ago" -#: ../../include/js_strings.php:81 +#: ../../include/js_strings.php:90 msgid "Sep" msgstr "sep" -#: ../../include/js_strings.php:82 +#: ../../include/js_strings.php:91 msgid "Oct" msgstr "oct" -#: ../../include/js_strings.php:83 +#: ../../include/js_strings.php:92 msgid "Nov" msgstr "nov" -#: ../../include/js_strings.php:84 +#: ../../include/js_strings.php:93 msgid "Dec" msgstr "dic" -#: ../../include/js_strings.php:92 +#: ../../include/js_strings.php:101 msgid "Sun" msgstr "dom" -#: ../../include/js_strings.php:93 +#: ../../include/js_strings.php:102 msgid "Mon" msgstr "lun" -#: ../../include/js_strings.php:94 +#: ../../include/js_strings.php:103 msgid "Tue" msgstr "mar" -#: ../../include/js_strings.php:95 +#: ../../include/js_strings.php:104 msgid "Wed" msgstr "mié" -#: ../../include/js_strings.php:96 +#: ../../include/js_strings.php:105 msgid "Thu" msgstr "jue" -#: ../../include/js_strings.php:97 +#: ../../include/js_strings.php:106 msgid "Fri" msgstr "vie" -#: ../../include/js_strings.php:98 +#: ../../include/js_strings.php:107 msgid "Sat" msgstr "sáb" -#: ../../include/js_strings.php:99 +#: ../../include/js_strings.php:108 msgctxt "calendar" msgid "today" msgstr "hoy" -#: ../../include/js_strings.php:100 +#: ../../include/js_strings.php:109 msgctxt "calendar" msgid "month" msgstr "mes" -#: ../../include/js_strings.php:101 +#: ../../include/js_strings.php:110 msgctxt "calendar" msgid "week" msgstr "semana" -#: ../../include/js_strings.php:102 +#: ../../include/js_strings.php:111 msgctxt "calendar" msgid "day" msgstr "día" -#: ../../include/js_strings.php:103 +#: ../../include/js_strings.php:112 msgctxt "calendar" msgid "All day" msgstr "Todos los días" @@ -14212,35 +14260,35 @@ msgstr "Llamadas de trabajo" msgid "Work, Fax" msgstr "Fax de trabajo" -#: ../../include/network.php:760 +#: ../../include/network.php:770 msgid "view full size" msgstr "Ver en el tamaño original" -#: ../../include/network.php:1766 +#: ../../include/network.php:1776 msgid "GNU-Social" msgstr "GNU Social" -#: ../../include/network.php:1767 +#: ../../include/network.php:1777 msgid "RSS/Atom" msgstr "RSS/Atom" -#: ../../include/network.php:1771 +#: ../../include/network.php:1781 msgid "Facebook" msgstr "Facebook" -#: ../../include/network.php:1773 +#: ../../include/network.php:1783 msgid "LinkedIn" msgstr "LinkedIn" -#: ../../include/network.php:1774 +#: ../../include/network.php:1784 msgid "XMPP/IM" msgstr "XMPP/IM" -#: ../../include/network.php:1775 +#: ../../include/network.php:1785 msgid "MySpace" msgstr "MySpace" -#: ../../include/language.php:410 +#: ../../include/language.php:436 msgid "Select an alternate language" msgstr "Seleccionar un idioma alternativo" @@ -14881,55 +14929,55 @@ msgstr "Buscar en el sitio @nombre, !foro, #tag, ?docs, contenido" msgid "Site Setup and Configuration" msgstr "Ajustes y configuración del sitio" -#: ../../include/nav.php:294 +#: ../../include/nav.php:299 msgid "@name, !forum, #tag, ?doc, content" msgstr "@nombre, !foro, #tag, ?docs, contenido" -#: ../../include/nav.php:295 +#: ../../include/nav.php:300 msgid "Please wait..." msgstr "Espere por favor…" -#: ../../include/nav.php:301 +#: ../../include/nav.php:306 msgid "Add Apps" msgstr "Añadir aplicaciones" -#: ../../include/nav.php:302 +#: ../../include/nav.php:307 msgid "Arrange Apps" msgstr "Organizar aplicaciones" -#: ../../include/nav.php:303 +#: ../../include/nav.php:308 msgid "Toggle System Apps" msgstr "Alternar aplicaciones de sistema" -#: ../../include/nav.php:389 +#: ../../include/nav.php:394 msgid "Status Messages and Posts" msgstr "Mensajes de estado y publicaciones" -#: ../../include/nav.php:402 +#: ../../include/nav.php:407 msgid "Profile Details" msgstr "Detalles del perfil" -#: ../../include/nav.php:412 ../../include/photos.php:667 +#: ../../include/nav.php:417 ../../include/photos.php:667 msgid "Photo Albums" msgstr "Álbumes de fotos" -#: ../../include/nav.php:420 +#: ../../include/nav.php:425 msgid "Files and Storage" msgstr "Ficheros y repositorio" -#: ../../include/nav.php:458 +#: ../../include/nav.php:463 msgid "Saved Bookmarks" msgstr "Marcadores guardados" -#: ../../include/nav.php:469 +#: ../../include/nav.php:474 msgid "View Cards" msgstr "Ver las fichas" -#: ../../include/nav.php:480 +#: ../../include/nav.php:485 msgid "View Articles" msgstr "Ver los artículos" -#: ../../include/nav.php:492 +#: ../../include/nav.php:497 msgid "View Webpages" msgstr "Ver páginas web" diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php index a92c1c6ea..6daac9592 100644 --- a/view/es-es/hstrings.php +++ b/view/es-es/hstrings.php @@ -5,6 +5,7 @@ function string_plural_select_es_es($n){ return ($n != 1);; }} App::$rtl = 0; +App::$strings["plural_function_code"] = "(n != 1);"; App::$strings["Can view my channel stream and posts"] = "Pueden verse la actividad y publicaciones de mi canal"; App::$strings["Can send me their channel stream and posts"] = "Se me pueden enviar entradas y contenido de un canal"; App::$strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado."; @@ -571,7 +572,7 @@ App::$strings["This is displayed on the public server site list."] = "Esto se mu App::$strings["Register text"] = "Texto del registro"; App::$strings["Will be displayed prominently on the registration page."] = "Se mostrará de forma destacada en la página de registro."; App::$strings["Site homepage to show visitors (default: login box)"] = "Página personal que se mostrará a los visitantes (por defecto: la página de identificación)"; -App::$strings["example: 'public' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "ejemplo: 'public' para mostrar contenido público, 'page/sys/home' para mostrar la página web definida como \"home\" o 'include:home.html' para mostrar el contenido de un fichero."; +App::$strings["example: 'pubstream' to show public stream, 'page/sys/home' to show a system webpage called 'home' or 'include:home.html' to include a file."] = "ejemplo: 'pubstream' para mostrar el stream público, 'page/sys/home' para mostrar una página web del sistema llamada 'home' o 'include:home.html' para incluir un archivo."; App::$strings["Preserve site homepage URL"] = "Preservar la dirección de la página personal"; App::$strings["Present the site homepage in a frame at the original location instead of redirecting"] = "Presenta la página personal del sitio en un marco en la ubicación original, en vez de redirigirla."; App::$strings["Accounts abandoned after x days"] = "Cuentas abandonadas después de x días"; @@ -753,7 +754,6 @@ App::$strings["Maximum Friend Requests/Day:"] = "Máximo de solicitudes de amist App::$strings["May reduce spam activity"] = "Podría reducir la actividad de spam"; App::$strings["Default Privacy Group"] = "Grupo de canales predeterminado"; App::$strings["Use my default audience setting for the type of object published"] = "Usar los ajustes de mi audiencia predeterminada para el tipo de publicación"; -App::$strings["Profile to assign new connections"] = "Perfil para asignar a las nuevas conexiones"; App::$strings["Default permissions category"] = "Categoría de permisos por defecto"; App::$strings["Maximum private messages per day from unknown people:"] = "Máximo de mensajes privados por día de gente desconocida:"; App::$strings["Useful to reduce spamming"] = "Útil para reducir el envío de correo no deseado"; @@ -801,9 +801,7 @@ App::$strings["Miscellaneous Settings"] = "Ajustes diversos"; App::$strings["Default photo upload folder"] = "Carpeta por defecto de las fotos subidas"; App::$strings["%Y - current year, %m - current month"] = "%Y - año en curso, %m - mes actual"; App::$strings["Default file upload folder"] = "Carpeta por defecto de los ficheros subidos"; -App::$strings["Personal menu to display in your channel pages"] = "Menú personal que debe mostrarse en las páginas de su canal"; App::$strings["Remove this channel."] = "Eliminar este canal."; -App::$strings["Firefox Share \$Projectname provider"] = "Servicio de compartición de Firefox: proveedor \$Projectname"; App::$strings["Additional Features"] = "Funcionalidades"; App::$strings["Events Settings"] = "Gestión de eventos"; App::$strings["CalDAV Settings"] = "Ajustes de CalDav"; @@ -840,6 +838,7 @@ App::$strings["Addon Settings"] = "Ajustes de los complementos"; App::$strings["Please save/submit changes to any panel before opening another."] = "Guarde o envíe los cambios a cualquier panel antes de abrir otro."; App::$strings["Max height of content (in pixels)"] = "Altura máxima del contenido (en píxeles)"; App::$strings["Click to expand content exceeding this height"] = "Haga clic para expandir el contenido que exceda esta altura"; +App::$strings["Personal menu to display in your channel pages"] = "Menú personal que debe mostrarse en las páginas de su canal"; App::$strings["Channel Home Settings"] = "Ajustes del canal"; App::$strings["Directory Settings"] = "Configuración del directorio"; App::$strings["Editor Settings"] = "Ajustes del editor"; @@ -2067,6 +2066,9 @@ App::$strings["Communicate"] = "Comunicarse"; App::$strings["View your channel homepage"] = "Ver la página principal de su canal"; App::$strings["View your network stream"] = "Ver el \"stream\" de su red"; App::$strings["Documentation"] = "Documentación"; +App::$strings["Missing Features?"] = "¿Faltan Características?"; +App::$strings["Pin apps to navigation bar"] = "Fijar apps a la barra de navegación"; +App::$strings["Install more apps"] = "Instalar más apps"; App::$strings["View public stream"] = "Ver el \"stream\" público"; App::$strings["Member registrations waiting for confirmation"] = "Inscripciones de nuevos miembros pendientes de aprobación"; App::$strings["Inspect queue"] = "Examinar la cola"; @@ -2453,6 +2455,13 @@ App::$strings["Approve subscription requests from Hubzilla contacts automaticall App::$strings["Purge internal list of jabber addresses of contacts"] = "Purgar la lista interna de las direcciones de contactos de jabber"; App::$strings["Configuration Help"] = "Ayuda para los ajustes"; App::$strings["Jappix Mini Settings"] = "Ajustes de Jappix Mini"; +App::$strings["Your channel has been upgraded to the latest \$Projectname version."] = "Su canal ha sido actualizado a la última versión de \$Projectname."; +App::$strings["To improve usability, we have converted some features into installable stand-alone apps."] = "Para mejorar la usabilidad, hemos convertido algunas características en aplicaciones independientes instalables."; +App::$strings["Please visit the \$Projectname"] = "Por favor visite el sitio web de \$Projectname"; +App::$strings["app store"] = "depósito de apps"; +App::$strings["and install possibly missing apps."] = "e instalar aplicaciones que posiblemente falten."; +App::$strings["Upgrade Info"] = "Información de actualización"; +App::$strings["Do not show this again"] = "No mostrar esto de nuevo"; App::$strings["Access Denied"] = "Acceso denegado"; App::$strings["Enable Community Moderation"] = "Habilitar la moderación de la comunidad"; App::$strings["Reputation automatically given to new members"] = "La reputación se otorga automáticamente a los nuevos miembros"; @@ -2805,6 +2814,7 @@ App::$strings["%1\$d of %2\$d messages sent."] = "%1\$d de %2\$d mensajes enviad App::$strings["Send email to all hub members."] = "Enviar un correo electrónico a todos los miembros del hub."; App::$strings["Sender Email address"] = "Dirección de correo electrónico del remitente"; App::$strings["Test mode (only send to hub administrator)"] = "Modo de prueba (enviar sólo al administrador del hub)"; +App::$strings["Profile to assign new connections"] = "Perfil para asignar a las nuevas conexiones"; App::$strings["Frequently"] = "Frecuentemente"; App::$strings["Hourly"] = "Cada hora"; App::$strings["Twice daily"] = "Dos veces al día"; @@ -3067,21 +3077,36 @@ App::$strings["Thank you, this nickname is valid."] = "Gracias, este alias es v App::$strings["A channel name is required."] = "Se requiere un nombre de canal"; App::$strings["This is a "] = "Esto es un "; App::$strings[" channel name"] = "nombre de canal"; +App::$strings["%d minutes"] = array( + 0 => "%d minutos", + 1 => "%d minutos", +); +App::$strings["about %d hours"] = array( + 0 => "alrededor de %d horas", + 1 => "alrededor de %d horas", +); +App::$strings["%d days"] = array( + 0 => "%d días", + 1 => "%d días", +); +App::$strings["%d months"] = array( + 0 => "%d meses", + 1 => "%d meses", +); +App::$strings["%d years"] = array( + 0 => "%d años", + 1 => "%d años", +); App::$strings["timeago.prefixAgo"] = "hace "; App::$strings["timeago.prefixFromNow"] = "en "; App::$strings["timeago.suffixAgo"] = "NONE"; App::$strings["timeago.suffixFromNow"] = "NONE"; App::$strings["less than a minute"] = "menos de un minuto"; App::$strings["about a minute"] = "alrededor de un minuto"; -App::$strings["%d minutes"] = "%d minutos"; App::$strings["about an hour"] = "alrededor de una hora"; -App::$strings["about %d hours"] = "alrededor de %d horas"; App::$strings["a day"] = "un día"; -App::$strings["%d days"] = "%d días"; App::$strings["about a month"] = "alrededor de un mes"; -App::$strings["%d months"] = "%d meses"; App::$strings["about a year"] = "alrededor de un año"; -App::$strings["%d years"] = "%d años"; App::$strings[" "] = " "; App::$strings["timeago.numbers"] = "timeago.numbers"; App::$strings["__ctx:long__ May"] = "mayo"; -- cgit v1.2.3 From aef212ada9ff61326ae56c5c17ff8873b7cc4c69 Mon Sep 17 00:00:00 2001 From: "M.Dent" Date: Thu, 25 Oct 2018 10:12:03 -0400 Subject: Add entropy to queue worker - and fix requeuing of expired tasks --- Zotlabs/Daemon/Master.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Zotlabs/Daemon/Master.php b/Zotlabs/Daemon/Master.php index 3a71ee578..0656ca05b 100644 --- a/Zotlabs/Daemon/Master.php +++ b/Zotlabs/Daemon/Master.php @@ -60,7 +60,8 @@ class Master { $k = explode('_',$worker['k']); q("delete from config where cat='queueworkers' and k='%s'", 'workerstarted_'.$k[1]); - q("update config set k='workitem' where cat='queuework' and k='%s'", + q("update config set k='%s' where cat='queuework' and k='%s'", + dbesc(uniqid('workitem:',true)), 'workitem_'.$k[1]); unset($workers[$idx]); } @@ -69,7 +70,7 @@ class Master { return false; } } - return uniqid(); + return uniqid('',true); } -- cgit v1.2.3 From 2b3cbc638bb626141bce0a6cc9860700823bc24b Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Fri, 26 Oct 2018 09:53:56 +0200 Subject: notifications: fix unseen forum count --- Zotlabs/Module/Ping.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index bc6985301..2ad4f1277 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -634,18 +634,20 @@ class Ping extends \Zotlabs\Web\Controller { if($vnotify & VNOTIFY_FORUMS) { $forums = get_forum_channels(local_channel()); - if(! $forums) { - $result['forums'] = 0; - } - else { - + if($forums) { $perms_sql = item_permissions_sql(local_channel()) . item_normal(); $fcount = count($forums); $forums['total'] = 0; for($x = 0; $x < $fcount; $x ++) { + $ttype = TERM_FORUM; + $p = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($forums[$x]['xchan_name']) . "'"); + $p = ids_to_querystr($p, 'parent'); + + $pquery = (($p) ? "OR parent IN ( $p )" : ''); + $r = q("select sum(item_unseen) as unseen from item - where uid = %d and owner_xchan = '%s' and item_unseen = 1 $perms_sql ", + where uid = %d and ( owner_xchan = '%s' $pquery ) and item_unseen = 1 $perms_sql ", intval(local_channel()), dbesc($forums[$x]['xchan_hash']) ); -- cgit v1.2.3 From 96bed3a623bf6bb832778b6957cd278c2a946c20 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 27 Oct 2018 22:34:18 +0200 Subject: fix issues with forum handling in mod network and ping. also some code cleanup. --- Zotlabs/Module/Network.php | 17 +++++++++++++---- Zotlabs/Module/Ping.php | 17 +++++++++++------ 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php index e8ee1eef9..294e11c52 100644 --- a/Zotlabs/Module/Network.php +++ b/Zotlabs/Module/Network.php @@ -258,12 +258,18 @@ class Network extends \Zotlabs\Web\Controller { } elseif($pf && $unseen && $nouveau) { - $ttype = TERM_FORUM; // This is for nouveau view public forum cid queries (if a forum notification is clicked) - $p = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'"); + $p = q("SELECT oid AS parent FROM term WHERE uid = %d AND ttype = %d AND term = '%s'", + intval(local_channel()), + intval(TERM_FORUM), + dbesc($cid_r[0]['xchan_name']) + ); - $p = ids_to_querystr($p, 'parent'); - $sql_extra = " AND ( owner_xchan = '" . dbesc($cid_r[0]['abook_xchan']) . "' OR item.parent IN ( $p ) ) AND item_unseen = 1 "; + $p_str = ids_to_querystr($p, 'parent'); + if($p_str) + $p_sql = " OR item.parent IN ( $p_str ) "; + + $sql_extra = " AND ( owner_xchan = '" . protect_sprintf(dbesc($cid_r[0]['abook_xchan'])) . "' OR owner_xchan = '" . protect_sprintf(dbesc($cid_r[0]['abook_xchan'])) . "' $p_sql ) AND item_unseen = 1 "; } else { // This is for threaded view cid queries (e.g. if a forum is selected from the forum filter) @@ -273,6 +279,9 @@ class Network extends \Zotlabs\Web\Controller { $p2 = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($cid_r[0]['xchan_name']) . "'"); $p_str = ids_to_querystr(array_merge($p1,$p2),'parent'); + if(! $p_str) + killme(); + $sql_extra = " AND item.parent IN ( $p_str ) "; } } diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 2ad4f1277..75e8843d6 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -635,20 +635,25 @@ class Ping extends \Zotlabs\Web\Controller { $forums = get_forum_channels(local_channel()); if($forums) { - $perms_sql = item_permissions_sql(local_channel()) . item_normal(); + $perms_sql = item_permissions_sql(local_channel()); + $item_normal = item_normal(); $fcount = count($forums); $forums['total'] = 0; for($x = 0; $x < $fcount; $x ++) { - $ttype = TERM_FORUM; - $p = q("SELECT oid AS parent FROM term WHERE uid = " . intval(local_channel()) . " AND ttype = $ttype AND term = '" . dbesc($forums[$x]['xchan_name']) . "'"); - $p = ids_to_querystr($p, 'parent'); + $p = q("SELECT oid AS parent FROM term WHERE uid = %d AND ttype = %d AND term = '%s'", + intval(local_channel()), + intval(TERM_FORUM), + dbesc($forums[$x]['xchan_hash']) + ); - $pquery = (($p) ? "OR parent IN ( $p )" : ''); + $p_str = ids_to_querystr($p, 'parent'); + $p_sql = (($p_str) ? "OR parent IN ( $p_str )" : ''); $r = q("select sum(item_unseen) as unseen from item - where uid = %d and ( owner_xchan = '%s' $pquery ) and item_unseen = 1 $perms_sql ", + where uid = %d and ( owner_xchan = '%s' OR author_xchan = '%s' $p_sql ) and item_unseen = 1 $perms_sql $item_normal", intval(local_channel()), + dbesc($forums[$x]['xchan_hash']), dbesc($forums[$x]['xchan_hash']) ); if($r[0]['unseen']) { -- cgit v1.2.3 From 0f19627407ccd373afe1ce2d2347ea240f3195c1 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 29 Oct 2018 10:59:54 +0100 Subject: changelog --- CHANGELOG | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 9821eda26..272f839fb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,25 @@ +Hubzilla 3.8.2 (2018-10-29) + - Merge unmerged changes from dev into master + - Fix issues with forum handling in mod network and ping + - Fix delivery chain linkage messed up if original post was edited + - Fix issues with the experimental queue worker + - Fix call to image source {1} from html template + - Group stream filters by threaded and unthreaded default view + - Show only unseen forum messages when clicking on forum notification + - Improve editor contact autocomplete performance + - Convert non UTF-8 content on link embeding + - Make textcomplete return up to 100 items + - Look for for matches in the entire string when suggesting emojis + - Add [summary] bbcode to autocomplete list + - Update blueimp_upload to version 9.23 + - Update spanish strings + + Addons + - Cart: don't allow items to be added unless user is logged into the Grid. + - Pubcrawl: simplify asencode_activity() addressing to reflect upcoming changes in mastodon 2.6 + - Rendezvous: Update rendezvous_group.tpl to fix broken Bootstrap library reference + + Hubzilla 3.8.1 (2018-10-21) - Fix issue with too long navbar banners - Fix menu item edit link -- cgit v1.2.3 From 0d2c3be367835e09fae0e3e12ab7f0af86f8465c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 29 Oct 2018 22:55:24 +0100 Subject: allow wiki_list widget to be used in any page --- Zotlabs/Widget/Wiki_list.php | 4 ---- view/pdl/mod_wiki.pdl | 1 - 2 files changed, 5 deletions(-) diff --git a/Zotlabs/Widget/Wiki_list.php b/Zotlabs/Widget/Wiki_list.php index c8d83cbe8..64c988ee7 100644 --- a/Zotlabs/Widget/Wiki_list.php +++ b/Zotlabs/Widget/Wiki_list.php @@ -6,10 +6,6 @@ class Wiki_list { function widget($arr) { - if(argc() < 3) { - return; - } - $channel = channelx_by_n(\App::$profile_uid); $wikis = \Zotlabs\Lib\NativeWiki::listwikis($channel,get_observer_hash()); diff --git a/view/pdl/mod_wiki.pdl b/view/pdl/mod_wiki.pdl index 2e99ea36b..be86be7e3 100644 --- a/view/pdl/mod_wiki.pdl +++ b/view/pdl/mod_wiki.pdl @@ -1,6 +1,5 @@ [region=aside] [widget=vcard][/widget] -[widget=wiki_list][/widget] [widget=wiki_pages][/widget] [/region] [region=right_aside] -- cgit v1.2.3 From 1eac4db491e6c597b56752b7915fdcafc529ed5e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 29 Oct 2018 23:01:13 +0100 Subject: fix forum ping results - the term query requires xchan_name instead of xchan_hash. also improve the query itself - item_permission_sql() is redundant here since we always deal with local_channel() and use count(id) instead of sum(item_unseen) to get the unseen count --- Zotlabs/Module/Ping.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php index 75e8843d6..cf5b2e004 100644 --- a/Zotlabs/Module/Ping.php +++ b/Zotlabs/Module/Ping.php @@ -635,7 +635,6 @@ class Ping extends \Zotlabs\Web\Controller { $forums = get_forum_channels(local_channel()); if($forums) { - $perms_sql = item_permissions_sql(local_channel()); $item_normal = item_normal(); $fcount = count($forums); $forums['total'] = 0; @@ -644,14 +643,14 @@ class Ping extends \Zotlabs\Web\Controller { $p = q("SELECT oid AS parent FROM term WHERE uid = %d AND ttype = %d AND term = '%s'", intval(local_channel()), intval(TERM_FORUM), - dbesc($forums[$x]['xchan_hash']) + dbesc($forums[$x]['xchan_name']) ); $p_str = ids_to_querystr($p, 'parent'); $p_sql = (($p_str) ? "OR parent IN ( $p_str )" : ''); - $r = q("select sum(item_unseen) as unseen from item - where uid = %d and ( owner_xchan = '%s' OR author_xchan = '%s' $p_sql ) and item_unseen = 1 $perms_sql $item_normal", + $r = q("select count(id) as unseen from item + where uid = %d and ( owner_xchan = '%s' OR author_xchan = '%s' $p_sql ) and item_unseen = 1 $item_normal", intval(local_channel()), dbesc($forums[$x]['xchan_hash']), dbesc($forums[$x]['xchan_hash']) -- cgit v1.2.3 From 2192ea6fdf21a00ccf44d626a01b756d194d6cbe Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 30 Oct 2018 12:12:07 +0100 Subject: update html_to_markdown, smarty and sabredav libs via composer --- composer.lock | 215 +- vendor/composer/autoload_classmap.php | 1 + vendor/composer/autoload_static.php | 1 + vendor/composer/installed.json | 50 +- vendor/league/html-to-markdown/CHANGELOG.md | 21 +- vendor/league/html-to-markdown/composer.json | 4 +- .../league/html-to-markdown/src/Configuration.php | 16 + .../src/Converter/CodeConverter.php | 37 +- .../src/Converter/HeaderConverter.php | 4 + .../src/Converter/LinkConverter.php | 13 + .../src/Converter/PreformattedConverter.php | 18 +- .../src/Converter/TextConverter.php | 4 +- .../league/html-to-markdown/src/HtmlConverter.php | 6 +- .../src/HtmlConverterInterface.php | 26 + vendor/sabre/dav/CHANGELOG.md | 6 + vendor/sabre/dav/bin/build.php | 0 vendor/sabre/dav/bin/googlecode_upload.py | 0 vendor/sabre/dav/bin/migrateto20.php | 0 vendor/sabre/dav/bin/migrateto21.php | 0 vendor/sabre/dav/bin/migrateto30.php | 0 vendor/sabre/dav/bin/migrateto32.php | 0 vendor/sabre/dav/bin/sabredav.php | 0 .../dav/lib/CardDAV/Xml/Filter/AddressData.php | 5 +- vendor/sabre/dav/lib/DAV/Server.php | 7 +- vendor/sabre/dav/lib/DAV/Tree.php | 4 +- .../Sabre/DAV/Auth/Backend/AbstractBasicTest.php | 2 +- vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php | 16 + vendor/smarty/smarty/NEW_FEATURES.txt | 9 +- vendor/smarty/smarty/change_log.txt | 44 +- vendor/smarty/smarty/composer.json | 11 +- vendor/smarty/smarty/demo/index.php | 27 +- .../smarty/demo/plugins/cacheresource.apc.php | 16 +- .../smarty/demo/plugins/cacheresource.memcache.php | 16 +- .../smarty/demo/plugins/cacheresource.mysql.php | 93 +- .../smarty/demo/plugins/cacheresource.pdo.php | 195 +- .../smarty/demo/plugins/cacheresource.pdo_gzip.php | 33 +- .../smarty/demo/plugins/resource.extendsall.php | 13 +- .../smarty/smarty/demo/plugins/resource.mysql.php | 42 +- .../smarty/smarty/demo/plugins/resource.mysqls.php | 30 +- vendor/smarty/smarty/libs/Autoloader.php | 12 +- vendor/smarty/smarty/libs/Smarty.class.php | 229 +- vendor/smarty/smarty/libs/SmartyBC.class.php | 45 +- vendor/smarty/smarty/libs/bootstrap.php | 7 +- vendor/smarty/smarty/libs/debug.tpl | 6 +- .../smarty/libs/plugins/block.textformat.php | 40 +- .../smarty/libs/plugins/function.counter.php | 15 +- .../smarty/smarty/libs/plugins/function.cycle.php | 33 +- .../smarty/smarty/libs/plugins/function.fetch.php | 21 +- .../libs/plugins/function.html_checkboxes.php | 168 +- .../smarty/libs/plugins/function.html_image.php | 39 +- .../smarty/libs/plugins/function.html_options.php | 101 +- .../smarty/libs/plugins/function.html_radios.php | 147 +- .../libs/plugins/function.html_select_date.php | 129 +- .../libs/plugins/function.html_select_time.php | 142 +- .../smarty/libs/plugins/function.html_table.php | 44 +- .../smarty/smarty/libs/plugins/function.mailto.php | 42 +- .../smarty/smarty/libs/plugins/function.math.php | 49 +- .../smarty/libs/plugins/modifier.capitalize.php | 61 +- .../smarty/libs/plugins/modifier.date_format.php | 36 +- .../libs/plugins/modifier.debug_print_var.php | 43 +- .../smarty/smarty/libs/plugins/modifier.escape.php | 132 +- .../smarty/libs/plugins/modifier.mb_wordwrap.php | 26 +- .../smarty/libs/plugins/modifier.regex_replace.php | 11 +- .../smarty/libs/plugins/modifier.replace.php | 6 +- .../smarty/libs/plugins/modifier.spacify.php | 3 +- .../smarty/libs/plugins/modifier.truncate.php | 18 +- .../smarty/libs/plugins/modifiercompiler.cat.php | 5 +- .../plugins/modifiercompiler.count_characters.php | 4 +- .../plugins/modifiercompiler.count_paragraphs.php | 5 +- .../plugins/modifiercompiler.count_sentences.php | 5 +- .../libs/plugins/modifiercompiler.count_words.php | 1 - .../libs/plugins/modifiercompiler.default.php | 3 - .../libs/plugins/modifiercompiler.escape.php | 33 +- .../libs/plugins/modifiercompiler.from_charset.php | 3 - .../libs/plugins/modifiercompiler.indent.php | 3 - .../smarty/libs/plugins/modifiercompiler.lower.php | 2 - .../libs/plugins/modifiercompiler.noprint.php | 3 +- .../plugins/modifiercompiler.string_format.php | 1 - .../smarty/libs/plugins/modifiercompiler.strip.php | 3 - .../libs/plugins/modifiercompiler.strip_tags.php | 1 - .../libs/plugins/modifiercompiler.to_charset.php | 3 - .../libs/plugins/modifiercompiler.unescape.php | 6 - .../smarty/libs/plugins/modifiercompiler.upper.php | 1 - .../libs/plugins/modifiercompiler.wordwrap.php | 2 +- .../libs/plugins/outputfilter.trimwhitespace.php | 46 +- .../libs/plugins/shared.escape_special_chars.php | 6 +- .../libs/plugins/shared.literal_compiler_param.php | 9 +- .../smarty/libs/plugins/shared.make_timestamp.php | 24 +- .../smarty/libs/plugins/shared.mb_str_replace.php | 10 +- .../smarty/libs/plugins/shared.mb_unicode.php | 5 +- .../libs/sysplugins/smarty_cacheresource.php | 19 +- .../sysplugins/smarty_cacheresource_custom.php | 123 +- .../smarty_cacheresource_keyvaluestore.php | 208 +- .../smarty/smarty/libs/sysplugins/smarty_data.php | 4 +- .../libs/sysplugins/smarty_internal_block.php | 2 +- .../smarty_internal_cacheresource_file.php | 42 +- .../sysplugins/smarty_internal_compile_append.php | 4 +- .../sysplugins/smarty_internal_compile_assign.php | 16 +- .../sysplugins/smarty_internal_compile_block.php | 57 +- .../smarty_internal_compile_block_child.php | 4 +- .../smarty_internal_compile_block_parent.php | 4 +- .../sysplugins/smarty_internal_compile_break.php | 22 +- .../sysplugins/smarty_internal_compile_call.php | 4 +- .../sysplugins/smarty_internal_compile_capture.php | 35 +- .../sysplugins/smarty_internal_compile_child.php | 22 +- .../smarty_internal_compile_config_load.php | 16 +- .../smarty_internal_compile_continue.php | 8 +- .../sysplugins/smarty_internal_compile_debug.php | 6 +- .../sysplugins/smarty_internal_compile_eval.php | 9 +- .../sysplugins/smarty_internal_compile_extends.php | 31 +- .../sysplugins/smarty_internal_compile_for.php | 28 +- .../sysplugins/smarty_internal_compile_foreach.php | 38 +- .../smarty_internal_compile_function.php | 80 +- .../libs/sysplugins/smarty_internal_compile_if.php | 30 +- .../sysplugins/smarty_internal_compile_include.php | 48 +- .../smarty_internal_compile_include_php.php | 8 +- .../sysplugins/smarty_internal_compile_insert.php | 22 +- .../sysplugins/smarty_internal_compile_ldelim.php | 4 +- .../smarty_internal_compile_make_nocache.php | 4 +- .../sysplugins/smarty_internal_compile_nocache.php | 6 +- .../sysplugins/smarty_internal_compile_parent.php | 5 +- ...marty_internal_compile_private_block_plugin.php | 35 +- ...rty_internal_compile_private_foreachsection.php | 82 +- ...ty_internal_compile_private_function_plugin.php | 20 +- .../smarty_internal_compile_private_modifier.php | 50 +- ...ernal_compile_private_object_block_function.php | 6 +- ...ty_internal_compile_private_object_function.php | 15 +- .../smarty_internal_compile_private_php.php | 89 +- ...y_internal_compile_private_print_expression.php | 56 +- ...y_internal_compile_private_registered_block.php | 6 +- ...nternal_compile_private_registered_function.php | 23 +- ...y_internal_compile_private_special_variable.php | 36 +- .../sysplugins/smarty_internal_compile_rdelim.php | 4 +- .../sysplugins/smarty_internal_compile_section.php | 111 +- .../smarty_internal_compile_setfilter.php | 8 +- .../smarty_internal_compile_shared_inheritance.php | 19 +- .../sysplugins/smarty_internal_compile_while.php | 20 +- .../sysplugins/smarty_internal_compilebase.php | 30 +- .../smarty_internal_config_file_compiler.php | 27 +- .../sysplugins/smarty_internal_configfilelexer.php | 208 +- .../smarty_internal_configfileparser.php | 279 +- .../libs/sysplugins/smarty_internal_data.php | 64 +- .../libs/sysplugins/smarty_internal_debug.php | 24 +- .../sysplugins/smarty_internal_errorhandler.php | 29 +- .../smarty_internal_extension_handler.php | 119 +- .../smarty_internal_method_addautoloadfilters.php | 23 +- .../smarty_internal_method_adddefaultmodifiers.php | 4 +- .../sysplugins/smarty_internal_method_append.php | 14 +- .../smarty_internal_method_appendbyref.php | 9 +- .../smarty_internal_method_assignbyref.php | 6 +- .../smarty_internal_method_assignglobal.php | 9 +- .../smarty_internal_method_clearallassign.php | 3 +- .../smarty_internal_method_clearallcache.php | 8 +- .../smarty_internal_method_clearassign.php | 5 +- .../smarty_internal_method_clearcache.php | 25 +- ...marty_internal_method_clearcompiledtemplate.php | 43 +- .../smarty_internal_method_clearconfig.php | 4 +- .../smarty_internal_method_compileallconfig.php | 23 +- .../smarty_internal_method_compilealltemplates.php | 61 +- .../smarty_internal_method_configload.php | 22 +- .../smarty_internal_method_createdata.php | 4 +- .../smarty_internal_method_getautoloadfilters.php | 4 +- .../smarty_internal_method_getconfigvariable.php | 2 +- .../smarty_internal_method_getconfigvars.php | 6 +- .../smarty_internal_method_getdebugtemplate.php | 2 +- .../smarty_internal_method_getdefaultmodifiers.php | 2 +- .../smarty_internal_method_getglobal.php | 8 +- .../smarty_internal_method_getregisteredobject.php | 4 +- .../smarty_internal_method_getstreamvariable.php | 5 +- .../sysplugins/smarty_internal_method_gettags.php | 2 +- .../smarty_internal_method_gettemplatevars.php | 30 +- .../sysplugins/smarty_internal_method_literals.php | 18 +- .../smarty_internal_method_loadfilter.php | 6 +- .../smarty_internal_method_loadplugin.php | 12 +- .../smarty_internal_method_mustcompile.php | 3 +- ...marty_internal_method_registercacheresource.php | 12 +- .../smarty_internal_method_registerclass.php | 6 +- ...nternal_method_registerdefaultconfighandler.php | 6 +- ...nternal_method_registerdefaultpluginhandler.php | 4 +- ...ernal_method_registerdefaulttemplatehandler.php | 26 +- .../smarty_internal_method_registerfilter.php | 11 +- .../smarty_internal_method_registerobject.php | 42 +- .../smarty_internal_method_registerplugin.php | 25 +- .../smarty_internal_method_registerresource.php | 14 +- .../smarty_internal_method_setautoloadfilters.php | 19 +- .../smarty_internal_method_setdebugtemplate.php | 4 +- .../smarty_internal_method_setdefaultmodifiers.php | 6 +- .../smarty_internal_method_unloadfilter.php | 8 +- ...rty_internal_method_unregistercacheresource.php | 6 +- .../smarty_internal_method_unregisterfilter.php | 6 +- .../smarty_internal_method_unregisterobject.php | 4 +- .../smarty_internal_method_unregisterplugin.php | 6 +- .../smarty_internal_method_unregisterresource.php | 4 +- .../sysplugins/smarty_internal_nocache_insert.php | 11 +- .../libs/sysplugins/smarty_internal_parsetree.php | 4 - .../sysplugins/smarty_internal_parsetree_dq.php | 20 +- .../sysplugins/smarty_internal_parsetree_tag.php | 2 - .../smarty_internal_parsetree_template.php | 21 +- .../sysplugins/smarty_internal_resource_eval.php | 17 +- .../smarty_internal_resource_extends.php | 2 - .../sysplugins/smarty_internal_resource_file.php | 160 +- .../sysplugins/smarty_internal_resource_php.php | 29 +- .../smarty_internal_resource_registered.php | 28 +- .../sysplugins/smarty_internal_resource_stream.php | 9 +- .../sysplugins/smarty_internal_resource_string.php | 18 +- .../smarty_internal_runtime_cachemodify.php | 11 +- .../smarty_internal_runtime_cacheresourcefile.php | 11 +- .../sysplugins/smarty_internal_runtime_capture.php | 29 +- .../smarty_internal_runtime_codeframe.php | 41 +- .../smarty_internal_runtime_filterhandler.php | 8 +- .../sysplugins/smarty_internal_runtime_foreach.php | 49 +- .../smarty_internal_runtime_getincludepath.php | 14 +- .../smarty_internal_runtime_inheritance.php | 45 +- .../smarty_internal_runtime_make_nocache.php | 6 +- .../smarty_internal_runtime_tplfunction.php | 34 +- .../smarty_internal_runtime_updatecache.php | 52 +- .../smarty_internal_runtime_updatescope.php | 28 +- .../smarty_internal_runtime_writefile.php | 7 +- .../smarty_internal_smartytemplatecompiler.php | 32 +- .../libs/sysplugins/smarty_internal_template.php | 209 +- .../sysplugins/smarty_internal_templatebase.php | 93 +- .../smarty_internal_templatecompilerbase.php | 505 ++-- .../sysplugins/smarty_internal_templatelexer.php | 310 ++- .../sysplugins/smarty_internal_templateparser.php | 2878 ++++++++++---------- .../sysplugins/smarty_internal_testinstall.php | 336 +-- .../libs/sysplugins/smarty_internal_undefined.php | 9 +- .../smarty/libs/sysplugins/smarty_resource.php | 72 +- .../libs/sysplugins/smarty_resource_custom.php | 12 +- .../libs/sysplugins/smarty_resource_recompiled.php | 7 +- .../smarty/libs/sysplugins/smarty_security.php | 228 +- .../libs/sysplugins/smarty_template_cached.php | 20 +- .../libs/sysplugins/smarty_template_compiled.php | 21 +- .../libs/sysplugins/smarty_template_config.php | 19 +- .../sysplugins/smarty_template_resource_base.php | 3 +- .../libs/sysplugins/smarty_template_source.php | 17 +- .../libs/sysplugins/smarty_undefined_variable.php | 4 +- .../smarty/libs/sysplugins/smarty_variable.php | 3 +- 237 files changed, 5891 insertions(+), 5162 deletions(-) create mode 100644 vendor/league/html-to-markdown/src/HtmlConverterInterface.php mode change 100755 => 100644 vendor/sabre/dav/bin/build.php mode change 100755 => 100644 vendor/sabre/dav/bin/googlecode_upload.py mode change 100755 => 100644 vendor/sabre/dav/bin/migrateto20.php mode change 100755 => 100644 vendor/sabre/dav/bin/migrateto21.php mode change 100755 => 100644 vendor/sabre/dav/bin/migrateto30.php mode change 100755 => 100644 vendor/sabre/dav/bin/migrateto32.php mode change 100755 => 100644 vendor/sabre/dav/bin/sabredav.php diff --git a/composer.lock b/composer.lock index d352ad29a..edeba994d 100644 --- a/composer.lock +++ b/composer.lock @@ -157,16 +157,16 @@ }, { "name": "league/html-to-markdown", - "version": "4.7.0", + "version": "4.8.0", "source": { "type": "git", "url": "https://github.com/thephpleague/html-to-markdown.git", - "reference": "76c076483cef89860d32a3fd25312f5a42848a8c" + "reference": "f9a879a068c68ff47b722de63f58bec79e448f9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/76c076483cef89860d32a3fd25312f5a42848a8c", - "reference": "76c076483cef89860d32a3fd25312f5a42848a8c", + "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/f9a879a068c68ff47b722de63f58bec79e448f9d", + "reference": "f9a879a068c68ff47b722de63f58bec79e448f9d", "shasum": "" }, "require": { @@ -185,7 +185,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.8-dev" + "dev-master": "4.9-dev" } }, "autoload": { @@ -198,17 +198,17 @@ "MIT" ], "authors": [ - { - "name": "Colin O'Dell", - "email": "colinodell@gmail.com", - "homepage": "http://www.colinodell.com", - "role": "Lead Developer" - }, { "name": "Nick Cernis", "email": "nick@cern.is", "homepage": "http://modernnerd.net", "role": "Original Author" + }, + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "https://www.colinodell.com", + "role": "Lead Developer" } ], "description": "An HTML-to-markdown conversion helper for PHP", @@ -217,7 +217,7 @@ "html", "markdown" ], - "time": "2018-05-19T23:47:12+00:00" + "time": "2018-09-18T12:18:08+00:00" }, { "name": "lukasreschke/id3parser", @@ -520,16 +520,16 @@ }, { "name": "sabre/dav", - "version": "3.2.2", + "version": "3.2.3", "source": { "type": "git", "url": "https://github.com/sabre-io/dav.git", - "reference": "e987775e619728f12205606c9cc3ee565ffb1516" + "reference": "a9780ce4f35560ecbd0af524ad32d9d2c8954b80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/dav/zipball/e987775e619728f12205606c9cc3ee565ffb1516", - "reference": "e987775e619728f12205606c9cc3ee565ffb1516", + "url": "https://api.github.com/repos/sabre-io/dav/zipball/a9780ce4f35560ecbd0af524ad32d9d2c8954b80", + "reference": "a9780ce4f35560ecbd0af524ad32d9d2c8954b80", "shasum": "" }, "require": { @@ -599,7 +599,7 @@ "framework", "iCalendar" ], - "time": "2017-02-15T03:06:08+00:00" + "time": "2018-10-19T09:58:27+00:00" }, { "name": "sabre/event", @@ -1002,16 +1002,16 @@ }, { "name": "smarty/smarty", - "version": "v3.1.32", + "version": "v3.1.33", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "ac9d4b587e5bf53381e21881820a9830765cb459" + "reference": "dd55b23121e55a3b4f1af90a707a6c4e5969530f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/ac9d4b587e5bf53381e21881820a9830765cb459", - "reference": "ac9d4b587e5bf53381e21881820a9830765cb459", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/dd55b23121e55a3b4f1af90a707a6c4e5969530f", + "reference": "dd55b23121e55a3b4f1af90a707a6c4e5969530f", "shasum": "" }, "require": { @@ -1051,7 +1051,7 @@ "keywords": [ "templating" ], - "time": "2018-04-24T14:53:33+00:00" + "time": "2018-09-12T20:54:16+00:00" }, { "name": "symfony/polyfill-ctype", @@ -2160,16 +2160,16 @@ }, { "name": "php-mock/php-mock-phpunit", - "version": "2.1.1", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/php-mock/php-mock-phpunit.git", - "reference": "ff1cc1d4e7478ce74221e05742588619bee84f69" + "reference": "57b92e621f14c2c07a4567cd29ed4e87de0d2912" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-mock/php-mock-phpunit/zipball/ff1cc1d4e7478ce74221e05742588619bee84f69", - "reference": "ff1cc1d4e7478ce74221e05742588619bee84f69", + "url": "https://api.github.com/repos/php-mock/php-mock-phpunit/zipball/57b92e621f14c2c07a4567cd29ed4e87de0d2912", + "reference": "57b92e621f14c2c07a4567cd29ed4e87de0d2912", "shasum": "" }, "require": { @@ -2210,7 +2210,7 @@ "test", "test double" ], - "time": "2018-04-06T13:54:43+00:00" + "time": "2018-10-07T14:38:37+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -2481,16 +2481,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "6.0.7", + "version": "6.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a" + "reference": "4d3ae9b21a7d7e440bd0cf65565533117976859f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/865662550c384bc1db7e51d29aeda1c2c161d69a", - "reference": "865662550c384bc1db7e51d29aeda1c2c161d69a", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/4d3ae9b21a7d7e440bd0cf65565533117976859f", + "reference": "4d3ae9b21a7d7e440bd0cf65565533117976859f", "shasum": "" }, "require": { @@ -2501,7 +2501,7 @@ "phpunit/php-text-template": "^1.2.1", "phpunit/php-token-stream": "^3.0", "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.1", + "sebastian/environment": "^3.1 || ^4.0", "sebastian/version": "^2.0.1", "theseer/tokenizer": "^1.1" }, @@ -2514,7 +2514,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "6.0-dev" + "dev-master": "6.1-dev" } }, "autoload": { @@ -2540,25 +2540,28 @@ "testing", "xunit" ], - "time": "2018-06-01T07:51:50+00:00" + "time": "2018-10-23T05:59:32+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "cecbc684605bb0cc288828eb5d65d93d5c676d3c" + "reference": "050bedf145a257b1ff02746c31894800e5122946" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cecbc684605bb0cc288828eb5d65d93d5c676d3c", - "reference": "cecbc684605bb0cc288828eb5d65d93d5c676d3c", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946", + "reference": "050bedf145a257b1ff02746c31894800e5122946", "shasum": "" }, "require": { "php": "^7.1" }, + "require-dev": { + "phpunit/phpunit": "^7.1" + }, "type": "library", "extra": { "branch-alias": { @@ -2587,7 +2590,7 @@ "filesystem", "iterator" ], - "time": "2018-06-11T11:44:00+00:00" + "time": "2018-09-13T20:33:42+00:00" }, { "name": "phpunit/php-text-template", @@ -2681,16 +2684,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "3.0.0", + "version": "3.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace" + "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/21ad88bbba7c3d93530d93994e0a33cd45f02ace", - "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18", + "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18", "shasum": "" }, "require": { @@ -2726,20 +2729,20 @@ "keywords": [ "tokenizer" ], - "time": "2018-02-01T13:16:43+00:00" + "time": "2018-10-30T05:52:18+00:00" }, { "name": "phpunit/phpunit", - "version": "7.3.2", + "version": "7.4.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "34705f81bddc3f505b9599a2ef96e2b4315ba9b8" + "reference": "c151651fb6ed264038d486ea262e243af72e5e64" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/34705f81bddc3f505b9599a2ef96e2b4315ba9b8", - "reference": "34705f81bddc3f505b9599a2ef96e2b4315ba9b8", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c151651fb6ed264038d486ea262e243af72e5e64", + "reference": "c151651fb6ed264038d486ea262e243af72e5e64", "shasum": "" }, "require": { @@ -2760,11 +2763,11 @@ "phpunit/php-timer": "^2.0", "sebastian/comparator": "^3.0", "sebastian/diff": "^3.0", - "sebastian/environment": "^3.1", + "sebastian/environment": "^3.1 || ^4.0", "sebastian/exporter": "^3.1", "sebastian/global-state": "^2.0", "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^1.0", + "sebastian/resource-operations": "^2.0", "sebastian/version": "^2.0.1" }, "conflict": { @@ -2784,7 +2787,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.3-dev" + "dev-master": "7.4-dev" } }, "autoload": { @@ -2810,7 +2813,7 @@ "testing", "xunit" ], - "time": "2018-08-22T06:39:21+00:00" + "time": "2018-10-23T05:57:41+00:00" }, { "name": "psr/container", @@ -3391,25 +3394,25 @@ }, { "name": "sebastian/resource-operations", - "version": "1.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" + "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9", + "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9", "shasum": "" }, "require": { - "php": ">=5.6.0" + "php": "^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -3429,7 +3432,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28T20:34:47+00:00" + "time": "2018-10-04T04:07:39+00:00" }, { "name": "sebastian/version", @@ -3476,7 +3479,7 @@ }, { "name": "symfony/browser-kit", - "version": "v4.1.4", + "version": "v4.1.6", "source": { "type": "git", "url": "https://github.com/symfony/browser-kit.git", @@ -3533,16 +3536,16 @@ }, { "name": "symfony/class-loader", - "version": "v3.4.15", + "version": "v3.4.17", "source": { "type": "git", "url": "https://github.com/symfony/class-loader.git", - "reference": "31db283fc86d3143e7ff87e922177b457d909c30" + "reference": "f31333bdff54c7595f834d510a6d2325573ddb36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/class-loader/zipball/31db283fc86d3143e7ff87e922177b457d909c30", - "reference": "31db283fc86d3143e7ff87e922177b457d909c30", + "url": "https://api.github.com/repos/symfony/class-loader/zipball/f31333bdff54c7595f834d510a6d2325573ddb36", + "reference": "f31333bdff54c7595f834d510a6d2325573ddb36", "shasum": "" }, "require": { @@ -3585,20 +3588,20 @@ ], "description": "Symfony ClassLoader Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:19:56+00:00" + "time": "2018-10-02T12:28:39+00:00" }, { "name": "symfony/config", - "version": "v4.1.4", + "version": "v4.1.6", "source": { "type": "git", "url": "https://github.com/symfony/config.git", - "reference": "76015a3cc372b14d00040ff58e18e29f69eba717" + "reference": "b3d4d7b567d7a49e6dfafb6d4760abc921177c96" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/config/zipball/76015a3cc372b14d00040ff58e18e29f69eba717", - "reference": "76015a3cc372b14d00040ff58e18e29f69eba717", + "url": "https://api.github.com/repos/symfony/config/zipball/b3d4d7b567d7a49e6dfafb6d4760abc921177c96", + "reference": "b3d4d7b567d7a49e6dfafb6d4760abc921177c96", "shasum": "" }, "require": { @@ -3648,20 +3651,20 @@ ], "description": "Symfony Config Component", "homepage": "https://symfony.com", - "time": "2018-08-08T06:37:38+00:00" + "time": "2018-09-08T13:24:10+00:00" }, { "name": "symfony/console", - "version": "v4.1.4", + "version": "v4.1.6", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "ca80b8ced97cf07390078b29773dc384c39eee1f" + "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/ca80b8ced97cf07390078b29773dc384c39eee1f", - "reference": "ca80b8ced97cf07390078b29773dc384c39eee1f", + "url": "https://api.github.com/repos/symfony/console/zipball/dc7122fe5f6113cfaba3b3de575d31112c9aa60b", + "reference": "dc7122fe5f6113cfaba3b3de575d31112c9aa60b", "shasum": "" }, "require": { @@ -3716,20 +3719,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:24:31+00:00" + "time": "2018-10-03T08:15:46+00:00" }, { "name": "symfony/css-selector", - "version": "v3.4.15", + "version": "v3.4.17", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "edda5a6155000ff8c3a3f85ee5c421af93cca416" + "reference": "3503415d4aafabc31cd08c3a4ebac7f43fde8feb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/edda5a6155000ff8c3a3f85ee5c421af93cca416", - "reference": "edda5a6155000ff8c3a3f85ee5c421af93cca416", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/3503415d4aafabc31cd08c3a4ebac7f43fde8feb", + "reference": "3503415d4aafabc31cd08c3a4ebac7f43fde8feb", "shasum": "" }, "require": { @@ -3769,20 +3772,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2018-07-26T09:06:28+00:00" + "time": "2018-10-02T16:33:53+00:00" }, { "name": "symfony/dependency-injection", - "version": "v4.1.4", + "version": "v4.1.6", "source": { "type": "git", "url": "https://github.com/symfony/dependency-injection.git", - "reference": "bae4983003c9d451e278504d7d9b9d7fc1846873" + "reference": "f6b9d893ad28aefd8942dc0469c8397e2216fe30" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/bae4983003c9d451e278504d7d9b9d7fc1846873", - "reference": "bae4983003c9d451e278504d7d9b9d7fc1846873", + "url": "https://api.github.com/repos/symfony/dependency-injection/zipball/f6b9d893ad28aefd8942dc0469c8397e2216fe30", + "reference": "f6b9d893ad28aefd8942dc0469c8397e2216fe30", "shasum": "" }, "require": { @@ -3840,20 +3843,20 @@ ], "description": "Symfony DependencyInjection Component", "homepage": "https://symfony.com", - "time": "2018-08-08T11:48:58+00:00" + "time": "2018-10-02T12:40:59+00:00" }, { "name": "symfony/dom-crawler", - "version": "v4.1.4", + "version": "v4.1.6", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "1c4519d257e652404c3aa550207ccd8ada66b38e" + "reference": "80e60271bb288de2a2259662cff125cff4f93f95" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/1c4519d257e652404c3aa550207ccd8ada66b38e", - "reference": "1c4519d257e652404c3aa550207ccd8ada66b38e", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/80e60271bb288de2a2259662cff125cff4f93f95", + "reference": "80e60271bb288de2a2259662cff125cff4f93f95", "shasum": "" }, "require": { @@ -3897,11 +3900,11 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2018-07-26T11:00:49+00:00" + "time": "2018-10-02T12:40:59+00:00" }, { "name": "symfony/event-dispatcher", - "version": "v4.1.4", + "version": "v4.1.6", "source": { "type": "git", "url": "https://github.com/symfony/event-dispatcher.git", @@ -3964,16 +3967,16 @@ }, { "name": "symfony/filesystem", - "version": "v4.1.4", + "version": "v4.1.6", "source": { "type": "git", "url": "https://github.com/symfony/filesystem.git", - "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e" + "reference": "596d12b40624055c300c8b619755b748ca5cf0b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/filesystem/zipball/c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e", - "reference": "c0f5f62db218fa72195b8b8700e4b9b9cf52eb5e", + "url": "https://api.github.com/repos/symfony/filesystem/zipball/596d12b40624055c300c8b619755b748ca5cf0b5", + "reference": "596d12b40624055c300c8b619755b748ca5cf0b5", "shasum": "" }, "require": { @@ -4010,7 +4013,7 @@ ], "description": "Symfony Filesystem Component", "homepage": "https://symfony.com", - "time": "2018-08-18T16:52:46+00:00" + "time": "2018-10-02T12:40:59+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -4073,16 +4076,16 @@ }, { "name": "symfony/translation", - "version": "v4.1.4", + "version": "v4.1.6", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f" + "reference": "9f0b61e339160a466ebcde167a6c5521c810e304" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/fa2182669f7983b7aa5f1a770d053f79f0ef144f", - "reference": "fa2182669f7983b7aa5f1a770d053f79f0ef144f", + "url": "https://api.github.com/repos/symfony/translation/zipball/9f0b61e339160a466ebcde167a6c5521c810e304", + "reference": "9f0b61e339160a466ebcde167a6c5521c810e304", "shasum": "" }, "require": { @@ -4138,20 +4141,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-08-07T12:45:11+00:00" + "time": "2018-10-02T16:36:10+00:00" }, { "name": "symfony/yaml", - "version": "v4.1.4", + "version": "v4.1.6", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "b832cc289608b6d305f62149df91529a2ab3c314" + "reference": "367e689b2fdc19965be435337b50bc8adf2746c9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/b832cc289608b6d305f62149df91529a2ab3c314", - "reference": "b832cc289608b6d305f62149df91529a2ab3c314", + "url": "https://api.github.com/repos/symfony/yaml/zipball/367e689b2fdc19965be435337b50bc8adf2746c9", + "reference": "367e689b2fdc19965be435337b50bc8adf2746c9", "shasum": "" }, "require": { @@ -4197,7 +4200,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-08-18T16:52:46+00:00" + "time": "2018-10-02T16:36:10+00:00" }, { "name": "theseer/tokenizer", diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php index 4b8316c37..065aceee8 100644 --- a/vendor/composer/autoload_classmap.php +++ b/vendor/composer/autoload_classmap.php @@ -300,6 +300,7 @@ return array( 'League\\HTMLToMarkdown\\ElementInterface' => $vendorDir . '/league/html-to-markdown/src/ElementInterface.php', 'League\\HTMLToMarkdown\\Environment' => $vendorDir . '/league/html-to-markdown/src/Environment.php', 'League\\HTMLToMarkdown\\HtmlConverter' => $vendorDir . '/league/html-to-markdown/src/HtmlConverter.php', + 'League\\HTMLToMarkdown\\HtmlConverterInterface' => $vendorDir . '/league/html-to-markdown/src/HtmlConverterInterface.php', 'Michelf\\Markdown' => $vendorDir . '/michelf/php-markdown/Michelf/Markdown.php', 'Michelf\\MarkdownExtra' => $vendorDir . '/michelf/php-markdown/Michelf/MarkdownExtra.php', 'Michelf\\MarkdownInterface' => $vendorDir . '/michelf/php-markdown/Michelf/MarkdownInterface.php', diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 0202e148c..4b8c414e0 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -468,6 +468,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d 'League\\HTMLToMarkdown\\ElementInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/ElementInterface.php', 'League\\HTMLToMarkdown\\Environment' => __DIR__ . '/..' . '/league/html-to-markdown/src/Environment.php', 'League\\HTMLToMarkdown\\HtmlConverter' => __DIR__ . '/..' . '/league/html-to-markdown/src/HtmlConverter.php', + 'League\\HTMLToMarkdown\\HtmlConverterInterface' => __DIR__ . '/..' . '/league/html-to-markdown/src/HtmlConverterInterface.php', 'Michelf\\Markdown' => __DIR__ . '/..' . '/michelf/php-markdown/Michelf/Markdown.php', 'Michelf\\MarkdownExtra' => __DIR__ . '/..' . '/michelf/php-markdown/Michelf/MarkdownExtra.php', 'Michelf\\MarkdownInterface' => __DIR__ . '/..' . '/michelf/php-markdown/Michelf/MarkdownInterface.php', diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index eac4cebde..b51c4160f 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -156,17 +156,17 @@ }, { "name": "league/html-to-markdown", - "version": "4.7.0", - "version_normalized": "4.7.0.0", + "version": "4.8.0", + "version_normalized": "4.8.0.0", "source": { "type": "git", "url": "https://github.com/thephpleague/html-to-markdown.git", - "reference": "76c076483cef89860d32a3fd25312f5a42848a8c" + "reference": "f9a879a068c68ff47b722de63f58bec79e448f9d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/76c076483cef89860d32a3fd25312f5a42848a8c", - "reference": "76c076483cef89860d32a3fd25312f5a42848a8c", + "url": "https://api.github.com/repos/thephpleague/html-to-markdown/zipball/f9a879a068c68ff47b722de63f58bec79e448f9d", + "reference": "f9a879a068c68ff47b722de63f58bec79e448f9d", "shasum": "" }, "require": { @@ -179,14 +179,14 @@ "phpunit/phpunit": "4.*", "scrutinizer/ocular": "~1.1" }, - "time": "2018-05-19T23:47:12+00:00", + "time": "2018-09-18T12:18:08+00:00", "bin": [ "bin/html-to-markdown" ], "type": "library", "extra": { "branch-alias": { - "dev-master": "4.8-dev" + "dev-master": "4.9-dev" } }, "installation-source": "dist", @@ -200,17 +200,17 @@ "MIT" ], "authors": [ - { - "name": "Colin O'Dell", - "email": "colinodell@gmail.com", - "homepage": "http://www.colinodell.com", - "role": "Lead Developer" - }, { "name": "Nick Cernis", "email": "nick@cern.is", "homepage": "http://modernnerd.net", "role": "Original Author" + }, + { + "name": "Colin O'Dell", + "email": "colinodell@gmail.com", + "homepage": "https://www.colinodell.com", + "role": "Lead Developer" } ], "description": "An HTML-to-markdown conversion helper for PHP", @@ -533,17 +533,17 @@ }, { "name": "sabre/dav", - "version": "3.2.2", - "version_normalized": "3.2.2.0", + "version": "3.2.3", + "version_normalized": "3.2.3.0", "source": { "type": "git", "url": "https://github.com/sabre-io/dav.git", - "reference": "e987775e619728f12205606c9cc3ee565ffb1516" + "reference": "a9780ce4f35560ecbd0af524ad32d9d2c8954b80" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/dav/zipball/e987775e619728f12205606c9cc3ee565ffb1516", - "reference": "e987775e619728f12205606c9cc3ee565ffb1516", + "url": "https://api.github.com/repos/sabre-io/dav/zipball/a9780ce4f35560ecbd0af524ad32d9d2c8954b80", + "reference": "a9780ce4f35560ecbd0af524ad32d9d2c8954b80", "shasum": "" }, "require": { @@ -574,7 +574,7 @@ "ext-curl": "*", "ext-pdo": "*" }, - "time": "2017-02-15T03:06:08+00:00", + "time": "2018-10-19T09:58:27+00:00", "bin": [ "bin/sabredav", "bin/naturalselection" @@ -1029,23 +1029,23 @@ }, { "name": "smarty/smarty", - "version": "v3.1.32", - "version_normalized": "3.1.32.0", + "version": "v3.1.33", + "version_normalized": "3.1.33.0", "source": { "type": "git", "url": "https://github.com/smarty-php/smarty.git", - "reference": "ac9d4b587e5bf53381e21881820a9830765cb459" + "reference": "dd55b23121e55a3b4f1af90a707a6c4e5969530f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/smarty-php/smarty/zipball/ac9d4b587e5bf53381e21881820a9830765cb459", - "reference": "ac9d4b587e5bf53381e21881820a9830765cb459", + "url": "https://api.github.com/repos/smarty-php/smarty/zipball/dd55b23121e55a3b4f1af90a707a6c4e5969530f", + "reference": "dd55b23121e55a3b4f1af90a707a6c4e5969530f", "shasum": "" }, "require": { "php": ">=5.2" }, - "time": "2018-04-24T14:53:33+00:00", + "time": "2018-09-12T20:54:16+00:00", "type": "library", "extra": { "branch-alias": { diff --git a/vendor/league/html-to-markdown/CHANGELOG.md b/vendor/league/html-to-markdown/CHANGELOG.md index 981ffd594..ab07c94f5 100644 --- a/vendor/league/html-to-markdown/CHANGELOG.md +++ b/vendor/league/html-to-markdown/CHANGELOG.md @@ -4,6 +4,24 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip ## [Unreleased][unreleased] +## [4.8.0] - 2018-09-18 +### Added + - Added support for email auto-linking + - Added a new interface (`HtmlConverterInterface`) for the main `HtmlConverter` class + - Added additional test cases (#14) + +### Changed + - The `italic_style` option now defaults to `'*'` so that in-word emphasis is handled properly (#75) + +### Fixed + - Fixed several issues of `` and `
` tags not converting to blocks or inlines properly (#26, #70, #102, #140, #161, #162)
+ - Fixed in-word emphasis using underscores as delimiter (#75)
+ - Fixed character escaping inside of `
` elements
+ - Fixed header edge cases
+
+### Deprecated
+ - The `bold_style` and `italic_style` options have been deprecated (#75)
+
 ## [4.7.0] - 2018-05-19
 ### Added
  - Added `setOptions()` function for chainable calling (#149)
@@ -217,7 +235,8 @@ not ideally set, so this releases fixes that. Moving forwards this should reduce
 ### Added
  - Initial release
 
-[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.7.0...master
+[unreleased]: https://github.com/thephpleague/html-to-markdown/compare/4.8.0...master
+[4.8.0]: https://github.com/thephpleague/html-to-markdown/compare/4.7.0...4.8.0
 [4.7.0]: https://github.com/thephpleague/html-to-markdown/compare/4.6.2...4.7.0
 [4.6.2]: https://github.com/thephpleague/html-to-markdown/compare/4.6.1...4.6.2
 [4.6.1]: https://github.com/thephpleague/html-to-markdown/compare/4.6.0...4.6.1
diff --git a/vendor/league/html-to-markdown/composer.json b/vendor/league/html-to-markdown/composer.json
index c79230562..53403916e 100644
--- a/vendor/league/html-to-markdown/composer.json
+++ b/vendor/league/html-to-markdown/composer.json
@@ -9,7 +9,7 @@
         {
             "name": "Colin O'Dell",
             "email": "colinodell@gmail.com",
-            "homepage": "http://www.colinodell.com",
+            "homepage": "https://www.colinodell.com",
             "role": "Lead Developer"
         },
         {
@@ -42,7 +42,7 @@
     "bin": ["bin/html-to-markdown"],
     "extra": {
         "branch-alias": {
-            "dev-master": "4.8-dev"
+            "dev-master": "4.9-dev"
         }
     }
 }
diff --git a/vendor/league/html-to-markdown/src/Configuration.php b/vendor/league/html-to-markdown/src/Configuration.php
index 2943383aa..5bc8d5503 100644
--- a/vendor/league/html-to-markdown/src/Configuration.php
+++ b/vendor/league/html-to-markdown/src/Configuration.php
@@ -12,6 +12,8 @@ class Configuration
     public function __construct(array $config = array())
     {
         $this->config = $config;
+
+        $this->checkForDeprecatedOptions($config);
     }
 
     /**
@@ -19,6 +21,7 @@ class Configuration
      */
     public function merge(array $config = array())
     {
+        $this->checkForDeprecatedOptions($config);
         $this->config = array_replace_recursive($this->config, $config);
     }
 
@@ -27,6 +30,7 @@ class Configuration
      */
     public function replace(array $config = array())
     {
+        $this->checkForDeprecatedOptions($config);
         $this->config = $config;
     }
 
@@ -36,6 +40,7 @@ class Configuration
      */
     public function setOption($key, $value)
     {
+        $this->checkForDeprecatedOptions(array($key => $value));
         $this->config[$key] = $value;
     }
 
@@ -57,4 +62,15 @@ class Configuration
 
         return $this->config[$key];
     }
+
+    private function checkForDeprecatedOptions(array $config)
+    {
+        foreach ($config as $key => $value) {
+            if ($key === 'bold_style' && $value !== '**') {
+                @trigger_error('Customizing the bold_style option is deprecated and may be removed in the next major version', E_USER_DEPRECATED);
+            } elseif ($key === 'italic_style' && $value !== '*') {
+                @trigger_error('Customizing the italic_style option is deprecated and may be removed in the next major version', E_USER_DEPRECATED);
+            }
+        }
+    }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php
index e536362ee..39e6a7bc4 100644
--- a/vendor/league/html-to-markdown/src/Converter/CodeConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/CodeConverter.php
@@ -13,7 +13,7 @@ class CodeConverter implements ConverterInterface
      */
     public function convert(ElementInterface $element)
     {
-        $language = null;
+        $language = '';
 
         // Checking for language class on the code block
         $classes = $element->getAttribute('class');
@@ -24,8 +24,7 @@ class CodeConverter implements ConverterInterface
             foreach ($classes as $class) {
                 if (strpos($class, 'language-') !== false) {
                     // Found one, save it as the selected language and stop looping over the classes.
-                    // The space after the language avoids gluing the actual code with the language tag
-                    $language = str_replace('language-', '', $class) . ' ';
+                    $language = str_replace('language-', '', $class);
                     break;
                 }
             }
@@ -39,14 +38,13 @@ class CodeConverter implements ConverterInterface
         $code = preg_replace('/]*>/', '', $code);
         $code = str_replace('', '', $code);
 
-        // Checking if the code has multiple lines
-        $lines = preg_split('/\r\n|\r|\n/', $code);
-        if (count($lines) > 1) {
-            // Multiple lines detected, adding three backticks and newlines
-            $markdown .= '```' . $language . "\n" . $code . "\n" . '```' . "\n\n";
+        // Checking if it's a code block or span
+        if ($this->shouldBeBlock($element, $code)) {
+            // Code block detected, newlines will be added in parent
+            $markdown .= '```' . $language . "\n" . $code . "\n" . '```';
         } else {
-            // One line of code, wrapping it on one backtick.
-            $markdown .= '`' . $language . $code . '`';
+            // One line of code, wrapping it on one backtick, removing new lines
+            $markdown .= '`' . preg_replace('/\r\n|\r|\n/', '', $code) . '`';
         }
 
         return $markdown;
@@ -59,4 +57,23 @@ class CodeConverter implements ConverterInterface
     {
         return array('code');
     }
+
+    /**
+     * @param ElementInterface $element
+     * @param string $code
+     *
+     * @return bool
+     */
+    private function shouldBeBlock(ElementInterface $element, $code)
+    {
+        if ($element->getParent()->getTagName() == 'pre') {
+            return true;
+        }
+
+        if (preg_match('/[^\s]` `/', $code)) {
+            return true;
+        }
+
+        return false;
+    }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php
index d117e7d36..05d4fe81e 100644
--- a/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/HeaderConverter.php
@@ -34,6 +34,10 @@ class HeaderConverter implements ConverterInterface, ConfigurationAwareInterface
         $level = (int) substr($element->getTagName(), 1, 1);
         $style = $this->config->getOption('header_style', self::STYLE_SETEXT);
 
+        if (strlen($element->getValue()) === 0) {
+            return '';
+        }
+
         if (($level === 1 || $level === 2) && !$element->isDescendantOf('blockquote') && $style === self::STYLE_SETEXT) {
             return $this->createSetextHeader($level, $element->getValue());
         }
diff --git a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php
index 74b49a778..c82b70e97 100644
--- a/vendor/league/html-to-markdown/src/Converter/LinkConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/LinkConverter.php
@@ -21,6 +21,8 @@ class LinkConverter implements ConverterInterface
             $markdown = '[' . $text . '](' . $href . ' "' . $title . '")';
         } elseif ($href === $text && $this->isValidAutolink($href)) {
             $markdown = '<' . $href . '>';
+        } elseif ($href === 'mailto:' . $text && $this->isValidEmail($text)) {
+            $markdown = '<' . $text . '>';
         } else {
             $markdown = '[' . $text . '](' . $href . ')';
         }
@@ -49,4 +51,15 @@ class LinkConverter implements ConverterInterface
     {
         return preg_match('/^[A-Za-z][A-Za-z0-9.+-]{1,31}:[^<>\x00-\x20]*/i', $href) === 1;
     }
+
+    /**
+     * @param string $email
+     *
+     * @return bool
+     */
+    private function isValidEmail($email)
+    {
+        // Email validation is messy business, but this should cover most cases
+        return filter_var($email, FILTER_VALIDATE_EMAIL);
+    }
 }
diff --git a/vendor/league/html-to-markdown/src/Converter/PreformattedConverter.php b/vendor/league/html-to-markdown/src/Converter/PreformattedConverter.php
index 3b77ba10b..321c898b1 100644
--- a/vendor/league/html-to-markdown/src/Converter/PreformattedConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/PreformattedConverter.php
@@ -13,8 +13,6 @@ class PreformattedConverter implements ConverterInterface
      */
     public function convert(ElementInterface $element)
     {
-        $markdown = '';
-
         $pre_content = html_entity_decode($element->getChildrenAsString());
         $pre_content = str_replace(array('
', '
'), '', $pre_content);
 
@@ -28,28 +26,22 @@ class PreformattedConverter implements ConverterInterface
         $firstBacktick = strpos(trim($pre_content), '`');
         $lastBacktick = strrpos(trim($pre_content), '`');
         if ($firstBacktick === 0 && $lastBacktick === strlen(trim($pre_content)) - 1) {
-            return $pre_content;
+            return $pre_content . "\n\n";
         }
 
         // If the execution reaches this point it means it's just a pre tag, with no code tag nested
 
         // Empty lines are a special case
         if ($pre_content === '') {
-            return "```\n```\n";
+            return "```\n```\n\n";
         }
 
         // Normalizing new lines
-        $pre_content = preg_replace('/\r\n|\r|\n/', PHP_EOL, $pre_content);
-
-        // Is it a single line?
-        if (strpos($pre_content, PHP_EOL) === false) {
-            // One line of code, wrapping it on one backtick.
-            return '`' . $pre_content . '`';
-        }
+        $pre_content = preg_replace('/\r\n|\r|\n/', "\n", $pre_content);
 
         // Ensure there's a newline at the end
-        if (strrpos($pre_content, PHP_EOL) !== strlen($pre_content) - 1) {
-            $pre_content .= PHP_EOL;
+        if (strrpos($pre_content, "\n") !== strlen($pre_content) - strlen("\n")) {
+            $pre_content .= "\n";
         }
 
         // Use three backticks
diff --git a/vendor/league/html-to-markdown/src/Converter/TextConverter.php b/vendor/league/html-to-markdown/src/Converter/TextConverter.php
index d6d91e16f..fcd466094 100644
--- a/vendor/league/html-to-markdown/src/Converter/TextConverter.php
+++ b/vendor/league/html-to-markdown/src/Converter/TextConverter.php
@@ -22,7 +22,9 @@ class TextConverter implements ConverterInterface
         $markdown = preg_replace('~\s+~u', ' ', $markdown);
 
         // Escape the following characters: '*', '_', '[', ']' and '\'
-        $markdown = preg_replace('~([*_\\[\\]\\\\])~u', '\\\\$1', $markdown);
+        if ($element->getParent() && $element->getParent()->getTagName() !== 'div') {
+            $markdown = preg_replace('~([*_\\[\\]\\\\])~u', '\\\\$1', $markdown);
+        }
 
         $markdown = preg_replace('~^#~u', '\\\\#', $markdown);
 
diff --git a/vendor/league/html-to-markdown/src/HtmlConverter.php b/vendor/league/html-to-markdown/src/HtmlConverter.php
index 155369f56..3381e1e1e 100644
--- a/vendor/league/html-to-markdown/src/HtmlConverter.php
+++ b/vendor/league/html-to-markdown/src/HtmlConverter.php
@@ -14,7 +14,7 @@ namespace League\HTMLToMarkdown;
  *
  * @license http://www.opensource.org/licenses/mit-license.php MIT
  */
-class HtmlConverter
+class HtmlConverter implements HtmlConverterInterface
 {
     /**
      * @var Environment
@@ -35,8 +35,8 @@ class HtmlConverter
                 'header_style' => 'setext', // Set to 'atx' to output H1 and H2 headers as # Header1 and ## Header2
                 'suppress_errors' => true, // Set to false to show warnings when loading malformed HTML
                 'strip_tags' => false, // Set to true to strip tags that don't have markdown equivalents. N.B. Strips tags, not their content. Useful to clean MS Word HTML output.
-                'bold_style' => '**', // Set to '__' if you prefer the underlined style
-                'italic_style' => '_', // Set to '*' if you prefer the asterisk style
+                'bold_style' => '**', // DEPRECATED: Set to '__' if you prefer the underlined style
+                'italic_style' => '*', // DEPRECATED: Set to '_' if you prefer the underlined style
                 'remove_nodes' => '', // space-separated list of dom nodes that should be removed. example: 'meta style script'
                 'hard_break' => false, // Set to true to turn 
 into `\n` instead of `  \n`
                 'list_item_style' => '-', // Set the default character for each 
  •  in a 
      . Can be '-', '*', or '+'
diff --git a/vendor/league/html-to-markdown/src/HtmlConverterInterface.php b/vendor/league/html-to-markdown/src/HtmlConverterInterface.php
new file mode 100644
index 000000000..7d43cf87e
--- /dev/null
+++ b/vendor/league/html-to-markdown/src/HtmlConverterInterface.php
@@ -0,0 +1,26 @@
+
+ *
+ * @link https://github.com/thephpleague/html-to-markdown/ Latest version on GitHub.
+ *
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
+ */
+interface HtmlConverterInterface
+{
+    /**
+     * Convert the given $html to Markdown
+     *
+     * @param string $html
+     *
+     * @throws \InvalidArgumentException
+     *
+     * @return string The Markdown version of the html
+     */
+    public function convert($html);
+}
diff --git a/vendor/sabre/dav/CHANGELOG.md b/vendor/sabre/dav/CHANGELOG.md
index 0bccc995c..cda2564e1 100644
--- a/vendor/sabre/dav/CHANGELOG.md
+++ b/vendor/sabre/dav/CHANGELOG.md
@@ -1,6 +1,12 @@
 ChangeLog
 =========
 
+3.2.3 (2018-10-19)
+------------------
+
+* #982: Make sure that files that are siblings of directories, are reported
+  as files (@nickvergessen)
+
 3.2.2 (2017-02-14)
 ------------------
 
diff --git a/vendor/sabre/dav/bin/build.php b/vendor/sabre/dav/bin/build.php
old mode 100755
new mode 100644
diff --git a/vendor/sabre/dav/bin/googlecode_upload.py b/vendor/sabre/dav/bin/googlecode_upload.py
old mode 100755
new mode 100644
diff --git a/vendor/sabre/dav/bin/migrateto20.php b/vendor/sabre/dav/bin/migrateto20.php
old mode 100755
new mode 100644
diff --git a/vendor/sabre/dav/bin/migrateto21.php b/vendor/sabre/dav/bin/migrateto21.php
old mode 100755
new mode 100644
diff --git a/vendor/sabre/dav/bin/migrateto30.php b/vendor/sabre/dav/bin/migrateto30.php
old mode 100755
new mode 100644
diff --git a/vendor/sabre/dav/bin/migrateto32.php b/vendor/sabre/dav/bin/migrateto32.php
old mode 100755
new mode 100644
diff --git a/vendor/sabre/dav/bin/sabredav.php b/vendor/sabre/dav/bin/sabredav.php
old mode 100755
new mode 100644
diff --git a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php
index a130cd61d..5b7b2ee17 100644
--- a/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php
+++ b/vendor/sabre/dav/lib/CardDAV/Xml/Filter/AddressData.php
@@ -52,12 +52,15 @@ class AddressData implements XmlDeserializable {
         ];
 
         $elems = (array)$reader->parseInnerTree();
+        $elems = array_filter($elems, function($element) {
+            return $element['name'] === '{urn:ietf:params:xml:ns:carddav}prop' &&
+                isset($element['attributes']['name']);
+        });
         $result['addressDataProperties'] = array_map(function($element) {
             return $element['attributes']['name'];
         }, $elems);
 
         return $result;
-
     }
 
 }
diff --git a/vendor/sabre/dav/lib/DAV/Server.php b/vendor/sabre/dav/lib/DAV/Server.php
index 6805ec0b0..f7fcf3057 100644
--- a/vendor/sabre/dav/lib/DAV/Server.php
+++ b/vendor/sabre/dav/lib/DAV/Server.php
@@ -893,15 +893,16 @@ class Server extends EventEmitter implements LoggerAwareInterface {
             $newDepth--;
         }
 
+        $propertyNames = $propFind->getRequestedProperties();
+        $propFindType = !empty($propertyNames) ? PropFind::NORMAL : PropFind::ALLPROPS;
+
         foreach ($this->tree->getChildren($path) as $childNode) {
-            $subPropFind = clone $propFind;
-            $subPropFind->setDepth($newDepth);
             if ($path !== '') {
                 $subPath = $path . '/' . $childNode->getName();
             } else {
                 $subPath = $childNode->getName();
             }
-            $subPropFind->setPath($subPath);
+            $subPropFind = new PropFind($subPath, $propertyNames, $newDepth, $propFindType);
 
             yield [
                 $subPropFind,
diff --git a/vendor/sabre/dav/lib/DAV/Tree.php b/vendor/sabre/dav/lib/DAV/Tree.php
index 5d2792503..7c04f0915 100644
--- a/vendor/sabre/dav/lib/DAV/Tree.php
+++ b/vendor/sabre/dav/lib/DAV/Tree.php
@@ -298,7 +298,9 @@ class Tree {
      */
     protected function copyNode(INode $source, ICollection $destinationParent, $destinationName = null) {
 
-        if (!$destinationName) $destinationName = $source->getName();
+        if ((string)$destinationName === '') {
+            $destinationName = $source->getName();
+        }
 
         if ($source instanceof IFile) {
 
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
index 455403aff..917f5ec3f 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/Auth/Backend/AbstractBasicTest.php
@@ -60,7 +60,7 @@ class AbstractBasicTest extends \PHPUnit_Framework_TestCase {
         $backend->setRealm('writing unittests on a saturday night');
         $backend->challenge($request, $response);
 
-        $this->assertEquals(
+        $this->assertContains(
             'Basic realm="writing unittests on a saturday night"',
             $response->getHeader('WWW-Authenticate')
         );
diff --git a/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php b/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php
index e719e38d5..c70d17a22 100644
--- a/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php
+++ b/vendor/sabre/dav/tests/Sabre/DAV/TreeTest.php
@@ -24,6 +24,22 @@ class TreeTest extends \PHPUnit_Framework_TestCase {
 
     }
 
+    function testCopyFile() {
+
+        $tree = new TreeMock();
+        $tree->copy('hi/file', 'hi/newfile');
+
+        $this->assertArrayHasKey('newfile', $tree->getNodeForPath('hi')->newFiles);
+    }
+
+    function testCopyFile0() {
+
+        $tree = new TreeMock();
+        $tree->copy('hi/file', 'hi/0');
+
+        $this->assertArrayHasKey('0', $tree->getNodeForPath('hi')->newFiles);
+    }
+
     function testMove() {
 
         $tree = new TreeMock();
diff --git a/vendor/smarty/smarty/NEW_FEATURES.txt b/vendor/smarty/smarty/NEW_FEATURES.txt
index 7632b07ea..b3289dfc1 100644
--- a/vendor/smarty/smarty/NEW_FEATURES.txt
+++ b/vendor/smarty/smarty/NEW_FEATURES.txt
@@ -2,7 +2,14 @@
 
 This file contains a brief description of new features which have been added to Smarty 3.1
 
-Smarty 3.1.32    New tags for inheritance parent and child
+Smarty 3.1.33-dev
+    Variable capture name in Smarty special variable
+    ================================================
+    {$smarty.capture.$foo} can now be used to access the content of a named
+     capture block
+
+Smarty 3.1.32
+    New tags for inheritance parent and child
     =========================================
     {parent}  == {$smarty.block.parent}
     {child}  == {$smarty.block.child}
diff --git a/vendor/smarty/smarty/change_log.txt b/vendor/smarty/smarty/change_log.txt
index 5765a1718..70762eda5 100644
--- a/vendor/smarty/smarty/change_log.txt
+++ b/vendor/smarty/smarty/change_log.txt
@@ -1,4 +1,46 @@
-===== 3.1.32 ===== (24.04.2018)
+===== 3.1.33 release ===== 12.09.2018
+===== 3.1.33-dev-12 =====
+03.09.2018
+  - bugfix {foreach} using new style property access like {$item@property} on
+    Smarty 2 style named foreach loop could produce errors https://github.com/smarty-php/smarty/issues/484
+
+31.08.2018
+  - bugfix some custom left and right delimiters like '{^' '^}' did not work
+    https://github.com/smarty-php/smarty/issues/450 https://github.com/smarty-php/smarty/pull/482
+
+  - reformating for PSR-2 coding standards https://github.com/smarty-php/smarty/pull/483
+
+  - bugfix on Windows absolute filepathes did fail if the drive letter was followed by a linux DIRECTORY_SEPARATOR
+    like C:/  at Smarty > 3.1.33-dev-5 https://github.com/smarty-php/smarty/issues/451
+
+  - PSR-2 code style fixes for config and template file Lexer/Parser generated with
+    the Smarty Lexer/Parser generator from https://github.com/smarty-php/smarty-lexer
+    https://github.com/smarty-php/smarty/pull/483
+
+26.08.2018
+  - bugfix/enhancement {capture} allow variable as capture block name in Smarty special variable
+    like $smarty.capture.$foo https://github.com/smarty-php/smarty/issues/478 https://github.com/smarty-php/smarty/pull/481
+
+===== 3.1.33-dev-6 =====
+19.08.2018
+  - fix PSR-2 coding standards and PHPDoc blocks https://github.com/smarty-php/smarty/pull/452
+    https://github.com/smarty-php/smarty/pull/475
+    https://github.com/smarty-php/smarty/pull/473
+  - bugfix PHP5.2 compatibility https://github.com/smarty-php/smarty/pull/472
+
+===== 3.1.33-dev-4 =====
+17.05.2018
+ - bugfix strip-block produces different output in Smarty v3.1.32 https://github.com/smarty-php/smarty/issues/436
+ - bugfix Smarty::compileAllTemplates ignores `$extension` parameter https://github.com/smarty-php/smarty/issues/437
+   https://github.com/smarty-php/smarty/pull/438
+ - improvement do not compute total property in {foreach} if not needed https://github.com/smarty-php/smarty/issues/443
+ - bugfix  plugins may not be loaded when setMergeCompiledIncludes is true https://github.com/smarty-php/smarty/issues/435
+
+26.04.2018
+ - bugfix  regarding Security Vulnerability did not solve the problem under Linux.
+   Security issue CVE-2018-16831
+
+===== 3.1.32 ===== (24.04.2018)
 24.04.2018
  - bugfix  possible Security Vulnerability in Smarty_Security class.
 
diff --git a/vendor/smarty/smarty/composer.json b/vendor/smarty/smarty/composer.json
index 5064c8ce3..5007517bc 100644
--- a/vendor/smarty/smarty/composer.json
+++ b/vendor/smarty/smarty/composer.json
@@ -2,7 +2,9 @@
     "name": "smarty/smarty",
     "type": "library",
     "description": "Smarty - the compiling PHP template engine",
-    "keywords": ["templating"],
+    "keywords": [
+        "templating"
+    ],
     "homepage": "http://www.smarty.net",
     "license": "LGPL-3.0",
     "authors": [
@@ -28,12 +30,13 @@
         "php": ">=5.2"
     },
     "autoload": {
-            "files": ["libs/bootstrap.php"]
+        "files": [
+            "libs/bootstrap.php"
+        ]
     },
     "extra": {
         "branch-alias": {
             "dev-master": "3.1.x-dev"
         }
     }
-
-}
+}
\ No newline at end of file
diff --git a/vendor/smarty/smarty/demo/index.php b/vendor/smarty/smarty/demo/index.php
index b67c217be..3aed37168 100644
--- a/vendor/smarty/smarty/demo/index.php
+++ b/vendor/smarty/smarty/demo/index.php
@@ -4,27 +4,32 @@
  *
  * @package Example-application
  */
-
 require '../libs/Smarty.class.php';
-
 $smarty = new Smarty;
-
 //$smarty->force_compile = true;
 $smarty->debugging = true;
 $smarty->caching = true;
 $smarty->cache_lifetime = 120;
-
 $smarty->assign("Name", "Fred Irving Johnathan Bradley Peppergill", true);
 $smarty->assign("FirstName", array("John", "Mary", "James", "Henry"));
 $smarty->assign("LastName", array("Doe", "Smith", "Johnson", "Case"));
-$smarty->assign("Class", array(array("A", "B", "C", "D"), array("E", "F", "G", "H"), array("I", "J", "K", "L"),
-                               array("M", "N", "O", "P")));
-
-$smarty->assign("contacts", array(array("phone" => "1", "fax" => "2", "cell" => "3"),
-                                  array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234")));
-
+$smarty->assign(
+    "Class",
+    array(
+        array("A", "B", "C", "D"),
+        array("E", "F", "G", "H"),
+        array("I", "J", "K", "L"),
+        array("M", "N", "O", "P")
+    )
+);
+$smarty->assign(
+    "contacts",
+    array(
+        array("phone" => "1", "fax" => "2", "cell" => "3"),
+        array("phone" => "555-4444", "fax" => "555-3333", "cell" => "760-1234")
+    )
+);
 $smarty->assign("option_values", array("NY", "NE", "KS", "IA", "OK", "TX"));
 $smarty->assign("option_output", array("New York", "Nebraska", "Kansas", "Iowa", "Oklahoma", "Texas"));
 $smarty->assign("option_selected", "NE");
-
 $smarty->display('index.tpl');
diff --git a/vendor/smarty/smarty/demo/plugins/cacheresource.apc.php b/vendor/smarty/smarty/demo/plugins/cacheresource.apc.php
index ed55ec846..7867cc598 100644
--- a/vendor/smarty/smarty/demo/plugins/cacheresource.apc.php
+++ b/vendor/smarty/smarty/demo/plugins/cacheresource.apc.php
@@ -11,6 +11,11 @@
  */
 class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
 {
+    /**
+     * Smarty_CacheResource_Apc constructor.
+     *
+     * @throws \Exception
+     */
     public function __construct()
     {
         // test if APC is present
@@ -22,7 +27,7 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
     /**
      * Read values for a set of keys from cache
      *
-     * @param  array $keys list of keys to fetch
+     * @param array $keys list of keys to fetch
      *
      * @return array   list of values with the given keys used as indexes
      * @return boolean true on success, false on failure
@@ -34,15 +39,14 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
         foreach ($res as $k => $v) {
             $_res[ $k ] = $v;
         }
-
         return $_res;
     }
 
     /**
      * Save values for a set of keys to cache
      *
-     * @param  array $keys   list of values to save
-     * @param  int   $expire expiration time
+     * @param array $keys   list of values to save
+     * @param int   $expire expiration time
      *
      * @return boolean true on success, false on failure
      */
@@ -51,14 +55,13 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
         foreach ($keys as $k => $v) {
             apc_store($k, $v, $expire);
         }
-
         return true;
     }
 
     /**
      * Remove values from cache
      *
-     * @param  array $keys list of keys to delete
+     * @param array $keys list of keys to delete
      *
      * @return boolean true on success, false on failure
      */
@@ -67,7 +70,6 @@ class Smarty_CacheResource_Apc extends Smarty_CacheResource_KeyValueStore
         foreach ($keys as $k) {
             apc_delete($k);
         }
-
         return true;
     }
 
diff --git a/vendor/smarty/smarty/demo/plugins/cacheresource.memcache.php b/vendor/smarty/smarty/demo/plugins/cacheresource.memcache.php
index 945beb349..9c8855c31 100644
--- a/vendor/smarty/smarty/demo/plugins/cacheresource.memcache.php
+++ b/vendor/smarty/smarty/demo/plugins/cacheresource.memcache.php
@@ -19,6 +19,9 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
      */
     protected $memcache = null;
 
+    /**
+     * Smarty_CacheResource_Memcache constructor.
+     */
     public function __construct()
     {
         if (class_exists('Memcached')) {
@@ -32,7 +35,7 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
     /**
      * Read values for a set of keys from cache
      *
-     * @param  array $keys list of keys to fetch
+     * @param array $keys list of keys to fetch
      *
      * @return array   list of values with the given keys used as indexes
      * @return boolean true on success, false on failure
@@ -50,15 +53,14 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
         foreach ($res as $k => $v) {
             $_res[ $lookup[ $k ] ] = $v;
         }
-
         return $_res;
     }
 
     /**
      * Save values for a set of keys to cache
      *
-     * @param  array $keys   list of values to save
-     * @param  int   $expire expiration time
+     * @param array $keys   list of values to save
+     * @param int   $expire expiration time
      *
      * @return boolean true on success, false on failure
      */
@@ -68,14 +70,13 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
             $k = sha1($k);
             $this->memcache->set($k, $v, 0, $expire);
         }
-
         return true;
     }
 
     /**
      * Remove values from cache
      *
-     * @param  array $keys list of keys to delete
+     * @param array $keys list of keys to delete
      *
      * @return boolean true on success, false on failure
      */
@@ -85,7 +86,6 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
             $k = sha1($k);
             $this->memcache->delete($k);
         }
-
         return true;
     }
 
@@ -96,6 +96,6 @@ class Smarty_CacheResource_Memcache extends Smarty_CacheResource_KeyValueStore
      */
     protected function purge()
     {
-        $this->memcache->flush();
+        return $this->memcache->flush();
     }
 }
diff --git a/vendor/smarty/smarty/demo/plugins/cacheresource.mysql.php b/vendor/smarty/smarty/demo/plugins/cacheresource.mysql.php
index 027b93766..c5037eb13 100644
--- a/vendor/smarty/smarty/demo/plugins/cacheresource.mysql.php
+++ b/vendor/smarty/smarty/demo/plugins/cacheresource.mysql.php
@@ -24,38 +24,55 @@
  */
 class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
 {
-    // PDO instance
+    /**
+     * @var \PDO
+     */
     protected $db;
 
+    /**
+     * @var \PDOStatement
+     */
     protected $fetch;
 
+    /**
+     * @var \PDOStatement
+     */
     protected $fetchTimestamp;
 
+    /**
+     * @var \PDOStatement
+     */
     protected $save;
 
+    /**
+     * Smarty_CacheResource_Mysql constructor.
+     *
+     * @throws \SmartyException
+     */
     public function __construct()
     {
         try {
             $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty");
-        }
-        catch (PDOException $e) {
+        } catch (PDOException $e) {
             throw new SmartyException('Mysql Resource failed: ' . $e->getMessage());
         }
         $this->fetch = $this->db->prepare('SELECT modified, content FROM output_cache WHERE id = :id');
         $this->fetchTimestamp = $this->db->prepare('SELECT modified FROM output_cache WHERE id = :id');
-        $this->save = $this->db->prepare('REPLACE INTO output_cache (id, name, cache_id, compile_id, content)
-            VALUES  (:id, :name, :cache_id, :compile_id, :content)');
+        $this->save = $this->db->prepare(
+            'REPLACE INTO output_cache (id, name, cache_id, compile_id, content)
+            VALUES  (:id, :name, :cache_id, :compile_id, :content)'
+        );
     }
 
     /**
      * fetch cached content and its modification time from data source
      *
-     * @param  string  $id         unique cache content identifier
-     * @param  string  $name       template name
-     * @param  string  $cache_id   cache id
-     * @param  string  $compile_id compile id
-     * @param  string  $content    cached content
-     * @param  integer $mtime      cache modification timestamp (epoch)
+     * @param string  $id         unique cache content identifier
+     * @param string  $name       template name
+     * @param string  $cache_id   cache id
+     * @param string  $compile_id compile id
+     * @param string  $content    cached content
+     * @param integer $mtime      cache modification timestamp (epoch)
      *
      * @return void
      */
@@ -76,12 +93,13 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
     /**
      * Fetch cached content's modification timestamp from data source
      *
-     * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the complete cached content.
+     * @note implementing this method is optional. Only implement it if modification times can be accessed faster than
+     *       loading the complete cached content.
      *
-     * @param  string $id         unique cache content identifier
-     * @param  string $name       template name
-     * @param  string $cache_id   cache id
-     * @param  string $compile_id compile id
+     * @param string $id         unique cache content identifier
+     * @param string $name       template name
+     * @param string $cache_id   cache id
+     * @param string $compile_id compile id
      *
      * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
      */
@@ -90,37 +108,40 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
         $this->fetchTimestamp->execute(array('id' => $id));
         $mtime = strtotime($this->fetchTimestamp->fetchColumn());
         $this->fetchTimestamp->closeCursor();
-
         return $mtime;
     }
 
     /**
      * Save content to cache
      *
-     * @param  string       $id         unique cache content identifier
-     * @param  string       $name       template name
-     * @param  string       $cache_id   cache id
-     * @param  string       $compile_id compile id
-     * @param  integer|null $exp_time   seconds till expiration time in seconds or null
-     * @param  string       $content    content to cache
+     * @param string       $id         unique cache content identifier
+     * @param string       $name       template name
+     * @param string       $cache_id   cache id
+     * @param string       $compile_id compile id
+     * @param integer|null $exp_time   seconds till expiration time in seconds or null
+     * @param string       $content    content to cache
      *
      * @return boolean      success
      */
     protected function save($id, $name, $cache_id, $compile_id, $exp_time, $content)
     {
-        $this->save->execute(array('id' => $id, 'name' => $name, 'cache_id' => $cache_id, 'compile_id' => $compile_id,
-                                   'content' => $content,));
-
+        $this->save->execute(
+            array('id' => $id,
+                  'name' => $name,
+                  'cache_id' => $cache_id,
+                  'compile_id' => $compile_id,
+                  'content' => $content,)
+        );
         return !!$this->save->rowCount();
     }
 
     /**
      * Delete content from cache
      *
-     * @param  string       $name       template name
-     * @param  string       $cache_id   cache id
-     * @param  string       $compile_id compile id
-     * @param  integer|null $exp_time   seconds till expiration or null
+     * @param string       $name       template name
+     * @param string       $cache_id   cache id
+     * @param string       $compile_id compile id
+     * @param integer|null $exp_time   seconds till expiration or null
      *
      * @return integer      number of deleted caches
      */
@@ -130,8 +151,7 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
         if ($name === null && $cache_id === null && $compile_id === null && $exp_time === null) {
             // returning the number of deleted caches would require a second query to count them
             $query = $this->db->query('TRUNCATE TABLE output_cache');
-
-            return - 1;
+            return -1;
         }
         // build the filter
         $where = array();
@@ -149,12 +169,15 @@ class Smarty_CacheResource_Mysql extends Smarty_CacheResource_Custom
         }
         // equal test cache_id and match sub-groups
         if ($cache_id !== null) {
-            $where[] = '(cache_id = ' . $this->db->quote($cache_id) . ' OR cache_id LIKE ' .
-                       $this->db->quote($cache_id . '|%') . ')';
+            $where[] =
+                '(cache_id = ' .
+                $this->db->quote($cache_id) .
+                ' OR cache_id LIKE ' .
+                $this->db->quote($cache_id . '|%') .
+                ')';
         }
         // run delete query
         $query = $this->db->query('DELETE FROM output_cache WHERE ' . join(' AND ', $where));
-
         return $query->rowCount();
     }
 }
diff --git a/vendor/smarty/smarty/demo/plugins/cacheresource.pdo.php b/vendor/smarty/smarty/demo/plugins/cacheresource.pdo.php
index 24a94c1a0..a80cd698e 100644
--- a/vendor/smarty/smarty/demo/plugins/cacheresource.pdo.php
+++ b/vendor/smarty/smarty/demo/plugins/cacheresource.pdo.php
@@ -29,28 +29,27 @@
  */
 class Smarty_CacheResource_Pdo extends Smarty_CacheResource_Custom
 {
-
-    protected $fetchStatements = Array('default' => 'SELECT %2$s
+    /**
+     * @var string[]
+     */
+    protected $fetchStatements = array('default' => 'SELECT %2$s
                                                                                     FROM %1$s 
                                                                                     WHERE 1 
                                                                                     AND id          = :id 
                                                                                     AND cache_id    IS NULL 
                                                                                     AND compile_id  IS NULL',
-
                                        'withCacheId' => 'SELECT %2$s
                                                                                 FROM %1$s 
                                                                                 WHERE 1 
                                                                                 AND id          = :id 
                                                                                 AND cache_id    = :cache_id 
                                                                                 AND compile_id  IS NULL',
-
                                        'withCompileId' => 'SELECT %2$s
                                                                                 FROM %1$s 
                                                                                 WHERE 1 
                                                                                 AND id          = :id 
                                                                                 AND compile_id  = :compile_id 
                                                                                 AND cache_id    IS NULL',
-
                                        'withCacheIdAndCompileId' => 'SELECT %2$s
                                                                                 FROM %1$s 
                                                                                 WHERE 1 
@@ -58,6 +57,9 @@ class Smarty_CacheResource_Pdo extends Smarty_CacheResource_Custom
                                                                                 AND cache_id    = :cache_id 
                                                                                 AND compile_id  = :compile_id');
 
+    /**
+     * @var string
+     */
     protected $insertStatement = 'INSERT INTO %s
 
                                                 SET id          =   :id, 
@@ -76,113 +78,130 @@ class Smarty_CacheResource_Pdo extends Smarty_CacheResource_Custom
                                                     expire      =   DATE_ADD(CURRENT_TIMESTAMP, INTERVAL :expire SECOND), 
                                                     content     =   :content';
 
+    /**
+     * @var string
+     */
     protected $deleteStatement = 'DELETE FROM %1$s WHERE %2$s';
 
+    /**
+     * @var string
+     */
     protected $truncateStatement = 'TRUNCATE TABLE %s';
 
+    /**
+     * @var string
+     */
     protected $fetchColumns = 'modified, content';
 
+    /**
+     * @var string
+     */
     protected $fetchTimestampColumns = 'modified';
 
-    protected $pdo, $table, $database;
+    /**
+     * @var \PDO
+     */
+    protected $pdo;
+
+    /**
+     * @var
+     */
+    protected $table;
 
-    /* 
-     * Constructor 
-     * 
-     * @param PDO $pdo PDO : active connection 
-     * @param string $table : table (or view) name 
-     * @param string $database : optional - if table is located in another db 
+    /**
+     * @var null
+     */
+    protected $database;
+
+    /**
+     * Constructor
+     *
+     * @param PDO    $pdo      PDO : active connection
+     * @param string $table    : table (or view) name
+     * @param string $database : optional - if table is located in another db
+     *
+     * @throws \SmartyException
      */
     public function __construct(PDO $pdo, $table, $database = null)
     {
-
         if (is_null($table)) {
             throw new SmartyException("Table name for caching can't be null");
         }
-
         $this->pdo = $pdo;
         $this->table = $table;
         $this->database = $database;
-
         $this->fillStatementsWithTableName();
     }
 
-    /* 
-     * Fills the table name into the statements. 
-     * 
-     * @return Current Instance 
-     * @access protected 
+    /**
+     * Fills the table name into the statements.
+     *
+     * @return $this Current Instance
+     * @access protected
      */
     protected function fillStatementsWithTableName()
     {
-
-        foreach ($this->fetchStatements AS &$statement) {
+        foreach ($this->fetchStatements as &$statement) {
             $statement = sprintf($statement, $this->getTableName(), '%s');
         }
-
         $this->insertStatement = sprintf($this->insertStatement, $this->getTableName());
         $this->deleteStatement = sprintf($this->deleteStatement, $this->getTableName(), '%s');
         $this->truncateStatement = sprintf($this->truncateStatement, $this->getTableName());
-
         return $this;
     }
 
-    /* 
-     * Gets the fetch statement, depending on what you specify 
-     * 
-     * @param string        $columns : the column(s) name(s) you want to retrieve from the database 
-     * @param string        $id unique cache content identifier 
-     * @param string|null   $cache_id cache id 
-     * @param string|null   $compile_id compile id 
-     * @access protected 
+    /**
+     * Gets the fetch statement, depending on what you specify
+     *
+     * @param string      $columns    : the column(s) name(s) you want to retrieve from the database
+     * @param string      $id         unique cache content identifier
+     * @param string|null $cache_id   cache id
+     * @param string|null $compile_id compile id
+     *
+     * @access protected
+     * @return \PDOStatement
      */
     protected function getFetchStatement($columns, $id, $cache_id = null, $compile_id = null)
     {
-
+        $args = array();
         if (!is_null($cache_id) && !is_null($compile_id)) {
-            $query = $this->fetchStatements[ 'withCacheIdAndCompileId' ] AND
-            $args = Array('id' => $id, 'cache_id' => $cache_id, 'compile_id' => $compile_id);
+            $query = $this->fetchStatements[ 'withCacheIdAndCompileId' ] and
+            $args = array('id' => $id, 'cache_id' => $cache_id, 'compile_id' => $compile_id);
         } elseif (is_null($cache_id) && !is_null($compile_id)) {
-            $query = $this->fetchStatements[ 'withCompileId' ] AND
-            $args = Array('id' => $id, 'compile_id' => $compile_id);
+            $query = $this->fetchStatements[ 'withCompileId' ] and
+            $args = array('id' => $id, 'compile_id' => $compile_id);
         } elseif (!is_null($cache_id) && is_null($compile_id)) {
-            $query = $this->fetchStatements[ 'withCacheId' ] AND $args = Array('id' => $id, 'cache_id' => $cache_id);
+            $query = $this->fetchStatements[ 'withCacheId' ] and $args = array('id' => $id, 'cache_id' => $cache_id);
         } else {
-            $query = $this->fetchStatements[ 'default' ] AND $args = Array('id' => $id);
+            $query = $this->fetchStatements[ 'default' ] and $args = array('id' => $id);
         }
-
         $query = sprintf($query, $columns);
-
         $stmt = $this->pdo->prepare($query);
-
-        foreach ($args AS $key => $value) {
+        foreach ($args as $key => $value) {
             $stmt->bindValue($key, $value);
         }
-
         return $stmt;
     }
 
     /**
      * fetch cached content and its modification time from data source
      *
-     * @param  string      $id         unique cache content identifier
-     * @param  string      $name       template name
-     * @param  string|null $cache_id   cache id
-     * @param  string|null $compile_id compile id
-     * @param  string      $content    cached content
-     * @param  integer     $mtime      cache modification timestamp (epoch)
+     * @param string      $id         unique cache content identifier
+     * @param string      $name       template name
+     * @param string|null $cache_id   cache id
+     * @param string|null $compile_id compile id
+     * @param string      $content    cached content
+     * @param integer     $mtime      cache modification timestamp (epoch)
      *
      * @return void
      * @access protected
      */
     protected function fetch($id, $name, $cache_id = null, $compile_id = null, &$content, &$mtime)
     {
-
         $stmt = $this->getFetchStatement($this->fetchColumns, $id, $cache_id, $compile_id);
         $stmt->execute();
         $row = $stmt->fetch();
         $stmt->closeCursor();
-
         if ($row) {
             $content = $this->outputContent($row[ 'content' ]);
             $mtime = strtotime($row[ 'modified' ]);
@@ -197,10 +216,10 @@ class Smarty_CacheResource_Pdo extends Smarty_CacheResource_Custom
      * {@internal implementing this method is optional.
      *  Only implement it if modification times can be accessed faster than loading the complete cached content.}}
      *
-     * @param  string      $id         unique cache content identifier
-     * @param  string      $name       template name
-     * @param  string|null $cache_id   cache id
-     * @param  string|null $compile_id compile id
+     * @param string      $id         unique cache content identifier
+     * @param string      $name       template name
+     * @param string|null $cache_id   cache id
+     * @param string|null $compile_id compile id
      *
      * @return integer|boolean timestamp (epoch) the template was modified, or false if not found
      * @access protected
@@ -212,7 +231,6 @@ class Smarty_CacheResource_Pdo extends Smarty_CacheResource_Custom
     //        $stmt       ->  closeCursor();
     //        return $mtime;
     //    }
-
     /**
      * Save content to cache
      *
@@ -228,38 +246,37 @@ class Smarty_CacheResource_Pdo extends Smarty_CacheResource_Custom
      */
     protected function save($id, $name, $cache_id = null, $compile_id = null, $exp_time, $content)
     {
-
         $stmt = $this->pdo->prepare($this->insertStatement);
-
         $stmt->bindValue('id', $id);
         $stmt->bindValue('name', $name);
         $stmt->bindValue('cache_id', $cache_id, (is_null($cache_id)) ? PDO::PARAM_NULL : PDO::PARAM_STR);
         $stmt->bindValue('compile_id', $compile_id, (is_null($compile_id)) ? PDO::PARAM_NULL : PDO::PARAM_STR);
-        $stmt->bindValue('expire', (int) $exp_time, PDO::PARAM_INT);
+        $stmt->bindValue('expire', (int)$exp_time, PDO::PARAM_INT);
         $stmt->bindValue('content', $this->inputContent($content));
         $stmt->execute();
-
         return !!$stmt->rowCount();
     }
 
-    /* 
-     * Encodes the content before saving to database 
-     * 
-     * @param string $content 
-     * @return string $content 
-     * @access protected 
+    /**
+     * Encodes the content before saving to database
+     *
+     * @param string $content
+     *
+     * @return string $content
+     * @access protected
      */
     protected function inputContent($content)
     {
         return $content;
     }
 
-    /* 
-     * Decodes the content before saving to database 
-     * 
-     * @param string $content 
-     * @return string $content 
-     * @access protected 
+    /**
+     * Decodes the content before saving to database
+     *
+     * @param string $content
+     *
+     * @return string $content
+     * @access protected
      */
     protected function outputContent($content)
     {
@@ -272,43 +289,46 @@ class Smarty_CacheResource_Pdo extends Smarty_CacheResource_Custom
      * @param string|null $name       template name
      * @param string|null $cache_id   cache id
      * @param string|null $compile_id compile id
-     * @param  integer|null|-1 $exp_time seconds till expiration or null
+     * @param              integer|null|-1 $exp_time   seconds till expiration or null
      *
      * @return integer number of deleted caches
-     * @access protected
+     * @access             protected
      */
     protected function delete($name = null, $cache_id = null, $compile_id = null, $exp_time = null)
     {
-
-        // delete the whole cache 
+        // delete the whole cache
         if ($name === null && $cache_id === null && $compile_id === null && $exp_time === null) {
-            // returning the number of deleted caches would require a second query to count them 
+            // returning the number of deleted caches would require a second query to count them
             $this->pdo->query($this->truncateStatement);
-            return - 1;
+            return -1;
         }
-        // build the filter 
+        // build the filter
         $where = array();
-        // equal test name 
+        // equal test name
         if ($name !== null) {
             $where[] = 'name = ' . $this->pdo->quote($name);
         }
-        // equal test cache_id and match sub-groups 
+        // equal test cache_id and match sub-groups
         if ($cache_id !== null) {
-            $where[] = '(cache_id = ' . $this->pdo->quote($cache_id) . ' OR cache_id LIKE ' .
-                       $this->pdo->quote($cache_id . '|%') . ')';
+            $where[] =
+                '(cache_id = ' .
+                $this->pdo->quote($cache_id) .
+                ' OR cache_id LIKE ' .
+                $this->pdo->quote($cache_id . '|%') .
+                ')';
         }
-        // equal test compile_id 
+        // equal test compile_id
         if ($compile_id !== null) {
             $where[] = 'compile_id = ' . $this->pdo->quote($compile_id);
         }
-        // for clearing expired caches 
+        // for clearing expired caches
         if ($exp_time === Smarty::CLEAR_EXPIRED) {
             $where[] = 'expire < CURRENT_TIMESTAMP';
         } // range test expiration time
         elseif ($exp_time !== null) {
             $where[] = 'modified < DATE_SUB(NOW(), INTERVAL ' . intval($exp_time) . ' SECOND)';
         }
-        // run delete query 
+        // run delete query
         $query = $this->pdo->query(sprintf($this->deleteStatement, join(' AND ', $where)));
         return $query->rowCount();
     }
@@ -324,4 +344,3 @@ class Smarty_CacheResource_Pdo extends Smarty_CacheResource_Custom
         return (is_null($this->database)) ? "`{$this->table}`" : "`{$this->database}`.`{$this->table}`";
     }
 }
- 
\ No newline at end of file
diff --git a/vendor/smarty/smarty/demo/plugins/cacheresource.pdo_gzip.php b/vendor/smarty/smarty/demo/plugins/cacheresource.pdo_gzip.php
index 8a9e0a5dd..5560b9e39 100644
--- a/vendor/smarty/smarty/demo/plugins/cacheresource.pdo_gzip.php
+++ b/vendor/smarty/smarty/demo/plugins/cacheresource.pdo_gzip.php
@@ -1,4 +1,5 @@
 uid ] = $s;
                 $uid .= $s->filepath;
                 $timestamp = $s->timestamp > $timestamp ? $s->timestamp : $timestamp;
-            }
-            catch (SmartyException $e) {
+            } catch (SmartyException $e) {
             }
         }
         if (!$sources) {
             $source->exists = false;
             return;
         }
-
         $sources = array_reverse($sources, true);
         reset($sources);
         $s = current($sources);
@@ -51,15 +49,14 @@ class Smarty_Resource_Extendsall extends Smarty_Internal_Resource_Extends
         $source->timestamp = $timestamp;
     }
 
-    /*
+    /**
      * Disable timestamp checks for extendsall resource.
      * The individual source components will be checked.
      *
-     * @return bool
+     * @return bool false
      */
     public function checkTimestamps()
     {
         return false;
     }
-
 }
diff --git a/vendor/smarty/smarty/demo/plugins/resource.mysql.php b/vendor/smarty/smarty/demo/plugins/resource.mysql.php
index 619707e78..95a3c2baf 100644
--- a/vendor/smarty/smarty/demo/plugins/resource.mysql.php
+++ b/vendor/smarty/smarty/demo/plugins/resource.mysql.php
@@ -12,28 +12,46 @@
  *   PRIMARY KEY (`name`)
  * ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
    • * Demo data: - * 
    INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');
    + * 
    INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello
+ * world"}{$x}');
    + * * * @package Resource-examples * @author Rodney Rehm */ class Smarty_Resource_Mysql extends Smarty_Resource_Custom { - // PDO instance + /** + * PDO instance + * + * @var \PDO + */ protected $db; - // prepared fetch() statement + /** + * prepared fetch() statement + * + * @var \PDOStatement + */ protected $fetch; - // prepared fetchTimestamp() statement + /** + * prepared fetchTimestamp() statement + * + * @var \PDOStatement + */ protected $mtime; + /** + * Smarty_Resource_Mysql constructor. + * + * @throws \SmartyException + */ public function __construct() { try { $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty"); - } - catch (PDOException $e) { + } catch (PDOException $e) { throw new SmartyException('Mysql Resource failed: ' . $e->getMessage()); } $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name'); @@ -43,9 +61,9 @@ class Smarty_Resource_Mysql extends Smarty_Resource_Custom /** * Fetch a template and its modification time from database * - * @param string $name template name - * @param string $source template source - * @param integer $mtime template modification timestamp (epoch) + * @param string $name template name + * @param string $source template source + * @param integer $mtime template modification timestamp (epoch) * * @return void */ @@ -66,9 +84,10 @@ class Smarty_Resource_Mysql extends Smarty_Resource_Custom /** * Fetch a template's modification time from database * - * @note implementing this method is optional. Only implement it if modification times can be accessed faster than loading the comple template source. + * @note implementing this method is optional. Only implement it if modification times can be accessed faster than + * loading the comple template source. * - * @param string $name template name + * @param string $name template name * * @return integer timestamp (epoch) the template was modified */ @@ -77,7 +96,6 @@ class Smarty_Resource_Mysql extends Smarty_Resource_Custom $this->mtime->execute(array('name' => $name)); $mtime = $this->mtime->fetchColumn(); $this->mtime->closeCursor(); - return strtotime($mtime); } } diff --git a/vendor/smarty/smarty/demo/plugins/resource.mysqls.php b/vendor/smarty/smarty/demo/plugins/resource.mysqls.php index d85aecf31..148a8dd61 100644 --- a/vendor/smarty/smarty/demo/plugins/resource.mysqls.php +++ b/vendor/smarty/smarty/demo/plugins/resource.mysqls.php @@ -14,25 +14,39 @@ * PRIMARY KEY (`name`) * ) ENGINE=InnoDB DEFAULT CHARSET=utf8; * Demo data: - * 
    INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello world"}{$x}');
    + * 
    INSERT INTO `templates` (`name`, `modified`, `source`) VALUES ('test.tpl', "2010-12-25 22:00:00", '{$x="hello
+ * world"}{$x}');
    + * * * @package Resource-examples * @author Rodney Rehm */ class Smarty_Resource_Mysqls extends Smarty_Resource_Custom { - // PDO instance + /** + * PDO instance + * + * @var \PDO + */ protected $db; - // prepared fetch() statement + /** + * prepared fetch() statement + * + * @var \PDOStatement + */ protected $fetch; + /** + * Smarty_Resource_Mysqls constructor. + * + * @throws \SmartyException + */ public function __construct() { try { $this->db = new PDO("mysql:dbname=test;host=127.0.0.1", "smarty"); - } - catch (PDOException $e) { + } catch (PDOException $e) { throw new SmartyException('Mysql Resource failed: ' . $e->getMessage()); } $this->fetch = $this->db->prepare('SELECT modified, source FROM templates WHERE name = :name'); @@ -41,9 +55,9 @@ class Smarty_Resource_Mysqls extends Smarty_Resource_Custom /** * Fetch a template and its modification time from database * - * @param string $name template name - * @param string $source template source - * @param integer $mtime template modification timestamp (epoch) + * @param string $name template name + * @param string $source template source + * @param integer $mtime template modification timestamp (epoch) * * @return void */ diff --git a/vendor/smarty/smarty/libs/Autoloader.php b/vendor/smarty/smarty/libs/Autoloader.php index 3a0da8faf..e4dc450f0 100644 --- a/vendor/smarty/smarty/libs/Autoloader.php +++ b/vendor/smarty/smarty/libs/Autoloader.php @@ -2,14 +2,14 @@ /** * Smarty Autoloader * - * @package Smarty + * @package Smarty */ /** * Smarty Autoloader * - * @package Smarty - * @author Uwe Tews + * @package Smarty + * @author Uwe Tews * Usage: * require_once '...path/Autoloader.php'; * Smarty_Autoloader::register(); @@ -20,7 +20,7 @@ */ class Smarty_Autoloader { - /** + /** * Filepath to Smarty root * * @var string @@ -54,8 +54,8 @@ class Smarty_Autoloader if (!defined('SMARTY_SPL_AUTOLOAD')) { define('SMARTY_SPL_AUTOLOAD', 0); } - if (SMARTY_SPL_AUTOLOAD && - set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false + if (SMARTY_SPL_AUTOLOAD + && set_include_path(get_include_path() . PATH_SEPARATOR . SMARTY_SYSPLUGINS_DIR) !== false ) { $registeredAutoLoadFunctions = spl_autoload_functions(); if (!isset($registeredAutoLoadFunctions[ 'spl_autoload' ])) { diff --git a/vendor/smarty/smarty/libs/Smarty.class.php b/vendor/smarty/smarty/libs/Smarty.class.php index 597fbbf0c..a8969926b 100644 --- a/vendor/smarty/smarty/libs/Smarty.class.php +++ b/vendor/smarty/smarty/libs/Smarty.class.php @@ -27,7 +27,7 @@ * @author Uwe Tews * @author Rodney Rehm * @package Smarty - * @version 3.1.32 + * @version 3.1.33 */ /** * set SMARTY_DIR to absolute path to Smarty library files. @@ -112,7 +112,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * smarty version */ - const SMARTY_VERSION = '3.1.32'; + const SMARTY_VERSION = '3.1.33'; /** * define variable scopes */ @@ -166,133 +166,157 @@ class Smarty extends Smarty_Internal_TemplateBase const PLUGIN_COMPILER = 'compiler'; const PLUGIN_MODIFIER = 'modifier'; const PLUGIN_MODIFIERCOMPILER = 'modifiercompiler'; + /** * assigned global tpl vars */ public static $global_tpl_vars = array(); + /** * Flag denoting if Multibyte String functions are available */ public static $_MBSTRING = SMARTY_MBSTRING; + /** * The character set to adhere to (e.g. "UTF-8") */ public static $_CHARSET = SMARTY_RESOURCE_CHAR_SET; + /** * The date format to be used internally * (accepts date() and strftime()) */ public static $_DATE_FORMAT = SMARTY_RESOURCE_DATE_FORMAT; + /** * Flag denoting if PCRE should run in UTF-8 mode */ public static $_UTF8_MODIFIER = 'u'; + /** * Flag denoting if operating system is windows */ public static $_IS_WINDOWS = false; + /** * auto literal on delimiters with whitespace * * @var boolean */ public $auto_literal = true; + /** * display error on not assigned variables * * @var boolean */ public $error_unassigned = false; + /** * look up relative file path in include_path * * @var boolean */ public $use_include_path = false; + /** * flag if template_dir is normalized * * @var bool */ public $_templateDirNormalized = false; + /** * joined template directory string used in cache keys * * @var string */ public $_joined_template_dir = null; + /** * flag if config_dir is normalized * * @var bool */ public $_configDirNormalized = false; + /** * joined config directory string used in cache keys * * @var string */ public $_joined_config_dir = null; + /** * default template handler * * @var callable */ public $default_template_handler_func = null; + /** * default config handler * * @var callable */ public $default_config_handler_func = null; + /** * default plugin handler * * @var callable */ public $default_plugin_handler_func = null; + /** * flag if template_dir is normalized * * @var bool */ public $_compileDirNormalized = false; + /** * flag if plugins_dir is normalized * * @var bool */ public $_pluginsDirNormalized = false; + /** * flag if template_dir is normalized * * @var bool */ public $_cacheDirNormalized = false; + /** * force template compiling? * * @var boolean */ public $force_compile = false; - /** + + /** * use sub dirs for compiled/cached files? * * @var boolean */ public $use_sub_dirs = false; + /** * allow ambiguous resources (that are made unique by the resource handler) * * @var boolean */ public $allow_ambiguous_resources = false; + /** * merge compiled includes * * @var boolean */ public $merge_compiled_includes = false; + /* * flag for behaviour when extends: resource and {extends} tag are used simultaneous * if false disable execution of {extends} in templates called by extends resource. @@ -301,30 +325,35 @@ class Smarty extends Smarty_Internal_TemplateBase * @var boolean */ public $extends_recursion = true; + /** * force cache file creation * * @var boolean */ public $force_cache = false; + /** * template left-delimiter * * @var string */ public $left_delimiter = "{"; + /** * template right-delimiter * * @var string */ public $right_delimiter = "}"; + /** * array of strings which shall be treated as literal by compiler * * @var array string */ public $literals = array(); + /** * class name * This should be instance of Smarty_Security. @@ -333,24 +362,28 @@ class Smarty extends Smarty_Internal_TemplateBase * @see Smarty_Security */ public $security_class = 'Smarty_Security'; + /** * implementation of security class * * @var Smarty_Security */ public $security_policy = null; + /** * controls handling of PHP-blocks * * @var integer */ public $php_handling = self::PHP_PASSTHRU; + /** * controls if the php template file resource is allowed * * @var bool */ public $allow_php_templates = false; + /** * debug mode * Setting this to true enables the debug-console. @@ -358,6 +391,7 @@ class Smarty extends Smarty_Internal_TemplateBase * @var boolean */ public $debugging = false; + /** * This determines if debugging is enable-able from the browser. *
      @@ -368,6 +402,7 @@ class Smarty extends Smarty_Internal_TemplateBase * @var string */ public $debugging_ctrl = 'NONE'; + /** * Name of debugging URL-param. * Only used when $debugging_ctrl is set to 'URL'. @@ -376,54 +411,63 @@ class Smarty extends Smarty_Internal_TemplateBase * @var string */ public $smarty_debug_id = 'SMARTY_DEBUG'; + /** * Path of debug template. * * @var string */ public $debug_tpl = null; + /** * When set, smarty uses this value as error_reporting-level. * * @var int */ public $error_reporting = null; + /** * Controls whether variables with the same name overwrite each other. * * @var boolean */ public $config_overwrite = true; + /** * Controls whether config values of on/true/yes and off/false/no get converted to boolean. * * @var boolean */ public $config_booleanize = true; + /** * Controls whether hidden config sections/vars are read from the file. * * @var boolean */ public $config_read_hidden = false; + /** * locking concurrent compiles * * @var boolean */ public $compile_locking = true; + /** * Controls whether cache resources should use locking mechanism * * @var boolean */ public $cache_locking = false; + /** * seconds to wait for acquiring a lock before ignoring the write lock * * @var float */ public $locking_timeout = 10; + /** * resource type used if none given * Must be an valid key of $registered_resources. @@ -431,6 +475,7 @@ class Smarty extends Smarty_Internal_TemplateBase * @var string */ public $default_resource_type = 'file'; + /** * caching type * Must be an element of $cache_resource_types. @@ -438,160 +483,189 @@ class Smarty extends Smarty_Internal_TemplateBase * @var string */ public $caching_type = 'file'; + /** * config type * * @var string */ public $default_config_type = 'file'; + /** * check If-Modified-Since headers * * @var boolean */ public $cache_modified_check = false; + /** * registered plugins * * @var array */ public $registered_plugins = array(); + /** * registered objects * * @var array */ public $registered_objects = array(); + /** * registered classes * * @var array */ public $registered_classes = array(); + /** * registered filters * * @var array */ public $registered_filters = array(); + /** * registered resources * * @var array */ public $registered_resources = array(); + /** * registered cache resources * * @var array */ public $registered_cache_resources = array(); + /** * autoload filter * * @var array */ public $autoload_filters = array(); + /** * default modifier * * @var array */ public $default_modifiers = array(); + /** * autoescape variable output * * @var boolean */ public $escape_html = false; + /** * start time for execution time calculation * * @var int */ public $start_time = 0; + /** * required by the compiler for BC * * @var string */ public $_current_file = null; + /** * internal flag to enable parser debugging * * @var bool */ public $_parserdebug = false; + /** * This object type (Smarty = 1, template = 2, data = 4) * * @var int */ public $_objType = 1; + /** * Debug object * * @var Smarty_Internal_Debug */ public $_debug = null; + /** * template directory * * @var array */ protected $template_dir = array('./templates/'); + /** * flags for normalized template directory entries * * @var array */ protected $_processedTemplateDir = array(); + /** * config directory * * @var array */ protected $config_dir = array('./configs/'); + /** * flags for normalized template directory entries * * @var array */ protected $_processedConfigDir = array(); + /** * compile directory * * @var string */ protected $compile_dir = './templates_c/'; + /** * plugins directory * * @var array */ protected $plugins_dir = array(); + /** * cache directory * * @var string */ protected $cache_dir = './cache/'; + /** * removed properties * * @var string[] */ - protected $obsoleteProperties = array('resource_caching', 'template_resource_caching', 'direct_access_security', - '_dir_perms', '_file_perms', 'plugin_search_order', - 'inheritance_merge_compiled_includes', 'resource_cache_mode',); + protected $obsoleteProperties = array( + 'resource_caching', 'template_resource_caching', 'direct_access_security', + '_dir_perms', '_file_perms', 'plugin_search_order', + 'inheritance_merge_compiled_includes', 'resource_cache_mode', + ); + /** * List of private properties which will call getter/setter on a direct access * * @var string[] */ - protected $accessMap = array('template_dir' => 'TemplateDir', 'config_dir' => 'ConfigDir', - 'plugins_dir' => 'PluginsDir', 'compile_dir' => 'CompileDir', - 'cache_dir' => 'CacheDir',); + protected $accessMap = array( + 'template_dir' => 'TemplateDir', 'config_dir' => 'ConfigDir', + 'plugins_dir' => 'PluginsDir', 'compile_dir' => 'CompileDir', + 'cache_dir' => 'CacheDir', + ); /** * Initialize new Smarty object @@ -618,7 +692,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Enable error handler to mute expected messages * - * @return boolean + * @return boolean * @deprecated */ public static function muteExpectedErrors() @@ -639,7 +713,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Check if a template resource exists * - * @param string $resource_name template name + * @param string $resource_name template name * * @return bool status * @throws \SmartyException @@ -654,10 +728,10 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Loads security class and enables security * - * @param string|Smarty_Security $security_class if a string is used, it must be class-name + * @param string|Smarty_Security $security_class if a string is used, it must be class-name * * @return Smarty current Smarty instance for chaining - * @throws SmartyException when an invalid class name is provided + * @throws \SmartyException */ public function enableSecurity($security_class = null) { @@ -679,9 +753,9 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Add template directory(s) * - * @param string|array $template_dir directory(s) of template sources - * @param string $key of the array element to assign the template dir to - * @param bool $isConfig true for config_dir + * @param string|array $template_dir directory(s) of template sources + * @param string $key of the array element to assign the template dir to + * @param bool $isConfig true for config_dir * * @return Smarty current Smarty instance for chaining */ @@ -747,8 +821,8 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Set template directory * - * @param string|array $template_dir directory(s) of template sources - * @param bool $isConfig true for config_dir + * @param string|array $template_dir directory(s) of template sources + * @param bool $isConfig true for config_dir * * @return \Smarty current Smarty instance for chaining */ @@ -835,7 +909,7 @@ class Smarty extends Smarty_Internal_TemplateBase $this->plugins_dir = (array)$this->plugins_dir; } foreach ($this->plugins_dir as $k => $v) { - $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v, "/\\") . DIRECTORY_SEPARATOR, true); + $this->plugins_dir[ $k ] = $this->_realpath(rtrim($v, '/\\') . DIRECTORY_SEPARATOR, true); } $this->_cache[ 'plugin_files' ] = array(); $this->_pluginsDirNormalized = true; @@ -846,7 +920,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Set plugins directory * - * @param string|array $plugins_dir directory(s) of plugins + * @param string|array $plugins_dir directory(s) of plugins * * @return Smarty current Smarty instance for chaining */ @@ -901,7 +975,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * Set cache directory * - * @param string $cache_dir directory to store cached templates in + * @param string $cache_dir directory to store cached templates in * * @return Smarty current Smarty instance for chaining */ @@ -915,11 +989,11 @@ class Smarty extends Smarty_Internal_TemplateBase /** * creates a template object * - * @param string $template the resource handle of the template file - * @param mixed $cache_id cache id to be used with this template - * @param mixed $compile_id compile id to be used with this template - * @param object $parent next higher level of Smarty variables - * @param boolean $do_clone flag is Smarty object shall be cloned + * @param string $template the resource handle of the template file + * @param mixed $cache_id cache id to be used with this template + * @param mixed $compile_id compile id to be used with this template + * @param object $parent next higher level of Smarty variables + * @param boolean $do_clone flag is Smarty object shall be cloned * * @return \Smarty_Internal_Template template object * @throws \SmartyException @@ -946,7 +1020,7 @@ class Smarty extends Smarty_Internal_TemplateBase Smarty_Internal_Template::$isCacheTplObj[ $_templateId ]; $tpl->inheritance = null; $tpl->tpl_vars = $tpl->config_vars = array(); - } else if (!$do_clone && isset(Smarty_Internal_Template::$tplObjCache[ $_templateId ])) { + } elseif (!$do_clone && isset(Smarty_Internal_Template::$tplObjCache[ $_templateId ])) { $tpl = clone Smarty_Internal_Template::$tplObjCache[ $_templateId ]; $tpl->inheritance = null; $tpl->tpl_vars = $tpl->config_vars = array(); @@ -981,11 +1055,11 @@ class Smarty extends Smarty_Internal_TemplateBase * class name format: Smarty_PluginType_PluginName * plugin filename format: plugintype.pluginname.php * - * @param string $plugin_name class plugin name to load - * @param bool $check check if already loaded + * @param string $plugin_name class plugin name to load + * @param bool $check check if already loaded * - * @throws SmartyException * @return string |boolean filepath of loaded file or false + * @throws \SmartyException */ public function loadPlugin($plugin_name, $check = true) { @@ -1004,12 +1078,13 @@ class Smarty extends Smarty_Internal_TemplateBase * @return string * @throws \SmartyException */ - public function _getTemplateId($template_name, - $cache_id = null, - $compile_id = null, - $caching = null, - Smarty_Internal_Template $template = null) - { + public function _getTemplateId( + $template_name, + $cache_id = null, + $compile_id = null, + $caching = null, + Smarty_Internal_Template $template = null + ) { $template_name = (strpos($template_name, ':') === false) ? "{$this->default_resource_type}:{$template_name}" : $template_name; $cache_id = $cache_id === null ? $this->cache_id : $cache_id; @@ -1033,33 +1108,22 @@ class Smarty extends Smarty_Internal_TemplateBase * - remove /./ and /../ * - make it absolute if required * - * @param string $path file path - * @param bool $realpath if true - convert to absolute - * false - convert to relative - * null - keep as it is but remove /./ /../ + * @param string $path file path + * @param bool $realpath if true - convert to absolute + * false - convert to relative + * null - keep as it is but + * remove /./ /../ * * @return string */ public function _realpath($path, $realpath = null) { - static $nds = null; - static $sepDotsep = null; - static $sepDot = null; - static $sepSep =null; - if (!isset($nds)) { - $nds = array('/' => '\\', '\\' => '/'); - $sepDotsep = DIRECTORY_SEPARATOR . '.' . DIRECTORY_SEPARATOR; - $sepDot = DIRECTORY_SEPARATOR . '.'; - $sepSep = DIRECTORY_SEPARATOR . DIRECTORY_SEPARATOR; - } - // normalize DIRECTORY_SEPARATOR - $path = str_replace(array($nds[DIRECTORY_SEPARATOR], $sepDotsep), DIRECTORY_SEPARATOR, $path); - if (strpos($path,$sepDot) === false && (($realpath === false && $path[0] === '.') || $realpath === null) && $path[0] !== '\\') { - return $path; - } - preg_match('%^(?(?:[[:alpha:]]:[\\\\]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?(.*))$%u', - $path, - $parts); + $nds = array('/' => '\\', '\\' => '/'); + preg_match( + '%^(?(?:[[:alpha:]]:[\\\\/]|/|[\\\\]{2}[[:alpha:]]+|[[:print:]]{2,}:[/]{2}|[\\\\])?)(?(.*))$%u', + $path, + $parts + ); $path = $parts[ 'path' ]; if ($parts[ 'root' ] === '\\') { $parts[ 'root' ] = substr(getcwd(), 0, 2) . $parts[ 'root' ]; @@ -1068,24 +1132,18 @@ class Smarty extends Smarty_Internal_TemplateBase $path = getcwd() . DIRECTORY_SEPARATOR . $path; } } - // remove noop 'DIRECTORY_SEPARATOR DIRECTORY_SEPARATOR' and 'DIRECTORY_SEPARATOR.DIRECTORY_SEPARATOR' patterns - $path = str_replace(array($sepDotsep,$sepSep), DIRECTORY_SEPARATOR, $path); - // resolve '..DIRECTORY_SEPARATOR' pattern, smallest first - if (strpos($path, '..' . DIRECTORY_SEPARATOR) !== false && - preg_match_all('#[\\\\/]([.][.][\\\\/])+#u', $path, $match) - ) { - $counts = array(); - foreach ($match[ 0 ] as $m) { - $counts[] = (int)((strlen($m) - 1) / 3); - } - sort($counts); - foreach ($counts as $count) { - $path = preg_replace('#([\\\\/]+[^\\\\/]+){' . $count . - '}[\\\\/]+([.][.][\\\\/]+){' . $count . '}#u', - DIRECTORY_SEPARATOR, - $path); - } - } + // normalize DIRECTORY_SEPARATOR + $path = str_replace($nds[ DIRECTORY_SEPARATOR ], DIRECTORY_SEPARATOR, $path); + $parts[ 'root' ] = str_replace($nds[ DIRECTORY_SEPARATOR ], DIRECTORY_SEPARATOR, $parts[ 'root' ]); + do { + $path = preg_replace( + array('#[\\\\/]{2}#', '#[\\\\/][.][\\\\/]#', '#[\\\\/]([^\\\\/.]+)[\\\\/][.][.][\\\\/]#'), + DIRECTORY_SEPARATOR, + $path, + -1, + $count + ); + } while ($count > 0); return $realpath !== false ? $parts[ 'root' ] . $path : str_ireplace(getcwd(), '.', $parts[ 'root' ] . $path); } @@ -1279,19 +1337,18 @@ class Smarty extends Smarty_Internal_TemplateBase * Calls the appropriate getter function. * Issues an E_USER_NOTICE if no valid getter is found. * - * @param string $name property name + * @param string $name property name * * @return mixed - * @throws \SmartyException */ public function __get($name) { if (isset($this->accessMap[ $name ])) { $method = 'get' . $this->accessMap[ $name ]; return $this->{$method}(); - } else if (isset($this->_cache[ $name ])) { + } elseif (isset($this->_cache[ $name ])) { return $this->_cache[ $name ]; - } else if (in_array($name, $this->obsoleteProperties)) { + } elseif (in_array($name, $this->obsoleteProperties)) { return null; } else { trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE); @@ -1307,21 +1364,18 @@ class Smarty extends Smarty_Internal_TemplateBase * @param string $name property name * @param mixed $value parameter passed to setter * - * @throws \SmartyException */ public function __set($name, $value) { if (isset($this->accessMap[ $name ])) { $method = 'set' . $this->accessMap[ $name ]; $this->{$method}($value); - } else if (in_array($name, $this->obsoleteProperties)) { + } elseif (in_array($name, $this->obsoleteProperties)) { return; + } elseif (is_object($value) && method_exists($value, $name)) { + $this->$name = $value; } else { - if (is_object($value) && method_exists($value, $name)) { - $this->$name = $value; - } else { - trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE); - } + trigger_error('Undefined property: ' . get_class($this) . '::$' . $name, E_USER_NOTICE); } } @@ -1345,7 +1399,6 @@ class Smarty extends Smarty_Internal_TemplateBase * Normalize template_dir or config_dir * * @param bool $isConfig true for config_dir - * */ private function _normalizeTemplateConfig($isConfig) { diff --git a/vendor/smarty/smarty/libs/SmartyBC.class.php b/vendor/smarty/smarty/libs/SmartyBC.class.php index f2230fc9c..836f98153 100644 --- a/vendor/smarty/smarty/libs/SmartyBC.class.php +++ b/vendor/smarty/smarty/libs/SmartyBC.class.php @@ -28,7 +28,7 @@ /** * @ignore */ -require_once(dirname(__FILE__) . '/Smarty.class.php'); +require_once dirname(__FILE__) . '/Smarty.class.php'; /** * Smarty Backward Compatibility Wrapper Class @@ -53,7 +53,6 @@ class SmartyBC extends Smarty /** * Initialize new SmartyBC object - * */ public function __construct() { @@ -127,12 +126,16 @@ class SmartyBC extends Smarty * @param boolean $smarty_args smarty argument format, else traditional * @param array $block_methods list of methods that are block format * - * @throws SmartyException + * @throws SmartyException * @internal param array $block_functs list of methods that are block format */ - public function register_object($object, $object_impl, $allowed = array(), $smarty_args = true, - $block_methods = array()) - { + public function register_object( + $object, + $object_impl, + $allowed = array(), + $smarty_args = true, + $block_methods = array() + ) { settype($allowed, 'array'); settype($smarty_args, 'boolean'); $this->registerObject($object, $object_impl, $allowed, $smarty_args, $block_methods); @@ -326,10 +329,10 @@ class SmartyBC extends Smarty /** * clear cached content for the given template and cache id * - * @param string $tpl_file name of template file - * @param string $cache_id name of cache_id - * @param string $compile_id name of compile_id - * @param string $exp_time expiration time + * @param string $tpl_file name of template file + * @param string $cache_id name of cache_id + * @param string $compile_id name of compile_id + * @param string $exp_time expiration time * * @return boolean */ @@ -341,7 +344,7 @@ class SmartyBC extends Smarty /** * clear the entire contents of cache (all templates) * - * @param string $exp_time expire time + * @param string $exp_time expire time * * @return boolean */ @@ -353,9 +356,9 @@ class SmartyBC extends Smarty /** * test to see if valid cache exists for this template * - * @param string $tpl_file name of template file - * @param string $cache_id - * @param string $compile_id + * @param string $tpl_file name of template file + * @param string $cache_id + * @param string $compile_id * * @return bool * @throws \Exception @@ -379,9 +382,9 @@ class SmartyBC extends Smarty * or all compiled template files if one is not specified. * This function is for advanced use only, not normally needed. * - * @param string $tpl_file - * @param string $compile_id - * @param string $exp_time + * @param string $tpl_file + * @param string $compile_id + * @param string $exp_time * * @return boolean results of {@link smarty_core_rm_auto()} */ @@ -393,7 +396,7 @@ class SmartyBC extends Smarty /** * Checks whether requested template exists. * - * @param string $tpl_file + * @param string $tpl_file * * @return bool * @throws \SmartyException @@ -406,7 +409,7 @@ class SmartyBC extends Smarty /** * Returns an array containing template variables * - * @param string $name + * @param string $name * * @return array */ @@ -418,7 +421,7 @@ class SmartyBC extends Smarty /** * Returns an array containing config variables * - * @param string $name + * @param string $name * * @return array */ @@ -442,7 +445,7 @@ class SmartyBC extends Smarty /** * return a reference to a registered object * - * @param string $name + * @param string $name * * @return object */ diff --git a/vendor/smarty/smarty/libs/bootstrap.php b/vendor/smarty/smarty/libs/bootstrap.php index dad72fcb1..2c830468e 100644 --- a/vendor/smarty/smarty/libs/bootstrap.php +++ b/vendor/smarty/smarty/libs/bootstrap.php @@ -1,5 +1,5 @@ @@ -7,11 +7,10 @@ * For the full copyright and license information, please view the LICENSE * file that was distributed with this source code. */ - -/* +/** * Load and register Smarty Autoloader */ if (!class_exists('Smarty_Autoloader')) { - require dirname(__FILE__) . '/Autoloader.php'; + include dirname(__FILE__) . '/Autoloader.php'; } Smarty_Autoloader::register(true); diff --git a/vendor/smarty/smarty/libs/debug.tpl b/vendor/smarty/smarty/libs/debug.tpl index 5526cbca8..edc7bef98 100644 --- a/vendor/smarty/smarty/libs/debug.tpl +++ b/vendor/smarty/smarty/libs/debug.tpl @@ -113,10 +113,10 @@
      {foreach $template_data as $template} {$template.name} -
         +
         (compile {$template['compile_time']|string_format:"%.5f"}) (render {$template['render_time']|string_format:"%.5f"}) (cache {$template['cache_time']|string_format:"%.5f"}) -
      +
      {/foreach}
      {/if} @@ -127,7 +127,7 @@ {foreach $assigned_vars as $vars}

      ${$vars@key}

      - {if isset($vars['nocache'])}Nocache
      {/if} + {if isset($vars['nocache'])}Nocache
      {/if} {if isset($vars['scope'])}Origin: {$vars['scope']|debug_print_var nofilter}{/if}

      Value

      {$vars['value']|debug_print_var:10:80 nofilter} diff --git a/vendor/smarty/smarty/libs/plugins/block.textformat.php b/vendor/smarty/smarty/libs/plugins/block.textformat.php index 310a420ee..5e494637e 100644 --- a/vendor/smarty/smarty/libs/plugins/block.textformat.php +++ b/vendor/smarty/smarty/libs/plugins/block.textformat.php @@ -20,7 +20,6 @@ * - indent_char - string (" ") * - wrap_boundary - boolean (true) * - * * @link http://www.smarty.net/manual/en/language.function.textformat.php {textformat} * (Smarty online manual) * @@ -39,10 +38,15 @@ function smarty_block_textformat($params, $content, Smarty_Internal_Template $te return; } if (Smarty::$_MBSTRING) { - $template->_checkPlugins(array(array('function' => 'smarty_modifier_mb_wordwrap', - 'file' => SMARTY_PLUGINS_DIR . 'modifier.mb_wordwrap.php'))); + $template->_checkPlugins( + array( + array( + 'function' => 'smarty_modifier_mb_wordwrap', + 'file' => SMARTY_PLUGINS_DIR . 'modifier.mb_wordwrap.php' + ) + ) + ); } - $style = null; $indent = 0; $indent_first = 0; @@ -51,47 +55,48 @@ function smarty_block_textformat($params, $content, Smarty_Internal_Template $te $wrap_char = "\n"; $wrap_cut = false; $assign = null; - foreach ($params as $_key => $_val) { switch ($_key) { case 'style': case 'indent_char': case 'wrap_char': case 'assign': - $$_key = (string) $_val; + $$_key = (string)$_val; break; - case 'indent': case 'indent_first': case 'wrap': - $$_key = (int) $_val; + $$_key = (int)$_val; break; - case 'wrap_cut': - $$_key = (bool) $_val; + $$_key = (bool)$_val; break; - default: trigger_error("textformat: unknown attribute '{$_key}'"); } } - if ($style === 'email') { $wrap = 72; } // split into paragraphs $_paragraphs = preg_split('![\r\n]{2}!', $content); - foreach ($_paragraphs as &$_paragraph) { if (!$_paragraph) { continue; } // convert mult. spaces & special chars to single space $_paragraph = - preg_replace(array('!\s+!' . Smarty::$_UTF8_MODIFIER, - '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER), - array(' ', - ''), $_paragraph); + preg_replace( + array( + '!\s+!' . Smarty::$_UTF8_MODIFIER, + '!(^\s+)|(\s+$)!' . Smarty::$_UTF8_MODIFIER + ), + array( + ' ', + '' + ), + $_paragraph + ); // indent first line if ($indent_first > 0) { $_paragraph = str_repeat($indent_char, $indent_first) . $_paragraph; @@ -108,7 +113,6 @@ function smarty_block_textformat($params, $content, Smarty_Internal_Template $te } } $_output = implode($wrap_char . $wrap_char, $_paragraphs); - if ($assign) { $template->assign($assign, $_output); } else { diff --git a/vendor/smarty/smarty/libs/plugins/function.counter.php b/vendor/smarty/smarty/libs/plugins/function.counter.php index 9610362d9..a4129e77c 100644 --- a/vendor/smarty/smarty/libs/plugins/function.counter.php +++ b/vendor/smarty/smarty/libs/plugins/function.counter.php @@ -5,7 +5,6 @@ * @package Smarty * @subpackage PluginsFunction */ - /** * Smarty {counter} function plugin * Type: function @@ -24,50 +23,40 @@ function smarty_function_counter($params, $template) { static $counters = array(); - $name = (isset($params[ 'name' ])) ? $params[ 'name' ] : 'default'; if (!isset($counters[ $name ])) { $counters[ $name ] = array('start' => 1, 'skip' => 1, 'direction' => 'up', 'count' => 1); } $counter =& $counters[ $name ]; - if (isset($params[ 'start' ])) { - $counter[ 'start' ] = $counter[ 'count' ] = (int) $params[ 'start' ]; + $counter[ 'start' ] = $counter[ 'count' ] = (int)$params[ 'start' ]; } - if (!empty($params[ 'assign' ])) { $counter[ 'assign' ] = $params[ 'assign' ]; } - if (isset($counter[ 'assign' ])) { $template->assign($counter[ 'assign' ], $counter[ 'count' ]); } - if (isset($params[ 'print' ])) { - $print = (bool) $params[ 'print' ]; + $print = (bool)$params[ 'print' ]; } else { $print = empty($counter[ 'assign' ]); } - if ($print) { $retval = $counter[ 'count' ]; } else { $retval = null; } - if (isset($params[ 'skip' ])) { $counter[ 'skip' ] = $params[ 'skip' ]; } - if (isset($params[ 'direction' ])) { $counter[ 'direction' ] = $params[ 'direction' ]; } - if ($counter[ 'direction' ] === 'down') { $counter[ 'count' ] -= $counter[ 'skip' ]; } else { $counter[ 'count' ] += $counter[ 'skip' ]; } - return $retval; } diff --git a/vendor/smarty/smarty/libs/plugins/function.cycle.php b/vendor/smarty/smarty/libs/plugins/function.cycle.php index b871524fc..07ffcc5e2 100644 --- a/vendor/smarty/smarty/libs/plugins/function.cycle.php +++ b/vendor/smarty/smarty/libs/plugins/function.cycle.php @@ -5,7 +5,6 @@ * @package Smarty * @subpackage PluginsFunction */ - /** * Smarty {cycle} function plugin * Type: function @@ -29,34 +28,29 @@ * {cycle name=row values="one,two,three" reset=true} * {cycle name=row} * - * - * @link http://www.smarty.net/manual/en/language.function.cycle.php {cycle} + * @link http://www.smarty.net/manual/en/language.function.cycle.php {cycle} * (Smarty online manual) - * @author Monte Ohrt - * @author credit to Mark Priatel - * @author credit to Gerard - * @author credit to Jason Sweat - * @version 1.3 + * @author Monte Ohrt + * @author credit to Mark Priatel + * @author credit to Gerard + * @author credit to Jason Sweat + * @version 1.3 * * @param array $params parameters * @param Smarty_Internal_Template $template template object * * @return string|null */ - function smarty_function_cycle($params, $template) { static $cycle_vars; - $name = (empty($params[ 'name' ])) ? 'default' : $params[ 'name' ]; - $print = (isset($params[ 'print' ])) ? (bool) $params[ 'print' ] : true; - $advance = (isset($params[ 'advance' ])) ? (bool) $params[ 'advance' ] : true; - $reset = (isset($params[ 'reset' ])) ? (bool) $params[ 'reset' ] : false; - + $print = (isset($params[ 'print' ])) ? (bool)$params[ 'print' ] : true; + $advance = (isset($params[ 'advance' ])) ? (bool)$params[ 'advance' ] : true; + $reset = (isset($params[ 'reset' ])) ? (bool)$params[ 'reset' ] : false; if (!isset($params[ 'values' ])) { if (!isset($cycle_vars[ $name ][ 'values' ])) { trigger_error('cycle: missing \'values\' parameter'); - return; } } else { @@ -65,41 +59,34 @@ function smarty_function_cycle($params, $template) } $cycle_vars[ $name ][ 'values' ] = $params[ 'values' ]; } - if (isset($params[ 'delimiter' ])) { $cycle_vars[ $name ][ 'delimiter' ] = $params[ 'delimiter' ]; } elseif (!isset($cycle_vars[ $name ][ 'delimiter' ])) { $cycle_vars[ $name ][ 'delimiter' ] = ','; } - if (is_array($cycle_vars[ $name ][ 'values' ])) { $cycle_array = $cycle_vars[ $name ][ 'values' ]; } else { $cycle_array = explode($cycle_vars[ $name ][ 'delimiter' ], $cycle_vars[ $name ][ 'values' ]); } - if (!isset($cycle_vars[ $name ][ 'index' ]) || $reset) { $cycle_vars[ $name ][ 'index' ] = 0; } - if (isset($params[ 'assign' ])) { $print = false; $template->assign($params[ 'assign' ], $cycle_array[ $cycle_vars[ $name ][ 'index' ] ]); } - if ($print) { $retval = $cycle_array[ $cycle_vars[ $name ][ 'index' ] ]; } else { $retval = null; } - if ($advance) { if ($cycle_vars[ $name ][ 'index' ] >= count($cycle_array) - 1) { $cycle_vars[ $name ][ 'index' ] = 0; } else { - $cycle_vars[ $name ][ 'index' ] ++; + $cycle_vars[ $name ][ 'index' ]++; } } - return $retval; } diff --git a/vendor/smarty/smarty/libs/plugins/function.fetch.php b/vendor/smarty/smarty/libs/plugins/function.fetch.php index 9539e1fcc..768761b23 100644 --- a/vendor/smarty/smarty/libs/plugins/function.fetch.php +++ b/vendor/smarty/smarty/libs/plugins/function.fetch.php @@ -5,7 +5,6 @@ * @package Smarty * @subpackage PluginsFunction */ - /** * Smarty {fetch} plugin * Type: function @@ -26,20 +25,16 @@ function smarty_function_fetch($params, $template) { if (empty($params[ 'file' ])) { trigger_error('[plugin] fetch parameter \'file\' cannot be empty', E_USER_NOTICE); - return; } - // strip file protocol if (stripos($params[ 'file' ], 'file://') === 0) { $params[ 'file' ] = substr($params[ 'file' ], 7); } - $protocol = strpos($params[ 'file' ], '://'); if ($protocol !== false) { $protocol = strtolower(substr($params[ 'file' ], 0, $protocol)); } - if (isset($template->smarty->security_policy)) { if ($protocol) { // remote resource (or php stream, …) @@ -53,7 +48,6 @@ function smarty_function_fetch($params, $template) } } } - $content = ''; if ($protocol === 'http') { // http fetch @@ -104,7 +98,6 @@ function smarty_function_fetch($params, $template) if (!empty($param_value)) { if (!preg_match('![\w\d-]+: .+!', $param_value)) { trigger_error("[plugin] invalid header format '{$param_value}'", E_USER_NOTICE); - return; } else { $extra_headers[] = $param_value; @@ -118,10 +111,9 @@ function smarty_function_fetch($params, $template) break; case 'proxy_port': if (!preg_match('!\D!', $param_value)) { - $proxy_port = (int) $param_value; + $proxy_port = (int)$param_value; } else { trigger_error("[plugin] invalid value for attribute '{$param_key }'", E_USER_NOTICE); - return; } break; @@ -137,16 +129,14 @@ function smarty_function_fetch($params, $template) break; case 'timeout': if (!preg_match('!\D!', $param_value)) { - $timeout = (int) $param_value; + $timeout = (int)$param_value; } else { trigger_error("[plugin] invalid value for attribute '{$param_key}'", E_USER_NOTICE); - return; } break; default: trigger_error("[plugin] unrecognized attribute '{$param_key}'", E_USER_NOTICE); - return; } } @@ -156,10 +146,8 @@ function smarty_function_fetch($params, $template) } else { $fp = fsockopen($server_name, $port, $errno, $errstr, $timeout); } - if (!$fp) { trigger_error("[plugin] unable to fetch: $errstr ($errno)", E_USER_NOTICE); - return; } else { if ($_is_proxy) { @@ -187,23 +175,19 @@ function smarty_function_fetch($params, $template) if (!empty($user) && !empty($pass)) { fputs($fp, 'Authorization: BASIC ' . base64_encode("$user:$pass") . "\r\n"); } - fputs($fp, "\r\n"); while (!feof($fp)) { $content .= fgets($fp, 4096); } fclose($fp); $csplit = preg_split("!\r\n\r\n!", $content, 2); - $content = $csplit[ 1 ]; - if (!empty($params[ 'assign_headers' ])) { $template->assign($params[ 'assign_headers' ], preg_split("!\r\n!", $csplit[ 0 ])); } } } else { trigger_error("[plugin fetch] unable to parse URL, check syntax", E_USER_NOTICE); - return; } } else { @@ -212,7 +196,6 @@ function smarty_function_fetch($params, $template) throw new SmartyException("{fetch} cannot read resource '" . $params[ 'file' ] . "'"); } } - if (!empty($params[ 'assign' ])) { $template->assign($params[ 'assign' ], $content); } else { diff --git a/vendor/smarty/smarty/libs/plugins/function.html_checkboxes.php b/vendor/smarty/smarty/libs/plugins/function.html_checkboxes.php index d654caba6..302358edd 100644 --- a/vendor/smarty/smarty/libs/plugins/function.html_checkboxes.php +++ b/vendor/smarty/smarty/libs/plugins/function.html_checkboxes.php @@ -29,25 +29,29 @@ * - assign (optional) - assign the output as an array to this variable * - escape (optional) - escape the content (not value), defaults to true * - * - * @link http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes} + * @link http://www.smarty.net/manual/en/language.function.html.checkboxes.php {html_checkboxes} * (Smarty online manual) - * @author Christopher Kvarme - * @author credits to Monte Ohrt - * @version 1.0 + * @author Christopher Kvarme + * @author credits to Monte Ohrt + * @version 1.0 * * @param array $params parameters * @param Smarty_Internal_Template $template template object * * @return string - * @uses smarty_function_escape_special_chars() + * @uses smarty_function_escape_special_chars() * @throws \SmartyException */ function smarty_function_html_checkboxes($params, Smarty_Internal_Template $template) { - $template->_checkPlugins(array(array('function' => 'smarty_function_escape_special_chars', - 'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php'))); - + $template->_checkPlugins( + array( + array( + 'function' => 'smarty_function_escape_special_chars', + 'file' => SMARTY_PLUGINS_DIR . 'shared.escape_special_chars.php' + ) + ) + ); $name = 'checkbox'; $values = null; $options = null; @@ -57,31 +61,25 @@ function smarty_function_html_checkboxes($params, Smarty_Internal_Template $temp $labels = true; $label_ids = false; $output = null; - $extra = ''; - foreach ($params as $_key => $_val) { switch ($_key) { case 'name': case 'separator': - $$_key = (string) $_val; + $$_key = (string)$_val; break; - case 'escape': case 'labels': case 'label_ids': - $$_key = (bool) $_val; + $$_key = (bool)$_val; break; - case 'options': - $$_key = (array) $_val; + $$_key = (array)$_val; break; - case 'values': case 'output': - $$_key = array_values((array) $_val); + $$_key = array_values((array)$_val); break; - case 'checked': case 'selected': if (is_array($_val)) { @@ -89,57 +87,61 @@ function smarty_function_html_checkboxes($params, Smarty_Internal_Template $temp foreach ($_val as $_sel) { if (is_object($_sel)) { if (method_exists($_sel, '__toString')) { - $_sel = smarty_function_escape_special_chars((string) $_sel->__toString()); + $_sel = smarty_function_escape_special_chars((string)$_sel->__toString()); } else { - trigger_error('html_checkboxes: selected attribute contains an object of class \'' . - get_class($_sel) . '\' without __toString() method', E_USER_NOTICE); + trigger_error( + 'html_checkboxes: selected attribute contains an object of class \'' . + get_class($_sel) . '\' without __toString() method', + E_USER_NOTICE + ); continue; } } else { - $_sel = smarty_function_escape_special_chars((string) $_sel); + $_sel = smarty_function_escape_special_chars((string)$_sel); } $selected[ $_sel ] = true; } } elseif (is_object($_val)) { if (method_exists($_val, '__toString')) { - $selected = smarty_function_escape_special_chars((string) $_val->__toString()); + $selected = smarty_function_escape_special_chars((string)$_val->__toString()); } else { - trigger_error('html_checkboxes: selected attribute is an object of class \'' . get_class($_val) . - '\' without __toString() method', E_USER_NOTICE); + trigger_error( + 'html_checkboxes: selected attribute is an object of class \'' . get_class($_val) . + '\' without __toString() method', + E_USER_NOTICE + ); } } else { - $selected = smarty_function_escape_special_chars((string) $_val); + $selected = smarty_function_escape_special_chars((string)$_val); } break; - case 'checkboxes': - trigger_error('html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead', - E_USER_WARNING); - $options = (array) $_val; + trigger_error( + 'html_checkboxes: the use of the "checkboxes" attribute is deprecated, use "options" instead', + E_USER_WARNING + ); + $options = (array)$_val; break; - case 'assign': break; - case 'strict': break; - case 'disabled': case 'readonly': if (!empty($params[ 'strict' ])) { if (!is_scalar($_val)) { - trigger_error("html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute", - E_USER_NOTICE); + trigger_error( + "html_options: {$_key} attribute must be a scalar, only boolean true or string '{$_key}' will actually add the attribute", + E_USER_NOTICE + ); } - if ($_val === true || $_val === $_key) { $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_key) . '"'; } - break; } // omit break; to fall through! - + // no break default: if (!is_array($_val)) { $extra .= ' ' . $_key . '="' . smarty_function_escape_special_chars($_val) . '"'; @@ -149,34 +151,49 @@ function smarty_function_html_checkboxes($params, Smarty_Internal_Template $temp break; } } - if (!isset($options) && !isset($values)) { return ''; } /* raise error here? */ - $_html_result = array(); - if (isset($options)) { foreach ($options as $_key => $_val) { $_html_result[] = - smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, - $label_ids, $escape); + smarty_function_html_checkboxes_output( + $name, + $_key, + $_val, + $selected, + $extra, + $separator, + $labels, + $label_ids, + $escape + ); } } else { foreach ($values as $_i => $_key) { $_val = isset($output[ $_i ]) ? $output[ $_i ] : ''; $_html_result[] = - smarty_function_html_checkboxes_output($name, $_key, $_val, $selected, $extra, $separator, $labels, - $label_ids, $escape); + smarty_function_html_checkboxes_output( + $name, + $_key, + $_val, + $selected, + $extra, + $separator, + $labels, + $label_ids, + $escape + ); } } - if (!empty($params[ 'assign' ])) { $template->assign($params[ 'assign' ], $_html_result); } else { return implode("\n", $_html_result); } } + /** * @param $name * @param $value @@ -190,59 +207,69 @@ function smarty_function_html_checkboxes($params, Smarty_Internal_Template $temp * * @return string */ -function smarty_function_html_checkboxes_output($name, $value, $output, $selected, $extra, $separator, $labels, - $label_ids, $escape = true) -{ +function smarty_function_html_checkboxes_output( + $name, + $value, + $output, + $selected, + $extra, + $separator, + $labels, + $label_ids, + $escape = true +) { $_output = ''; - if (is_object($value)) { if (method_exists($value, '__toString')) { - $value = (string) $value->__toString(); + $value = (string)$value->__toString(); } else { - trigger_error('html_options: value is an object of class \'' . get_class($value) . - '\' without __toString() method', E_USER_NOTICE); - + trigger_error( + 'html_options: value is an object of class \'' . get_class($value) . + '\' without __toString() method', + E_USER_NOTICE + ); return ''; } } else { - $value = (string) $value; + $value = (string)$value; } - if (is_object($output)) { if (method_exists($output, '__toString')) { - $output = (string) $output->__toString(); + $output = (string)$output->__toString(); } else { - trigger_error('html_options: output is an object of class \'' . get_class($output) . - '\' without __toString() method', E_USER_NOTICE); - + trigger_error( + 'html_options: output is an object of class \'' . get_class($output) . + '\' without __toString() method', + E_USER_NOTICE + ); return ''; } } else { - $output = (string) $output; + $output = (string)$output; } - if ($labels) { if ($label_ids) { - $_id = smarty_function_escape_special_chars(preg_replace('![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, '_', - $name . '_' . $value)); + $_id = smarty_function_escape_special_chars( + preg_replace( + '![^\w\-\.]!' . Smarty::$_UTF8_MODIFIER, + '_', + $name . '_' . $value + ) + ); $_output .= '